0.2.1

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 0.2.1 - 10 March 2016
+
+Fix for localKeys
+
 ##### 0.2.0 - 10 March 2016
 
 Pulled a lot more common adapter functionality into js-data-adapter.

dist/js-data-adapter.js

@@ -1,7 +1,7 @@
 {
   "name": "js-data-adapter",
   "description": "Base adapter class that all other js-data adapters extend.",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "homepage": "https://github.com/js-data/js-data-adapter",
   "repository": {
     "type": "git",

dist/js-data-adapter.js.map

@@ -706,6 +706,23 @@ addHiddenPropsToTarget(Adapter.prototype, {
     return def.getForeignKey(record)
   },
 
+  /**
+   * Return the localKeys from the given record for the provided relationship.
+   *
+   * Override with care.
+   *
+   * @name Adapter#makeHasManyLocalKeys
+   * @method
+   * @return {*}
+   */
+  makeHasManyLocalKeys (mapper, def, record) {
+    let localKeys = []
+    let itemKeys = get(record, def.localKeys) || []
+    itemKeys = isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
+    localKeys = localKeys.concat(itemKeys)
+    return unique(localKeys).filter(function (x) { return x })
+  },
+
   /**
    * Return the foreignKeys from the given record for the provided relationship.
    *
@@ -779,25 +796,19 @@ addHiddenPropsToTarget(Adapter.prototype, {
     }
 
     if (record) {
-      let localKeys = []
-      let itemKeys = get(record, def.localKeys) || []
-      itemKeys = isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
-      localKeys = localKeys.concat(itemKeys)
       return self.findAll(relatedMapper, {
         where: {
           [relatedMapper.idAttribute]: {
-            'in': unique(localKeys).filter(function (x) { return x })
+            'in': self.makeHasManyLocalKeys(mapper, def, record)
           }
         }
       }, __opts).then(function (relatedItems) {
         def.setLocalField(record, relatedItems)
       })
     } else {
       let localKeys = []
-      records.forEach(function (item) {
-        let itemKeys = item[def.localKeys] || []
-        itemKeys = isArray(itemKeys) ? itemKeys : Object.keys(itemKeys)
-        localKeys = localKeys.concat(itemKeys)
+      records.forEach(function (record) {
+        localKeys = localKeys.concat(self.self.makeHasManyLocalKeys(mapper, def, record))
       })
       return self.findAll(relatedMapper, {
         where: {