@swagger-api/apidom-parser-adapter-yaml-1-2 1.0.0-alpha.8 → 1.0.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-yaml-1-2",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-beta.0",
   "description": "Parser adapter for parsing YAML documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -8,39 +8,39 @@
   },
   "type": "module",
   "sideEffects": [
-    "./es/lexical-analysis/browser-patch.mjs",
-    "./cjs/lexical-analysis/browser-patch.cjs"
+    "./src/lexical-analysis/browser-patch.mjs",
+    "./src/lexical-analysis/browser-patch.cjs"
   ],
   "unpkg": "./dist/apidom-parser-apdater-yaml-1-2.browser.min.js",
-  "main": "./cjs/adapter-node.cjs",
+  "main": "./src/adapter-node.cjs",
   "exports": {
-    "types": "./types/dist.d.ts",
+    "types": "./types/apidom-parser-adapter-yaml-1-2.d.ts",
     "node": {
-      "import": "./es/adapter-node.mjs",
-      "require": "./cjs/adapter-node.cjs"
+      "import": "./src/adapter-node.mjs",
+      "require": "./src/adapter-node.cjs"
     },
     "browser": {
-      "import": "./es/adapter-browser.mjs"
+      "import": "./src/adapter-browser.mjs"
     },
-    "default": "./cjs/adapter-node.cjs"
+    "default": "./src/adapter-node.cjs"
   },
-  "types": "./types/dist.d.ts",
+  "types": "./types/apidom-parser-adapter-yaml-1-2.d.ts",
   "scripts": {
     "build": "npm run clean && run-p --max-parallel ${CPU_CORES:-2} typescript:declaration build:es build:cjs build:umd:browser",
-    "build:es": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=es babel src --out-dir es --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward'",
-    "build:cjs": "npm run build:wasm && npm run build:wasm:copy && BABEL_ENV=cjs babel src --out-dir cjs --extensions '.ts' --out-file-extension '.cjs' --root-mode 'upward'",
+    "build:es": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=es babel src --out-dir src --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward'",
+    "build:cjs": "npm run build:wasm && npm run build:wasm:copy && BABEL_ENV=cjs babel src --out-dir src --extensions '.ts' --out-file-extension '.cjs' --root-mode 'upward'",
     "build:umd:browser": "npm run build:wasm && npm run build:wasm:copy && cross-env BABEL_ENV=browser webpack --config config/webpack/browser.config.js --progress",
-    "build:wasm": "node ../../scripts/file-exists.js ../../node_modules/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ../../node_modules/tree-sitter-yaml && cross-env BABEL_ENV=cjs NODE_OPTIONS='-r core-js/stable @babel/register' tree-sitter generate --abi=13 ./grammar.js && tree-sitter build-wasm && node-gyp rebuild",
-    "build:wasm:copy": "copyfiles -u 4 ../../node_modules/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
+    "build:wasm": "node ../../scripts/file-exists.js ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm && exit 0 || cd ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml && tree-sitter generate ./grammar.js && tree-sitter build --wasm && node-gyp rebuild",
+    "build:wasm:copy": "copyfiles -u 5 ../../node_modules/@tree-sitter-grammars/tree-sitter-yaml/tree-sitter-yaml.wasm wasm",
     "lint": "eslint ./",
     "lint:fix": "eslint ./ --fix",
-    "clean": "rimraf ./es ./cjs ./dist ./types",
-    "typescript:check-types": "tsc --noEmit",
-    "typescript:declaration": "tsc -p declaration.tsconfig.json && rollup -c config/rollup/types.dist.js",
-    "test": "cross-env NODE_ENV=test BABEL_ENV=cjs mocha",
-    "perf": "cross-env NODE_ENV=test BABEL_ENV=cjs node ./test/perf/index.cjs",
-    "perf:lexical-analysis": "cross-env NODE_ENV=test BABEL_ENV=cjs node ./test/perf/lexical-analysis.cjs",
-    "perf:parse-syntactic-analysis-indirect": "cross-env NODE_ENV=test BABEL_ENV=cjs node ./test/perf/parse-syntactic-analysis-indirect.cjs",
+    "clean": "rimraf --glob 'src/**/*.mjs' 'src/**/*.cjs' 'test/**/*.mjs' ./dist ./types",
+    "typescript:check-types": "tsc --noEmit && tsc -p ./test/tsconfig.json --noEmit",
+    "typescript:declaration": "tsc -p tsconfig.declaration.json && api-extractor run -l -c ./config/api-extractor/api-extractor.json",
+    "test": "npm run build:es && cross-env BABEL_ENV=es babel test --out-dir test --extensions '.ts' --out-file-extension '.mjs' --root-mode 'upward' && cross-env NODE_ENV=test NODE_NO_WARNINGS=1 mocha",
+    "perf": "cross-env BABEL_ENV=es babel ./test/perf/index.ts --out-file ./test/perf/index.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/index.mjs",
+    "perf:lexical-analysis": "cross-env BABEL_ENV=es babel ./test/perf/lexical-analysis.ts --out-file ./test/perf/lexical-analysis.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/lexical-analysis.mjs",
+    "perf:parse-syntactic-analysis-indirect": "cross-env BABEL_ENV=es babel ./test/perf/parse-syntactic-analysis-indirect.ts --out-file ./test/perf/parse-syntactic-analysis-indirect.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/parse-syntactic-analysis-indirect.mjs",
     "prepack": "copyfiles -u 3 ../../LICENSES/* LICENSES && copyfiles -u 2 ../../NOTICE .",
     "postpack": "rimraf NOTICE LICENSES"
   },
@@ -52,29 +52,29 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.7",
-    "@swagger-api/apidom-ast": "^1.0.0-alpha.8",
-    "@swagger-api/apidom-core": "^1.0.0-alpha.8",
-    "@swagger-api/apidom-error": "^1.0.0-alpha.8",
+    "@swagger-api/apidom-ast": "^1.0.0-beta.0",
+    "@swagger-api/apidom-core": "^1.0.0-beta.0",
+    "@swagger-api/apidom-error": "^1.0.0-beta.0",
+    "@tree-sitter-grammars/tree-sitter-yaml": "=0.6.1",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
-    "tree-sitter": "=0.20.4",
-    "tree-sitter-yaml": "=0.5.0",
-    "web-tree-sitter": "=0.20.3"
+    "tree-sitter": "=0.21.1",
+    "web-tree-sitter": "=0.24.3"
   },
   "devDependencies": {
-    "tree-sitter-cli": "=0.20.4"
+    "tree-sitter-cli": "=0.24.3"
   },
   "files": [
-    "cjs/",
+    "src/**/*.mjs",
+    "src/**/*.cjs",
     "dist/",
-    "es/",
-    "types/dist.d.ts",
+    "types/apidom-parser-adapter-yaml-1-2.d.ts",
     "wasm/",
     "LICENSES",
     "NOTICE",
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "525fb8dced08aeecac9e9ae57c0187f023c845da"
+  "gitHead": "ed1426743ba9d9d581146e617ec1762df670320c"
 }

package/{cjs → src}/adapter-browser.cjs

@@ -10,15 +10,29 @@ exports.syntacticAnalysis = _index.default;
 var _adapter = require("./adapter.cjs");
 exports.mediaTypes = _adapter.mediaTypes;
 exports.namespace = _adapter.namespace;
+/**
+ * @public
+ */
 const detect = async source => {
   try {
     const cst = await (0, _browser.default)(source);
-    return cst.rootNode.type !== 'ERROR';
+    return !cst.rootNode.isError;
   } catch {
     return false;
   }
 };
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
 exports.detect = detect;
+/**
+ * @public
+ */
 const parse = async (source, {
   sourceMap = false
 } = {}) => {

package/{es → src}/adapter-browser.mjs

@@ -2,14 +2,30 @@ import lexicalAnalysis from "./lexical-analysis/browser.mjs";
 import syntacticAnalysis from "./syntactic-analysis/indirect/index.mjs";
 export { mediaTypes, namespace } from "./adapter.mjs";
 export { lexicalAnalysis, syntacticAnalysis };
+
+/**
+ * @public
+ */
 export const detect = async source => {
   try {
     const cst = await lexicalAnalysis(source);
-    return cst.rootNode.type !== 'ERROR';
+    return !cst.rootNode.isError;
   } catch {
     return false;
   }
 };
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
 export const parse = async (source, {
   sourceMap = false
 } = {}) => {

package/{cjs → src}/adapter-node.cjs

@@ -10,15 +10,29 @@ exports.syntacticAnalysis = _index.default;
 var _adapter = require("./adapter.cjs");
 exports.mediaTypes = _adapter.mediaTypes;
 exports.namespace = _adapter.namespace;
+/**
+ * @public
+ */
 const detect = async source => {
   try {
     const cst = await (0, _node.default)(source);
-    return cst.rootNode.type !== 'ERROR';
+    return !cst.rootNode.isError;
   } catch {
     return false;
   }
 };
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
 exports.detect = detect;
+/**
+ * @public
+ */
 const parse = async (source, {
   sourceMap = false
 } = {}) => {

package/{es → src}/adapter-node.mjs

@@ -2,14 +2,30 @@ import lexicalAnalysis from "./lexical-analysis/node.mjs";
 import syntacticAnalysis from "./syntactic-analysis/indirect/index.mjs";
 export { mediaTypes, namespace } from "./adapter.mjs";
 export { lexicalAnalysis, syntacticAnalysis };
+
+/**
+ * @public
+ */
 export const detect = async source => {
   try {
     const cst = await lexicalAnalysis(source);
-    return cst.rootNode.type !== 'ERROR';
+    return !cst.rootNode.isError;
   } catch {
     return false;
   }
 };
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
 export const parse = async (source, {
   sourceMap = false
 } = {}) => {

package/{cjs → src}/adapter.cjs

@@ -6,4 +6,7 @@ exports.namespace = exports.mediaTypes = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
 var _mediaTypes = _interopRequireDefault(require("./media-types.cjs"));
 exports.mediaTypes = _mediaTypes.default;
+/**
+ * @public
+ */
 const namespace = exports.namespace = (0, _apidomCore.createNamespace)();

package/{es → src}/adapter.mjs

@@ -1,3 +1,6 @@
 import { createNamespace } from '@swagger-api/apidom-core';
 export { default as mediaTypes } from "./media-types.mjs";
+/**
+ * @public
+ */
 export const namespace = createNamespace();

package/{cjs → src}/lexical-analysis/browser.cjs

@@ -18,6 +18,7 @@ let parserInitLock = null;
  *
  * Given JavaScript doesn't support true parallelism, this
  * code should be as lazy as possible and temporal safety should be fine.
+ * @public
  */
 const analyze = async source => {
   if (parser === null && parserInitLock === null) {

package/{es → src}/lexical-analysis/browser.mjs

@@ -13,6 +13,7 @@ let parserInitLock = null;
  *
  * Given JavaScript doesn't support true parallelism, this
  * code should be as lazy as possible and temporal safety should be fine.
+ * @public
  */
 const analyze = async source => {
   if (parser === null && parserInitLock === null) {

package/{cjs → src}/lexical-analysis/node.cjs

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 var _treeSitter = _interopRequireDefault(require("tree-sitter"));
-var _treeSitterYaml = _interopRequireDefault(require("tree-sitter-yaml"));
+var _treeSitterYaml = _interopRequireDefault(require("@tree-sitter-grammars/tree-sitter-yaml"));
 // @ts-ignore
 
 const parser = new _treeSitter.default();
@@ -13,6 +13,7 @@ parser.setLanguage(_treeSitterYaml.default);
 /**
  * Lexical Analysis of source string using TreeSitter.
  * This is Node.js version of TreeSitters Lexical Analysis.
+ * @public
  */
 const analyze = async source => {
   return parser.parse(source);

package/{es → src}/lexical-analysis/node.mjs

@@ -1,12 +1,13 @@
 import Parser from 'tree-sitter';
 // @ts-ignore
-import YAMLLanguage from 'tree-sitter-yaml';
+import YAMLLanguage from '@tree-sitter-grammars/tree-sitter-yaml';
 const parser = new Parser();
 parser.setLanguage(YAMLLanguage);
 
 /**
  * Lexical Analysis of source string using TreeSitter.
  * This is Node.js version of TreeSitters Lexical Analysis.
+ * @public
  */
 const analyze = async source => {
   return parser.parse(source);

package/{cjs → src}/media-types.cjs

@@ -3,11 +3,18 @@
 exports.__esModule = true;
 exports.default = exports.YamlMediaTypes = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
+/**
+ * @public
+ */
 class YamlMediaTypes extends _apidomCore.MediaTypes {
   latest() {
     return this[1];
   }
 }
+
+/**
+ * @public
+ */
 exports.YamlMediaTypes = YamlMediaTypes;
 const mediaTypes = new YamlMediaTypes('text/yaml', 'application/yaml');
 var _default = exports.default = mediaTypes;

package/{es → src}/media-types.mjs

@@ -1,8 +1,16 @@
 import { MediaTypes } from '@swagger-api/apidom-core';
+
+/**
+ * @public
+ */
 export class YamlMediaTypes extends MediaTypes {
   latest() {
     return this[1];
   }
 }
+
+/**
+ * @public
+ */
 const mediaTypes = new YamlMediaTypes('text/yaml', 'application/yaml');
 export default mediaTypes;

package/{cjs → src}/syntactic-analysis/TreeCursorSyntaxNode.cjs

@@ -63,19 +63,11 @@ class TreeCursorSyntaxNode {
     return this.children.find(node => node.isNamed);
   }
   setFieldName(cursor) {
-    if (typeof cursor.currentFieldName === 'function') {
-      this.fieldName = cursor.currentFieldName();
-    } else {
-      this.fieldName = cursor.currentFieldName;
-    }
+    this.fieldName = cursor.currentFieldName;
     return this;
   }
   setHasError(cursor) {
-    if (typeof cursor.currentNode === 'function') {
-      this.hasError = cursor.currentNode().hasError();
-    } else {
-      this.hasError = cursor.currentNode.hasError();
-    }
+    this.hasError = cursor.currentNode.hasError;
     return this;
   }
   setPreviousSibling(previousSibling) {

package/{es → src}/syntactic-analysis/TreeCursorSyntaxNode.mjs

@@ -59,19 +59,11 @@ class TreeCursorSyntaxNode {
     return this.children.find(node => node.isNamed);
   }
   setFieldName(cursor) {
-    if (typeof cursor.currentFieldName === 'function') {
-      this.fieldName = cursor.currentFieldName();
-    } else {
-      this.fieldName = cursor.currentFieldName;
-    }
+    this.fieldName = cursor.currentFieldName;
     return this;
   }
   setHasError(cursor) {
-    if (typeof cursor.currentNode === 'function') {
-      this.hasError = cursor.currentNode().hasError();
-    } else {
-      this.hasError = cursor.currentNode.hasError();
-    }
+    this.hasError = cursor.currentNode.hasError;
     return this;
   }
   setPreviousSibling(previousSibling) {

package/{cjs → src}/syntactic-analysis/indirect/index.cjs

@@ -8,10 +8,15 @@ var _apidomAst = require("@swagger-api/apidom-ast");
 var _CstVisitor = _interopRequireWildcard(require("./visitors/CstVisitor.cjs"));
 var _YamlAstVisitor = _interopRequireWildcard(require("./visitors/YamlAstVisitor.cjs"));
 var _TreeCursorIterator = _interopRequireDefault(require("../TreeCursorIterator.cjs"));
+/**
+ * @public
+ */
+
 /**
  * This version of syntactic analysis does following transformations:
- *   TreeSitter CST -> YAML AST -> ApiDOM
+ *   `TreeSitter CST -> YAML AST -> ApiDOM`
  * Two traversals passes are needed to get from CST to ApiDOM.
+ * @public
  */
 const analyze = (cst, {
   sourceMap = false

package/{es → src}/syntactic-analysis/indirect/index.mjs

@@ -2,10 +2,14 @@ import { visit, YamlJsonSchema as JsonSchema, YamlReferenceManager } from '@swag
 import CstVisitor, { keyMap as cstKeyMap, isNode as isCstNode } from "./visitors/CstVisitor.mjs";
 import YamlAstVisitor, { keyMap as astKeyMap, isNode as isAstNode, getNodeType as getAstNodeType } from "./visitors/YamlAstVisitor.mjs";
 import TreeCursorIterator from "../TreeCursorIterator.mjs";
+/**
+ * @public
+ */
 /**
  * This version of syntactic analysis does following transformations:
- *   TreeSitter CST -> YAML AST -> ApiDOM
+ *   `TreeSitter CST -> YAML AST -> ApiDOM`
  * Two traversals passes are needed to get from CST to ApiDOM.
+ * @public
  */
 const analyze = (cst, {
   sourceMap = false

package/types/apidom-parser-adapter-yaml-1-2.d.ts

@@ -0,0 +1,71 @@
+import { MediaTypes } from '@swagger-api/apidom-core';
+import { Namespace } from '@swagger-api/apidom-core';
+import { ParseResultElement } from '@swagger-api/apidom-core';
+import { Tree as Tree_2 } from 'web-tree-sitter';
+import { Tree as Tree_3 } from 'tree-sitter';
+
+/**
+ * @public
+ */
+export declare const detect: (source: string) => Promise<boolean>;
+
+/**
+ * Lexical Analysis of source string using WebTreeSitter.
+ * This is WebAssembly version of TreeSitters Lexical Analysis.
+ *
+ * Given JavaScript doesn't support true parallelism, this
+ * code should be as lazy as possible and temporal safety should be fine.
+ * @public
+ */
+export declare const lexicalAnalysis: (source: string) => Promise<Tree_2>;
+
+/**
+ * @public
+ */
+export declare const mediaTypes: YamlMediaTypes;
+
+/**
+ * @public
+ */
+export declare const namespace: Namespace;
+
+/**
+ * @public
+ */
+export declare const parse: ParseFunction;
+
+/**
+ * @public
+ */
+export declare type ParseFunction = (source: string, options?: ParseFunctionOptions) => Promise<ParseResultElement>;
+
+/**
+ * @public
+ */
+export declare interface ParseFunctionOptions {
+    sourceMap?: boolean;
+}
+
+/**
+ * This version of syntactic analysis does following transformations:
+ *   `TreeSitter CST -> YAML AST -> ApiDOM`
+ * Two traversals passes are needed to get from CST to ApiDOM.
+ * @public
+ */
+export declare const syntacticAnalysis: (cst: Tree, { sourceMap }?: {
+    sourceMap?: boolean | undefined;
+}) => ParseResultElement;
+
+/**
+ * @public
+ */
+export declare type Tree = Tree_2 | Tree_3;
+
+/**
+ * @public
+ */
+export declare class YamlMediaTypes extends MediaTypes<string> {
+    latest(): string;
+}
+
+export { }

package/types/dist.d.ts

@@ -1,39 +0,0 @@
-import * as _swagger_api_apidom_core from '@swagger-api/apidom-core';
-import { ParseResultElement, MediaTypes } from '@swagger-api/apidom-core';
-import { Tree as Tree$1 } from 'web-tree-sitter';
-import { Tree as Tree$2 } from 'tree-sitter';
-
-/**
- * Lexical Analysis of source string using WebTreeSitter.
- * This is WebAssembly version of TreeSitters Lexical Analysis.
- *
- * Given JavaScript doesn't support true parallelism, this
- * code should be as lazy as possible and temporal safety should be fine.
- */
-declare const analyze$1: (source: string) => Promise<Tree$1>;
-
-type Tree = Tree$1 | Tree$2;
-/**
- * This version of syntactic analysis does following transformations:
- *   TreeSitter CST -> YAML AST -> ApiDOM
- * Two traversals passes are needed to get from CST to ApiDOM.
- */
-declare const analyze: (cst: Tree, { sourceMap }?: {
-    sourceMap?: boolean | undefined;
-}) => ParseResultElement;
-
-declare class YamlMediaTypes extends MediaTypes<string> {
-    latest(): string;
-}
-declare const mediaTypes: YamlMediaTypes;
-
-declare const namespace: _swagger_api_apidom_core.Namespace;
-
-declare const detect: (source: string) => Promise<boolean>;
-interface ParseFunctionOptions {
-    sourceMap?: boolean;
-}
-type ParseFunction = (source: string, options?: ParseFunctionOptions) => Promise<ParseResultElement>;
-declare const parse: ParseFunction;
-
-export { detect, analyze$1 as lexicalAnalysis, mediaTypes, namespace, parse, analyze as syntacticAnalysis };