fix(kitsu-core): fix deserialisation of relationships from primary data (#683)

Author: pedep

packages/kitsu-core/src/deserialise/index.js

@@ -10,8 +10,7 @@ import { linkRelationships } from '../linkRelationships'
  */
 function deserialiseArray (array) {
   for (let value of array.data) {
-    if (array.included) value = linkRelationships(value, array.included)
-    if (value.relationships) value = linkRelationships(value)
+    value = linkRelationships(value, [ ...array.data, ...(array.included || []) ])
     if (value.attributes) value = deattribute(value)
     array.data[array.data.indexOf(value)] = value
   }

packages/kitsu-core/src/deserialise/index.spec.js

@@ -670,5 +670,122 @@ describe('kitsu-core', () => {
         ]
       })
     })
+
+    it('deserialises a relationship from the data key', () => {
+      expect.assertions(1)
+
+      const input = deserialise({
+        data: [
+          {
+            id: '1',
+            type: 'anime',
+            attributes: { name: 'A' },
+            relationships: {
+              prequel: {
+                data: {
+                  type: 'anime',
+                  id: '42'
+                }
+              }
+            }
+          },
+          {
+            id: '2',
+            type: 'anime',
+            attributes: { name: 'B' },
+            relationships: {
+              prequel: {
+                data: {
+                  type: 'anime',
+                  id: '1'
+                }
+              }
+            }
+          },
+          {
+            id: '3',
+            type: 'anime',
+            attributes: { name: 'C' },
+            relationships: {
+              prequel: {
+                data: {
+                  type: 'anime',
+                  id: '4'
+                }
+              }
+            }
+          }
+        ],
+        included: [
+          {
+            id: '4',
+            type: 'anime',
+            attributes: { name: 'D' },
+            relationships: {
+              prequel: {
+                data: {
+                  type: 'anime',
+                  id: '42'
+                }
+              }
+            }
+          }
+        ]
+      })
+
+      const output = {
+        data: [
+          {
+            id: '1',
+            type: 'anime',
+            name: 'A',
+            prequel: {
+              data: {
+                id: '42',
+                type: 'anime'
+              }
+            }
+          },
+          {
+            id: '2',
+            type: 'anime',
+            name: 'B',
+            prequel: {
+              data: {
+                id: '1',
+                type: 'anime',
+                name: 'A',
+                prequel: {
+                  data: {
+                    id: '42',
+                    type: 'anime'
+                  }
+                }
+              }
+            }
+          },
+          {
+            id: '3',
+            type: 'anime',
+            name: 'C',
+            prequel: {
+              data: {
+                id: '4',
+                type: 'anime',
+                name: 'D',
+                prequel: {
+                  data: {
+                    id: '42',
+                    type: 'anime'
+                  }
+                }
+              }
+            }
+          }
+        ]
+      }
+
+      expect(input).toEqual(output)
+    })
   })
 })