Switching to JSONPath-Plus (#1)

Author: foosel

package.json

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "date-fns": "^2.16.1",
-    "jsonpath": "^1.0.2",
+    "jsonpath-plus": "^4.0.0",
     "memory-cache": "^0.2.0"
   }
 }

src/DataSource.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { isValid, parseISO } from 'date-fns';
-import jp from 'jsonpath';
+import { JSONPath } from 'jsonpath-plus';
 
 import {
   DataQueryRequest,
@@ -32,10 +32,12 @@ export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOpt
       const fields = query.fields
         .filter(field => field.jsonPath)
         .map(field => {
-          const values = jp.query(response, field.jsonPath);
+          const values = JSONPath( { path: field.jsonPath, json: response } );
 
           // Get the path for automatic setting of the field name.
-          const paths = jp.paths(response, field.jsonPath)[0];
+          //
+          // Casted to any due to typing issues with JSONPath-Plus
+          const paths = (JSONPath as any).toPathArray(field.jsonPath);
 
           const [type, newvals] = detectFieldType(values);
 
@@ -68,7 +70,7 @@ export class DataSource extends DataSourceApi<JsonApiQuery, JsonApiDataSourceOpt
     if (!query.jsonPath) {
       return [];
     }
-    return jp.query(await this.api.get(), query.jsonPath).map(_ => ({ text: _ }));
+    return JSONPath( { path: query.jsonPath, json: await this.api.get() } ).map((_: any) => ({ text: _ }));
   }
 
   /**

yarn.lock

@@ -7252,6 +7252,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonpath-plus@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonpath-plus/-/jsonpath-plus-4.0.0.tgz#954b69faa3d8b07f30ae2f9e601176a4b0d2806e"
+  integrity sha512-e0Jtg4KAzDJKKwzbLaUtinCn0RZseWBVRTRGihSpvFlM3wTR7ExSp+PTdeTsDrLNJUe7L7JYJe8mblHX5SCT6A==
+
 jsonpath@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/jsonpath/-/jsonpath-1.0.2.tgz#e6aae681d03e9a77b4651d5d96eac5fc63b1fd13"