@swagger-api/apidom-parser-adapter-yaml-1-2 0.93.0 → 0.95.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.95.0](https://github.com/swagger-api/apidom/compare/v0.94.0...v0.95.0) (2024-02-09)
+
+### Bug Fixes
+
+- **parser-adapter-yaml-1-2:** fix canonical formatting of quoted scalars ([#3792](https://github.com/swagger-api/apidom/issues/3792)) ([3d9ff9f](https://github.com/swagger-api/apidom/commit/3d9ff9fd990f1ec0dd9618b6d3b135ccdb00a9ba)), closes [#3788](https://github.com/swagger-api/apidom/issues/3788)
+
+# [0.94.0](https://github.com/swagger-api/apidom/compare/v0.93.0...v0.94.0) (2024-02-05)
+
+### Bug Fixes
+
+- **parser-adapter-yaml-1-2:** add syntactic analysis for YAML aliases ([#3785](https://github.com/swagger-api/apidom/issues/3785)) ([e975718](https://github.com/swagger-api/apidom/commit/e97571823d1d3154fe3b13936260ed13230cf573)), closes [#3703](https://github.com/swagger-api/apidom/issues/3703)
+
 # [0.93.0](https://github.com/swagger-api/apidom/compare/v0.92.0...v0.93.0) (2024-01-23)
 
 **Note:** Version bump only for package @swagger-api/apidom-parser-adapter-yaml-1-2

package/cjs/syntactic-analysis/TreeCursorIterator.cjs

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.default = void 0;
 var _TreeCursorSyntaxNode = _interopRequireDefault(require("./TreeCursorSyntaxNode.cjs"));
 class TreeCursorIterator {
+  cursor;
   constructor(cursor) {
     this.cursor = cursor;
   }

package/cjs/syntactic-analysis/TreeCursorSyntaxNode.cjs

@@ -3,8 +3,18 @@
 exports.__esModule = true;
 exports.default = void 0;
 class TreeCursorSyntaxNode {
+  type;
+  startPosition;
+  endPosition;
+  startIndex;
+  endIndex;
+  text;
+  isNamed;
+  isMissing;
+  fieldName;
   hasError = false;
   children = [];
+  previousSibling;
   constructor(cursor) {
     this.type = cursor.nodeType;
     this.startPosition = cursor.startPosition;

package/cjs/syntactic-analysis/indirect/index.cjs

@@ -22,13 +22,15 @@ const analyze = (cst, {
   const cstVisitor = new _CstVisitor.default();
   const astVisitor = new _YamlAstVisitor.default();
   const schema = new _apidomAst.YamlJsonSchema();
+  const referenceManager = new _apidomAst.YamlReferenceManager();
   const yamlAst = (0, _apidomAst.visit)(rootNode, cstVisitor, {
     // @ts-ignore
     keyMap: _CstVisitor.keyMap,
     nodePredicate: _CstVisitor.isNode,
     state: {
       schema,
-      sourceMap
+      sourceMap,
+      referenceManager
     }
   });
   return (0, _apidomAst.visit)(yamlAst.rootNode, astVisitor, {

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

@@ -40,6 +40,16 @@ class CstVisitor {
       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)
+    });
+  }
   static hasKeyValuePairEmptyKey(node) {
     if (node.type !== 'block_mapping_pair' && node.type !== 'flow_pair') {
       return false;
@@ -67,91 +77,10 @@ class CstVisitor {
       position
     });
   }
-  static kindNodeToYamlAnchor(node) {
-    const {
-      anchor: anchorNode
-    } = node;
-    if (typeof anchorNode === 'undefined') return undefined;
-    return new _apidomAst.YamlAnchor({
-      name: anchorNode.text,
-      position: CstVisitor.toPosition(anchorNode)
-    });
-  }
-  static 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({
-      explicitName: tagNode.text,
-      kind: _apidomAst.YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(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;
-    return new _apidomAst.YamlScalar({
-      content: '',
-      position: new _apidomAst.Position({
-        start: emptyPoint,
-        end: emptyPoint
-      }),
-      tag,
-      anchor,
-      styleGroup: _apidomAst.YamlStyleGroup.Flow,
-      style: _apidomAst.YamlStyle.Plain
-    });
-  }
-  static 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({
-      explicitName: tagNode.text,
-      kind: _apidomAst.YamlNodeKind.Scalar,
-      position: CstVisitor.toPosition(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;
-    return new _apidomAst.YamlScalar({
-      content: '',
-      position: new _apidomAst.Position({
-        start: emptyPoint,
-        end: emptyPoint
-      }),
-      tag,
-      anchor,
-      styleGroup: _apidomAst.YamlStyleGroup.Flow,
-      style: _apidomAst.YamlStyle.Plain
-    });
-  }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+  schema;
+  referenceManager;
   stream = {
     enter: node => {
       const position = CstVisitor.toPosition(node);
@@ -258,6 +187,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Plain
       });
+      this.registerAnchor(emptyScalarNode);
       return [...node.children, emptyScalarNode];
     }
   };
@@ -285,6 +215,7 @@ class CstVisitor {
         style: _apidomAst.YamlStyle.NextLine,
         isMissing: node.isMissing
       });
+      this.registerAnchor(mappingNode);
       return this.schema.resolve(mappingNode);
     }
   };
@@ -293,11 +224,11 @@ class CstVisitor {
       const position = CstVisitor.toPosition(node);
       const children = [...node.children];
       if (CstVisitor.hasKeyValuePairEmptyKey(node)) {
-        const keyNode = CstVisitor.createKeyValuePairEmptyKey(node);
+        const keyNode = this.createKeyValuePairEmptyKey(node);
         children.unshift(keyNode);
       }
       if (CstVisitor.hasKeyValuePairEmptyValue(node)) {
-        const valueNode = CstVisitor.createKeyValuePairEmptyValue(node);
+        const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
       return new _apidomAst.YamlKeyValuePair({
@@ -322,6 +253,7 @@ class CstVisitor {
         style: _apidomAst.YamlStyle.Explicit,
         isMissing: node.isMissing
       });
+      this.registerAnchor(mappingNode);
       return this.schema.resolve(mappingNode);
     }
   };
@@ -330,11 +262,11 @@ class CstVisitor {
       const position = CstVisitor.toPosition(node);
       const children = [...node.children];
       if (CstVisitor.hasKeyValuePairEmptyKey(node)) {
-        const keyNode = CstVisitor.createKeyValuePairEmptyKey(node);
+        const keyNode = this.createKeyValuePairEmptyKey(node);
         children.unshift(keyNode);
       }
       if (CstVisitor.hasKeyValuePairEmptyValue(node)) {
-        const valueNode = CstVisitor.createKeyValuePairEmptyValue(node);
+        const valueNode = this.createKeyValuePairEmptyValue(node);
         children.push(valueNode);
       }
       return new _apidomAst.YamlKeyValuePair({
@@ -363,6 +295,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         style: _apidomAst.YamlStyle.NextLine
       });
+      this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
   };
@@ -408,6 +341,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Explicit
       });
+      this.registerAnchor(sequenceNode);
       return this.schema.resolve(sequenceNode);
     }
   };
@@ -429,6 +363,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.Plain
       });
+      this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
@@ -445,6 +380,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.SingleQuoted
       });
+      this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
@@ -461,6 +397,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Flow,
         style: _apidomAst.YamlStyle.DoubleQuoted
       });
+      this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
@@ -478,6 +415,7 @@ class CstVisitor {
         styleGroup: _apidomAst.YamlStyleGroup.Block,
         style
       });
+      this.registerAnchor(scalarNode);
       return this.schema.resolve(scalarNode);
     }
   };
@@ -488,6 +426,14 @@ class CstVisitor {
       });
     }
   };
+  alias = {
+    enter: node => {
+      const alias = new _apidomAst.YamlAlias({
+        content: node.text
+      });
+      return this.referenceManager.resolveAlias(alias);
+    }
+  };
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   constructor(schema) {
@@ -529,5 +475,86 @@ class CstVisitor {
     }
     return errorNode;
   }
+  registerAnchor(node) {
+    if (node.anchor !== undefined) {
+      this.referenceManager.addAnchor(node);
+    }
+  }
+  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({
+      explicitName: tagNode.text,
+      kind: _apidomAst.YamlNodeKind.Scalar,
+      position: CstVisitor.toPosition(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 scalarNode = new _apidomAst.YamlScalar({
+      content: '',
+      position: new _apidomAst.Position({
+        start: emptyPoint,
+        end: emptyPoint
+      }),
+      tag,
+      anchor,
+      styleGroup: _apidomAst.YamlStyleGroup.Flow,
+      style: _apidomAst.YamlStyle.Plain
+    });
+    this.registerAnchor(scalarNode);
+    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({
+      explicitName: tagNode.text,
+      kind: _apidomAst.YamlNodeKind.Scalar,
+      position: CstVisitor.toPosition(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 scalarNode = new _apidomAst.YamlScalar({
+      content: '',
+      position: new _apidomAst.Position({
+        start: emptyPoint,
+        end: emptyPoint
+      }),
+      tag,
+      anchor,
+      styleGroup: _apidomAst.YamlStyleGroup.Flow,
+      style: _apidomAst.YamlStyle.Plain
+    });
+    this.registerAnchor(scalarNode);
+    return scalarNode;
+  }
 }
 var _default = exports.default = CstVisitor;

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

@@ -26,6 +26,8 @@ const isNode = node => (0, _apidomCore.isElement)(node) || (0, _apidomAst.isNode
 exports.isNode = isNode;
 class YamlAstVisitor {
   sourceMap = false;
+  annotations;
+  namespace;
   processedDocumentCount = 0;
   stream = {
     leave: node => {