Store included relations in object instead of an array

Author: Skysplit

lib/deserializer-utils.js

@@ -4,10 +4,13 @@ var isFunction = require('lodash/isFunction');
 var _find = require('lodash/find');
 var _extend = require('lodash/extend');
 var _transform = require('lodash/transform');
+var _merge = require('lodash/merge');
+var _get = require('lodash/get');
+var _set = require('lodash/set');
 var Inflector = require('./inflector');
 
 module.exports = function (jsonapi, data, opts) {
-  var alreadyIncluded = [];
+  var alreadyIncluded = {};
 
   function isComplexType(obj) {
     return Array.isArray(obj) || isPlainObject(obj);
@@ -33,21 +36,20 @@ module.exports = function (jsonapi, data, opts) {
         type: relationshipData.type
       });
 
-      var includedObject = {
-        to: {
-          id: from.id,
-          type: from.type,
-        },
-        from: Object.assign({}, relationshipData),
-        relation: relationshipName,
-      };
+      var path = [
+        from.type,
+        from.id,
+        relationshipName,
+        relationshipData.type,
+        relationshipData.id,
+      ]
 
       // Check if the include is already processed (prevent circular
       // references).
-      if (_find(alreadyIncluded, includedObject)) {
+      if (_get(alreadyIncluded, path, false)) {
         return resolve(null);
       } else {
-        alreadyIncluded.push(includedObject);
+        _merge(alreadyIncluded, _set({}, path, true));
       }
 
       if (included) {