@swagger-api/apidom-parser-adapter-json 1.0.0-beta.8 → 1.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-json",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-rc.0",
   "description": "Parser adapter for parsing JSON documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -52,14 +52,14 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^1.0.0-beta.8",
-    "@swagger-api/apidom-core": "^1.0.0-beta.8",
-    "@swagger-api/apidom-error": "^1.0.0-beta.8",
+    "@babel/runtime-corejs3": "^7.26.10",
+    "@swagger-api/apidom-ast": "^1.0.0-rc.0",
+    "@swagger-api/apidom-core": "^1.0.0-rc.0",
+    "@swagger-api/apidom-error": "^1.0.0-rc.0",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
-    "tree-sitter": "=0.22.1",
+    "tree-sitter": "=0.21.1",
     "tree-sitter-json": "=0.24.8",
     "web-tree-sitter": "=0.24.5"
   },
@@ -77,5 +77,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "1066cb6941da513bc53171fbf205cd894b7f0d4e"
+  "gitHead": "af4b6e0fcae489477729581c52036725ac57a412"
 }

package/src/syntactic-analysis/TreeCursorSyntaxNode.cjs

@@ -4,9 +4,11 @@ exports.__esModule = true;
 exports.default = void 0;
 class TreeCursorSyntaxNode {
   type;
-  startPosition;
-  endPosition;
+  startPositionRow;
+  startPositionColumn;
   startIndex;
+  endPositionRow;
+  endPositionColumn;
   endIndex;
   text;
   isNamed;
@@ -16,9 +18,11 @@ class TreeCursorSyntaxNode {
   children = [];
   constructor(cursor) {
     this.type = cursor.nodeType;
-    this.startPosition = cursor.startPosition;
-    this.endPosition = cursor.endPosition;
+    this.startPositionRow = cursor.startPosition.row;
+    this.startPositionColumn = cursor.startPosition.column;
     this.startIndex = cursor.startIndex;
+    this.endPositionRow = cursor.endPosition.row;
+    this.endPositionColumn = cursor.endPosition.column;
     this.endIndex = cursor.endIndex;
     this.text = cursor.nodeText;
     this.isNamed = cursor.nodeIsNamed;

package/src/syntactic-analysis/TreeCursorSyntaxNode.mjs

@@ -1,8 +1,10 @@
 class TreeCursorSyntaxNode {
   type;
-  startPosition;
-  endPosition;
+  startPositionRow;
+  startPositionColumn;
   startIndex;
+  endPositionRow;
+  endPositionColumn;
   endIndex;
   text;
   isNamed;
@@ -12,9 +14,11 @@ class TreeCursorSyntaxNode {
   children = [];
   constructor(cursor) {
     this.type = cursor.nodeType;
-    this.startPosition = cursor.startPosition;
-    this.endPosition = cursor.endPosition;
+    this.startPositionRow = cursor.startPosition.row;
+    this.startPositionColumn = cursor.startPosition.column;
     this.startIndex = cursor.startIndex;
+    this.endPositionRow = cursor.endPosition.row;
+    this.endPositionColumn = cursor.endPosition.column;
     this.endIndex = cursor.endIndex;
     this.text = cursor.nodeText;
     this.isNamed = cursor.nodeIsNamed;

package/src/syntactic-analysis/direct/visitors/CstVisitor.cjs

@@ -8,13 +8,6 @@ var _TreeCursorSyntaxNode = _interopRequireDefault(require("../../TreeCursorSynt
 /* eslint-disable no-underscore-dangle */
 
 class CstVisitor {
-  static toPosition(node) {
-    const start = new _apidomCore.ArrayElement([node.startPosition.row, node.startPosition.column, node.startIndex]);
-    const end = new _apidomCore.ArrayElement([node.endPosition.row, node.endPosition.column, node.endIndex]);
-    start.classes.push('position');
-    end.classes.push('position');
-    return [start, end];
-  }
   sourceMap = false;
   annotations;
   ParseResultElement = {
@@ -144,16 +137,7 @@ class CstVisitor {
     if (!this.sourceMap) {
       return;
     }
-    const sourceMap = new _apidomCore.SourceMapElement();
-    const position = CstVisitor.toPosition(node);
-    if (position !== null) {
-      const [start, end] = position;
-      sourceMap.push(start);
-      sourceMap.push(end);
-    }
-    // @ts-ignore
-    sourceMap.astNode = node;
-    element.meta.set('sourceMap', sourceMap);
+    (0, _apidomCore.assignSourceMap)(element, node);
   }
 }
 

package/src/syntactic-analysis/direct/visitors/CstVisitor.mjs

@@ -1,14 +1,7 @@
-import { BooleanElement, NullElement, NumberElement, ParseResultElement, SourceMapElement, MemberElement, ObjectElement, ArrayElement, StringElement, AnnotationElement, isPrimitiveElement } from '@swagger-api/apidom-core';
+import { BooleanElement, NullElement, NumberElement, ParseResultElement, MemberElement, ObjectElement, ArrayElement, StringElement, AnnotationElement, isPrimitiveElement, assignSourceMap } from '@swagger-api/apidom-core';
 import TreeCursorSyntaxNode from "../../TreeCursorSyntaxNode.mjs";
 /* eslint-disable no-underscore-dangle */
 class CstVisitor {
-  static toPosition(node) {
-    const start = new ArrayElement([node.startPosition.row, node.startPosition.column, node.startIndex]);
-    const end = new ArrayElement([node.endPosition.row, node.endPosition.column, node.endIndex]);
-    start.classes.push('position');
-    end.classes.push('position');
-    return [start, end];
-  }
   sourceMap = false;
   annotations;
   ParseResultElement = {
@@ -138,16 +131,7 @@ class CstVisitor {
     if (!this.sourceMap) {
       return;
     }
-    const sourceMap = new SourceMapElement();
-    const position = CstVisitor.toPosition(node);
-    if (position !== null) {
-      const [start, end] = position;
-      sourceMap.push(start);
-      sourceMap.push(end);
-    }
-    // @ts-ignore
-    sourceMap.astNode = node;
-    element.meta.set('sourceMap', sourceMap);
+    assignSourceMap(element, node);
   }
 }
 

package/src/syntactic-analysis/indirect/visitors/CstVisitor.cjs

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.keyMap = exports.default = void 0;
 var _apidomAst = require("@swagger-api/apidom-ast");
+var _apidomCore = require("@swagger-api/apidom-core");
 var _TreeCursorSyntaxNode = _interopRequireDefault(require("../../TreeCursorSyntaxNode.cjs"));
 const keyMap = exports.keyMap = {
   document: ['children'],
@@ -18,30 +19,12 @@ const keyMap = exports.keyMap = {
 /* eslint-disable class-methods-use-this */
 
 class CstVisitor {
-  static toPosition(node) {
-    const start = new _apidomAst.Point({
-      row: node.startPosition.row,
-      column: node.startPosition.column,
-      char: node.startIndex
-    });
-    const end = new _apidomAst.Point({
-      row: node.endPosition.row,
-      column: node.endPosition.column,
-      char: node.endIndex
-    });
-    return new _apidomAst.Position({
-      start,
-      end
-    });
-  }
   document = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new _apidomAst.JsonDocument({
+      return new _apidomAst.JsonDocument((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: document => {
       return new _apidomAst.ParseResult({
@@ -52,114 +35,93 @@ class CstVisitor {
   enter(node) {
     // anonymous literals from CST transformed into AST literal nodes
     if (node instanceof _TreeCursorSyntaxNode.default && !node.isNamed) {
-      const position = CstVisitor.toPosition(node);
       const value = node.type || node.text;
       const {
         isMissing
       } = node;
-      return new _apidomAst.Literal({
+      return new _apidomAst.Literal((0, _apidomCore.assignSourceMap)({
         value,
-        position,
         isMissing
-      });
+      }, node));
     }
     return undefined;
   }
   object(node) {
-    const position = CstVisitor.toPosition(node);
-    return new _apidomAst.JsonObject({
+    return new _apidomAst.JsonObject((0, _apidomCore.assignSourceMap)({
       children: node.children,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   pair(node) {
-    const position = CstVisitor.toPosition(node);
     const children = node.children.slice(1);
     const {
       keyNode
     } = node;
-    const key = new _apidomAst.JsonKey({
+    const key = new _apidomAst.JsonKey((0, _apidomCore.assignSourceMap)({
       children: (keyNode == null ? void 0 : keyNode.children) || [],
-      position: keyNode != null ? CstVisitor.toPosition(keyNode) : undefined,
       isMissing: keyNode != null ? keyNode.isMissing : false
-    });
-    return new _apidomAst.JsonProperty({
+    }, keyNode));
+    return new _apidomAst.JsonProperty((0, _apidomCore.assignSourceMap)({
       children: [key, ...children],
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   array(node) {
-    const position = CstVisitor.toPosition(node);
-    return new _apidomAst.JsonArray({
+    return new _apidomAst.JsonArray((0, _apidomCore.assignSourceMap)({
       children: node.children,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   string(node) {
-    const position = CstVisitor.toPosition(node);
     const content = new _apidomAst.JsonStringContent({
       value: JSON.parse(node.text)
     });
-    return new _apidomAst.JsonString({
+    return new _apidomAst.JsonString((0, _apidomCore.assignSourceMap)({
       children: [content],
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   number(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new _apidomAst.JsonNumber({
+    return new _apidomAst.JsonNumber((0, _apidomCore.assignSourceMap)({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   null(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new _apidomAst.JsonNull({
+    return new _apidomAst.JsonNull((0, _apidomCore.assignSourceMap)({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   true(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new _apidomAst.JsonTrue({
+    return new _apidomAst.JsonTrue((0, _apidomCore.assignSourceMap)({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   false(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new _apidomAst.JsonFalse({
+    return new _apidomAst.JsonFalse((0, _apidomCore.assignSourceMap)({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   ERROR(node, key, parent, path) {
-    const position = CstVisitor.toPosition(node);
-    const errorNode = new _apidomAst.Error({
+    const errorNode = new _apidomAst.Error((0, _apidomCore.assignSourceMap)({
       children: node.children,
-      position,
       isUnexpected: !node.hasError,
       isMissing: node.isMissing,
       value: node.text
-    });
+    }, node));
     if (path.length === 0) {
       return new _apidomAst.ParseResult({
         children: [errorNode]

package/src/syntactic-analysis/indirect/visitors/CstVisitor.mjs

@@ -1,4 +1,5 @@
-import { JsonArray, JsonDocument, JsonFalse, JsonNull, JsonNumber, JsonObject, JsonKey, JsonProperty, JsonString, JsonStringContent, JsonTrue, ParseResult, Position, Point, Literal, Error } from '@swagger-api/apidom-ast';
+import { JsonArray, JsonDocument, JsonFalse, JsonNull, JsonNumber, JsonObject, JsonKey, JsonProperty, JsonString, JsonStringContent, JsonTrue, ParseResult, Literal, Error } from '@swagger-api/apidom-ast';
+import { assignSourceMap } from '@swagger-api/apidom-core';
 import TreeCursorSyntaxNode from "../../TreeCursorSyntaxNode.mjs";
 export const keyMap = {
   document: ['children'],
@@ -13,30 +14,12 @@ export const keyMap = {
 /* eslint-disable class-methods-use-this */
 
 class CstVisitor {
-  static toPosition(node) {
-    const start = new Point({
-      row: node.startPosition.row,
-      column: node.startPosition.column,
-      char: node.startIndex
-    });
-    const end = new Point({
-      row: node.endPosition.row,
-      column: node.endPosition.column,
-      char: node.endIndex
-    });
-    return new Position({
-      start,
-      end
-    });
-  }
   document = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new JsonDocument({
+      return new JsonDocument(assignSourceMap({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: document => {
       return new ParseResult({
@@ -47,114 +30,93 @@ class CstVisitor {
   enter(node) {
     // anonymous literals from CST transformed into AST literal nodes
     if (node instanceof TreeCursorSyntaxNode && !node.isNamed) {
-      const position = CstVisitor.toPosition(node);
       const value = node.type || node.text;
       const {
         isMissing
       } = node;
-      return new Literal({
+      return new Literal(assignSourceMap({
         value,
-        position,
         isMissing
-      });
+      }, node));
     }
     return undefined;
   }
   object(node) {
-    const position = CstVisitor.toPosition(node);
-    return new JsonObject({
+    return new JsonObject(assignSourceMap({
       children: node.children,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   pair(node) {
-    const position = CstVisitor.toPosition(node);
     const children = node.children.slice(1);
     const {
       keyNode
     } = node;
-    const key = new JsonKey({
+    const key = new JsonKey(assignSourceMap({
       children: (keyNode === null || keyNode === void 0 ? void 0 : keyNode.children) || [],
-      position: keyNode != null ? CstVisitor.toPosition(keyNode) : undefined,
       isMissing: keyNode != null ? keyNode.isMissing : false
-    });
-    return new JsonProperty({
+    }, keyNode));
+    return new JsonProperty(assignSourceMap({
       children: [key, ...children],
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   array(node) {
-    const position = CstVisitor.toPosition(node);
-    return new JsonArray({
+    return new JsonArray(assignSourceMap({
       children: node.children,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   string(node) {
-    const position = CstVisitor.toPosition(node);
     const content = new JsonStringContent({
       value: JSON.parse(node.text)
     });
-    return new JsonString({
+    return new JsonString(assignSourceMap({
       children: [content],
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   number(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new JsonNumber({
+    return new JsonNumber(assignSourceMap({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   null(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new JsonNull({
+    return new JsonNull(assignSourceMap({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   true(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new JsonTrue({
+    return new JsonTrue(assignSourceMap({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
 
   // eslint-disable-next-line @typescript-eslint/naming-convention
   false(node) {
-    const position = CstVisitor.toPosition(node);
     const value = node.text;
-    return new JsonFalse({
+    return new JsonFalse(assignSourceMap({
       value,
-      position,
       isMissing: node.isMissing
-    });
+    }, node));
   }
   ERROR(node, key, parent, path) {
-    const position = CstVisitor.toPosition(node);
-    const errorNode = new Error({
+    const errorNode = new Error(assignSourceMap({
       children: node.children,
-      position,
       isUnexpected: !node.hasError,
       isMissing: node.isMissing,
       value: node.text
-    });
+    }, node));
     if (path.length === 0) {
       return new ParseResult({
         children: [errorNode]

package/src/syntactic-analysis/indirect/visitors/JsonAstVisitor.cjs

@@ -166,12 +166,7 @@ class JsonAstVisitor {
     if (!this.sourceMap) {
       return;
     }
-    const sourceMap = new _apidomCore.SourceMapElement();
-    // @ts-ignore
-    sourceMap.position = node.position;
-    // @ts-ignore
-    sourceMap.astNode = node;
-    element.meta.set('sourceMap', sourceMap);
+    (0, _apidomCore.assignSourceMap)(element, node);
   }
 }
 var _default = exports.default = JsonAstVisitor;

package/src/syntactic-analysis/indirect/visitors/JsonAstVisitor.mjs

@@ -1,5 +1,5 @@
 import { JsonArray, JsonDocument, JsonObject, JsonProperty, ParseResult, Error, isNode as isCSTNode, getNodeType as getCSTNodeType } from '@swagger-api/apidom-ast';
-import { ParseResultElement, ObjectElement, SourceMapElement, MemberElement, ArrayElement, BooleanElement, NullElement, NumberElement, StringElement, AnnotationElement, isParseResultElement, isPrimitiveElement, isElement, keyMap as keyMapApiDOM, getNodeType as getNodeTypeApiDOM } from '@swagger-api/apidom-core';
+import { ParseResultElement, ObjectElement, MemberElement, ArrayElement, BooleanElement, NullElement, NumberElement, StringElement, AnnotationElement, isParseResultElement, isPrimitiveElement, isElement, keyMap as keyMapApiDOM, getNodeType as getNodeTypeApiDOM, assignSourceMap } from '@swagger-api/apidom-core';
 export const keyMap = {
   // @ts-ignore
   [ParseResult.type]: ['children'],
@@ -161,12 +161,7 @@ class JsonAstVisitor {
     if (!this.sourceMap) {
       return;
     }
-    const sourceMap = new SourceMapElement();
-    // @ts-ignore
-    sourceMap.position = node.position;
-    // @ts-ignore
-    sourceMap.astNode = node;
-    element.meta.set('sourceMap', sourceMap);
+    assignSourceMap(element, node);
   }
 }
 export default JsonAstVisitor;