@swagger-api/apidom-ast 1.0.0-beta.8 → 1.0.0-rc.0

package/src/traversal/visitor.mjs

@@ -351,7 +351,8 @@ visitor, {
   nodeTypeGetter = getNodeType,
   nodePredicate = isNode,
   nodeCloneFn = cloneNode,
-  detectCycles = true
+  detectCycles = true,
+  detectCyclesCallback = null
 } = {}) => {
   const visitorKeys = keyMap || {};
   let stack;
@@ -423,6 +424,10 @@ visitor, {
 
       // cycle detected; skipping over a sub-tree to avoid recursion
       if (detectCycles && ancestors.includes(node)) {
+        if (typeof detectCyclesCallback === 'function') {
+          // @ts-ignore
+          detectCyclesCallback(node, key, parent, path, ancestors);
+        }
         path.pop();
         continue;
       }
@@ -525,7 +530,8 @@ visitor, {
   nodeTypeGetter = getNodeType,
   nodePredicate = isNode,
   nodeCloneFn = cloneNode,
-  detectCycles = true
+  detectCycles = true,
+  detectCyclesCallback = null
 } = {}) => {
   const visitorKeys = keyMap || {};
   let stack;
@@ -596,6 +602,10 @@ visitor, {
 
       // cycle detected; skipping over a sub-tree to avoid recursion
       if (detectCycles && ancestors.includes(node)) {
+        if (typeof detectCyclesCallback === 'function') {
+          // @ts-ignore
+          detectCyclesCallback(node, key, parent, path, ancestors);
+        }
         path.pop();
         continue;
       }

package/src/yaml/errors/YamlTagError.cjs

@@ -15,7 +15,12 @@ class YamlTagError extends _YamlSchemaError.default {
   specificTagName;
   explicitTagName;
   tagKind;
-  tagPosition;
+  tagStartPositionRow;
+  tagStartPositionColumn;
+  tagStartPositionIndex;
+  tagEndPositionRow;
+  tagEndPositionColumn;
+  tagEndPositionIndex;
   nodeCanonicalContent;
   node;
   constructor(message, structuredOptions) {
@@ -24,7 +29,12 @@ class YamlTagError extends _YamlSchemaError.default {
       this.specificTagName = structuredOptions.specificTagName;
       this.explicitTagName = structuredOptions.explicitTagName;
       this.tagKind = structuredOptions.tagKind;
-      this.tagPosition = structuredOptions.tagPosition;
+      this.tagStartPositionRow = structuredOptions.tagStartPositionRow;
+      this.tagStartPositionColumn = structuredOptions.tagStartPositionColumn;
+      this.tagStartPositionIndex = structuredOptions.tagStartPositionIndex;
+      this.tagEndPositionRow = structuredOptions.tagEndPositionRow;
+      this.tagEndPositionColumn = structuredOptions.tagEndPositionColumn;
+      this.tagEndPositionIndex = structuredOptions.tagEndPositionIndex;
       this.nodeCanonicalContent = structuredOptions.nodeCanonicalContent;
       this.node = structuredOptions.node;
     }

package/src/yaml/errors/YamlTagError.mjs

@@ -9,7 +9,12 @@ class YamlTagError extends YamlSchemaError {
   specificTagName;
   explicitTagName;
   tagKind;
-  tagPosition;
+  tagStartPositionRow;
+  tagStartPositionColumn;
+  tagStartPositionIndex;
+  tagEndPositionRow;
+  tagEndPositionColumn;
+  tagEndPositionIndex;
   nodeCanonicalContent;
   node;
   constructor(message, structuredOptions) {
@@ -18,7 +23,12 @@ class YamlTagError extends YamlSchemaError {
       this.specificTagName = structuredOptions.specificTagName;
       this.explicitTagName = structuredOptions.explicitTagName;
       this.tagKind = structuredOptions.tagKind;
-      this.tagPosition = structuredOptions.tagPosition;
+      this.tagStartPositionRow = structuredOptions.tagStartPositionRow;
+      this.tagStartPositionColumn = structuredOptions.tagStartPositionColumn;
+      this.tagStartPositionIndex = structuredOptions.tagStartPositionIndex;
+      this.tagEndPositionRow = structuredOptions.tagEndPositionRow;
+      this.tagEndPositionColumn = structuredOptions.tagEndPositionColumn;
+      this.tagEndPositionIndex = structuredOptions.tagEndPositionIndex;
       this.nodeCanonicalContent = structuredOptions.nodeCanonicalContent;
       this.node = structuredOptions.node;
     }

package/src/yaml/schemas/failsafe/index.cjs

@@ -3,7 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _ramda = require("ramda");
 var _YamlTagError = _interopRequireDefault(require("../../errors/YamlTagError.cjs"));
 var _YamlTag = require("../../nodes/YamlTag.cjs");
 var _GenericMapping = _interopRequireDefault(require("./GenericMapping.cjs"));
@@ -87,7 +86,12 @@ class FailsafeSchema {
         specificTagName,
         explicitTagName: node.tag.explicitName,
         tagKind: node.tag.kind,
-        tagPosition: (0, _ramda.clone)(node.tag.position),
+        tagStartPositionRow: node.tag.startPositionRow,
+        tagStartPositionColumn: node.tag.startPositionColumn,
+        tagStartPositionIndex: node.tag.startIndex,
+        tagEndPositionRow: node.tag.endPositionRow,
+        tagEndPositionColumn: node.tag.endPositionColumn,
+        tagEndPositionIndex: node.tag.endIndex,
         node: node.clone()
       });
     }
@@ -98,7 +102,12 @@ class FailsafeSchema {
         specificTagName,
         explicitTagName: node.tag.explicitName,
         tagKind: node.tag.kind,
-        tagPosition: (0, _ramda.clone)(node.tag.position),
+        tagStartPositionRow: node.tag.startPositionRow,
+        tagStartPositionColumn: node.tag.startPositionColumn,
+        tagStartPositionIndex: node.tag.startIndex,
+        tagEndPositionRow: node.tag.endPositionRow,
+        tagEndPositionColumn: node.tag.endPositionColumn,
+        tagEndPositionIndex: node.tag.endIndex,
         nodeCanonicalContent: canonicalNode.content,
         node: node.clone()
       });

package/src/yaml/schemas/failsafe/index.mjs

@@ -1,4 +1,3 @@
-import { clone } from 'ramda';
 import YamlTagError from "../../errors/YamlTagError.mjs";
 import { YamlNodeKind } from "../../nodes/YamlTag.mjs";
 import GenericMappingTag from "./GenericMapping.mjs";
@@ -82,7 +81,12 @@ class FailsafeSchema {
         specificTagName,
         explicitTagName: node.tag.explicitName,
         tagKind: node.tag.kind,
-        tagPosition: clone(node.tag.position),
+        tagStartPositionRow: node.tag.startPositionRow,
+        tagStartPositionColumn: node.tag.startPositionColumn,
+        tagStartPositionIndex: node.tag.startIndex,
+        tagEndPositionRow: node.tag.endPositionRow,
+        tagEndPositionColumn: node.tag.endPositionColumn,
+        tagEndPositionIndex: node.tag.endIndex,
         node: node.clone()
       });
     }
@@ -93,7 +97,12 @@ class FailsafeSchema {
         specificTagName,
         explicitTagName: node.tag.explicitName,
         tagKind: node.tag.kind,
-        tagPosition: clone(node.tag.position),
+        tagStartPositionRow: node.tag.startPositionRow,
+        tagStartPositionColumn: node.tag.startPositionColumn,
+        tagStartPositionIndex: node.tag.startIndex,
+        tagEndPositionRow: node.tag.endPositionRow,
+        tagEndPositionColumn: node.tag.endPositionColumn,
+        tagEndPositionIndex: node.tag.endIndex,
         nodeCanonicalContent: canonicalNode.content,
         node: node.clone()
       });

package/types/apidom-ast.d.ts

@@ -116,16 +116,6 @@ export declare const isNode: (node: any) => boolean;
  */
 export declare const isParseResult: (node: unknown) => node is ParseResult;
 
-/**
- * @public
- */
-export declare const isPoint: (node: unknown) => node is Point;
-
-/**
- * @public
- */
-export declare const isPosition: (node: unknown) => node is Position;
-
 /**
  * @public
  */
@@ -367,8 +357,13 @@ declare class Node_2 {
     readonly type: string;
     readonly isMissing: boolean;
     children: unknown[];
-    position?: Position;
-    constructor({ children, position, isMissing }?: NodeOptions);
+    startPositionRow?: number;
+    startPositionColumn?: number;
+    startIndex?: number;
+    endPositionRow?: number;
+    endPositionColumn?: number;
+    endIndex?: number;
+    constructor({ children, isMissing, startPositionRow, startPositionColumn, startIndex, endPositionRow, endPositionColumn, endIndex, }?: NodeOptions);
     clone(): Node_2;
 }
 export { Node_2 as Node }
@@ -380,6 +375,12 @@ export declare interface NodeOptions {
     readonly children?: unknown[];
     readonly position?: Position;
     readonly isMissing?: boolean;
+    readonly startPositionRow?: number;
+    readonly startPositionColumn?: number;
+    readonly startIndex?: number;
+    readonly endPositionRow?: number;
+    readonly endPositionColumn?: number;
+    readonly endIndex?: number;
 }
 
 /**
@@ -525,7 +526,7 @@ export { PositionOptions_2 as PositionOptions }
  *
  *  @public
  */
-export declare const visit: (root: any, visitor: any, { keyMap, state, breakSymbol, deleteNodeSymbol, skipVisitingNodeSymbol, visitFnGetter, nodeTypeGetter, nodePredicate, nodeCloneFn, detectCycles, }?: {
+export declare const visit: (root: any, visitor: any, { keyMap, state, breakSymbol, deleteNodeSymbol, skipVisitingNodeSymbol, visitFnGetter, nodeTypeGetter, nodePredicate, nodeCloneFn, detectCycles, detectCyclesCallback, }?: {
     keyMap?: null | undefined;
     state?: {} | undefined;
     breakSymbol?: {} | undefined;
@@ -536,6 +537,7 @@ export declare const visit: (root: any, visitor: any, { keyMap, state, breakSymb
     nodePredicate?: ((node: any) => boolean) | undefined;
     nodeCloneFn?: ((node: any) => any) | undefined;
     detectCycles?: boolean | undefined;
+    detectCyclesCallback?: null | undefined;
 }) => any;
 
 /**
@@ -797,7 +799,12 @@ export declare class YamlTagError extends YamlSchemaError {
     readonly specificTagName: string;
     readonly explicitTagName: string;
     readonly tagKind: string;
-    readonly tagPosition?: Position;
+    readonly tagStartPositionRow?: number;
+    readonly tagStartPositionColumn?: number;
+    readonly tagStartPositionIndex?: number;
+    readonly tagEndPositionRow?: number;
+    readonly tagEndPositionColumn?: number;
+    readonly tagEndPositionIndex?: number;
     readonly nodeCanonicalContent?: string;
     readonly node?: unknown;
     constructor(message?: string, structuredOptions?: YamlTagErrorOptions);
@@ -810,7 +817,12 @@ export declare interface YamlTagErrorOptions<T extends Node_2 = Node_2> extends
     readonly specificTagName: string;
     readonly explicitTagName: string;
     readonly tagKind: string;
-    readonly tagPosition?: Position;
+    readonly tagStartPositionRow?: number;
+    readonly tagStartPositionColumn?: number;
+    readonly tagStartPositionIndex?: number;
+    readonly tagEndPositionRow?: number;
+    readonly tagEndPositionColumn?: number;
+    readonly tagEndPositionIndex?: number;
     readonly nodeCanonicalContent?: string;
     readonly node?: T;
 }