@swagger-api/apidom-parser-adapter-yaml-1-2 1.0.0-beta.9 → 1.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-yaml-1-2",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-rc.1",
   "description": "Parser adapter for parsing YAML documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -30,8 +30,8 @@
     "build:es": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=es babel src --out-dir src --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward'",
     "build:cjs": "npm run build:wasm && npm run build:wasm:copy && BABEL_ENV=cjs babel src --out-dir src --extensions '.ts' --out-file-extension '.cjs' --root-mode 'upward'",
     "build:umd:browser": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
-    "build:wasm": "node ../../scripts/file-exists.js ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
-    "build:wasm:copy": "copyfiles -u 5 ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
+    "build:wasm": "node ../../scripts/file-exists.js ./node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ./node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
+    "build:wasm:copy": "copyfiles -u 3 ./node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
     "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types",
@@ -51,15 +51,15 @@
   "author": "Vladimir Gorej",
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^1.0.0-beta.9",
-    "@swagger-api/apidom-core": "^1.0.0-beta.9",
-    "@swagger-api/apidom-error": "^1.0.0-beta.9",
-    "@tree-sitter-grammars/tree-sitter-yaml": "=0.7.0",
+    "@babel/runtime-corejs3": "^7.26.10",
+    "@swagger-api/apidom-ast": "^1.0.0-rc.1",
+    "@swagger-api/apidom-core": "^1.0.0-rc.1",
+    "@swagger-api/apidom-error": "^1.0.0-rc.1",
+    "@tree-sitter-grammars/tree-sitter-yaml": "=0.7.1",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
-    "tree-sitter": "=0.22.1",
+    "tree-sitter": "=0.22.4",
     "web-tree-sitter": "=0.24.5"
   },
   "devDependencies": {
@@ -76,5 +76,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "2d97871bd8addd42274917c6d131a09eebe9b1f8"
+  "gitHead": "e08fdf4c8a8070453c33066cc50f4e949fc4bd20"
 }

package/src/lexical-analysis/node.cjs

@@ -8,6 +8,7 @@ var _treeSitterYaml = _interopRequireDefault(require("@tree-sitter-grammars/tree
 // @ts-ignore
 
 const parser = new _treeSitter.default();
+// @ts-ignore
 parser.setLanguage(_treeSitterYaml.default);
 
 /**

package/src/lexical-analysis/node.mjs

@@ -2,6 +2,7 @@ import Parser from 'tree-sitter';
 // @ts-ignore
 import YAMLLanguage from '@tree-sitter-grammars/tree-sitter-yaml';
 const parser = new Parser();
+// @ts-ignore
 parser.setLanguage(YAMLLanguage);
 
 /**

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;
@@ -17,9 +19,11 @@ class TreeCursorSyntaxNode {
   previousSibling;
   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;
@@ -13,9 +15,11 @@ class TreeCursorSyntaxNode {
   previousSibling;
   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/indirect/visitors/CstVisitor.cjs

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.keyMap = exports.isNode = 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 = {
   stream: ['children'],
@@ -24,31 +25,14 @@ class CstVisitor {
   static isKind(ending) {
     return node => node != null && typeof node === 'object' && 'type' in node && typeof node.type === 'string' && node.type.endsWith(ending);
   }
-  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
-    });
-  }
   static kindNodeToYamlAnchor(node) {
     const {
       anchor: anchorNode
     } = node;
     if (typeof anchorNode === 'undefined') return undefined;
-    return new _apidomAst.YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    });
+    return new _apidomAst.YamlAnchor((0, _apidomCore.assignSourceMap)({
+      name: anchorNode.text
+    }, anchorNode));
   }
   static hasKeyValuePairEmptyKey(node) {
     if (node.type !== 'block_mapping_pair' && node.type !== 'flow_pair') {
@@ -70,12 +54,10 @@ class CstVisitor {
     } = node;
     const explicitName = (tagNode == null ? void 0 : tagNode.text) || (node.type === 'plain_scalar' ? '?' : '!');
     const kind = node.type.endsWith('mapping') ? _apidomAst.YamlNodeKind.Mapping : node.type.endsWith('sequence') ? _apidomAst.YamlNodeKind.Sequence : _apidomAst.YamlNodeKind.Scalar;
-    const position = tagNode ? CstVisitor.toPosition(tagNode) : undefined;
-    return new _apidomAst.YamlTag({
+    return new _apidomAst.YamlTag((0, _apidomCore.assignSourceMap)({
       explicitName,
-      kind,
-      position
-    });
+      kind
+    }, tagNode));
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -83,12 +65,10 @@ class CstVisitor {
   referenceManager;
   stream = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new _apidomAst.YamlStream({
+      return new _apidomAst.YamlStream((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: stream => {
       return new _apidomAst.ParseResult({
@@ -99,58 +79,50 @@ class CstVisitor {
   yaml_directive = {
     enter: node => {
       var _node$firstNamedChild;
-      const position = CstVisitor.toPosition(node);
       const version = node == null || (_node$firstNamedChild = node.firstNamedChild) == null ? void 0 : _node$firstNamedChild.text;
-      return new _apidomAst.YamlDirective({
-        position,
+      return new _apidomAst.YamlDirective((0, _apidomCore.assignSourceMap)({
         name: '%YAML',
         parameters: {
           version
         }
-      });
+      }, node));
     }
   };
   tag_directive = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tagHandleNode = node.children[0];
       const tagPrefixNode = node.children[1];
-      const tagDirective = new _apidomAst.YamlDirective({
-        position,
+      const tagDirective = new _apidomAst.YamlDirective((0, _apidomCore.assignSourceMap)({
         name: '%TAG',
         parameters: {
           handle: tagHandleNode == null ? void 0 : tagHandleNode.text,
           prefix: tagPrefixNode == null ? void 0 : tagPrefixNode.text
         }
-      });
+      }, node));
       this.schema.registerTagDirective(tagDirective);
       return tagDirective;
     }
   };
   reserved_directive = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const directiveNameNode = node.children[0];
       const directiveParameter1Node = node.children[1];
       const directiveParameter2Node = node.children[2];
-      return new _apidomAst.YamlDirective({
-        position,
+      return new _apidomAst.YamlDirective((0, _apidomCore.assignSourceMap)({
         name: directiveNameNode == null ? void 0 : directiveNameNode.text,
         parameters: {
           handle: directiveParameter1Node == null ? void 0 : directiveParameter1Node.text,
           prefix: directiveParameter2Node == null ? void 0 : directiveParameter2Node.text
         }
-      });
+      }, node));
     }
   };
   document = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new _apidomAst.YamlDocument({
+      return new _apidomAst.YamlDocument((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: node => {
       node.children = node.children.flat();
@@ -169,21 +141,17 @@ class CstVisitor {
       if (CstVisitor.isScalar(kindCandidate) || CstVisitor.isMapping(kindCandidate) || CstVisitor.isSequence(kindCandidate)) {
         return node.children;
       }
-
       // kind node not present in flow node, creating empty node
-      const emptyPoint = new _apidomAst.Point({
-        row: kindCandidate.endPosition.row,
-        column: kindCandidate.endPosition.column,
-        char: kindCandidate.endIndex
-      });
       const emptyScalarNode = new _apidomAst.YamlScalar({
         content: '',
         anchor: CstVisitor.kindNodeToYamlAnchor(kindCandidate),
         tag: CstVisitor.kindNodeToYamlTag(kindCandidate),
-        position: new _apidomAst.Position({
-          start: emptyPoint,
-          end: emptyPoint
-        }),
+        startPositionRow: kindCandidate.endPositionRow,
+        startPositionColumn: kindCandidate.endPositionColumn,
+        startIndex: kindCandidate.endIndex,
+        endPositionRow: kindCandidate.endPositionRow,
+        endPositionColumn: kindCandidate.endPositionColumn,
+        endIndex: kindCandidate.endIndex,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Plain
       });
@@ -203,25 +171,22 @@ class CstVisitor {
   };
   block_mapping = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const mappingNode = new _apidomAst.YamlMapping({
+      const mappingNode = new _apidomAst.YamlMapping((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         style: _apidomAst.YamlStyle.NextLine,
         isMissing: node.isMissing
-      });
+      }, node));
       this.registerAnchor(mappingNode);
       return this.schema.resolve(mappingNode);
     }
   };
   block_mapping_pair = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const children = [...node.children];
       if (CstVisitor.hasKeyValuePairEmptyKey(node)) {
         const keyNode = this.createKeyValuePairEmptyKey(node);
@@ -231,35 +196,31 @@ class CstVisitor {
         const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
-      return new _apidomAst.YamlKeyValuePair({
+      return new _apidomAst.YamlKeyValuePair((0, _apidomCore.assignSourceMap)({
         children,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         isMissing: node.isMissing
-      });
+      }, node));
     }
   };
   flow_mapping = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const mappingNode = new _apidomAst.YamlMapping({
+      const mappingNode = new _apidomAst.YamlMapping((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Explicit,
         isMissing: node.isMissing
-      });
+      }, node));
       this.registerAnchor(mappingNode);
       return this.schema.resolve(mappingNode);
     }
   };
   flow_pair = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const children = [...node.children];
       if (CstVisitor.hasKeyValuePairEmptyKey(node)) {
         const keyNode = this.createKeyValuePairEmptyKey(node);
@@ -269,12 +230,11 @@ class CstVisitor {
         const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
-      return new _apidomAst.YamlKeyValuePair({
+      return new _apidomAst.YamlKeyValuePair((0, _apidomCore.assignSourceMap)({
         children,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         isMissing: node.isMissing
-      });
+      }, node));
     }
   };
   keyValuePair = {
@@ -284,17 +244,15 @@ class CstVisitor {
   };
   block_sequence = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const sequenceNode = new _apidomAst.YamlSequence({
+      const sequenceNode = new _apidomAst.YamlSequence((0, _apidomCore.assignSourceMap)({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         style: _apidomAst.YamlStyle.NextLine
-      });
+      }, node));
       this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
@@ -307,21 +265,18 @@ class CstVisitor {
       }
 
       // create empty node
-      const emptyPoint = new _apidomAst.Point({
-        row: node.endPosition.row,
-        column: node.endPosition.column,
-        char: node.endIndex
-      });
       const emptyScalarNode = new _apidomAst.YamlScalar({
         content: '',
         tag: new _apidomAst.YamlTag({
           explicitName: '?',
           kind: _apidomAst.YamlNodeKind.Scalar
         }),
-        position: new _apidomAst.Position({
-          start: emptyPoint,
-          end: emptyPoint
-        }),
+        startPositionRow: node.endPositionRow,
+        startPositionColumn: node.endPositionColumn,
+        startIndex: node.endIndex,
+        endPositionRow: node.endPositionRow,
+        endPositionColumn: node.endPositionColumn,
+        endIndex: node.endIndex,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Plain
       });
@@ -330,17 +285,15 @@ class CstVisitor {
   };
   flow_sequence = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const sequenceNode = new _apidomAst.YamlSequence({
+      const sequenceNode = new _apidomAst.YamlSequence((0, _apidomCore.assignSourceMap)({
         children: node.children.flat(),
-        position,
         anchor,
         tag,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Explicit
-      });
+      }, node));
       this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
@@ -352,69 +305,61 @@ class CstVisitor {
   };
   plain_scalar = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const scalarNode = new _apidomAst.YamlScalar({
+      const scalarNode = new _apidomAst.YamlScalar((0, _apidomCore.assignSourceMap)({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Plain
-      });
+      }, node));
       this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
   single_quote_scalar = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const scalarNode = new _apidomAst.YamlScalar({
+      const scalarNode = new _apidomAst.YamlScalar((0, _apidomCore.assignSourceMap)({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.SingleQuoted
-      });
+      }, node));
       this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
   double_quote_scalar = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
-      const scalarNode = new _apidomAst.YamlScalar({
+      const scalarNode = new _apidomAst.YamlScalar((0, _apidomCore.assignSourceMap)({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.DoubleQuoted
-      });
+      }, node));
       this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
   block_scalar = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
       const tag = CstVisitor.kindNodeToYamlTag(node);
       const anchor = CstVisitor.kindNodeToYamlAnchor(node);
       const style = node.text.startsWith('|') ? _apidomAst.YamlStyle.Literal : node.text.startsWith('>') ? _apidomAst.YamlStyle.Folded : _apidomAst.YamlStyle.Plain;
-      const scalarNode = new _apidomAst.YamlScalar({
+      const scalarNode = new _apidomAst.YamlScalar((0, _apidomCore.assignSourceMap)({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         style
-      });
+      }, node));
       this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
@@ -444,30 +389,26 @@ class CstVisitor {
   enter(node) {
     // missing 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;
   }
 
   // eslint-disable-next-line class-methods-use-this
   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]
@@ -481,35 +422,30 @@ class CstVisitor {
     }
   }
   createKeyValuePairEmptyKey(node) {
-    const emptyPoint = new _apidomAst.Point({
-      row: node.startPosition.row,
-      column: node.startPosition.column,
-      char: node.startIndex
-    });
     const {
       keyNode
     } = node;
     const children = (keyNode == null ? void 0 : keyNode.children) || [];
     const tagNode = children.find(CstVisitor.isKind('tag'));
     const anchorNode = children.find(CstVisitor.isKind('anchor'));
-    const tag = typeof tagNode !== 'undefined' ? new _apidomAst.YamlTag({
+    const tag = typeof tagNode !== 'undefined' ? new _apidomAst.YamlTag((0, _apidomCore.assignSourceMap)({
       explicitName: tagNode.text,
-      kind: _apidomAst.YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(tagNode)
-    }) : new _apidomAst.YamlTag({
+      kind: _apidomAst.YamlNodeKind.Scalar
+    }, tagNode)) : new _apidomAst.YamlTag({
       explicitName: '?',
       kind: _apidomAst.YamlNodeKind.Scalar
     });
-    const anchor = typeof anchorNode !== 'undefined' ? new _apidomAst.YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    }) : undefined;
+    const anchor = typeof anchorNode !== 'undefined' ? new _apidomAst.YamlAnchor((0, _apidomCore.assignSourceMap)({
+      name: anchorNode.text
+    }, anchorNode)) : undefined;
     const scalarNode = new _apidomAst.YamlScalar({
       content: '',
-      position: new _apidomAst.Position({
-        start: emptyPoint,
-        end: emptyPoint
-      }),
+      startPositionRow: node.startPositionRow,
+      startPositionColumn: node.startPositionColumn,
+      startIndex: node.startIndex,
+      endPositionRow: node.startPositionRow,
+      endPositionColumn: node.startPositionColumn,
+      endIndex: node.startIndex,
       tag,
       anchor,
       styleGroup: _apidomAst.YamlStyleGroup.Flow,
@@ -519,35 +455,30 @@ class CstVisitor {
     return scalarNode;
   }
   createKeyValuePairEmptyValue(node) {
-    const emptyPoint = new _apidomAst.Point({
-      row: node.endPosition.row,
-      column: node.endPosition.column,
-      char: node.endIndex
-    });
     const {
       valueNode
     } = node;
     const children = (valueNode == null ? void 0 : valueNode.children) || [];
     const tagNode = children.find(CstVisitor.isKind('tag'));
     const anchorNode = children.find(CstVisitor.isKind('anchor'));
-    const tag = typeof tagNode !== 'undefined' ? new _apidomAst.YamlTag({
+    const tag = typeof tagNode !== 'undefined' ? new _apidomAst.YamlTag((0, _apidomCore.assignSourceMap)({
       explicitName: tagNode.text,
-      kind: _apidomAst.YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(tagNode)
-    }) : new _apidomAst.YamlTag({
+      kind: _apidomAst.YamlNodeKind.Scalar
+    }, tagNode)) : new _apidomAst.YamlTag({
       explicitName: '?',
       kind: _apidomAst.YamlNodeKind.Scalar
     });
-    const anchor = typeof anchorNode !== 'undefined' ? new _apidomAst.YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    }) : undefined;
+    const anchor = typeof anchorNode !== 'undefined' ? new _apidomAst.YamlAnchor((0, _apidomCore.assignSourceMap)({
+      name: anchorNode.text
+    }, anchorNode)) : undefined;
     const scalarNode = new _apidomAst.YamlScalar({
       content: '',
-      position: new _apidomAst.Position({
-        start: emptyPoint,
-        end: emptyPoint
-      }),
+      startPositionRow: node.endPositionRow,
+      startPositionColumn: node.endPositionColumn,
+      startIndex: node.endIndex,
+      endPositionRow: node.endPositionRow,
+      endPositionColumn: node.endPositionColumn,
+      endIndex: node.endIndex,
       tag,
       anchor,
       styleGroup: _apidomAst.YamlStyleGroup.Flow,