@swagger-api/apidom-parser-adapter-json 0.91.0 → 0.93.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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-json
+
+# [0.92.0](https://github.com/swagger-api/apidom/compare/v0.91.0...v0.92.0) (2024-01-12)
+
+**Note:** Version bump only for package @swagger-api/apidom-parser-adapter-json
+
 # [0.91.0](https://github.com/swagger-api/apidom/compare/v0.90.0...v0.91.0) (2024-01-08)
 
 **Note:** Version bump only for package @swagger-api/apidom-parser-adapter-json

package/README.md

@@ -117,7 +117,7 @@ You can omit the `mediaType` option here, but please read [Word on detect vs med
 import ApiDOMParser from '@swagger-api/apidom-parser';
 import * as jsonParserAdapter from '@swagger-api/apidom-parser-adapter-json';
 
-const parser = ApiDOMParser();
+const parser = new ApiDOMParser();
 
 parser.use(jsonParserAdapter);
 

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

@@ -46,7 +46,7 @@ const isNode = element => (0, _apidomCore.isElement)(element) || (0, _apidomAst.
 const analyze = (cst, {
   sourceMap = false
 } = {}) => {
-  const visitor = (0, _CstVisitor.default)();
+  const visitor = new _CstVisitor.default();
   const cursor = cst.walk();
   const iterator = new _TreeCursorIterator.default(cursor);
   const [rootNode] = Array.from(iterator);

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

@@ -3,171 +3,158 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _stampit = _interopRequireDefault(require("stampit"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _TreeCursorSyntaxNode = _interopRequireDefault(require("../../TreeCursorSyntaxNode.cjs"));
 /* eslint-disable no-underscore-dangle */
 
-const CstVisitor = (0, _stampit.default)({
-  props: {
-    sourceMap: false,
-    annotations: []
-  },
-  init() {
-    /**
-     * Private API.
-     */
+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;
+  ParseResultElement = {
+    leave: element => {
+      // mark first-non Annotation element as result
+      // @ts-ignore
+      const elements = element.findElements(_apidomCore.isPrimitiveElement);
+      if (elements.length > 0) {
+        const resultElement = elements[0];
+        resultElement.classes.push('result');
+      }
 
+      // provide annotations
+      this.annotations.forEach(annotationElement => {
+        element.push(annotationElement);
+      });
+      this.annotations = [];
+    }
+  };
+  constructor() {
     this.annotations = [];
-    const 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];
-    };
-    const maybeAddSourceMap = (node, element) => {
-      if (!this.sourceMap) {
-        return;
-      }
-      const sourceMap = new _apidomCore.SourceMapElement();
-      const position = 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);
-    };
+  }
+  enter(node) {
+    // missing anonymous literals from CST transformed into AnnotationElements.
+    if (node instanceof _TreeCursorSyntaxNode.default && !node.isNamed && node.isMissing) {
+      // collect annotations from missing literals
+      const value = node.type || node.text;
+      const message = `(Missing ${value})`;
+      const element = new _apidomCore.AnnotationElement(message);
+      element.classes.push('warning');
+      this.maybeAddSourceMap(node, element);
+      this.annotations.push(element);
+    }
+    return null; // remove everything unrecognized
+  }
+  document(node) {
+    const element = new _apidomCore.ParseResultElement();
+    // @ts-ignore
+    element._content = node.children;
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  object(node) {
+    const element = new _apidomCore.ObjectElement();
+    // @ts-ignore
+    element._content = node.children;
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  array(node) {
+    const element = new _apidomCore.ArrayElement();
+    // @ts-ignore
+    element._content = node.children;
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  pair(node) {
+    const element = new _apidomCore.MemberElement();
+    // @ts-ignore
+    element.content.key = node.keyNode;
+    // @ts-ignore
+    element.content.value = node.valueNode;
+    this.maybeAddSourceMap(node, element);
 
     /**
-     * Public API.
+     * Process possible errors here that may be present in pair node children as we're using direct field access.
+     * There are usually 3 children here found: "key", ":", "value".
      */
+    if (node.children.length > 3) {
+      node.children.filter(child => child.type === 'ERROR').forEach(errorNode => {
+        this.ERROR(errorNode, node, [], [node]);
+      });
+    }
+    return element;
+  }
+  string(node) {
+    const element = new _apidomCore.StringElement(JSON.parse(node.text));
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  number(node) {
+    const element = new _apidomCore.NumberElement(Number(node.text));
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    this.enter = function enter(node) {
-      // missing anonymous literals from CST transformed into AnnotationElements.
-      if (node instanceof _TreeCursorSyntaxNode.default && !node.isNamed && node.isMissing) {
-        // collect annotations from missing literals
-        const value = node.type || node.text;
-        const message = `(Missing ${value})`;
-        const element = new _apidomCore.AnnotationElement(message);
-        element.classes.push('warning');
-        maybeAddSourceMap(node, element);
-        this.annotations.push(element);
-      }
-      return null; // remove everything unrecognized
-    };
-    this.document = function document(node) {
-      const element = new _apidomCore.ParseResultElement();
-      // @ts-ignore
-      element._content = node.children;
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.ParseResultElement = {
-      leave(element) {
-        // mark first-non Annotation element as result
-        // @ts-ignore
-        const elements = element.findElements(_apidomCore.isPrimitiveElement);
-        if (elements.length > 0) {
-          const resultElement = elements[0];
-          resultElement.classes.push('result');
-        }
-
-        // provide annotations
-        this.annotations.forEach(annotationElement => {
-          element.push(annotationElement);
-        });
-        this.annotations = [];
-      }
-    };
-    this.object = function object(node) {
-      const element = new _apidomCore.ObjectElement();
-      // @ts-ignore
-      element._content = node.children;
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.array = function array(node) {
-      const element = new _apidomCore.ArrayElement();
-      // @ts-ignore
-      element._content = node.children;
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.pair = function pair(node) {
-      const element = new _apidomCore.MemberElement();
-      // @ts-ignore
-      element.content.key = node.keyNode;
-      // @ts-ignore
-      element.content.value = node.valueNode;
-      maybeAddSourceMap(node, element);
-
-      /**
-       * Process possible errors here that may be present in pair node children as we're using direct field access.
-       * There are usually 3 children here found: "key", ":", "value".
-       */
-      if (node.children.length > 3) {
-        node.children.filter(child => child.type === 'ERROR').forEach(errorNode => {
-          this.ERROR(errorNode, node, [], [node]);
-        });
-      }
-      return element;
-    };
-    this.string = function string(node) {
-      const element = new _apidomCore.StringElement(JSON.parse(node.text));
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.number = function number(node) {
-      const element = new _apidomCore.NumberElement(Number(node.text));
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.null = function _null(node) {
-      const element = new _apidomCore.NullElement();
-      maybeAddSourceMap(node, element);
-      return element;
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  null(node) {
+    const element = new _apidomCore.NullElement();
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.true = function _true(node) {
-      const element = new _apidomCore.BooleanElement(true);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  true(node) {
+    const element = new _apidomCore.BooleanElement(true);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.false = function _false(node) {
-      const element = new _apidomCore.BooleanElement(false);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.ERROR = function ERROR(node, key, parent, path) {
-      // collect errors as annotations
-      const isUnexpected = !node.hasError;
-      const value = node.text;
-      const message = isUnexpected ? `(Unexpected ${value})` : `(Error ${value})`;
-      const element = new _apidomCore.AnnotationElement(message);
-      element.classes.push('error');
-      maybeAddSourceMap(node, element);
-      if (path.length === 0) {
-        // no document to visit, only error is present in CST
-        const parseResultElement = new _apidomCore.ParseResultElement();
-        parseResultElement.push(element);
-        return parseResultElement;
-      }
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  false(node) {
+    const element = new _apidomCore.BooleanElement(false);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  ERROR(node, key, parent, path) {
+    // collect errors as annotations
+    const isUnexpected = !node.hasError;
+    const value = node.text;
+    const message = isUnexpected ? `(Unexpected ${value})` : `(Error ${value})`;
+    const element = new _apidomCore.AnnotationElement(message);
+    element.classes.push('error');
+    this.maybeAddSourceMap(node, element);
+    if (path.length === 0) {
+      // no document to visit, only error is present in CST
+      const parseResultElement = new _apidomCore.ParseResultElement();
+      parseResultElement.push(element);
+      return parseResultElement;
+    }
 
-      // we have CST node for document
-      this.annotations.push(element);
-      return null;
-    };
+    // we have CST node for document
+    this.annotations.push(element);
+    return null;
+  }
+  maybeAddSourceMap(node, element) {
+    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);
   }
-});
+}
 
 /* eslint-enable no-underscore-dangle */
 var _default = exports.default = CstVisitor;

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

@@ -29,8 +29,8 @@ const analyze = (cst, {
   const cursor = cst.walk();
   const iterator = new _TreeCursorIterator.default(cursor);
   const [rootNode] = Array.from(iterator);
-  const cstVisitor = (0, _CstVisitor.default)();
-  const astVisitor = (0, _JsonAstVisitor.default)();
+  const cstVisitor = new _CstVisitor.default();
+  const astVisitor = new _JsonAstVisitor.default();
   const jsonAst = (0, _apidomAst.visit)(rootNode, cstVisitor, {
     // @ts-ignore
     keyMap: _CstVisitor.keyMap,

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

@@ -3,7 +3,6 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.keyMap = exports.default = void 0;
-var _stampit = _interopRequireDefault(require("stampit"));
 var _apidomAst = require("@swagger-api/apidom-ast");
 var _TreeCursorSyntaxNode = _interopRequireDefault(require("../../TreeCursorSyntaxNode.cjs"));
 const keyMap = exports.keyMap = {
@@ -15,166 +14,158 @@ const keyMap = exports.keyMap = {
   key: ['children'],
   error: ['children']
 };
-const CstVisitor = (0, _stampit.default)({
-  init() {
-    /**
-     * Private API.
-     */
 
-    const toPosition = node => {
-      const start = (0, _apidomAst.Point)({
-        row: node.startPosition.row,
-        column: node.startPosition.column,
-        char: node.startIndex
-      });
-      const end = (0, _apidomAst.Point)({
-        row: node.endPosition.row,
-        column: node.endPosition.column,
-        char: node.endIndex
-      });
-      return (0, _apidomAst.Position)({
-        start,
-        end
-      });
-    };
+/* eslint-disable class-methods-use-this */
 
-    /**
-     * Public API.
-     */
-
-    this.enter = function enter(node) {
-      // anonymous literals from CST transformed into AST literal nodes
-      if (node instanceof _TreeCursorSyntaxNode.default && !node.isNamed) {
-        const position = toPosition(node);
-        const value = node.type || node.text;
-        const {
-          isMissing
-        } = node;
-        return (0, _apidomAst.Literal)({
-          value,
-          position,
-          isMissing
-        });
-      }
-      return undefined;
-    };
-    this.document = {
-      enter(node) {
-        const position = toPosition(node);
-        return (0, _apidomAst.JsonDocument)({
-          children: node.children,
-          position,
-          isMissing: node.isMissing
-        });
-      },
-      leave(document) {
-        return (0, _apidomAst.ParseResult)({
-          children: [document]
-        });
-      }
-    };
-    this.object = function object(node) {
-      const position = toPosition(node);
-      return (0, _apidomAst.JsonObject)({
+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({
         children: node.children,
         position,
         isMissing: node.isMissing
       });
-    };
-    this.pair = function pair(node) {
-      const position = toPosition(node);
-      const children = node.children.slice(1);
+    },
+    leave: document => {
+      return new _apidomAst.ParseResult({
+        children: [document]
+      });
+    }
+  };
+  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 {
-        keyNode
+        isMissing
       } = node;
-      const key = (0, _apidomAst.JsonKey)({
-        children: (keyNode == null ? void 0 : keyNode.children) || [],
-        position: keyNode != null ? toPosition(keyNode) : null,
-        isMissing: keyNode != null ? keyNode.isMissing : false
-      });
-      return (0, _apidomAst.JsonProperty)({
-        children: [key, ...children],
-        position,
-        isMissing: node.isMissing
-      });
-    };
-    this.array = function array(node) {
-      const position = toPosition(node);
-      return (0, _apidomAst.JsonArray)({
-        children: node.children,
-        position,
-        isMissing: node.isMissing
-      });
-    };
-    this.string = function string(node) {
-      const position = toPosition(node);
-      const content = (0, _apidomAst.JsonStringContent)({
-        value: JSON.parse(node.text)
-      });
-      return (0, _apidomAst.JsonString)({
-        children: [content],
-        position,
-        isMissing: node.isMissing
-      });
-    };
-    this.number = function number(node) {
-      const position = toPosition(node);
-      const value = node.text;
-      return (0, _apidomAst.JsonNumber)({
+      return new _apidomAst.Literal({
         value,
         position,
-        isMissing: node.isMissing
+        isMissing
       });
-    };
+    }
+    return undefined;
+  }
+  object(node) {
+    const position = CstVisitor.toPosition(node);
+    return new _apidomAst.JsonObject({
+      children: node.children,
+      position,
+      isMissing: node.isMissing
+    });
+  }
+  pair(node) {
+    const position = CstVisitor.toPosition(node);
+    const children = node.children.slice(1);
+    const {
+      keyNode
+    } = node;
+    const key = new _apidomAst.JsonKey({
+      children: (keyNode == null ? void 0 : keyNode.children) || [],
+      position: keyNode != null ? CstVisitor.toPosition(keyNode) : undefined,
+      isMissing: keyNode != null ? keyNode.isMissing : false
+    });
+    return new _apidomAst.JsonProperty({
+      children: [key, ...children],
+      position,
+      isMissing: node.isMissing
+    });
+  }
+  array(node) {
+    const position = CstVisitor.toPosition(node);
+    return new _apidomAst.JsonArray({
+      children: node.children,
+      position,
+      isMissing: node.isMissing
+    });
+  }
+  string(node) {
+    const position = CstVisitor.toPosition(node);
+    const content = new _apidomAst.JsonStringContent({
+      value: JSON.parse(node.text)
+    });
+    return new _apidomAst.JsonString({
+      children: [content],
+      position,
+      isMissing: node.isMissing
+    });
+  }
+  number(node) {
+    const position = CstVisitor.toPosition(node);
+    const value = node.text;
+    return new _apidomAst.JsonNumber({
+      value,
+      position,
+      isMissing: node.isMissing
+    });
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.null = function _null(node) {
-      const position = toPosition(node);
-      const value = node.text;
-      return (0, _apidomAst.JsonNull)({
-        value,
-        position,
-        isMissing: node.isMissing
-      });
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  null(node) {
+    const position = CstVisitor.toPosition(node);
+    const value = node.text;
+    return new _apidomAst.JsonNull({
+      value,
+      position,
+      isMissing: node.isMissing
+    });
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.true = function _true(node) {
-      const position = toPosition(node);
-      const value = node.text;
-      return (0, _apidomAst.JsonTrue)({
-        value,
-        position,
-        isMissing: node.isMissing
-      });
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  true(node) {
+    const position = CstVisitor.toPosition(node);
+    const value = node.text;
+    return new _apidomAst.JsonTrue({
+      value,
+      position,
+      isMissing: node.isMissing
+    });
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.false = function _false(node) {
-      const position = toPosition(node);
-      const value = node.text;
-      return (0, _apidomAst.JsonFalse)({
-        value,
-        position,
-        isMissing: node.isMissing
-      });
-    };
-    this.ERROR = function ERROR(node, key, parent, path) {
-      const position = toPosition(node);
-      const errorNode = (0, _apidomAst.Error)({
-        children: node.children,
-        position,
-        isUnexpected: !node.hasError,
-        isMissing: node.isMissing,
-        value: node.text
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  false(node) {
+    const position = CstVisitor.toPosition(node);
+    const value = node.text;
+    return new _apidomAst.JsonFalse({
+      value,
+      position,
+      isMissing: node.isMissing
+    });
+  }
+  ERROR(node, key, parent, path) {
+    const position = CstVisitor.toPosition(node);
+    const errorNode = new _apidomAst.Error({
+      children: node.children,
+      position,
+      isUnexpected: !node.hasError,
+      isMissing: node.isMissing,
+      value: node.text
+    });
+    if (path.length === 0) {
+      return new _apidomAst.ParseResult({
+        children: [errorNode]
       });
-      if (path.length === 0) {
-        return (0, _apidomAst.ParseResult)({
-          children: [errorNode]
-        });
-      }
-      return errorNode;
-    };
+    }
+    return errorNode;
   }
-});
+}
 var _default = exports.default = CstVisitor;