@swagger-api/apidom-parser-adapter-yaml-1-2 1.8.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-yaml-1-2",
-  "version": "1.8.0",
+  "version": "1.10.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.8.0",
-    "@swagger-api/apidom-core": "^1.8.0",
-    "@swagger-api/apidom-error": "^1.8.0",
+    "@swagger-api/apidom-ast": "^1.10.0",
+    "@swagger-api/apidom-core": "^1.10.0",
+    "@swagger-api/apidom-error": "^1.10.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": "1dd54ab78366b9936cdd0422949093b93e958ab7"
+  "gitHead": "c72e92fc541b7df2b92335a0f2df147eb7b9b945"
 }

package/src/adapter-browser.cjs

@@ -14,13 +14,16 @@ exports.namespace = _adapter.namespace;
  * @public
  */
 const detect = async source => {
+  let cst = null;
   try {
-    const cst = await (0, _browser.default)(source);
-    const isError = !cst.rootNode.isError;
-    cst.delete();
-    return isError;
+    cst = await (0, _browser.default)(source);
+    return !cst.rootNode.isError;
   } catch {
     return false;
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
 };
 
@@ -38,11 +41,16 @@ exports.detect = detect;
 const parse = async (source, {
   sourceMap = false
 } = {}) => {
-  const cst = await (0, _browser.default)(source);
-  const syntacticAnalysisResult = (0, _index.default)(cst, {
-    sourceMap
-  });
-  cst.delete();
-  return syntacticAnalysisResult;
+  let cst = null;
+  try {
+    cst = await (0, _browser.default)(source);
+    return (0, _index.default)(cst, {
+      sourceMap
+    });
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
+  }
 };
 exports.parse = parse;

package/src/adapter-browser.mjs

@@ -7,13 +7,16 @@ export { lexicalAnalysis, syntacticAnalysis };
  * @public
  */
 export const detect = async source => {
+  let cst = null;
   try {
-    const cst = await lexicalAnalysis(source);
-    const isError = !cst.rootNode.isError;
-    cst.delete();
-    return isError;
+    cst = await lexicalAnalysis(source);
+    return !cst.rootNode.isError;
   } catch {
     return false;
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
 };
 
@@ -31,10 +34,15 @@ export const detect = async source => {
 export const parse = async (source, {
   sourceMap = false
 } = {}) => {
-  const cst = await lexicalAnalysis(source);
-  const syntacticAnalysisResult = syntacticAnalysis(cst, {
-    sourceMap
-  });
-  cst.delete();
-  return syntacticAnalysisResult;
+  let cst = null;
+  try {
+    cst = await lexicalAnalysis(source);
+    return syntacticAnalysis(cst, {
+      sourceMap
+    });
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
+  }
 };

package/src/adapter-node.cjs

@@ -14,11 +14,13 @@ exports.namespace = _adapter.namespace;
  * @public
  */
 const detect = async source => {
+  const cst = await (0, _node.default)(source);
   try {
-    const cst = await (0, _node.default)(source);
     return !cst.rootNode.isError;
   } catch {
     return false;
+  } finally {
+    cst.delete();
   }
 };
 
@@ -37,8 +39,12 @@ const parse = async (source, {
   sourceMap = false
 } = {}) => {
   const cst = await (0, _node.default)(source);
-  return (0, _index.default)(cst, {
-    sourceMap
-  });
+  try {
+    return (0, _index.default)(cst, {
+      sourceMap
+    });
+  } finally {
+    cst.delete();
+  }
 };
 exports.parse = parse;

package/src/adapter-node.mjs

@@ -7,11 +7,13 @@ export { lexicalAnalysis, syntacticAnalysis };
  * @public
  */
 export const detect = async source => {
+  const cst = await lexicalAnalysis(source);
   try {
-    const cst = await lexicalAnalysis(source);
     return !cst.rootNode.isError;
   } catch {
     return false;
+  } finally {
+    cst.delete();
   }
 };
 
@@ -30,7 +32,11 @@ export const parse = async (source, {
   sourceMap = false
 } = {}) => {
   const cst = await lexicalAnalysis(source);
-  return syntacticAnalysis(cst, {
-    sourceMap
-  });
+  try {
+    return syntacticAnalysis(cst, {
+      sourceMap
+    });
+  } finally {
+    cst.delete();
+  }
 };

package/src/lexical-analysis/analyze.cjs

@@ -7,7 +7,8 @@ var _webTreeSitter = _interopRequireDefault(require("web-tree-sitter"));
 var _apidomError = require("@swagger-api/apidom-error");
 let parser = null;
 let parserInitLock = null;
-let currentTree = null;
+const activeTrees = new Set();
+const MAX_ACTIVE_TREES = 5;
 const createAnalyze = treeSitterYaml => async source => {
   if (parser === null && parserInitLock === null) {
     // acquire lock
@@ -27,8 +28,27 @@ const createAnalyze = treeSitterYaml => async source => {
   if (parser === null) {
     throw new _apidomError.ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
   }
-  currentTree = parser.parse(source);
+
+  // prevent WASM OOM during concurrency spikes by evicting oldest trees
+  // when the pool exceeds threshold; tree.delete() is idempotent so
+  // callers that still hold a reference can safely call delete() again
+  if (activeTrees.size >= MAX_ACTIVE_TREES) {
+    const treesToEvict = [...activeTrees];
+    activeTrees.clear();
+    for (const oldTree of treesToEvict) {
+      oldTree.delete();
+    }
+  }
+  const tree = parser.parse(source);
+  activeTrees.add(tree);
+
+  // remove from tracking when caller deletes
+  const originalDelete = tree.delete;
+  tree.delete = function deleteAndUntrack() {
+    activeTrees.delete(this);
+    originalDelete.call(this);
+  };
   parser.reset();
-  return currentTree;
+  return tree;
 };
 var _default = exports.default = createAnalyze;

package/src/lexical-analysis/analyze.mjs

@@ -2,7 +2,8 @@ import Parser from 'web-tree-sitter';
 import { ApiDOMError } from '@swagger-api/apidom-error';
 let parser = null;
 let parserInitLock = null;
-let currentTree = null;
+const activeTrees = new Set();
+const MAX_ACTIVE_TREES = 5;
 const createAnalyze = treeSitterYaml => async source => {
   if (parser === null && parserInitLock === null) {
     // acquire lock
@@ -22,8 +23,27 @@ const createAnalyze = treeSitterYaml => async source => {
   if (parser === null) {
     throw new ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-yaml grammar.');
   }
-  currentTree = parser.parse(source);
+
+  // prevent WASM OOM during concurrency spikes by evicting oldest trees
+  // when the pool exceeds threshold; tree.delete() is idempotent so
+  // callers that still hold a reference can safely call delete() again
+  if (activeTrees.size >= MAX_ACTIVE_TREES) {
+    const treesToEvict = [...activeTrees];
+    activeTrees.clear();
+    for (const oldTree of treesToEvict) {
+      oldTree.delete();
+    }
+  }
+  const tree = parser.parse(source);
+  activeTrees.add(tree);
+
+  // remove from tracking when caller deletes
+  const originalDelete = tree.delete;
+  tree.delete = function deleteAndUntrack() {
+    activeTrees.delete(this);
+    originalDelete.call(this);
+  };
   parser.reset();
-  return currentTree;
+  return tree;
 };
 export default createAnalyze;