@swaggerexpert/jsonpath 2.4.1 → 3.0.0

package/README.md

@@ -38,6 +38,7 @@ The development of this library contributed to the identification and formal sub
       - [Translators](#translators)
         - [CST](#cst-translator)
         - [CST Optimized](#cst-optimized-translator)
+        - [AST](#ast-translator)
         - [XML](#xml-translator)
       - [Statistics](#statistics)
       - [Tracing](#tracing)
@@ -118,42 +119,22 @@ parse("$['\\u000b']", { normalized: true });
 ###### CST translator
 
 [Concrete Syntax Tree](https://en.wikipedia.org/wiki/Parse_tree) (Parse tree) representation is available on parse result
-by default or when instance of `CSTTranslator` is provided via a `translator` option to the `parse` function.
+when instance of `CSTTranslator` is provided via a `translator` option to the `parse` function.
 CST is suitable to be consumed by other tools like IDEs, editors, etc...
 
-```js
-import { parse } from '@swaggerexpert/jsonpath';
-
-const { tree: CST } = parse('$.store.book[0].title');
-```
-
-or
-
 ```js
 import { parse, CSTTranslator } from '@swaggerexpert/jsonpath';
 
 const { tree: CST } = parse('$.store.book[0].title', { translator: new CSTTranslator() });
 ```
 
-CST tree has the following shape:
-
-```ts
-interface CSTTree {
-  readonly root: CSTNode;
-}
-interface CSTNode {
-  readonly type: string,
-  readonly text: string,
-  readonly start: number,
-  readonly length: number,
-  readonly children: CSTNode[],
-}
-```
+CST tree has a shape documented by [TypeScript typings (CSTTree)](https://github.com/swaggerexpert/jsonpath/blob/main/types/index.d.ts).
 
 ###### CST Optimized translator
 
 Same as CST, but optimizes the tree for more optimized representation. By default, it collapses
 fragmented `single-quoted`, `double-quoted` or `normal-single-quoted` nodes into a single node.
+`text`, `segments` and `singular-query-segments` nodes, when empty, are removed from the tree.
 
 ```js
 import { parse, CSTOptimizedTranslator } from '@swaggerexpert/jsonpath';
@@ -161,6 +142,29 @@ import { parse, CSTOptimizedTranslator } from '@swaggerexpert/jsonpath';
 const { tree: CST } = parse('$.store.book[0].title', { translator: new CSTOptimizedTranslator() });
 ```
 
+###### AST translator
+
+**Default translator**. [Abstract Syntax Tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree) representation is available on parse result
+by default or when instance of `ASTTranslator` is provided via a `translator` option to the `parse` function.
+AST is suitable to be consumed by implementations that need to analyze the structure of the JSONPath expression
+or for building a custom JSONPath evaluation engine.
+
+```js
+import { parse } from '@swaggerexpert/jsonpath';
+
+const { tree: AST } = parse('$.store.book[0].title');
+```
+
+or
+
+```js
+import { parse, ASTTranslator } from '@swaggerexpert/jsonpath';
+
+const { tree: AST } = parse('$.store.book[0].title', { translator: new ASTTranslator() });
+```
+
+AST tree has a shape documented by [TypeScript typings (ASTTree)](https://github.com/swaggerexpert/jsonpath/blob/main/types/index.d.ts).
+
 ###### XML translator
 
 ```js
@@ -213,7 +217,7 @@ test('$.store.book[0].title'); // => true
 test('$$'); // => false
 ```
 
-Normalized paths can be validated by setting `normalized` option to `true`.
+**Normalized paths** can be validated by setting `normalized` option to `true`.
 
 ```js
 import { test } from '@swaggerexpert/jsonpath';

package/cjs/index.cjs

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.test = exports.parse = exports.XMLTranslator = exports.Grammar = exports.CSTTranslator = exports.CSTOptimizedTranslator = void 0;
+exports.test = exports.parse = exports.XMLTranslator = exports.Grammar = exports.CSTTranslator = exports.CSTOptimizedTranslator = exports.ASTTranslator = void 0;
 var _grammar = _interopRequireDefault(require("./grammar.cjs"));
 exports.Grammar = _grammar.default;
 var _index = _interopRequireDefault(require("./parse/index.cjs"));
@@ -10,8 +10,10 @@ var _CSTTranslator = _interopRequireDefault(require("./parse/translators/CSTTran
 exports.CSTTranslator = _CSTTranslator.default;
 var _CSTOptimizedTranslator = _interopRequireDefault(require("./parse/translators/CSTOptimizedTranslator.cjs"));
 exports.CSTOptimizedTranslator = _CSTOptimizedTranslator.default;
+var _index2 = _interopRequireDefault(require("./parse/translators/ASTTranslator/index.cjs"));
+exports.ASTTranslator = _index2.default;
 var _XMLTranslator = _interopRequireDefault(require("./parse/translators/XMLTranslator.cjs"));
 exports.XMLTranslator = _XMLTranslator.default;
-var _index2 = _interopRequireDefault(require("./test/index.cjs"));
-exports.test = _index2.default;
+var _index3 = _interopRequireDefault(require("./test/index.cjs"));
+exports.test = _index3.default;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/cjs/parse/callbacks/cst.cjs

@@ -5,28 +5,31 @@ exports.default = void 0;
 var _apgLite = require("../../apg-lite.cjs");
 var _JSONPathParseError = _interopRequireDefault(require("../../errors/JSONPathParseError.cjs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const cst = ruleName => {
+const cst = nodeType => {
   return (state, chars, phraseIndex, phraseLength, data) => {
+    var _data$options, _data$options2;
     if (!(typeof data === 'object' && data !== null && !Array.isArray(data))) {
       throw new _JSONPathParseError.default("parser's user data must be an object");
     }
 
     // drop the empty nodes
-    if (phraseLength === 0) return;
+    if ((_data$options = data.options) != null && _data$options.optimize && phraseLength === 0 && (_data$options2 = data.options) != null && (_data$options2 = _data$options2.droppableTypes) != null && _data$options2.includes(nodeType)) {
+      return;
+    }
     if (state === _apgLite.identifiers.SEM_PRE) {
       const node = {
-        type: ruleName,
+        type: nodeType,
         text: _apgLite.utilities.charsToString(chars, phraseIndex, phraseLength),
         start: phraseIndex,
         length: phraseLength,
         children: []
       };
       if (data.stack.length > 0) {
-        var _data$options, _data$options2;
+        var _data$options3, _data$options4;
         const parent = data.stack[data.stack.length - 1];
         const prevSibling = parent.children[parent.children.length - 1];
         const isTextNodeWithinTextNode = parent.type === 'text' && node.type === 'text';
-        const shouldCollapse = ((_data$options = data.options) == null ? void 0 : _data$options.optimize) && ((_data$options2 = data.options) == null || (_data$options2 = _data$options2.collapsibleTypes) == null ? void 0 : _data$options2.includes(node.type)) && (prevSibling == null ? void 0 : prevSibling.type) === node.type;
+        const shouldCollapse = ((_data$options3 = data.options) == null ? void 0 : _data$options3.optimize) && ((_data$options4 = data.options) == null || (_data$options4 = _data$options4.collapsibleTypes) == null ? void 0 : _data$options4.includes(node.type)) && (prevSibling == null ? void 0 : prevSibling.type) === node.type;
         if (shouldCollapse) {
           prevSibling.text += node.text;
           prevSibling.length += node.length;

package/cjs/parse/index.cjs

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _apgLite = require("../apg-lite.cjs");
 var _grammar = _interopRequireDefault(require("../grammar.cjs"));
-var _CSTTranslator = _interopRequireDefault(require("./translators/CSTTranslator.cjs"));
+var _index = _interopRequireDefault(require("./translators/ASTTranslator/index.cjs"));
 var _JSONPathParseError = _interopRequireDefault(require("../errors/JSONPathParseError.cjs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const grammar = new _grammar.default();
@@ -12,13 +12,12 @@ const parse = (jsonPath, {
   normalized = false,
   stats = false,
   trace = false,
-  translator = new _CSTTranslator.default()
+  translator = new _index.default()
 } = {}) => {
   if (typeof jsonPath !== 'string') {
     throw new TypeError('JSONPath must be a string');
   }
   try {
-    var _parser$ast;
     const parser = new _apgLite.Parser();
     if (translator) parser.ast = translator;
     if (stats) parser.stats = new _apgLite.Stats();
@@ -27,7 +26,7 @@ const parse = (jsonPath, {
     const result = parser.parse(grammar, startRule, jsonPath);
     return {
       result,
-      tree: result.success ? (_parser$ast = parser.ast) == null ? void 0 : _parser$ast.getTree() : undefined,
+      tree: result.success && translator ? parser.ast.getTree() : undefined,
       stats: parser.stats,
       trace: parser.trace
     };

package/cjs/parse/translators/ASTTranslator/decoders.cjs

@@ -0,0 +1,16 @@
+"use strict";
+
+exports.__esModule = true;
+exports.decodeString = exports.decodeJSONValue = exports.decodeInteger = void 0;
+const decodeString = str => {
+  return JSON.parse(`"${str.replace(/"/g, '\\"')}"`);
+};
+exports.decodeString = decodeString;
+const decodeInteger = str => {
+  return parseInt(str, 10);
+};
+exports.decodeInteger = decodeInteger;
+const decodeJSONValue = str => {
+  return JSON.parse(str);
+};
+exports.decodeJSONValue = decodeJSONValue;

package/cjs/parse/translators/ASTTranslator/index.cjs

@@ -0,0 +1,16 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+var _CSTOptimizedTranslator = _interopRequireDefault(require("../CSTOptimizedTranslator.cjs"));
+var _transformers = _interopRequireWildcard(require("./transformers.cjs"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class ASTTranslator extends _CSTOptimizedTranslator.default {
+  getTree() {
+    const cst = super.getTree();
+    return (0, _transformers.transformCSTtoAST)(cst.root, _transformers.default);
+  }
+}
+var _default = exports.default = ASTTranslator;

package/cjs/parse/translators/ASTTranslator/transformers.cjs

@@ -0,0 +1,410 @@
+"use strict";
+
+exports.__esModule = true;
+exports.transformCSTtoAST = exports.default = void 0;
+var _JSONPathParseError = _interopRequireDefault(require("../../../errors/JSONPathParseError.cjs"));
+var _decoders = require("./decoders.cjs");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const transformCSTtoAST = (node, transformerMap, ctx = {
+  parent: null,
+  path: []
+}) => {
+  const transformer = transformerMap[node.type];
+  if (!transformer) {
+    throw new _JSONPathParseError.default(`No transformer for CST node type: ${node.type}`);
+  }
+  const nextCtx = {
+    parent: node,
+    path: [...ctx.path, node]
+  };
+  return transformer(node, nextCtx);
+};
+exports.transformCSTtoAST = transformCSTtoAST;
+const transformers = {
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.1.1
+   */
+  ['jsonpath-query'](node, ctx) {
+    const segments = node.children.find(c => c.type === 'segments');
+    return {
+      type: 'JsonPathQuery',
+      segments: segments ? segments.children.filter(({
+        type
+      }) => type === 'segment').map(segNode => transformCSTtoAST(segNode, transformers, ctx)) : []
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.5
+   */
+  segment(node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['child-segment', 'descendant-segment'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3
+   */
+  selector(node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['name-selector', 'wildcard-selector', 'slice-selector', 'index-selector', 'filter-selector'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3.1.1
+   */
+  ['name-selector'](node, ctx) {
+    const stringLiteralCSTNode = node.children.find(({
+      type
+    }) => type === 'string-literal');
+    const stringLiteralASTNode = transformCSTtoAST(stringLiteralCSTNode, transformers, ctx);
+    return {
+      type: 'NameSelector',
+      value: stringLiteralASTNode.value,
+      format: stringLiteralASTNode.format
+    };
+  },
+  ['string-literal'](node) {
+    const isSingleQuoted = node.children.find(({
+      type,
+      text
+    }) => type === 'text' && text === "'");
+    const quoted = node.children.find(({
+      type
+    }) => ['double-quoted', 'single-quoted'].includes(type));
+    return {
+      type: 'StringLiteral',
+      value: quoted ? (0, _decoders.decodeString)(quoted.text) : '',
+      format: isSingleQuoted ? 'single-quoted' : 'double-quoted'
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3.2.1
+   */
+  ['wildcard-selector']() {
+    return {
+      type: 'WildcardSelector'
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3.3.1
+   */
+  ['index-selector'](node) {
+    return {
+      type: 'IndexSelector',
+      value: (0, _decoders.decodeInteger)(node.text)
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3.4.1
+   */
+  ['slice-selector'](node) {
+    const start = node.children.find(({
+      type
+    }) => type === 'start');
+    const end = node.children.find(({
+      type
+    }) => type === 'end');
+    const step = node.children.find(({
+      type
+    }) => type === 'step');
+    return {
+      type: 'SliceSelector',
+      start: start ? (0, _decoders.decodeInteger)(start.text) : null,
+      end: end ? (0, _decoders.decodeInteger)(end.text) : null,
+      step: step ? (0, _decoders.decodeInteger)(step.text) : null
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.3.5.1
+   */
+  ['filter-selector'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => type === 'logical-expr');
+    return {
+      type: 'FilterSelector',
+      expression: transformCSTtoAST(child, transformers, ctx)
+    };
+  },
+  ['logical-expr'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => type === 'logical-or-expr');
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['logical-or-expr'](node, ctx) {
+    const logicalAndExprs = node.children.filter(({
+      type
+    }) => type === 'logical-and-expr');
+    if (logicalAndExprs.length === 1) {
+      return transformCSTtoAST(logicalAndExprs[0], transformers, ctx);
+    }
+
+    // fold left for left-associativity
+    let left = transformCSTtoAST(logicalAndExprs[0], transformers, ctx);
+    for (let i = 1; i < logicalAndExprs.length; i += 1) {
+      const right = transformCSTtoAST(logicalAndExprs[i], transformers, ctx);
+      left = {
+        type: 'LogicalOrExpr',
+        left,
+        right
+      };
+    }
+  },
+  ['logical-and-expr'](node, ctx) {
+    const basicExprs = node.children.filter(({
+      type
+    }) => type === 'basic-expr');
+    if (basicExprs.length === 1) {
+      return transformCSTtoAST(basicExprs[0], transformers, ctx);
+    }
+    let left = transformCSTtoAST(basicExprs[0], transformers, ctx);
+    for (let i = 1; i < basicExprs.length; i += 1) {
+      const right = transformCSTtoAST(basicExprs[i], transformers, ctx);
+      left = {
+        type: 'LogicalAndExpr',
+        left,
+        right
+      };
+    }
+    return left;
+  },
+  ['basic-expr'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['paren-expr', 'comparison-expr', 'test-expr'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['paren-expr'](node, ctx) {
+    const isNegated = node.children.some(child => child.type === 'logical-not-op');
+    const logicalExprCSTNode = node.children.find(child => child.type === 'logical-expr');
+    const logicalExpressionASTNode = transformCSTtoAST(logicalExprCSTNode, transformers, ctx);
+    if (isNegated) {
+      return {
+        type: 'LogicalNotExpr',
+        expression: logicalExpressionASTNode
+      };
+    }
+    return logicalExpressionASTNode;
+  },
+  ['test-expr'](node, ctx) {
+    const isNegated = node.children.some(({
+      type
+    }) => type === 'logical-not-op');
+    const expression = node.children.find(({
+      type
+    }) => ['filter-query', 'function-expr'].includes(type));
+    const testExpr = {
+      type: 'TestExpr',
+      expression: transformCSTtoAST(expression, transformers, ctx)
+    };
+    return isNegated ? {
+      type: 'LogicalNotExpr',
+      expression: testExpr
+    } : testExpr;
+  },
+  ['filter-query'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['rel-query', 'jsonpath-query'].includes(type));
+    return {
+      type: 'FilterQuery',
+      query: transformCSTtoAST(child, transformers, ctx)
+    };
+  },
+  ['rel-query'](node, ctx) {
+    const segments = node.children.find(c => c.type === 'segments');
+    return {
+      type: 'RelQuery',
+      segments: segments ? segments.children.filter(n => n.type === 'segment').map(segNode => transformCSTtoAST(segNode, transformers, ctx)) : []
+    };
+  },
+  ['comparison-expr'](node, ctx) {
+    const children = node.children.filter(({
+      type
+    }) => ['comparable', 'comparison-op'].includes(type));
+    const [left, op, right] = children;
+    return {
+      type: 'ComparisonExpr',
+      left: transformCSTtoAST(left, transformers, ctx),
+      op: op.text,
+      right: transformCSTtoAST(right, transformers, ctx)
+    };
+  },
+  ['literal'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['number', 'string-literal', 'true', 'false', 'null'].includes(type));
+    if (child.type === 'string-literal') {
+      const stringLiteralASTNode = transformCSTtoAST(child, transformers, ctx);
+      return {
+        type: 'Literal',
+        value: stringLiteralASTNode.value
+      };
+    }
+    return {
+      type: 'Literal',
+      value: (0, _decoders.decodeJSONValue)(child.text)
+    };
+  },
+  ['comparable'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['singular-query', 'function-expr', 'literal'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['singular-query'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['rel-singular-query', 'abs-singular-query'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['rel-singular-query'](node, ctx) {
+    const segmentsNode = node.children.find(({
+      type
+    }) => type === 'singular-query-segments');
+    const segments = segmentsNode ? segmentsNode.children.filter(({
+      type
+    }) => ['name-segment', 'index-segment'].includes(type)).map(segNode => ({
+      type: 'SingularQuerySegment',
+      selector: transformCSTtoAST(segNode, transformers, ctx)
+    })) : [];
+    return {
+      type: 'RelSingularQuery',
+      segments
+    };
+  },
+  ['abs-singular-query'](node, ctx) {
+    const segmentsNode = node.children.find(({
+      type
+    }) => type === 'singular-query-segments');
+    const segments = segmentsNode ? segmentsNode.children.filter(({
+      type
+    }) => ['name-segment', 'index-segment'].includes(type)).map(segNode => ({
+      type: 'SingularQuerySegment',
+      selector: transformCSTtoAST(segNode, transformers, ctx)
+    })) : [];
+    return {
+      type: 'AbsSingularQuery',
+      segments
+    };
+  },
+  ['name-segment'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['name-selector', 'member-name-shorthand'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['index-segment'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => type === 'index-selector');
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.4
+   */
+  ['function-expr'](node, ctx) {
+    const name = node.children.find(({
+      type
+    }) => type === 'function-name');
+    const args = node.children.filter(({
+      type
+    }) => type === 'function-argument');
+    return {
+      type: 'FunctionExpr',
+      name: name.text,
+      arguments: args.map(arg => transformCSTtoAST(arg, transformers, ctx))
+    };
+  },
+  ['function-argument'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['logical-expr', 'function-expr', 'filter-query', 'literal'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.5.1.1
+   */
+  ['child-segment'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['bracketed-selection', 'wildcard-selector', 'member-name-shorthand'].includes(type));
+    return {
+      type: 'ChildSegment',
+      selector: transformCSTtoAST(child, transformers, ctx)
+    };
+  },
+  ['bracketed-selection'](node, ctx) {
+    return {
+      type: 'BracketedSelection',
+      selectors: node.children.filter(({
+        type
+      }) => type === 'selector').map(selectorNode => transformCSTtoAST(selectorNode, transformers, ctx))
+    };
+  },
+  ['member-name-shorthand'](node) {
+    return {
+      type: 'NameSelector',
+      value: node.text,
+      format: 'shorthand'
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#section-2.5.2.1
+   */
+  ['descendant-segment'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['bracketed-selection', 'wildcard-selector', 'member-name-shorthand'].includes(type));
+    return {
+      type: 'DescendantSegment',
+      selector: transformCSTtoAST(child, transformers, ctx)
+    };
+  },
+  /**
+   * https://www.rfc-editor.org/rfc/rfc9535#name-normalized-paths
+   */
+  ['normalized-path'](node, ctx) {
+    return {
+      type: 'JsonPathQuery',
+      segments: node.children.filter(({
+        type
+      }) => type === 'normal-index-segment').map(segNode => transformCSTtoAST(segNode, transformers, ctx))
+    };
+  },
+  ['normal-index-segment'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => type === 'normal-selector');
+    return {
+      type: 'ChildSegment',
+      selector: transformCSTtoAST(child, transformers, ctx)
+    };
+  },
+  ['normal-selector'](node, ctx) {
+    const child = node.children.find(({
+      type
+    }) => ['normal-name-selector', 'normal-index-selector'].includes(type));
+    return transformCSTtoAST(child, transformers, ctx);
+  },
+  ['normal-name-selector'](node) {
+    const child = node.children.find(({
+      type
+    }) => type === 'normal-single-quoted');
+    return {
+      type: 'NameSelector',
+      value: child ? (0, _decoders.decodeString)(child.text) : '',
+      format: 'single-quoted'
+    };
+  },
+  ['normal-index-selector'](node) {
+    return {
+      type: 'IndexSelector',
+      value: (0, _decoders.decodeInteger)(node.text)
+    };
+  }
+};
+var _default = exports.default = transformers;

package/cjs/parse/translators/CSTOptimizedTranslator.cjs

@@ -6,18 +6,24 @@ var _CSTTranslator = _interopRequireDefault(require("./CSTTranslator.cjs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class CSTOptimizedTranslator extends _CSTTranslator.default {
   collapsibleTypes = ['single-quoted', 'double-quoted', 'normal-single-quoted'];
+  droppableTypes = ['text', 'segments', 'singular-query-segments'];
   constructor({
-    collapsibleTypes
+    collapsibleTypes,
+    droppableTypes
   } = {}) {
     super();
     if (Array.isArray(collapsibleTypes)) {
       this.collapsibleTypes = collapsibleTypes;
     }
+    if (Array.isArray(droppableTypes)) {
+      this.droppableTypes = droppableTypes;
+    }
   }
   getTree() {
     const options = {
       optimize: true,
-      collapsibleTypes: this.collapsibleTypes
+      collapsibleTypes: this.collapsibleTypes,
+      droppableTypes: this.droppableTypes
     };
     const data = {
       stack: [],

package/es/index.mjs

@@ -2,5 +2,6 @@ export { default as Grammar } from "./grammar.mjs";
 export { default as parse } from "./parse/index.mjs";
 export { default as CSTTranslator } from "./parse/translators/CSTTranslator.mjs";
 export { default as CSTOptimizedTranslator } from "./parse/translators/CSTOptimizedTranslator.mjs";
+export { default as ASTTranslator } from "./parse/translators/ASTTranslator/index.mjs";
 export { default as XMLTranslator } from "./parse/translators/XMLTranslator.mjs";
 export { default as test } from "./test/index.mjs";