@swaggerexpert/jsonpath 1.0.1 → 1.1.0

package/README.md

@@ -30,6 +30,9 @@ The development of this library contributed to the identification and formal sub
   - [Installation](#installation)
   - [Usage](#usage)
     - [Parsing](#parsing)
+      - [Concrete Syntax Tree (CST)](#concrete-syntax-tree-cst)
+      - [Interpreting Parse result as XML](#interpreting-parse-result-as-xml)
+      - [Parse statistics](#parse-statistics)
     - [Errors](#errors)
     - [Grammar](#grammar)
 - [More about JSONPath](#more-about-jsonpath)
@@ -256,7 +259,27 @@ const parseResult = parse('$.store.book[0].title', { ast: new JSONPathQueryCST()
 }
 ```
 
-###### Interpreting AST as XML
+###### Concrete Syntax Tree (CST)
+
+[Concrete Syntax Tree](https://en.wikipedia.org/wiki/Parse_tree) (Parse tree) is available on parse result via `computed` field.
+Instance of `JSONPathQueryCST` needs to be assigned to `ast` option in `parse` function (default behavior).
+CST is suitable to be consumed by other tools like IDEs, editors, etc...
+
+```js
+import { parse } from '@swaggerexpert/jsonpath';
+
+const { computed: CST } = parse('$.store.book[0].title');
+```
+
+or
+
+```js
+import { parse, JSONPathQueryCST } from '@swaggerexpert/jsonpath';
+
+const { computed: CST } = parse('$.store.book[0].title', { ast: new JSONPathQueryCST() });
+```
+
+###### Interpreting Parse result as XML
 
 ```js
 import { parse } from '@swaggerexpert/jsonpath';
@@ -265,6 +288,20 @@ const parseResult = parse('$.store.book[0].title');
 const xml = parseResult.ast.toXml();
 ```
 
+###### Parse statistics
+
+`parse` function returns additional statistical information about the parsing process.
+Collection of the statistics can be enabled by setting `stats` option to `true`.
+
+```js
+import { parse } from '@swaggerexpert/jsonpath';
+
+const { stats } = parse('$.store.book[0].title', { stats: true });
+
+stats.displayStats(); // returns operator stats
+stats.displayHits(); // returns rules grouped by hit count
+```
+
 #### Errors
 
 `@swaggerexpert/jsonpath` provides a structured error class hierarchy,
@@ -453,8 +490,8 @@ LCALPHA             = %x61-7A  ; "a".."z"
 function-expr       = function-name left-paren S [function-argument ; MODIFICATION: surrogate text rule used
                          *(S comma S function-argument)] S right-paren ; MODIFICATION: surrogate text rule used
 function-argument   = logical-expr / ; MODIFICATION: https://www.rfc-editor.org/errata/eid8343
-                      function-expr /
                       filter-query / ; (includes singular-query)
+                      function-expr /
                       literal
 
 

package/cjs/grammar.cjs

@@ -1998,13 +1998,13 @@ function grammar() {
     index: 27
   }; // RNM(logical-expr)
   this.rules[58].opcodes[2] = {
-    type: 4,
-    index: 57
-  }; // RNM(function-expr)
-  this.rules[58].opcodes[3] = {
     type: 4,
     index: 34
   }; // RNM(filter-query)
+  this.rules[58].opcodes[3] = {
+    type: 4,
+    index: 57
+  }; // RNM(function-expr)
   this.rules[58].opcodes[4] = {
     type: 4,
     index: 38
@@ -2749,8 +2749,8 @@ function grammar() {
     str += "function-expr       = function-name left-paren S [function-argument ; MODIFICATION: surrogate text rule used\n";
     str += "                         *(S comma S function-argument)] S right-paren ; MODIFICATION: surrogate text rule used\n";
     str += "function-argument   = logical-expr / ; MODIFICATION: https://www.rfc-editor.org/errata/eid8343\n";
-    str += "                      function-expr /\n";
     str += "                      filter-query / ; (includes singular-query)\n";
+    str += "                      function-expr /\n";
     str += "                      literal\n";
     str += "\n";
     str += "\n";

package/cjs/parse/index.cjs

@@ -11,6 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const grammar = new _grammar.default();
 const parse = (jsonPath, {
   ast = new _JSONPathQueryCST.default(),
+  stats = false,
   evaluator = _translate.default
 } = {}) => {
   if (typeof jsonPath !== 'string') {
@@ -19,6 +20,7 @@ const parse = (jsonPath, {
   try {
     const parser = new _apgLite.Parser();
     parser.ast = ast;
+    if (stats) parser.stats = new _apgLite.Stats();
     const result = parser.parse(grammar, 'jsonpath-query', jsonPath);
     const computed = evaluator(ast, {
       result
@@ -26,6 +28,7 @@ const parse = (jsonPath, {
     return {
       result,
       ast,
+      stats: parser.stats,
       computed
     };
   } catch (error) {

package/es/grammar.mjs

@@ -1994,13 +1994,13 @@ export default function grammar() {
     index: 27
   }; // RNM(logical-expr)
   this.rules[58].opcodes[2] = {
-    type: 4,
-    index: 57
-  }; // RNM(function-expr)
-  this.rules[58].opcodes[3] = {
     type: 4,
     index: 34
   }; // RNM(filter-query)
+  this.rules[58].opcodes[3] = {
+    type: 4,
+    index: 57
+  }; // RNM(function-expr)
   this.rules[58].opcodes[4] = {
     type: 4,
     index: 38
@@ -2745,8 +2745,8 @@ export default function grammar() {
     str += "function-expr       = function-name left-paren S [function-argument ; MODIFICATION: surrogate text rule used\n";
     str += "                         *(S comma S function-argument)] S right-paren ; MODIFICATION: surrogate text rule used\n";
     str += "function-argument   = logical-expr / ; MODIFICATION: https://www.rfc-editor.org/errata/eid8343\n";
-    str += "                      function-expr /\n";
     str += "                      filter-query / ; (includes singular-query)\n";
+    str += "                      function-expr /\n";
     str += "                      literal\n";
     str += "\n";
     str += "\n";

package/es/parse/index.mjs

@@ -1,4 +1,4 @@
-import { Parser } from 'apg-lite';
+import { Parser, Stats } from 'apg-lite';
 import Grammar from "../grammar.mjs";
 import translateEvaluator from "./evaluators/translate.mjs";
 import JSONPathQueryCST from "./ast/JSONPathQueryCST.mjs";
@@ -6,6 +6,7 @@ import JSONPathParseError from "../errors/JSONPathParseError.mjs";
 const grammar = new Grammar();
 const parse = (jsonPath, {
   ast = new JSONPathQueryCST(),
+  stats = false,
   evaluator = translateEvaluator
 } = {}) => {
   if (typeof jsonPath !== 'string') {
@@ -14,6 +15,7 @@ const parse = (jsonPath, {
   try {
     const parser = new Parser();
     parser.ast = ast;
+    if (stats) parser.stats = new Stats();
     const result = parser.parse(grammar, 'jsonpath-query', jsonPath);
     const computed = evaluator(ast, {
       result
@@ -21,6 +23,7 @@ const parse = (jsonPath, {
     return {
       result,
       ast,
+      stats: parser.stats,
       computed
     };
   } catch (error) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "RCF 9535 implementation of JSONPath",
   "main": "./cjs/index.cjs",
   "types": "./types/index.d.ts",

package/types/index.d.ts

@@ -5,6 +5,7 @@ export function parse(jsonpath: string, options?: ParseOptions): ParseResult;
 
 export interface ParseOptions {
   readonly ast?: AST;
+  readonly stats?: boolean;
 }
 
 export interface AST {
@@ -18,14 +19,20 @@ export interface ParseResult {
   };
   readonly ast: AST;
   readonly computed: Record<string, CSTNode>;
+  readonly stats?: Stats;
 }
 
 export interface CSTNode {
-  type: string,
-  text: string,
-  start: number,
-  length: number,
-  children: CSTNode[],
+  readonly type: string,
+  readonly text: string,
+  readonly start: number,
+  readonly length: number,
+  readonly children: CSTNode[],
+}
+
+export interface Stats {
+  displayStats(): string;
+  displayHits(): string;
 }
 
 /**