fix: allow falsey at values in filter (now may require checking for presence of @ in some cases); fixes #136

brettz9 · brettz9 · commit 6d31ded7abb2 · 2021-03-02T07:24:46.000+08:00
diff --git a/badges/tests-badge.svg b/badges/tests-badge.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">173/173</text><text class="high" x="46" y="14">173/173</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#4c1" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">175/175</text><text class="high" x="46" y="14">175/175</text></g></svg>
diff --git a/dist/index-browser-esm.js b/dist/index-browser-esm.js
@@ -477,7 +477,6 @@ JSONPath.prototype.evaluate = function (expr, json, callback, otherTypeCallback)
     return undefined;
   }
 
-  this._obj = json;
   var exprList = JSONPath.toPathArray(expr);
 
   if (exprList[0] === '$' && exprList.length > 1) {
@@ -867,10 +866,6 @@ JSONPath.prototype._slice = function (loc, expr, val, path, parent, parentPropNa
 };
 
 JSONPath.prototype._eval = function (code, _v, _vname, path, parent, parentPropName) {
-  if (!this._obj || !_v) {
-    return false;
-  }
-
   if (code.includes('@parentProperty')) {
     this.currSandbox._$_parentProperty = parentPropName;
     code = code.replace(/@parentProperty/g, '_$_parentProperty');
diff --git a/dist/index-browser-esm.min.js b/dist/index-browser-esm.min.js
diff --git a/dist/index-browser-esm.min.js.map b/dist/index-browser-esm.min.js.map
diff --git a/dist/index-browser-umd.js b/dist/index-browser-umd.js
@@ -483,7 +483,6 @@
       return undefined;
     }
 
-    this._obj = json;
     var exprList = JSONPath.toPathArray(expr);
 
     if (exprList[0] === '$' && exprList.length > 1) {
@@ -873,10 +872,6 @@
   };
 
   JSONPath.prototype._eval = function (code, _v, _vname, path, parent, parentPropName) {
-    if (!this._obj || !_v) {
-      return false;
-    }
-
     if (code.includes('@parentProperty')) {
       this.currSandbox._$_parentProperty = parentPropName;
       code = code.replace(/@parentProperty/g, '_$_parentProperty');
diff --git a/dist/index-browser-umd.min.js b/dist/index-browser-umd.min.js
diff --git a/dist/index-browser-umd.min.js.map b/dist/index-browser-umd.min.js.map
diff --git a/dist/index-node-cjs.js b/dist/index-node-cjs.js
@@ -234,7 +234,6 @@ JSONPath.prototype.evaluate = function (expr, json, callback, otherTypeCallback)
     return undefined;
   }
 
-  this._obj = json;
   const exprList = JSONPath.toPathArray(expr);
 
   if (exprList[0] === '$' && exprList.length > 1) {
@@ -612,10 +611,6 @@ JSONPath.prototype._slice = function (loc, expr, val, path, parent, parentPropNa
 };
 
 JSONPath.prototype._eval = function (code, _v, _vname, path, parent, parentPropName) {
-  if (!this._obj || !_v) {
-    return false;
-  }
-
   if (code.includes('@parentProperty')) {
     this.currSandbox._$_parentProperty = parentPropName;
     code = code.replace(/@parentProperty/gu, '_$_parentProperty');
diff --git a/dist/index-node-esm.mjs b/dist/index-node-esm.mjs
@@ -226,7 +226,6 @@ JSONPath.prototype.evaluate = function (expr, json, callback, otherTypeCallback)
     return undefined;
   }
 
-  this._obj = json;
   const exprList = JSONPath.toPathArray(expr);
 
   if (exprList[0] === '$' && exprList.length > 1) {
@@ -604,10 +603,6 @@ JSONPath.prototype._slice = function (loc, expr, val, path, parent, parentPropNa
 };
 
 JSONPath.prototype._eval = function (code, _v, _vname, path, parent, parentPropName) {
-  if (!this._obj || !_v) {
-    return false;
-  }
-
   if (code.includes('@parentProperty')) {
     this.currSandbox._$_parentProperty = parentPropName;
     code = code.replace(/@parentProperty/gu, '_$_parentProperty');
diff --git a/src/jsonpath.js b/src/jsonpath.js
@@ -225,7 +225,6 @@ JSONPath.prototype.evaluate = function (
     if ((!expr && expr !== '') || !json) {
         return undefined;
     }
-    this._obj = json;
 
     const exprList = JSONPath.toPathArray(expr);
     if (exprList[0] === '$' && exprList.length > 1) { exprList.shift(); }
@@ -582,7 +581,6 @@ JSONPath.prototype._slice = function (
 JSONPath.prototype._eval = function (
     code, _v, _vname, path, parent, parentPropName
 ) {
-    if (!this._obj || !_v) { return false; }
     if (code.includes('@parentProperty')) {
         this.currSandbox._$_parentProperty = parentPropName;
         code = code.replace(/@parentProperty/gu, '_$_parentProperty');
diff --git a/test/test.at_and_dollar.js b/test/test.at_and_dollar.js
@@ -30,4 +30,26 @@ describe('JSONPath - At and Dollar sign', function () {
         assert.strictEqual(jsonpath({json: t1, path: '$.`$.`@'})[0], t1.$['@']);
         assert.strictEqual(jsonpath({json: t1, path: '\\@'})[1], undefined);
     });
+
+    it('@ as false', () => {
+        const json = {
+            a: {
+                b: false
+            }
+        };
+        const expected = [false];
+        const result = jsonpath({json, path: "$..*[?(@ === false)]", wrap: false});
+        assert.deepEqual(result, expected);
+    });
+
+    it('@ as 0', function () {
+        const json = {
+            a: {
+                b: 0
+            }
+        };
+        const expected = [0];
+        const result = jsonpath({json, path: "$.a[?(@property === 'b' && @ < 1)]", wrap: false});
+        assert.deepEqual(result, expected);
+    });
 });
diff --git a/test/test.properties.js b/test/test.properties.js
@@ -37,7 +37,7 @@ checkBuiltInVMAndNodeVM(function (vmType, setBuiltInState) {
         it('At signs within properties (null data)', () => {
             const result = jsonpath({json: {
                 datafield: [null]
-            }, path: "$.datafield[?(@.tag=='xxx')]", wrap: false});
+            }, path: "$.datafield[?(@ && @.tag=='xxx')]", wrap: false});
             assert.deepEqual(result, undefined);
         });
 
