@speclynx/apidom-parser-adapter-yaml-1-2 1.12.2 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-parser-adapter-yaml-1-2",
-  "version": "1.12.2",
+  "version": "2.1.0",
   "description": "Parser adapter for parsing YAML documents into base namespace.",
   "publishConfig": {
     "access": "public",
@@ -28,9 +28,9 @@
     "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": "cross-env BABEL_ENV=es babel ./test/perf --out-dir ./test/perf --extensions '.ts' --out-file-extension '.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",
+    "perf:syntactic-analysis": "cross-env BABEL_ENV=es babel ./test/perf/syntactic-analysis.ts --out-file ./test/perf/syntactic-analysis.mjs --root-mode 'upward' && cross-env NODE_ENV=test node ./test/perf/syntactic-analysis.mjs",
     "prepack": "copyfiles -u 3 ../../LICENSES/* LICENSES && copyfiles -u 2 ../../NOTICE .",
     "postpack": "rimraf NOTICE LICENSES"
   },
@@ -42,13 +42,14 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@speclynx/apidom-ast": "^1.12.2",
-    "@speclynx/apidom-core": "^1.12.2",
-    "@speclynx/apidom-error": "^1.12.2",
-    "@types/ramda": "~0.30.0",
+    "@speclynx/apidom-core": "^2.1.0",
+    "@speclynx/apidom-datamodel": "^2.1.0",
+    "@speclynx/apidom-error": "^2.1.0",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.0.0",
-    "web-tree-sitter": "=0.25.10"
+    "unraw": "^3.0.0",
+    "web-tree-sitter": "=0.25.10",
+    "yaml": "^2.8.2"
   },
   "devDependencies": {
     "@tree-sitter-grammars/tree-sitter-yaml": "=0.7.1",
@@ -64,5 +65,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "8c77c8183cb058797925e09a0b5399612e3a2e39"
+  "gitHead": "dd02cfbbe82b0a31c6e7c444cec140e740e1c6e9"
 }

package/src/adapter.cjs

@@ -1,13 +1,15 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
-exports.parse = exports.namespace = exports.mediaTypes = exports.detect = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
-var _index = _interopRequireDefault(require("./lexical-analysis/index.cjs"));
-exports.lexicalAnalysis = _index.default;
-var _index2 = _interopRequireDefault(require("./syntactic-analysis/indirect/index.cjs"));
-exports.syntacticAnalysis = _index2.default;
+exports.syntacticAnalysis = exports.parse = exports.namespace = exports.mediaTypes = exports.lexicalAnalysis = exports.detect = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomError = require("@speclynx/apidom-error");
+var yaml = _interopRequireWildcard(require("./yaml/index.cjs"));
+var treeSitter = _interopRequireWildcard(require("./tree-sitter/index.cjs"));
+exports.lexicalAnalysis = treeSitter.lexicalAnalysis;
+exports.syntacticAnalysis = treeSitter.syntacticAnalysis;
 var _mediaTypes = _interopRequireDefault(require("./media-types.cjs"));
 exports.mediaTypes = _mediaTypes.default;
 /**
@@ -17,18 +19,22 @@ exports.mediaTypes = _mediaTypes.default;
 /**
  * @public
  */
-const namespace = exports.namespace = (0, _apidomCore.createNamespace)();
+const namespace = exports.namespace = new _apidomDatamodel.Namespace();
 
 /**
  * @public
  */
-const detect = async source => {
-  try {
-    const cst = await (0, _index.default)(source);
-    return !cst.rootNode.isError;
-  } catch {
-    return false;
+
+/**
+ * @public
+ */
+const detect = async (source, {
+  strict = false
+} = {}) => {
+  if (strict) {
+    return yaml.detect(source);
   }
+  return treeSitter.detect(source);
 };
 
 /**
@@ -43,10 +49,16 @@ exports.detect = detect;
  * @public
  */
 const parse = async (source, {
-  sourceMap = false
+  sourceMap = false,
+  strict = false
 } = {}) => {
-  const cst = await (0, _index.default)(source);
-  return (0, _index2.default)(cst, {
+  if (strict && sourceMap) {
+    throw new _apidomError.ApiDOMError('Cannot use sourceMap with strict parsing. Strict parsing does not support source maps.');
+  }
+  if (strict) {
+    return yaml.parse(source);
+  }
+  return treeSitter.parse(source, {
     sourceMap
   });
 };

package/src/adapter.mjs

@@ -1,8 +1,8 @@
-import { createNamespace } from '@speclynx/apidom-core';
-import lexicalAnalysis from "./lexical-analysis/index.mjs";
-import syntacticAnalysis from "./syntactic-analysis/indirect/index.mjs";
-export { lexicalAnalysis, syntacticAnalysis };
-
+import { Namespace } from '@speclynx/apidom-datamodel';
+import { ApiDOMError } from '@speclynx/apidom-error';
+import * as yaml from "./yaml/index.mjs";
+import * as treeSitter from "./tree-sitter/index.mjs";
+export { lexicalAnalysis, syntacticAnalysis } from "./tree-sitter/index.mjs";
 /**
  * @public
  */
@@ -10,18 +10,22 @@ export { default as mediaTypes } from "./media-types.mjs";
 /**
  * @public
  */
-export const namespace = createNamespace();
+export const namespace = new Namespace();
+
+/**
+ * @public
+ */
 
 /**
  * @public
  */
-export const detect = async source => {
-  try {
-    const cst = await lexicalAnalysis(source);
-    return !cst.rootNode.isError;
-  } catch {
-    return false;
+export const detect = async (source, {
+  strict = false
+} = {}) => {
+  if (strict) {
+    return yaml.detect(source);
   }
+  return treeSitter.detect(source);
 };
 
 /**
@@ -36,10 +40,16 @@ export const detect = async source => {
  * @public
  */
 export const parse = async (source, {
-  sourceMap = false
+  sourceMap = false,
+  strict = false
 } = {}) => {
-  const cst = await lexicalAnalysis(source);
-  return syntacticAnalysis(cst, {
+  if (strict && sourceMap) {
+    throw new ApiDOMError('Cannot use sourceMap with strict parsing. Strict parsing does not support source maps.');
+  }
+  if (strict) {
+    return yaml.parse(source);
+  }
+  return treeSitter.parse(source, {
     sourceMap
   });
 };

package/src/tree-sitter/index.cjs

@@ -0,0 +1,44 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.parse = exports.detect = void 0;
+var _index = _interopRequireDefault(require("./lexical-analysis/index.cjs"));
+exports.lexicalAnalysis = _index.default;
+var _index2 = _interopRequireDefault(require("./syntactic-analysis/index.cjs"));
+exports.syntacticAnalysis = _index2.default;
+/**
+ * @public
+ */
+const detect = async source => {
+  let cst = null;
+  try {
+    cst = await (0, _index.default)(source);
+    return !cst.rootNode.isError;
+  } catch {
+    return false;
+  } finally {
+    cst?.delete();
+  }
+};
+
+/**
+ * @public
+ */
+exports.detect = detect;
+/**
+ * @public
+ */
+const parse = async (source, {
+  sourceMap = false
+} = {}) => {
+  const cst = await (0, _index.default)(source);
+  try {
+    return (0, _index2.default)(cst, {
+      sourceMap
+    });
+  } finally {
+    cst.delete();
+  }
+};
+exports.parse = parse;

package/src/tree-sitter/index.mjs

@@ -0,0 +1,38 @@
+import lexicalAnalysis from "./lexical-analysis/index.mjs";
+import syntacticAnalysis from "./syntactic-analysis/index.mjs";
+export { lexicalAnalysis, syntacticAnalysis };
+
+/**
+ * @public
+ */
+export const detect = async source => {
+  let cst = null;
+  try {
+    cst = await lexicalAnalysis(source);
+    return !cst.rootNode.isError;
+  } catch {
+    return false;
+  } finally {
+    cst?.delete();
+  }
+};
+
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
+export const parse = async (source, {
+  sourceMap = false
+} = {}) => {
+  const cst = await lexicalAnalysis(source);
+  try {
+    return syntacticAnalysis(cst, {
+      sourceMap
+    });
+  } finally {
+    cst.delete();
+  }
+};