0.2.2

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,7 @@
+##### 0.2.2 - 12 March 2016
+
+Added support for filtering on "with" sub queries
+
 ##### 0.2.1 - 10 March 2016
 
 Fix for localKeys

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.1",
+  "version": "0.2.2",
   "homepage": "https://github.com/js-data/js-data-adapter",
   "repository": {
     "type": "git",
@@ -31,16 +31,16 @@
     "ci": "npm run test && cat coverage/lcov.info | coveralls || true"
   },
   "peerDependencies": {
-    "js-data": "^3.0.0-alpha.16"
+    "js-data": "^3.0.0-alpha.18"
   },
   "devDependencies": {
-    "babel-core": "6.7.0",
-    "babel-polyfill": "6.6.1",
+    "babel-core": "6.7.2",
+    "babel-polyfill": "6.7.2",
     "babel-preset-es2015-rollup": "1.1.1",
     "chai": "3.5.0",
     "coveralls": "2.11.8",
     "istanbul": "0.4.2",
-    "js-data-adapter-tests": "^2.0.0-alpha.14",
+    "js-data-adapter-tests": "^2.0.0-alpha.15",
     "js-data-repo-tools": "0.2.0",
     "mocha": "2.4.5",
     "rollup": "0.25.4",

dist/js-data-adapter.js.map

@@ -2,6 +2,7 @@ import {utils} from 'js-data'
 
 const {
   addHiddenPropsToTarget,
+  deepFillIn,
   extend,
   fillIn,
   forEachRelation,
@@ -1051,6 +1052,17 @@ addHiddenPropsToTarget(Adapter.prototype, {
 
     let records = []
     let op
+    const activeWith = opts._activeWith
+
+    if (isObject(activeWith)) {
+      const activeQuery = activeWith.query || {}
+      if (activeWith.replace) {
+        query = activeQuery
+      } else {
+        deepFillIn(query, activeQuery)
+      }
+    }
+
     // beforeFindAll lifecycle hook
     op = opts.op = 'beforeFindAll'
     return resolve(self[op](mapper, query, opts)).then(function () {