Fix nested resources loading

Author: Skysplit

lib/deserializer-utils.js

@@ -24,21 +24,33 @@ module.exports = function (jsonapi, data, opts) {
     }
   }
 
-  function findIncluded(relationshipData) {
+  function findIncluded(relationshipData, from) {
     return new Promise(function (resolve) {
-      if (!jsonapi.included || !relationshipData) { resolve(null); }
+      if (!jsonapi.included || !relationshipData) { return resolve(null); }
 
       var included = _find(jsonapi.included, {
         id: relationshipData.id,
         type: relationshipData.type
       });
 
+      var includedObject = {
+        to: {
+          id: from.id,
+          type: from.type,
+        },
+        from: relationshipData,
+      };
+
       // Check if the include is already processed (prevent circular
       // references).
-      if (alreadyIncluded.indexOf(included) > -1) {
+      if (_find(alreadyIncluded, includedObject)) {
         return resolve(null);
       } else {
-        alreadyIncluded.push(included);
+        alreadyIncluded.push(includedObject)
+        alreadyIncluded.push({
+          to: includedObject.from,
+          from: includedObject.to,
+        });
       }
 
       if (included) {
@@ -107,13 +119,13 @@ module.exports = function (jsonapi, data, opts) {
         } else if (Array.isArray(relationship.data)) {
           return Promise
             .all(relationship.data.map(function (relationshipData) {
-              return extractIncludes(relationshipData);
+              return extractIncludes(relationshipData, from);
             }))
             .then(function (includes) {
               if (includes) { dest[keyForAttribute(key)] = includes; }
             });
         } else {
-          return extractIncludes(relationship.data)
+          return extractIncludes(relationship.data, from)
             .then(function (include) {
               if (include) { dest[keyForAttribute(key)] = include; }
             });
@@ -124,8 +136,8 @@ module.exports = function (jsonapi, data, opts) {
       });
   }
 
-  function extractIncludes(relationshipData) {
-    return findIncluded(relationshipData)
+  function extractIncludes(relationshipData, from) {
+    return findIncluded(relationshipData, from)
       .then(function (included) {
         var valueForRelationship = getValueForRelationship(relationshipData,
           included);

test/deserializer.js

@@ -714,11 +714,7 @@ describe('JSON API Deserializer', function () {
             });
 
             expect(json[0].addresses[2].lock).to.be.eql({
-              'address-line1': '123 Sth Street',
-              'zip-code': '12332',
-              country: 'USA',
-              id: '54735697e16624ba1eee36cf',
-              lock: { 'secret-key': 'S*7v0oMf7YxCtFyA$ffy', id: '1' }
+              'secret-key': 'S*7v0oMf7YxCtFyA$ffy', id: '1'
             });
 
             done(null, json);