- Fix: Ensure throwing with a bad result type

brettz9 · brettz9 · commit 19cb462b0acf · 2020-01-13T11:14:44.000+08:00
- Enhancement: Allow path as array in non-object signature
- Testing; Improve coverage
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,8 @@
 ## 3.0.0 (2020-01-13)
 
 - Fix: wrap: false returning inconsistent data types (@CacheControl)
+- Fix: Ensure throwing with a bad result type
+- Enhancement: Allow path as array in non-object signature
 - Linting (ESLint): As per latest ash-nazg
 - Linting (ESLint): Remove redundant "use strict" with switch to ESM
 - Maintenance: 2 sp. for package.json
diff --git a/src/jsonpath.js b/src/jsonpath.js
@@ -10,9 +10,7 @@ const supportsNodeVM = function () {
         return false;
     }
 };
-const allowedResultTypes = [
-    'value', 'path', 'pointer', 'parent', 'parentProperty', 'all'
-];
+
 const {hasOwnProperty: hasOwnProp} = Object.prototype;
 
 /**
@@ -274,7 +272,7 @@ JSONPath.prototype.evaluate = function (
 
     json = json || this.json;
     expr = expr || this.path;
-    if (expr && typeof expr === 'object') {
+    if (expr && typeof expr === 'object' && !Array.isArray(expr)) {
         if (!expr.path) {
             throw new TypeError(
                 'You must supply a "path" property when providing an object ' +
@@ -315,7 +313,7 @@ JSONPath.prototype.evaluate = function (
     if (Array.isArray(expr)) {
         expr = JSONPath.toPathString(expr);
     }
-    if (!expr || !json || !allowedResultTypes.includes(this.currResultType)) {
+    if (!expr || !json) {
         return undefined;
     }
     this._obj = json;
diff --git a/test/test.api.js b/test/test.api.js
@@ -43,4 +43,13 @@ describe('JSONPath - API', function () {
         result = jsonpath({json, path: 'store.book[*].author'});
         assert.deepEqual(expected, result);
     });
+
+    it('should test array path of constructor', () => {
+        const books = json.store.book;
+        const expected = [books[0].author, books[1].author, books[2].author, books[3].author];
+        let result = jsonpath({path: ['$', 'store', 'book', '*', 'author'], json});
+        assert.deepEqual(expected, result);
+        result = jsonpath({json, path: 'store.book[*].author'});
+        assert.deepEqual(expected, result);
+    });
 });
diff --git a/test/test.errors.js b/test/test.errors.js
@@ -18,4 +18,48 @@ describe('JSONPath - Errors', function () {
             jsonpath({json: {book: []}, path: '$..[?(@.category === category)]'});
         }).to.throw(Error, 'jsonPath: category is not defined: _$_v.category === category');
     });
+
+    it('should throw with a bad result type', () => {
+        expect(() => {
+            jsonpath({
+                json: {children: [5]},
+                path: '$..children',
+                resultType: 'badType'
+            });
+        }).to.throw(TypeError, 'Unknown result type');
+    });
+
+    it('should throw with `preventEval` and [?()] filtering expression', () => {
+        expect(() => {
+            const json = {
+                datafield: [
+                    {"tag": "035", "subfield": {"@code": "a", "#text": "1879"}},
+                    {"@tag": "042", "subfield": {"@code": "a", "#text": "5555"}},
+                    {"@tag": "045", "045": "secret"}
+                ]
+            };
+            jsonpath({
+                json,
+                path: "$.datafield[?(@.tag=='035')]",
+                preventEval: true
+            });
+        }).to.throw(Error, 'Eval [?(expr)] prevented in JSONPath expression.');
+    });
+
+    it('should throw with `preventEval` and [?()] filtering expression', () => {
+        expect(() => {
+            const json = {
+                datafield: [
+                    {"tag": "035", "subfield": {"@code": "a", "#text": "1879"}},
+                    {"@tag": "042", "subfield": {"@code": "a", "#text": "5555"}},
+                    {"@tag": "045", "045": "secret"}
+                ]
+            };
+            jsonpath({
+                json,
+                path: '$..datafield[(@.length-1)]',
+                preventEval: true
+            });
+        }).to.throw(Error, 'Eval [(expr)] prevented in JSONPath expression.');
+    });
 });
