fix(kitsu-core): correctly parse attributes.attributes (closes #137)

Author: wopian

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

@@ -30,8 +30,21 @@ export function deattribute (data) {
   if (typeof data === 'object' && data !== null) {
     if (Array.isArray(data)) data.map(el => deattribute(el))
     else if (data.attributes && data.attributes.constructor === Object) {
-      Object.keys(data.attributes).forEach(key => { data[key] = data.attributes[key] })
-      delete data.attributes
+      for (const key of Object.keys(data.attributes)) {
+        // Hoist everything but attributes to parent to avoid issues with deleting
+        // as can't delete data.attributes[key] as it will belete data[key] too
+        if (!data.attributes.attributes) {
+          data[key] = data.attributes[key]
+        }
+      }
+
+      // Replace attributes with attributes variable if it exists, else delete
+      // attributes. Avoids deletion issue with object references
+      if (data.attributes.attributes) {
+        data.attributes = data.attributes.attributes
+      } else {
+        delete data.attributes
+      }
     }
   }
   return data

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

@@ -53,5 +53,16 @@ describe('kitsu-core', () => {
       expect(deattribute(map)).toEqual(map)
       expect(deattribute(weakMap)).toEqual(weakMap)
     })
+
+    it('allows attributes.attributes', () => {
+      expect.assertions(1)
+      expect(deattribute({
+        attributes: {
+          attributes: 'value'
+        }
+      })).toEqual({
+        attributes: 'value'
+      })
+    })
   })
 })

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

@@ -227,5 +227,38 @@ describe('kitsu-core', () => {
         }
       })
     })
+
+    it('accepts attribute.attribute in relationships', () => {
+      expect.assertions(1)
+      const data = {
+        relationships: {
+          author: {
+            data: {
+              id: '1',
+              type: 'people'
+            }
+          }
+        }
+      }
+      const included = [
+        {
+          id: '1',
+          type: 'people',
+          attributes: {
+            attributes: 'Joe'
+          }
+        }
+      ]
+      expect(linkRelationships(data, included))
+        .toEqual({
+          author: {
+            data: {
+              id: '1',
+              attributes: 'Joe',
+              type: 'people'
+            }
+          }
+        })
+    })
   })
 })