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

package/es/syntactic-analysis/indirect/visitors/JsonAstVisitor.mjs

@@ -1,4 +1,3 @@
-import stampit from 'stampit';
 import { JsonArray, JsonDocument, JsonObject, JsonProperty, ParseResult, Error, isNode as isCSTNode, getNodeType as getCSTNodeType } from '@swagger-api/apidom-ast';
 import { ParseResultElement, ObjectElement, SourceMapElement, MemberElement, ArrayElement, BooleanElement, NullElement, NumberElement, StringElement, AnnotationElement, isParseResultElement, isPrimitiveElement, isElement, keyMap as keyMapApiDOM, getNodeType as getNodeTypeApiDOM } from '@swagger-api/apidom-core';
 export const keyMap = {
@@ -29,150 +28,144 @@ export const isNode = element => isElement(element) || isCSTNode(element);
 
 /* eslint-disable no-underscore-dangle */
 
-const JsonAstVisitor = stampit({
-  props: {
-    sourceMap: false,
-    annotations: []
-  },
-  init() {
-    /**
-     * Private API.
-     */
-
-    this.annotation = [];
-    const maybeAddSourceMap = (node, element) => {
-      if (!this.sourceMap) {
-        return;
-      }
-      const sourceMap = new SourceMapElement();
-      // @ts-ignore
-      sourceMap.position = node.position;
+class JsonAstVisitor {
+  sourceMap = false;
+  ParseResultElement = {
+    leave: element => {
+      // mark first-non Annotation element as result
       // @ts-ignore
-      sourceMap.astNode = node;
-      element.meta.set('sourceMap', sourceMap);
-    };
-
-    /**
-     * Public API.
-     */
+      const elements = element.findElements(isPrimitiveElement);
+      if (elements.length > 0) {
+        const resultElement = elements[0];
+        resultElement.classes.push('result');
+      }
 
-    this.document = function document(node) {
-      const element = new ParseResultElement();
-      // @ts-ignore
-      element._content = node.children;
-      return element;
-    };
-    this.ParseResultElement = {
-      leave(element) {
-        // mark first-non Annotation element as result
-        // @ts-ignore
-        const elements = element.findElements(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 = [];
+  }
 
-        // provide annotations
-        this.annotations.forEach(annotationElement => {
-          element.push(annotationElement);
-        });
-        this.annotations = [];
-      }
-    };
-    this.object = function object(node) {
-      const element = new ObjectElement();
-      // @ts-ignore
-      element._content = node.children;
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.property = function property(node) {
-      const element = new MemberElement();
+  // eslint-disable-next-line class-methods-use-this
+  document(node) {
+    const element = new ParseResultElement();
+    // @ts-ignore
+    element._content = node.children;
+    return element;
+  }
+  object(node) {
+    const element = new ObjectElement();
+    // @ts-ignore
+    element._content = node.children;
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  property(node) {
+    const element = new MemberElement();
 
-      // @ts-ignore
-      element.content.key = node.key;
-      // @ts-ignore
-      element.content.value = node.value;
-      maybeAddSourceMap(node, element);
+    // @ts-ignore
+    element.content.key = node.key;
+    // @ts-ignore
+    element.content.value = node.value;
+    this.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.key = function key(node) {
-      const element = new StringElement(node.value);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.array = function array(node) {
-      const element = new ArrayElement();
-      // @ts-ignore
-      element._content = node.children;
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.string = function string(node) {
-      const element = new StringElement(node.value);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.number = function number(node) {
-      const element = new NumberElement(Number(node.value));
-      maybeAddSourceMap(node, element);
-      return 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
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      .filter(child => child.type === 'error')
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      .forEach(errorNode => {
+        this.error(errorNode, node, [], [node]);
+      });
+    }
+    return element;
+  }
+  key(node) {
+    const element = new StringElement(node.value);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  array(node) {
+    const element = new ArrayElement();
+    // @ts-ignore
+    element._content = node.children;
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  string(node) {
+    const element = new StringElement(node.value);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  number(node) {
+    const element = new NumberElement(Number(node.value));
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.null = function _null(node) {
-      const element = new NullElement();
-      maybeAddSourceMap(node, element);
-      return element;
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  null(node) {
+    const element = new NullElement();
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.true = function _true(node) {
-      const element = new BooleanElement(true);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  true(node) {
+    const element = new BooleanElement(true);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.false = function _false(node) {
-      const element = new BooleanElement(false);
-      maybeAddSourceMap(node, element);
-      return element;
-    };
-    this.literal = function literal(node) {
-      if (node.isMissing) {
-        const message = `(Missing ${node.value})`;
-        const element = new AnnotationElement(message);
-        element.classes.push('warning');
-        maybeAddSourceMap(node, element);
-        this.annotations.push(element);
-      }
-      return null;
-    };
-    this.error = function error(node, key, parent, path) {
-      const message = node.isUnexpected ? `(Unexpected ${node.value})` : `(Error ${node.value})`;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  false(node) {
+    const element = new BooleanElement(false);
+    this.maybeAddSourceMap(node, element);
+    return element;
+  }
+  literal(node) {
+    if (node.isMissing) {
+      const message = `(Missing ${node.value})`;
       const element = new 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 ParseResultElement();
-        parseResultElement.push(element);
-        return parseResultElement;
-      }
+      element.classes.push('warning');
+      this.maybeAddSourceMap(node, element);
       this.annotations.push(element);
-      return null;
-    };
+    }
+    return null;
+  }
+  error(node, key, parent, path) {
+    const message = node.isUnexpected ? `(Unexpected ${node.value})` : `(Error ${node.value})`;
+    const element = new 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 ParseResultElement();
+      parseResultElement.push(element);
+      return parseResultElement;
+    }
+    this.annotations.push(element);
+    return null;
+  }
+  maybeAddSourceMap(node, element) {
+    if (!this.sourceMap) {
+      return;
+    }
+    const sourceMap = new SourceMapElement();
+    // @ts-ignore
+    sourceMap.position = node.position;
+    // @ts-ignore
+    sourceMap.astNode = node;
+    element.meta.set('sourceMap', sourceMap);
   }
-});
+}
 export default JsonAstVisitor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-json",
-  "version": "0.91.0",
+  "version": "0.92.0",
   "description": "Parser adapter for parsing JSON documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -53,13 +53,12 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^0.91.0",
-    "@swagger-api/apidom-core": "^0.91.0",
-    "@swagger-api/apidom-error": "^0.91.0",
+    "@swagger-api/apidom-ast": "^0.92.0",
+    "@swagger-api/apidom-core": "^0.92.0",
+    "@swagger-api/apidom-error": "^0.92.0",
     "@types/ramda": "~0.29.6",
     "ramda": "~0.29.1",
     "ramda-adjunct": "^4.1.1",
-    "stampit": "^4.3.2",
     "tree-sitter": "=0.20.4",
     "tree-sitter-json": "=0.20.1",
     "web-tree-sitter": "=0.20.3"
@@ -78,5 +77,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "a3b88484e7a38bbf82b04458cda81e4dc0b53519"
+  "gitHead": "c7a45ee8d68ac82ac2ab93ebb639a95ced1d6e86"
 }