@swagger-api/apidom-parser-adapter-yaml-1-2 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-yaml-1-2",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Parser adapter for parsing YAML documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -51,9 +51,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.26.10",
-    "@swagger-api/apidom-ast": "^1.7.0",
-    "@swagger-api/apidom-core": "^1.7.0",
-    "@swagger-api/apidom-error": "^1.7.0",
+    "@swagger-api/apidom-ast": "^1.9.0",
+    "@swagger-api/apidom-core": "^1.9.0",
+    "@swagger-api/apidom-error": "^1.9.0",
     "@tree-sitter-grammars/tree-sitter-yaml": "=0.7.1",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
@@ -75,5 +75,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "56725b508a7d7e6f7ac90cc60adf57dbe73a3606"
+  "gitHead": "25c005d35205319822eef5ce48cfef2081da7cc3"
 }

package/src/lexical-analysis/analyze.cjs

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.default = void 0;
+var _webTreeSitter = _interopRequireDefault(require("web-tree-sitter"));
+var _apidomError = require("@swagger-api/apidom-error");
+let parser = null;
+let parserInitLock = null;
+let currentTree = null;
+const createAnalyze = treeSitterYaml => async source => {
+  if (parser === null && parserInitLock === null) {
+    // acquire lock
+    parserInitLock = _webTreeSitter.default.init().then(() => _webTreeSitter.default.Language.load(treeSitterYaml)).then(yamlLanguage => {
+      const parserInstance = new _webTreeSitter.default();
+      parserInstance.setLanguage(yamlLanguage);
+      return parserInstance;
+    }).finally(() => {
+      // release lock
+      parserInitLock = null;
+    });
+    parser = await parserInitLock;
+  } else if (parser === null && parserInitLock !== null) {
+    // await for lock to be released if there is one
+    parser = await parserInitLock;
+  }
+  if (parser === null) {
+    throw new _apidomError.ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
+  }
+  if (currentTree !== null) {
+    currentTree.delete();
+  }
+  currentTree = parser.parse(source);
+  parser.reset();
+  return currentTree;
+};
+var _default = exports.default = createAnalyze;

package/src/lexical-analysis/analyze.mjs

@@ -0,0 +1,32 @@
+import Parser from 'web-tree-sitter';
+import { ApiDOMError } from '@swagger-api/apidom-error';
+let parser = null;
+let parserInitLock = null;
+let currentTree = null;
+const createAnalyze = treeSitterYaml => async source => {
+  if (parser === null && parserInitLock === null) {
+    // acquire lock
+    parserInitLock = Parser.init().then(() => Parser.Language.load(treeSitterYaml)).then(yamlLanguage => {
+      const parserInstance = new Parser();
+      parserInstance.setLanguage(yamlLanguage);
+      return parserInstance;
+    }).finally(() => {
+      // release lock
+      parserInitLock = null;
+    });
+    parser = await parserInitLock;
+  } else if (parser === null && parserInitLock !== null) {
+    // await for lock to be released if there is one
+    parser = await parserInitLock;
+  }
+  if (parser === null) {
+    throw new ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
+  }
+  if (currentTree !== null) {
+    currentTree.delete();
+  }
+  currentTree = parser.parse(source);
+  parser.reset();
+  return currentTree;
+};
+export default createAnalyze;

package/src/lexical-analysis/browser.cjs

@@ -4,15 +4,10 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 require("./browser-patch.cjs");
-var _webTreeSitter = _interopRequireDefault(require("web-tree-sitter"));
-var _apidomError = require("@swagger-api/apidom-error");
 var _treeSitterYaml = _interopRequireDefault(require("../../wasm/tree-sitter-yaml.wasm"));
+var _analyze = _interopRequireDefault(require("./analyze.cjs"));
 // @ts-ignore
 
-let parser = null;
-let parserInitLock = null;
-let currentTree = null;
-
 /**
  * Lexical Analysis of source string using WebTreeSitter.
  * This is WebAssembly version of TreeSitters Lexical Analysis.
@@ -21,26 +16,5 @@ let currentTree = null;
  * code should be as lazy as possible and temporal safety should be fine.
  * @public
  */
-const analyze = async source => {
-  if (parser === null && parserInitLock === null) {
-    // acquire lock
-    parserInitLock = _webTreeSitter.default.init().then(() => _webTreeSitter.default.Language.load(_treeSitterYaml.default)).then(jsonLanguage => {
-      const parserInstance = new _webTreeSitter.default();
-      parserInstance.setLanguage(jsonLanguage);
-      return parserInstance;
-    }).finally(() => {
-      // release lock
-      parserInitLock = null;
-    });
-    parser = await parserInitLock;
-  } else if (parser === null && parserInitLock !== null) {
-    // await for lock to be released if there is one
-    parser = await parserInitLock;
-  } else if (parser === null) {
-    throw new _apidomError.ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
-  }
-  currentTree = parser.parse(source);
-  parser.reset();
-  return currentTree;
-};
+const analyze = (0, _analyze.default)(_treeSitterYaml.default);
 var _default = exports.default = analyze;

package/src/lexical-analysis/browser.mjs

@@ -1,13 +1,6 @@
-import "./browser-patch.mjs";
-import Parser from 'web-tree-sitter';
-import { ApiDOMError } from '@swagger-api/apidom-error';
-
-// @ts-ignore
+import "./browser-patch.mjs"; // @ts-ignore
 import treeSitterYaml from '../../wasm/tree-sitter-yaml.wasm';
-let parser = null;
-let parserInitLock = null;
-let currentTree = null;
-
+import createAnalyze from "./analyze.mjs";
 /**
  * Lexical Analysis of source string using WebTreeSitter.
  * This is WebAssembly version of TreeSitters Lexical Analysis.
@@ -16,26 +9,5 @@ let currentTree = null;
  * code should be as lazy as possible and temporal safety should be fine.
  * @public
  */
-const analyze = async source => {
-  if (parser === null && parserInitLock === null) {
-    // acquire lock
-    parserInitLock = Parser.init().then(() => Parser.Language.load(treeSitterYaml)).then(jsonLanguage => {
-      const parserInstance = new Parser();
-      parserInstance.setLanguage(jsonLanguage);
-      return parserInstance;
-    }).finally(() => {
-      // release lock
-      parserInitLock = null;
-    });
-    parser = await parserInitLock;
-  } else if (parser === null && parserInitLock !== null) {
-    // await for lock to be released if there is one
-    parser = await parserInitLock;
-  } else if (parser === null) {
-    throw new ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
-  }
-  currentTree = parser.parse(source);
-  parser.reset();
-  return currentTree;
-};
+const analyze = createAnalyze(treeSitterYaml);
 export default analyze;

package/src/lexical-analysis/node.cjs

@@ -3,17 +3,19 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _treeSitter = _interopRequireDefault(require("tree-sitter"));
-var _treeSitterYaml = _interopRequireDefault(require("@tree-sitter-grammars/tree-sitter-yaml"));
-const parser = new _treeSitter.default();
-parser.setLanguage(_treeSitterYaml.default);
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+var _nodeUrl = require("node:url");
+var _analyze = _interopRequireDefault(require("./analyze.cjs"));
+const treeSitterYamlPath = (0, _nodeUrl.fileURLToPath)(new URL('../../wasm/tree-sitter-yaml.wasm', require('url').pathToFileURL(__filename).toString()));
+const treeSitterYaml = _nodeFs.default.readFileSync(treeSitterYamlPath);
 
 /**
- * Lexical Analysis of source string using TreeSitter.
- * This is Node.js version of TreeSitters Lexical Analysis.
+ * 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
  */
-const analyze = async source => {
-  return parser.parse(source);
-};
+const analyze = (0, _analyze.default)(treeSitterYaml);
 var _default = exports.default = analyze;

package/src/lexical-analysis/node.mjs

@@ -1,14 +1,16 @@
-import Parser from 'tree-sitter';
-import YAMLLanguage from '@tree-sitter-grammars/tree-sitter-yaml';
-const parser = new Parser();
-parser.setLanguage(YAMLLanguage);
+import fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import createAnalyze from "./analyze.mjs";
+const treeSitterYamlPath = fileURLToPath(new URL('../../wasm/tree-sitter-yaml.wasm', import.meta.url));
+const treeSitterYaml = fs.readFileSync(treeSitterYamlPath);
 
 /**
- * Lexical Analysis of source string using TreeSitter.
- * This is Node.js version of TreeSitters Lexical Analysis.
+ * 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
  */
-const analyze = async source => {
-  return parser.parse(source);
-};
+const analyze = createAnalyze(treeSitterYaml);
 export default analyze;