@swagger-api/apidom-parser-adapter-json 0.70.3 → 0.71.0

package/es/syntactic-analysis/indirect/visitors/CstVisitor.js

@@ -1,5 +1,6 @@
 import stampit from 'stampit';
 import { JsonArray, JsonDocument, JsonFalse, JsonNull, JsonNumber, JsonObject, JsonKey, JsonProperty, JsonString, JsonStringContent, JsonTrue, ParseResult, Position, Point, Literal, Error } from '@swagger-api/apidom-ast';
+import TreeCursorSyntaxNode from "../../TreeCursorSyntaxNode.js";
 export const keyMap = {
   document: ['children'],
   object: ['children'],
@@ -16,9 +17,6 @@ const CstVisitor = stampit({
      */
 
     const toPosition = node => {
-      if (node === null) {
-        return null;
-      }
       const start = Point({
         row: node.startPosition.row,
         column: node.startPosition.column,
@@ -34,27 +32,19 @@ const CstVisitor = stampit({
         end
       });
     };
-    const getFieldFromNode = (fieldName, node) => {
-      var _node$childForFieldNa;
-      return `${fieldName}Node` in node ?
-      // @ts-ignore
-      node[`${fieldName}Node`] : 'childForFieldName' in node ? (_node$childForFieldNa = node.childForFieldName) === null || _node$childForFieldNa === void 0 ? void 0 : _node$childForFieldNa.call(node, fieldName) : null;
-    };
 
     /**
      * Public API.
      */
 
     this.enter = function enter(node) {
-      // missing anonymous literals from CST transformed into AST literal nodes
-      // WARNING: be aware that web-tree-sitter and tree-sitter node bindings have inconsistency
-      // in `SyntaxNode.isNamed` property. web-tree-sitter has it defined as method
-      // whether tree-sitter node binding has it defined as a boolean property.
-      // @ts-ignore
-      if (typeof node.isNamed === 'function' && !node.isNamed() || node.isNamed === false) {
+      // anonymous literals from CST transformed into AST literal nodes
+      if (node instanceof TreeCursorSyntaxNode && !node.isNamed) {
         const position = toPosition(node);
         const value = node.type || node.text;
-        const isMissing = node.isMissing();
+        const {
+          isMissing
+        } = node;
         return Literal({
           value,
           position,
@@ -69,7 +59,7 @@ const CstVisitor = stampit({
         return JsonDocument({
           children: node.children,
           position,
-          isMissing: node.isMissing()
+          isMissing: node.isMissing
         });
       },
       leave(document) {
@@ -83,22 +73,24 @@ const CstVisitor = stampit({
       return JsonObject({
         children: node.children,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
     this.pair = function pair(node) {
       const position = toPosition(node);
       const children = node.children.slice(1);
-      const keyNode = getFieldFromNode('key', node);
+      const {
+        keyNode
+      } = node;
       const key = JsonKey({
         children: (keyNode === null || keyNode === void 0 ? void 0 : keyNode.children) || [],
-        position: toPosition(keyNode),
-        isMissing: (keyNode === null || keyNode === void 0 ? void 0 : keyNode.isMissing()) || false
+        position: keyNode != null ? toPosition(keyNode) : null,
+        isMissing: keyNode != null ? keyNode.isMissing : false
       });
       return JsonProperty({
         children: [key, ...children],
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
     this.array = function array(node) {
@@ -106,18 +98,18 @@ const CstVisitor = stampit({
       return JsonArray({
         children: node.children,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
     this.string = function string(node) {
       const position = toPosition(node);
       const content = JsonStringContent({
-        value: node.text.slice(1, -1)
+        value: JSON.parse(node.text)
       });
       return JsonString({
         children: [content],
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
     this.number = function number(node) {
@@ -126,7 +118,7 @@ const CstVisitor = stampit({
       return JsonNumber({
         value,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
 
@@ -137,7 +129,7 @@ const CstVisitor = stampit({
       return JsonNull({
         value,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
 
@@ -148,7 +140,7 @@ const CstVisitor = stampit({
       return JsonTrue({
         value,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
 
@@ -159,7 +151,7 @@ const CstVisitor = stampit({
       return JsonFalse({
         value,
         position,
-        isMissing: node.isMissing()
+        isMissing: node.isMissing
       });
     };
     this.ERROR = function ERROR(node, key, parent, path) {
@@ -167,8 +159,8 @@ const CstVisitor = stampit({
       const errorNode = Error({
         children: node.children,
         position,
-        isUnexpected: !node.hasError(),
-        isMissing: node.isMissing(),
+        isUnexpected: !node.hasError,
+        isMissing: node.isMissing,
         value: node.text
       });
       if (path.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-json",
-  "version": "0.70.3",
+  "version": "0.71.0",
   "description": "Parser adapter for parsing JSON documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -53,9 +53,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^0.70.0",
-    "@swagger-api/apidom-core": "^0.70.1",
-    "@types/ramda": "~0.29.1",
+    "@swagger-api/apidom-ast": "^0.71.0",
+    "@swagger-api/apidom-core": "^0.71.0",
+    "@types/ramda": "~0.29.3",
     "ramda": "~0.29.0",
     "ramda-adjunct": "^4.0.0",
     "stampit": "^4.3.2",
@@ -77,5 +77,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "bfa20e24b97ce223e0c33dac55c4d953dbe9a1f1"
+  "gitHead": "397e4cd2fd84bb57038183b177c0da4d80f15004"
 }

package/types/dist.d.ts

@@ -13,12 +13,19 @@ import { Tree as Tree$2 } from 'tree-sitter';
 declare const analyze$2: (source: string) => Promise<Tree$1>;
 
 /**
- * This version of syntactic analysis translates TreeSitter CTS into ApiDOM.
+ * This version of syntactic analysis translates TreeSitter CTS
+ * directly into ApiDOM.
+ *
+ * Transient transformation of TreeSitter CST is performed
+ * using TreeSitter cursor. TreeSitter cursor is a stateful object
+ * that allows us to walk syntax tree containing large number of nodes
+ * with maximum efficiency. Using this transient CST transformation
+ * gives us double the performance when syntactically analyzing
+ * CST into ApiDOM.
+ *
  * Single traversal pass is needed to get from CST to ApiDOM.
  */
-declare const analyze$1: (cst: {
-    rootNode: unknown;
-}, { sourceMap }?: {
+declare const analyze$1: (cst: Tree$2 | Tree$1, { sourceMap }?: {
     sourceMap?: boolean | undefined;
 }) => ParseResultElement;
 
@@ -26,6 +33,14 @@ type Tree = Tree$1 | Tree$2;
 /**
  * This version of syntactic analysis does following transformations:
  *   TreeSitter CST -> JSON AST -> ApiDOM
+ *
+ * Transient transformation of TreeSitter CST is performed
+ * using TreeSitter cursor. TreeSitter cursor is a stateful object
+ * that allows us to walk syntax tree containing large number of nodes
+ * with maximum efficiency. Using this transient CST transformation
+ * gives us double the performance when syntactically analyzing
+ * CST into JSON AST.
+ *
  * Two traversals passes are needed to get from CST to ApiDOM.
  * This analysis is much slower than the direct one, but allows
  * to do additional analysis magic on JSON AST.

package/cjs/syntactic-analysis/PreOrderCursorChildrenIterator.cjs

@@ -1,33 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.default = void 0;
-class PreOrderCursorChildrenIterator {
-  constructor(cursor) {
-    this.cursor = cursor;
-  }
-  createNode() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      children: []
-    };
-  }
-  *[Symbol.iterator]() {
-    // @ts-ignore
-    const method = this[this.cursor.nodeType];
-    const currentNode = (method || this.createNode).call(this);
-    const constructor = this.constructor;
-    if (this.cursor.gotoFirstChild()) {
-      currentNode.children.push(...[...new constructor(this.cursor)]);
-      while (this.cursor.gotoNextSibling()) {
-        currentNode.children.push(...[...new constructor(this.cursor)]);
-      }
-      this.cursor.gotoParent();
-    }
-    yield currentNode;
-  }
-}
-var _default = PreOrderCursorChildrenIterator;
-exports.default = _default;

package/cjs/syntactic-analysis/PreOrderCusrorIterator.cjs

@@ -1,31 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.default = void 0;
-class PreOrderCursorIterator {
-  constructor(cursor) {
-    this.cursor = cursor;
-  }
-  createNode() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition
-    };
-  }
-  *[Symbol.iterator]() {
-    // @ts-ignore
-    const method = this[this.cursor.nodeType];
-    const constructor = this.constructor;
-    yield (method || this.createNode).call(this);
-    if (this.cursor.gotoFirstChild()) {
-      yield* new constructor(this.cursor);
-      while (this.cursor.gotoNextSibling()) {
-        yield* new constructor(this.cursor);
-      }
-      this.cursor.gotoParent();
-    }
-  }
-}
-var _default = PreOrderCursorIterator;
-exports.default = _default;

package/cjs/syntactic-analysis/direct/CursorIterator.cjs

@@ -1,110 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-exports.__esModule = true;
-exports.default = void 0;
-var _PreOrderCursorChildrenIterator = _interopRequireDefault(require("../PreOrderCursorChildrenIterator.cjs"));
-class CursorIterator extends _PreOrderCursorChildrenIterator.default {
-  document() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      children: []
-    };
-  }
-  object() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  array() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  pair() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      get keyNode() {
-        return this.children.find(node => node.fieldName === 'key');
-      },
-      get valueNode() {
-        return this.children.find(node => node.fieldName === 'value');
-      },
-      children: []
-    };
-  }
-  string() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      text: this.cursor.nodeText,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  number() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      text: this.cursor.nodeText,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  null() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  true() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  false() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  ERROR() {
-    const {
-      currentNode
-    } = this.cursor;
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      // @ts-ignore
-      hasError: () => currentNode.hasError(),
-      children: []
-    };
-  }
-}
-var _default = CursorIterator;
-exports.default = _default;

package/es/syntactic-analysis/PreOrderCursorChildrenIterator.js

@@ -1,32 +0,0 @@
-import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-let _Symbol$iterator;
-_Symbol$iterator = Symbol.iterator;
-class PreOrderCursorChildrenIterator {
-  constructor(cursor) {
-    _defineProperty(this, "cursor", void 0);
-    this.cursor = cursor;
-  }
-  createNode() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      children: []
-    };
-  }
-  *[_Symbol$iterator]() {
-    // @ts-ignore
-    const method = this[this.cursor.nodeType];
-    const currentNode = (method || this.createNode).call(this);
-    const constructor = this.constructor;
-    if (this.cursor.gotoFirstChild()) {
-      currentNode.children.push(...[...new constructor(this.cursor)]);
-      while (this.cursor.gotoNextSibling()) {
-        currentNode.children.push(...[...new constructor(this.cursor)]);
-      }
-      this.cursor.gotoParent();
-    }
-    yield currentNode;
-  }
-}
-export default PreOrderCursorChildrenIterator;

package/es/syntactic-analysis/PreOrderCusrorIterator.js

@@ -1,30 +0,0 @@
-import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
-let _Symbol$iterator;
-_Symbol$iterator = Symbol.iterator;
-class PreOrderCursorIterator {
-  constructor(cursor) {
-    _defineProperty(this, "cursor", void 0);
-    this.cursor = cursor;
-  }
-  createNode() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition
-    };
-  }
-  *[_Symbol$iterator]() {
-    // @ts-ignore
-    const method = this[this.cursor.nodeType];
-    const constructor = this.constructor;
-    yield (method || this.createNode).call(this);
-    if (this.cursor.gotoFirstChild()) {
-      yield* new constructor(this.cursor);
-      while (this.cursor.gotoNextSibling()) {
-        yield* new constructor(this.cursor);
-      }
-      this.cursor.gotoParent();
-    }
-  }
-}
-export default PreOrderCursorIterator;

package/es/syntactic-analysis/direct/CursorIterator.js

@@ -1,104 +0,0 @@
-import PreOrderCursorChildrenIterator from "../PreOrderCursorChildrenIterator.js";
-class CursorIterator extends PreOrderCursorChildrenIterator {
-  document() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      children: []
-    };
-  }
-  object() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  array() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  pair() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      get keyNode() {
-        return this.children.find(node => node.fieldName === 'key');
-      },
-      get valueNode() {
-        return this.children.find(node => node.fieldName === 'value');
-      },
-      children: []
-    };
-  }
-  string() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      text: this.cursor.nodeText,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  number() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      text: this.cursor.nodeText,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  null() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  true() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  false() {
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      fieldName: this.cursor.currentFieldName,
-      children: []
-    };
-  }
-  ERROR() {
-    const {
-      currentNode
-    } = this.cursor;
-    return {
-      type: this.cursor.nodeType,
-      startPosition: this.cursor.startPosition,
-      endPosition: this.cursor.endPosition,
-      // @ts-ignore
-      hasError: () => currentNode.hasError(),
-      children: []
-    };
-  }
-}
-export default CursorIterator;