@swagger-api/apidom-parser-adapter-json 1.8.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swagger-api/apidom-parser-adapter-json",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Parser adapter for parsing JSON documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -56,9 +56,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",
     "@types/ramda": "~0.30.0",
     "ramda": "~0.30.0",
     "ramda-adjunct": "^5.0.0",
@@ -80,5 +80,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "1dd54ab78366b9936cdd0422949093b93e958ab7"
+  "gitHead": "c72e92fc541b7df2b92335a0f2df147eb7b9b945"
 }

package/src/adapter-browser.cjs

@@ -21,13 +21,17 @@ const detect = async source => {
   if (!_adapter.detectionRegExp.test(source)) {
     return false;
   }
+  let cst = null;
   try {
-    const cst = await (0, _browser.default)(source);
+    cst = await (0, _browser.default)(source);
     const isError = cst.rootNode.type !== 'ERROR';
-    cst.delete();
     return isError;
   } catch {
     return false;
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
 };
 
@@ -46,18 +50,21 @@ const parse = async (source, {
   sourceMap = false,
   syntacticAnalysis = 'direct'
 } = {}) => {
-  const cst = await (0, _browser.default)(source);
-  let apiDOM;
-  if (syntacticAnalysis === 'indirect') {
-    apiDOM = (0, _index2.default)(cst, {
-      sourceMap
-    });
-  } else {
-    apiDOM = (0, _index.default)(cst, {
+  let cst = null;
+  try {
+    cst = await (0, _browser.default)(source);
+    if (syntacticAnalysis === 'indirect') {
+      return (0, _index2.default)(cst, {
+        sourceMap
+      });
+    }
+    return (0, _index.default)(cst, {
       sourceMap
     });
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
-  cst.delete();
-  return apiDOM;
 };
 exports.parse = parse;

package/src/adapter-browser.mjs

@@ -13,13 +13,17 @@ export const detect = async source => {
   if (!detectionRegExp.test(source)) {
     return false;
   }
+  let cst = null;
   try {
-    const cst = await lexicalAnalysis(source);
+    cst = await lexicalAnalysis(source);
     const isError = cst.rootNode.type !== 'ERROR';
-    cst.delete();
     return isError;
   } catch {
     return false;
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
 };
 
@@ -38,17 +42,20 @@ export const parse = async (source, {
   sourceMap = false,
   syntacticAnalysis = 'direct'
 } = {}) => {
-  const cst = await lexicalAnalysis(source);
-  let apiDOM;
-  if (syntacticAnalysis === 'indirect') {
-    apiDOM = syntacticAnalysisIndirect(cst, {
-      sourceMap
-    });
-  } else {
-    apiDOM = syntacticAnalysisDirect(cst, {
+  let cst = null;
+  try {
+    cst = await lexicalAnalysis(source);
+    if (syntacticAnalysis === 'indirect') {
+      return syntacticAnalysisIndirect(cst, {
+        sourceMap
+      });
+    }
+    return syntacticAnalysisDirect(cst, {
       sourceMap
     });
+  } finally {
+    if (cst !== null) {
+      cst.delete();
+    }
   }
-  cst.delete();
-  return apiDOM;
 };

package/src/lexical-analysis/browser.cjs

@@ -11,14 +11,12 @@ var _treeSitterJson = _interopRequireDefault(require("../../wasm/tree-sitter-jso
 
 let parser = null;
 let parserInitLock = null;
-let currentTree = null;
+const activeTrees = new Set();
+const MAX_ACTIVE_TREES = 5;
 
 /**
  * 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 => {
@@ -39,8 +37,27 @@ const analyze = async source => {
   } else if (parser === null) {
     throw new _apidomError.ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-json 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 = analyze;

package/src/lexical-analysis/browser.mjs

@@ -6,14 +6,12 @@ import { ApiDOMError } from '@swagger-api/apidom-error';
 import treeSitterJson from '../../wasm/tree-sitter-json.wasm';
 let parser = null;
 let parserInitLock = null;
-let currentTree = null;
+const activeTrees = new Set();
+const MAX_ACTIVE_TREES = 5;
 
 /**
  * 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 => {
@@ -34,8 +32,27 @@ const analyze = async source => {
   } else if (parser === null) {
     throw new ApiDOMError('Error while initializing web-tree-sitter and loading tree-sitter-json 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 analyze;

package/types/apidom-parser-adapter-json.d.ts

@@ -44,9 +44,6 @@ export declare class JSONMediaTypes extends MediaTypes<string> {
 /**
  * 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>;