Merge pull request #36 from JaredCE/json-path-rules

Json path rules

Author: JaredCE

README.md

@@ -240,9 +240,9 @@ Work on Reporting still needs completeing.
 
 Accessing an OpenAPI operation by Operation Path `'{$sourceDescriptions.petstoreDescription.url}#/paths/~1pet~1findByStatus/get'` does not work currently
 
-### JSONPath and XPath criteria objects
+### XPath criteria objects
 
-Criteria Objects set as type JSON Path or XPath do not work
+Criteria Objects set as type XPath do not work
 
 ### Non application/json Responses
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "arazzo-runner",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "A runner to run through Arazzo Document workflows",
   "main": "index.js",
   "scripts": {
@@ -39,9 +39,9 @@
     "@redocly/openapi-core": "^2.14.5",
     "@swaggerexpert/arazzo-runtime-expression": "^1.0.1",
     "@swaggerexpert/json-pointer": "^2.10.2",
+    "@swaggerexpert/jsonpath": "^4.0.1",
     "ajv": "^8.17.1",
     "fast-xml-parser": "^5.3.3",
-    "jsonpath": "^1.1.1",
     "openapi-params": "^0.0.5",
     "openapi-server-url-templating": "^1.3.0",
     "openid-client": "^6.8.1",

package.json

@@ -12,7 +12,7 @@ const {
   extract,
 } = require("@swaggerexpert/arazzo-runtime-expression");
 const { evaluate } = require("@swaggerexpert/json-pointer");
-const jp = require("jsonpath");
+const { evaluate: jsonPathEvaluate } = require("@swaggerexpert/jsonpath");
 
 /**
  * Handles resolution of Arazzo runtime expressions to context values.
@@ -94,8 +94,11 @@ class Expression {
   checkJSONPathExpression(expression, jsonPath) {
     try {
       const value = this.resolveExpression(expression);
-      return jp.query(value, jsonPath);
+      const result = jsonPathEvaluate(value, jsonPath);
+
+      return Array.isArray(result) && result.length > 0;
     } catch (e) {
+      console.error(e);
       return null;
     }
   }