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

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

@@ -1,4 +1,5 @@
-import { Error, isNode as isCSTNode, Literal, ParseResult, Point, Position, YamlAlias, YamlAnchor, YamlComment, YamlDirective, YamlDocument, YamlKeyValuePair, YamlMapping, YamlNodeKind, YamlScalar, YamlSequence, YamlStream, YamlStyle, YamlStyleGroup, YamlTag } from '@swagger-api/apidom-ast';
+import { Error, isNode as isCSTNode, Literal, ParseResult, YamlAlias, YamlAnchor, YamlComment, YamlDirective, YamlDocument, YamlKeyValuePair, YamlMapping, YamlNodeKind, YamlScalar, YamlSequence, YamlStream, YamlStyle, YamlStyleGroup, YamlTag } from '@swagger-api/apidom-ast';
+import { assignSourceMap } from '@swagger-api/apidom-core';
 import TreeCursorSyntaxNode from "../../TreeCursorSyntaxNode.mjs";
 export const keyMap = {
   stream: ['children'],
@@ -19,31 +20,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 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
-    });
-  }
   static kindNodeToYamlAnchor(node) {
     const {
       anchor: anchorNode
     } = node;
     if (typeof anchorNode === 'undefined') return undefined;
-    return new YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    });
+    return new YamlAnchor(assignSourceMap({
+      name: anchorNode.text
+    }, anchorNode));
   }
   static hasKeyValuePairEmptyKey(node) {
     if (node.type !== 'block_mapping_pair' && node.type !== 'flow_pair') {
@@ -65,12 +49,10 @@ class CstVisitor {
     } = node;
     const explicitName = (tagNode === null || tagNode === void 0 ? void 0 : tagNode.text) || (node.type === 'plain_scalar' ? '?' : '!');
     const kind = node.type.endsWith('mapping') ? YamlNodeKind.Mapping : node.type.endsWith('sequence') ? YamlNodeKind.Sequence : YamlNodeKind.Scalar;
-    const position = tagNode ? CstVisitor.toPosition(tagNode) : undefined;
-    return new YamlTag({
+    return new YamlTag(assignSourceMap({
       explicitName,
-      kind,
-      position
-    });
+      kind
+    }, tagNode));
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -78,12 +60,10 @@ class CstVisitor {
   referenceManager;
   stream = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new YamlStream({
+      return new YamlStream(assignSourceMap({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: stream => {
       return new ParseResult({
@@ -94,58 +74,50 @@ class CstVisitor {
   yaml_directive = {
     enter: node => {
       var _node$firstNamedChild;
-      const position = CstVisitor.toPosition(node);
       const version = node === null || node === void 0 || (_node$firstNamedChild = node.firstNamedChild) === null || _node$firstNamedChild === void 0 ? void 0 : _node$firstNamedChild.text;
-      return new YamlDirective({
-        position,
+      return new YamlDirective(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 YamlDirective({
-        position,
+      const tagDirective = new YamlDirective(assignSourceMap({
         name: '%TAG',
         parameters: {
           handle: tagHandleNode === null || tagHandleNode === void 0 ? void 0 : tagHandleNode.text,
           prefix: tagPrefixNode === null || tagPrefixNode === void 0 ? 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 YamlDirective({
-        position,
+      return new YamlDirective(assignSourceMap({
         name: directiveNameNode === null || directiveNameNode === void 0 ? void 0 : directiveNameNode.text,
         parameters: {
           handle: directiveParameter1Node === null || directiveParameter1Node === void 0 ? void 0 : directiveParameter1Node.text,
           prefix: directiveParameter2Node === null || directiveParameter2Node === void 0 ? void 0 : directiveParameter2Node.text
         }
-      });
+      }, node));
     }
   };
   document = {
     enter: node => {
-      const position = CstVisitor.toPosition(node);
-      return new YamlDocument({
+      return new YamlDocument(assignSourceMap({
         children: node.children,
-        position,
         isMissing: node.isMissing
-      });
+      }, node));
     },
     leave: node => {
       node.children = node.children.flat();
@@ -164,21 +136,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 Point({
-        row: kindCandidate.endPosition.row,
-        column: kindCandidate.endPosition.column,
-        char: kindCandidate.endIndex
-      });
       const emptyScalarNode = new YamlScalar({
         content: '',
         anchor: CstVisitor.kindNodeToYamlAnchor(kindCandidate),
         tag: CstVisitor.kindNodeToYamlTag(kindCandidate),
-        position: new Position({
-          start: emptyPoint,
-          end: emptyPoint
-        }),
+        startPositionRow: kindCandidate.endPositionRow,
+        startPositionColumn: kindCandidate.endPositionColumn,
+        startIndex: kindCandidate.endIndex,
+        endPositionRow: kindCandidate.endPositionRow,
+        endPositionColumn: kindCandidate.endPositionColumn,
+        endIndex: kindCandidate.endIndex,
         styleGroup: YamlStyleGroup.Flow,
         style: YamlStyle.Plain
       });
@@ -198,25 +166,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 YamlMapping({
+      const mappingNode = new YamlMapping(assignSourceMap({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: YamlStyleGroup.Block,
         style: 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);
@@ -226,35 +191,31 @@ class CstVisitor {
         const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
-      return new YamlKeyValuePair({
+      return new YamlKeyValuePair(assignSourceMap({
         children,
-        position,
         styleGroup: 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 YamlMapping({
+      const mappingNode = new YamlMapping(assignSourceMap({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: YamlStyleGroup.Flow,
         style: 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);
@@ -264,12 +225,11 @@ class CstVisitor {
         const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
-      return new YamlKeyValuePair({
+      return new YamlKeyValuePair(assignSourceMap({
         children,
-        position,
         styleGroup: YamlStyleGroup.Flow,
         isMissing: node.isMissing
-      });
+      }, node));
     }
   };
   keyValuePair = {
@@ -279,17 +239,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 YamlSequence({
+      const sequenceNode = new YamlSequence(assignSourceMap({
         children: node.children,
-        position,
         anchor,
         tag,
         styleGroup: YamlStyleGroup.Block,
         style: YamlStyle.NextLine
-      });
+      }, node));
       this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
@@ -302,21 +260,18 @@ class CstVisitor {
       }
 
       // create empty node
-      const emptyPoint = new Point({
-        row: node.endPosition.row,
-        column: node.endPosition.column,
-        char: node.endIndex
-      });
       const emptyScalarNode = new YamlScalar({
         content: '',
         tag: new YamlTag({
           explicitName: '?',
           kind: YamlNodeKind.Scalar
         }),
-        position: new Position({
-          start: emptyPoint,
-          end: emptyPoint
-        }),
+        startPositionRow: node.endPositionRow,
+        startPositionColumn: node.endPositionColumn,
+        startIndex: node.endIndex,
+        endPositionRow: node.endPositionRow,
+        endPositionColumn: node.endPositionColumn,
+        endIndex: node.endIndex,
         styleGroup: YamlStyleGroup.Flow,
         style: YamlStyle.Plain
       });
@@ -325,17 +280,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 YamlSequence({
+      const sequenceNode = new YamlSequence(assignSourceMap({
         children: node.children.flat(),
-        position,
         anchor,
         tag,
         styleGroup: YamlStyleGroup.Flow,
         style: YamlStyle.Explicit
-      });
+      }, node));
       this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
@@ -347,69 +300,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 YamlScalar({
+      const scalarNode = new YamlScalar(assignSourceMap({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: YamlStyleGroup.Flow,
         style: 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 YamlScalar({
+      const scalarNode = new YamlScalar(assignSourceMap({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: YamlStyleGroup.Flow,
         style: 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 YamlScalar({
+      const scalarNode = new YamlScalar(assignSourceMap({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: YamlStyleGroup.Flow,
         style: 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('|') ? YamlStyle.Literal : node.text.startsWith('>') ? YamlStyle.Folded : YamlStyle.Plain;
-      const scalarNode = new YamlScalar({
+      const scalarNode = new YamlScalar(assignSourceMap({
         content: node.text,
         anchor,
         tag,
-        position,
         styleGroup: YamlStyleGroup.Block,
         style
-      });
+      }, node));
       this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
@@ -439,30 +384,26 @@ class CstVisitor {
   enter(node) {
     // missing 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;
   }
 
   // eslint-disable-next-line class-methods-use-this
   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]
@@ -476,35 +417,30 @@ class CstVisitor {
     }
   }
   createKeyValuePairEmptyKey(node) {
-    const emptyPoint = new Point({
-      row: node.startPosition.row,
-      column: node.startPosition.column,
-      char: node.startIndex
-    });
     const {
       keyNode
     } = node;
     const children = (keyNode === null || keyNode === void 0 ? void 0 : keyNode.children) || [];
     const tagNode = children.find(CstVisitor.isKind('tag'));
     const anchorNode = children.find(CstVisitor.isKind('anchor'));
-    const tag = typeof tagNode !== 'undefined' ? new YamlTag({
+    const tag = typeof tagNode !== 'undefined' ? new YamlTag(assignSourceMap({
       explicitName: tagNode.text,
-      kind: YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(tagNode)
-    }) : new YamlTag({
+      kind: YamlNodeKind.Scalar
+    }, tagNode)) : new YamlTag({
       explicitName: '?',
       kind: YamlNodeKind.Scalar
     });
-    const anchor = typeof anchorNode !== 'undefined' ? new YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    }) : undefined;
+    const anchor = typeof anchorNode !== 'undefined' ? new YamlAnchor(assignSourceMap({
+      name: anchorNode.text
+    }, anchorNode)) : undefined;
     const scalarNode = new YamlScalar({
       content: '',
-      position: new 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: YamlStyleGroup.Flow,
@@ -514,35 +450,30 @@ class CstVisitor {
     return scalarNode;
   }
   createKeyValuePairEmptyValue(node) {
-    const emptyPoint = new Point({
-      row: node.endPosition.row,
-      column: node.endPosition.column,
-      char: node.endIndex
-    });
     const {
       valueNode
     } = node;
     const children = (valueNode === null || valueNode === void 0 ? void 0 : valueNode.children) || [];
     const tagNode = children.find(CstVisitor.isKind('tag'));
     const anchorNode = children.find(CstVisitor.isKind('anchor'));
-    const tag = typeof tagNode !== 'undefined' ? new YamlTag({
+    const tag = typeof tagNode !== 'undefined' ? new YamlTag(assignSourceMap({
       explicitName: tagNode.text,
-      kind: YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(tagNode)
-    }) : new YamlTag({
+      kind: YamlNodeKind.Scalar
+    }, tagNode)) : new YamlTag({
       explicitName: '?',
       kind: YamlNodeKind.Scalar
     });
-    const anchor = typeof anchorNode !== 'undefined' ? new YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    }) : undefined;
+    const anchor = typeof anchorNode !== 'undefined' ? new YamlAnchor(assignSourceMap({
+      name: anchorNode.text
+    }, anchorNode)) : undefined;
     const scalarNode = new YamlScalar({
       content: '',
-      position: new 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: YamlStyleGroup.Flow,

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

@@ -155,12 +155,7 @@ class YamlAstVisitor {
     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 = YamlAstVisitor;

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

@@ -1,5 +1,5 @@
 import { getNodeType as getCSTNodeType, isNode as isCSTNode, YamlStyle } from '@swagger-api/apidom-ast';
-import { ParseResultElement, AnnotationElement, CommentElement, SourceMapElement, MemberElement, ObjectElement, ArrayElement, isPrimitiveElement, isElement, keyMap as keyMapApiDOM, getNodeType as getNodeTypeApiDOM, createNamespace } from '@swagger-api/apidom-core';
+import { ParseResultElement, AnnotationElement, CommentElement, MemberElement, ObjectElement, ArrayElement, isPrimitiveElement, isElement, keyMap as keyMapApiDOM, getNodeType as getNodeTypeApiDOM, createNamespace, assignSourceMap } from '@swagger-api/apidom-core';
 export const keyMap = {
   stream: ['children'],
   document: ['children'],
@@ -150,12 +150,7 @@ class YamlAstVisitor {
     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 YamlAstVisitor;