@speclynx/apidom-reference 1.12.2 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-reference",
-  "version": "1.12.2",
+  "version": "2.1.0",
   "description": "Advanced algorithms for semantic ApiDOM manipulations like dereferencing or resolution.",
   "publishConfig": {
     "access": "public",
@@ -79,16 +79,6 @@
       "require": "./src/resolve/strategies/openapi-3-1/index.cjs",
       "types": "./types/resolve/strategies/openapi-3-1/index.d.ts"
     },
-    "./parse/parsers/api-design-systems-json": {
-      "import": "./src/parse/parsers/api-design-systems-json/index.mjs",
-      "require": "./src/parse/parsers/api-design-systems-json/index.cjs",
-      "types": "./types/parse/parsers/api-design-systems-json/index.d.ts"
-    },
-    "./parse/parsers/api-design-systems-yaml": {
-      "import": "./src/parse/parsers/api-design-systems-yaml/index.mjs",
-      "require": "./src/parse/parsers/api-design-systems-yaml/index.cjs",
-      "types": "./types/parse/parsers/api-design-systems-yaml/index.d.ts"
-    },
     "./parse/parsers/asyncapi-json-2": {
       "import": "./src/parse/parsers/asyncapi-json-2/index.mjs",
       "require": "./src/parse/parsers/asyncapi-json-2/index.cjs",
@@ -236,58 +226,35 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@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",
+    "@speclynx/apidom-json-pointer": "^2.1.0",
+    "@speclynx/apidom-ns-arazzo-1": "^2.1.0",
+    "@speclynx/apidom-ns-asyncapi-2": "^2.1.0",
+    "@speclynx/apidom-ns-openapi-2": "^2.1.0",
+    "@speclynx/apidom-ns-openapi-3-0": "^2.1.0",
+    "@speclynx/apidom-ns-openapi-3-1": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-arazzo-json-1": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-json": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-2": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "^2.1.0",
+    "@speclynx/apidom-parser-adapter-yaml-1-2": "^2.1.0",
+    "@speclynx/apidom-traverse": "^2.1.0",
     "axios": "^1.13.0",
     "minimatch": "^7.4.6",
     "process": "^0.11.10",
     "ramda": "~0.32.0",
     "ramda-adjunct": "^6.0.0"
   },
-  "optionalDependencies": {
-    "@speclynx/apidom-json-pointer": "^1.12.2",
-    "@speclynx/apidom-ns-arazzo-1": "^1.12.2",
-    "@speclynx/apidom-ns-asyncapi-2": "^1.12.2",
-    "@speclynx/apidom-ns-openapi-2": "^1.12.2",
-    "@speclynx/apidom-ns-openapi-3-0": "^1.12.2",
-    "@speclynx/apidom-ns-openapi-3-1": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-api-design-systems-json": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-api-design-systems-yaml": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-arazzo-json-1": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-json": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-json-2": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "^1.12.2",
-    "@speclynx/apidom-parser-adapter-yaml-1-2": "^1.12.2"
-  },
   "devDependencies": {
-    "@speclynx/apidom-json-pointer": "*",
-    "@speclynx/apidom-ns-arazzo-1": "*",
-    "@speclynx/apidom-ns-asyncapi-2": "*",
-    "@speclynx/apidom-ns-openapi-2": "*",
-    "@speclynx/apidom-ns-openapi-3-0": "*",
-    "@speclynx/apidom-ns-openapi-3-1": "*",
-    "@speclynx/apidom-parser-adapter-api-design-systems-json": "*",
-    "@speclynx/apidom-parser-adapter-api-design-systems-yaml": "*",
-    "@speclynx/apidom-parser-adapter-arazzo-json-1": "*",
-    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "*",
-    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "*",
-    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "*",
-    "@speclynx/apidom-parser-adapter-json": "*",
-    "@speclynx/apidom-parser-adapter-openapi-json-2": "*",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "*",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "*",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "*",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "*",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "*",
-    "@speclynx/apidom-parser-adapter-yaml-1-2": "*",
     "axios-mock-adapter": "^2.0.0"
   },
   "files": [
@@ -300,5 +267,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "8c77c8183cb058797925e09a0b5399612e3a2e39"
+  "gitHead": "dd02cfbbe82b0a31c6e7c444cec140e740e1c6e9"
 }

package/src/configuration/saturated.cjs

@@ -9,35 +9,39 @@ var _index3 = _interopRequireDefault(require("../resolve/strategies/openapi-3-0/
 var _index4 = _interopRequireDefault(require("../resolve/strategies/openapi-3-1/index.cjs"));
 var _index5 = _interopRequireDefault(require("../resolve/strategies/asyncapi-2/index.cjs"));
 var _index6 = _interopRequireDefault(require("../resolve/strategies/apidom/index.cjs"));
-var _index7 = _interopRequireDefault(require("../parse/parsers/api-design-systems-json/index.cjs"));
-var _index8 = _interopRequireDefault(require("../parse/parsers/api-design-systems-yaml/index.cjs"));
-var _index9 = _interopRequireDefault(require("../parse/parsers/openapi-json-2/index.cjs"));
-var _index0 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-2/index.cjs"));
-var _index1 = _interopRequireDefault(require("../parse/parsers/openapi-json-3-0/index.cjs"));
-var _index10 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-3-0/index.cjs"));
-var _index11 = _interopRequireDefault(require("../parse/parsers/openapi-json-3-1/index.cjs"));
-var _index12 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-3-1/index.cjs"));
-var _index13 = _interopRequireDefault(require("../parse/parsers/asyncapi-json-2/index.cjs"));
-var _index14 = _interopRequireDefault(require("../parse/parsers/asyncapi-yaml-2/index.cjs"));
-var _index15 = _interopRequireDefault(require("../parse/parsers/arazzo-json-1/index.cjs"));
-var _index16 = _interopRequireDefault(require("../parse/parsers/arazzo-yaml-1/index.cjs"));
-var _index17 = _interopRequireDefault(require("../parse/parsers/apidom-json/index.cjs"));
-var _index18 = _interopRequireDefault(require("../parse/parsers/json/index.cjs"));
-var _index19 = _interopRequireDefault(require("../parse/parsers/yaml-1-2/index.cjs"));
+var _index7 = _interopRequireDefault(require("../parse/parsers/openapi-json-2/index.cjs"));
+var _index8 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-2/index.cjs"));
+var _index9 = _interopRequireDefault(require("../parse/parsers/openapi-json-3-0/index.cjs"));
+var _index0 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-3-0/index.cjs"));
+var _index1 = _interopRequireDefault(require("../parse/parsers/openapi-json-3-1/index.cjs"));
+var _index10 = _interopRequireDefault(require("../parse/parsers/openapi-yaml-3-1/index.cjs"));
+var _index11 = _interopRequireDefault(require("../parse/parsers/asyncapi-json-2/index.cjs"));
+var _index12 = _interopRequireDefault(require("../parse/parsers/asyncapi-yaml-2/index.cjs"));
+var _index13 = _interopRequireDefault(require("../parse/parsers/arazzo-json-1/index.cjs"));
+var _index14 = _interopRequireDefault(require("../parse/parsers/arazzo-yaml-1/index.cjs"));
+var _index15 = _interopRequireDefault(require("../parse/parsers/apidom-json/index.cjs"));
+var _index16 = _interopRequireDefault(require("../parse/parsers/json/index.cjs"));
+var _index17 = _interopRequireDefault(require("../parse/parsers/yaml-1-2/index.cjs"));
 var _indexNode2 = _interopRequireDefault(require("../parse/parsers/binary/index-node.cjs"));
-var _index20 = _interopRequireDefault(require("../dereference/strategies/apidom/index.cjs"));
-var _index21 = _interopRequireDefault(require("../dereference/strategies/openapi-2/index.cjs"));
-var _index22 = _interopRequireDefault(require("../dereference/strategies/openapi-3-0/index.cjs"));
-var _index23 = _interopRequireDefault(require("../dereference/strategies/openapi-3-1/index.cjs"));
-var _index24 = _interopRequireDefault(require("../dereference/strategies/asyncapi-2/index.cjs"));
-var _index25 = _interopRequireDefault(require("../bundle/strategies/openapi-3-1/index.cjs"));
-var _index26 = require("../index.cjs");
-Object.keys(_index26).forEach(function (key) {
+var _index18 = _interopRequireDefault(require("../dereference/strategies/apidom/index.cjs"));
+var _index19 = _interopRequireDefault(require("../dereference/strategies/openapi-2/index.cjs"));
+var _index20 = _interopRequireDefault(require("../dereference/strategies/openapi-3-0/index.cjs"));
+var _index21 = _interopRequireDefault(require("../dereference/strategies/openapi-3-1/index.cjs"));
+var _index22 = _interopRequireDefault(require("../dereference/strategies/asyncapi-2/index.cjs"));
+var _index23 = _interopRequireDefault(require("../bundle/strategies/openapi-3-1/index.cjs"));
+var _index24 = require("../index.cjs");
+Object.keys(_index24).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _index26[key]) return;
-  exports[key] = _index26[key];
+  if (key in exports && exports[key] === _index24[key]) return;
+  exports[key] = _index24[key];
 });
-_index26.options.parse.parsers = [new _index9.default({
+_index24.options.parse.parsers = [new _index7.default({
+  allowEmpty: true,
+  sourceMap: false
+}), new _index8.default({
+  allowEmpty: true,
+  sourceMap: false
+}), new _index9.default({
   allowEmpty: true,
   sourceMap: false
 }), new _index0.default({
@@ -67,29 +71,17 @@ _index26.options.parse.parsers = [new _index9.default({
 }), new _index16.default({
   allowEmpty: true,
   sourceMap: false
-}), new _index7.default({
-  allowEmpty: true,
-  sourceMap: false
-}), new _index8.default({
-  allowEmpty: true,
-  sourceMap: false
 }), new _index17.default({
   allowEmpty: true,
   sourceMap: false
-}), new _index18.default({
-  allowEmpty: true,
-  sourceMap: false
-}), new _index19.default({
-  allowEmpty: true,
-  sourceMap: false
 }), new _indexNode2.default({
   allowEmpty: true
 })];
-_index26.options.resolve.resolvers = [new _indexNode.default(), new _index.default({
+_index24.options.resolve.resolvers = [new _indexNode.default(), new _index.default({
   timeout: 5000,
   redirects: 5,
   withCredentials: false
 })];
-_index26.options.resolve.strategies = [new _index2.default(), new _index3.default(), new _index4.default(), new _index5.default(), new _index6.default()];
-_index26.options.dereference.strategies = [new _index21.default(), new _index22.default(), new _index23.default(), new _index24.default(), new _index20.default()];
-_index26.options.bundle.strategies = [new _index25.default()];
+_index24.options.resolve.strategies = [new _index2.default(), new _index3.default(), new _index4.default(), new _index5.default(), new _index6.default()];
+_index24.options.dereference.strategies = [new _index19.default(), new _index20.default(), new _index21.default(), new _index22.default(), new _index18.default()];
+_index24.options.bundle.strategies = [new _index23.default()];

package/src/configuration/saturated.mjs

@@ -5,8 +5,6 @@ import OpenAPI3_0ResolveStrategy from "../resolve/strategies/openapi-3-0/index.m
 import OpenAPI3_1ResolveStrategy from "../resolve/strategies/openapi-3-1/index.mjs";
 import AsyncAPI2ResolveStrategy from "../resolve/strategies/asyncapi-2/index.mjs";
 import ApiDOMResolveStrategy from "../resolve/strategies/apidom/index.mjs";
-import APIDesignSystemsJSONParser from "../parse/parsers/api-design-systems-json/index.mjs";
-import APIDesignSystemsYAMLParser from "../parse/parsers/api-design-systems-yaml/index.mjs";
 import OpenAPIJSON2Parser from "../parse/parsers/openapi-json-2/index.mjs";
 import OpenAPIYAML2Parser from "../parse/parsers/openapi-yaml-2/index.mjs";
 import OpenAPIJSON3_0Parser from "../parse/parsers/openapi-json-3-0/index.mjs";
@@ -58,12 +56,6 @@ options.parse.parsers = [new OpenAPIJSON2Parser({
 }), new ArazzoYAML1Parser({
   allowEmpty: true,
   sourceMap: false
-}), new APIDesignSystemsJSONParser({
-  allowEmpty: true,
-  sourceMap: false
-}), new APIDesignSystemsYAMLParser({
-  allowEmpty: true,
-  sourceMap: false
 }), new APIDOMJSONParser({
   allowEmpty: true,
   sourceMap: false

package/src/dereference/index.cjs

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.dereferenceApiDOM = exports.default = void 0;
 var _ramda = require("ramda");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _File = _interopRequireDefault(require("../File.cjs"));
 var plugins = _interopRequireWildcard(require("../util/plugins.cjs"));
 var _UnmatchedDereferenceStrategyError = _interopRequireDefault(require("../errors/UnmatchedDereferenceStrategyError.cjs"));
@@ -22,10 +22,10 @@ const dereferenceApiDOM = async (element, options) => {
   let surrogateWrapping = false;
 
   // wrap element into parse result
-  if (!(0, _apidomCore.isParseResultElement)(element)) {
-    const elementClone = (0, _apidomCore.cloneShallow)(element);
+  if (!(0, _apidomDatamodel.isParseResultElement)(element)) {
+    const elementClone = (0, _apidomDatamodel.cloneShallow)(element);
     elementClone.classes.push('result');
-    parseResult = new _apidomCore.ParseResultElement([elementClone]);
+    parseResult = new _apidomDatamodel.ParseResultElement([elementClone]);
     surrogateWrapping = true;
   }
   const file = new _File.default({

package/src/dereference/index.mjs

@@ -1,5 +1,5 @@
 import { isEmpty, propEq } from 'ramda';
-import { isParseResultElement, ParseResultElement, cloneShallow } from '@speclynx/apidom-core';
+import { isParseResultElement, ParseResultElement, cloneShallow } from '@speclynx/apidom-datamodel';
 import File from "../File.mjs";
 import * as plugins from "../util/plugins.mjs";
 import UnmatchedDereferenceStrategyError from "../errors/UnmatchedDereferenceStrategyError.mjs";

package/src/dereference/strategies/apidom/index.cjs

@@ -3,15 +3,13 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _DereferenceStrategy = _interopRequireDefault(require("../DereferenceStrategy.cjs"));
 var _Reference = _interopRequireDefault(require("../../../Reference.cjs"));
 var _ReferenceSet = _interopRequireDefault(require("../../../ReferenceSet.cjs"));
 var _visitor = _interopRequireDefault(require("./visitor.cjs"));
 exports.ApiDOMDereferenceVisitor = _visitor.default;
-// @ts-ignore
-const visitAsync = _apidomCore.visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
@@ -27,7 +25,7 @@ class ApiDOMDereferenceStrategy extends _DereferenceStrategy.default {
     });
   }
   canDereference(file) {
-    return file.mediaType.startsWith('application/vnd.apidom') && (0, _apidomCore.isElement)(file.parseResult?.result);
+    return file.mediaType.startsWith('application/vnd.apidom') && (0, _apidomDatamodel.isElement)(file.parseResult?.result);
   }
   async dereference(file, options) {
     const immutableRefSet = options.dereference.refSet ?? new _ReferenceSet.default();
@@ -54,7 +52,7 @@ class ApiDOMDereferenceStrategy extends _DereferenceStrategy.default {
     if (options.dereference.immutable) {
       immutableRefSet.refs.map(ref => new _Reference.default({
         ...ref,
-        value: (0, _apidomCore.cloneDeep)(ref.value)
+        value: (0, _apidomDatamodel.cloneDeep)(ref.value)
       })).forEach(ref => mutableRefSet.add(ref));
       reference = mutableRefSet.find(ref => ref.uri === file.uri);
       refSet = mutableRefSet;
@@ -63,7 +61,9 @@ class ApiDOMDereferenceStrategy extends _DereferenceStrategy.default {
       reference: reference,
       options
     });
-    const dereferencedElement = await visitAsync(refSet.rootRef.value, visitor);
+    const dereferencedElement = await (0, _apidomTraverse.traverseAsync)(refSet.rootRef.value, visitor, {
+      mutable: true
+    });
 
     /**
      * If immutable option is set, replay refs from the refSet.

package/src/dereference/strategies/apidom/index.mjs

@@ -1,15 +1,12 @@
-import { isElement, cloneDeep, visit } from '@speclynx/apidom-core';
+import { isElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { traverseAsync } from '@speclynx/apidom-traverse';
 import DereferenceStrategy from "../DereferenceStrategy.mjs";
 import Reference from "../../../Reference.mjs";
 import ReferenceSet from "../../../ReferenceSet.mjs";
 import ApiDOMDereferenceVisitor from "./visitor.mjs";
-// @ts-ignore
-const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
-
 /**
  * @public
  */
@@ -57,7 +54,9 @@ class ApiDOMDereferenceStrategy extends DereferenceStrategy {
       reference: reference,
       options
     });
-    const dereferencedElement = await visitAsync(refSet.rootRef.value, visitor);
+    const dereferencedElement = await traverseAsync(refSet.rootRef.value, visitor, {
+      mutable: true
+    });
 
     /**
      * If immutable option is set, replay refs from the refSet.

package/src/dereference/strategies/apidom/selectors/element-id.cjs

@@ -4,10 +4,12 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.evaluate = void 0;
 var _ramdaAdjunct = require("ramda-adjunct");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _EvaluationElementIdError = _interopRequireDefault(require("../../../../errors/EvaluationElementIdError.cjs"));
 exports.EvaluationElementIdError = _EvaluationElementIdError.default;
-const hasElementID = element => !!element.id;
+const hasElementID = element => element.hasMetaProperty('id') && (0, _apidomDatamodel.isStringElement)(element.meta.id);
 
 /**
  * Evaluates element ID against ApiDOM fragment.
@@ -19,7 +21,7 @@ const evaluate = (elementID, element) => {
   } = evaluate;
   // warm the cache
   if (!cache.has(element)) {
-    const elementsWithID = (0, _apidomCore.filter)(hasElementID, element);
+    const elementsWithID = (0, _apidomTraverse.filter)(element, hasElementID);
     cache.set(element, Array.from(elementsWithID));
   }
 

package/src/dereference/strategies/apidom/selectors/element-id.mjs

@@ -1,7 +1,9 @@
 import { isUndefined } from 'ramda-adjunct';
-import { filter, toValue } from '@speclynx/apidom-core';
+import { isStringElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { filter } from '@speclynx/apidom-traverse';
 import EvaluationElementIdError from "../../../../errors/EvaluationElementIdError.mjs";
-const hasElementID = element => !!element.id;
+const hasElementID = element => element.hasMetaProperty('id') && isStringElement(element.meta.id);
 
 /**
  * Evaluates element ID against ApiDOM fragment.
@@ -13,7 +15,7 @@ export const evaluate = (elementID, element) => {
   } = evaluate;
   // warm the cache
   if (!cache.has(element)) {
-    const elementsWithID = filter(hasElementID, element);
+    const elementsWithID = filter(element, hasElementID);
     cache.set(element, Array.from(elementsWithID));
   }
 

package/src/dereference/strategies/apidom/visitor.cjs

@@ -6,16 +6,15 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _apidomError = require("@speclynx/apidom-error");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _apidomJsonPointer = require("@speclynx/apidom-json-pointer");
 var _MaximumResolveDepthError = _interopRequireDefault(require("../../../errors/MaximumResolveDepthError.cjs"));
 var url = _interopRequireWildcard(require("../../../util/url.cjs"));
 var _index = _interopRequireDefault(require("../../../parse/index.cjs"));
 var _Reference = _interopRequireDefault(require("../../../Reference.cjs"));
 var _elementId = require("./selectors/element-id.cjs");
-// @ts-ignore
-const visitAsync = _apidomCore.visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * The following rules apply:
  *
@@ -71,7 +70,7 @@ class ApiDOMDereferenceVisitor {
     // register new mutable reference with a refSet
     const mutableReference = new _Reference.default({
       uri: baseURI,
-      value: (0, _apidomCore.cloneDeep)(parseResult),
+      value: (0, _apidomDatamodel.cloneDeep)(parseResult),
       depth: this.reference.depth + 1
     });
     refSet.add(mutableReference);
@@ -86,7 +85,13 @@ class ApiDOMDereferenceVisitor {
     }
     return mutableReference;
   }
-  async RefElement(refElement, key, parent, path, ancestors) {
+  async RefElement(path) {
+    const refElement = path.node;
+    const {
+      parent,
+      key
+    } = path;
+    const ancestors = path.getAncestorNodes();
     const refURI = (0, _apidomCore.toValue)(refElement);
     const refNormalizedURI = refURI.includes('#') ? refURI : `#${refURI}`;
     const retrievalURI = this.toBaseURI(refNormalizedURI);
@@ -96,24 +101,26 @@ class ApiDOMDereferenceVisitor {
     // ignore resolving internal RefElements
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this ref element
-      return false;
+      path.skip();
+      return;
     }
     // ignore resolving external RefElements
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this ref element
-      return false;
+      path.skip();
+      return;
     }
     const reference = await this.toReference(refNormalizedURI);
     const refBaseURI = url.resolve(retrievalURI, refNormalizedURI);
     const elementID = _apidomJsonPointer.URIFragmentIdentifier.fromURIReference(refBaseURI);
     let referencedElement = (0, _elementId.evaluate)(elementID, reference.value.result);
-    if (!(0, _apidomCore.isElement)(referencedElement)) {
+    if (!(0, _apidomDatamodel.isElement)(referencedElement)) {
       throw new _apidomError.ApiDOMError(`Referenced element with id="${elementID}" was not found`);
     }
     if (refElement === referencedElement) {
       throw new _apidomError.ApiDOMError('RefElement cannot reference itself');
     }
-    if ((0, _apidomCore.isRefElement)(referencedElement)) {
+    if ((0, _apidomDatamodel.isRefElement)(referencedElement)) {
       throw new _apidomError.ApiDOMError('RefElement cannot reference another RefElement');
     }
     if (isExternalReference) {
@@ -122,33 +129,38 @@ class ApiDOMDereferenceVisitor {
         reference,
         options: this.options
       });
-      referencedElement = await visitAsync(referencedElement, visitor);
+      referencedElement = await (0, _apidomTraverse.traverseAsync)(referencedElement, visitor, {
+        mutable: true
+      });
     }
 
     /**
-     * When path is used, it references the given property of the referenced element
+     * When path is used, it references the given property of the referenced element.
+     * Valid paths are: 'element', 'content', 'meta', 'attributes'.
      */
     const referencedElementPath = (0, _apidomCore.toValue)(refElement.path);
-    if (referencedElementPath !== 'element' && (0, _apidomCore.isElement)(referencedElement)) {
-      referencedElement = (0, _apidomCore.refract)(referencedElement[referencedElementPath]);
+    if (referencedElementPath !== 'element' && (0, _apidomDatamodel.isElement)(referencedElement)) {
+      referencedElement = (0, _apidomDatamodel.refract)(referencedElement[referencedElementPath]);
     }
 
     /**
      * Transclusion of a Ref Element SHALL be defined in the if/else block below.
      */
-    if ((0, _apidomCore.isObjectElement)(referencedElement) && (0, _apidomCore.isObjectElement)(ancestors[ancestors.length - 1]) && Array.isArray(parent) && typeof key === 'number') {
+    // ancestors[0] is the grandparent (nearest ancestor from getAncestorNodes())
+    const grandparent = ancestors[0];
+    if ((0, _apidomDatamodel.isObjectElement)(referencedElement) && (0, _apidomDatamodel.isObjectElement)(grandparent) && Array.isArray(parent) && typeof key === 'number') {
       /**
        * If the Ref Element is held by an Object Element and references an Object Element,
        * its content entries SHALL be inserted in place of the Ref Element.
        */
       parent.splice(key, 1, ...referencedElement.content);
-    } else if ((0, _apidomCore.isArrayElement)(referencedElement) && Array.isArray(parent) && typeof key === 'number') {
+    } else if ((0, _apidomDatamodel.isArrayElement)(referencedElement) && Array.isArray(parent) && typeof key === 'number') {
       /**
        * If the Ref Element is held by an Array Element and references an Array Element,
        * its content entries SHALL be inserted in place of the Ref Element.
        */
       parent.splice(key, 1, ...referencedElement.content);
-    } else if ((0, _apidomCore.isMemberElement)(parent)) {
+    } else if ((0, _apidomDatamodel.isMemberElement)(parent)) {
       /**
        * The Ref Element is substituted by the Element it references.
        */
@@ -159,7 +171,9 @@ class ApiDOMDereferenceVisitor {
        */
       parent[key] = referencedElement;
     }
-    return !parent ? referencedElement : false;
+    if (!parent) {
+      path.replaceWith(referencedElement);
+    }
   }
 }
 var _default = exports.default = ApiDOMDereferenceVisitor;

package/src/dereference/strategies/apidom/visitor.mjs

@@ -1,15 +1,14 @@
 import { propEq } from 'ramda';
 import { ApiDOMError } from '@speclynx/apidom-error';
-import { isElement, isMemberElement, isArrayElement, isObjectElement, isRefElement, toValue, refract, visit, cloneDeep } from '@speclynx/apidom-core';
+import { isElement, isMemberElement, isArrayElement, isObjectElement, isRefElement, refract, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { traverseAsync } from '@speclynx/apidom-traverse';
 import { URIFragmentIdentifier } from '@speclynx/apidom-json-pointer';
 import MaximumResolveDepthError from "../../../errors/MaximumResolveDepthError.mjs";
 import * as url from "../../../util/url.mjs";
 import parse from "../../../parse/index.mjs";
 import Reference from "../../../Reference.mjs";
 import { evaluate } from "./selectors/element-id.mjs";
-// @ts-ignore
-const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * The following rules apply:
  *
@@ -23,7 +22,6 @@ const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
  * WARNING: this implementation only supports referencing elements in the local document. Points 2-4 are not supported.
  * @public
  */
-
 /**
  * @public
  */
@@ -80,7 +78,13 @@ class ApiDOMDereferenceVisitor {
     }
     return mutableReference;
   }
-  async RefElement(refElement, key, parent, path, ancestors) {
+  async RefElement(path) {
+    const refElement = path.node;
+    const {
+      parent,
+      key
+    } = path;
+    const ancestors = path.getAncestorNodes();
     const refURI = toValue(refElement);
     const refNormalizedURI = refURI.includes('#') ? refURI : `#${refURI}`;
     const retrievalURI = this.toBaseURI(refNormalizedURI);
@@ -90,12 +94,14 @@ class ApiDOMDereferenceVisitor {
     // ignore resolving internal RefElements
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this ref element
-      return false;
+      path.skip();
+      return;
     }
     // ignore resolving external RefElements
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this ref element
-      return false;
+      path.skip();
+      return;
     }
     const reference = await this.toReference(refNormalizedURI);
     const refBaseURI = url.resolve(retrievalURI, refNormalizedURI);
@@ -116,11 +122,14 @@ class ApiDOMDereferenceVisitor {
         reference,
         options: this.options
       });
-      referencedElement = await visitAsync(referencedElement, visitor);
+      referencedElement = await traverseAsync(referencedElement, visitor, {
+        mutable: true
+      });
     }
 
     /**
-     * When path is used, it references the given property of the referenced element
+     * When path is used, it references the given property of the referenced element.
+     * Valid paths are: 'element', 'content', 'meta', 'attributes'.
      */
     const referencedElementPath = toValue(refElement.path);
     if (referencedElementPath !== 'element' && isElement(referencedElement)) {
@@ -130,7 +139,9 @@ class ApiDOMDereferenceVisitor {
     /**
      * Transclusion of a Ref Element SHALL be defined in the if/else block below.
      */
-    if (isObjectElement(referencedElement) && isObjectElement(ancestors[ancestors.length - 1]) && Array.isArray(parent) && typeof key === 'number') {
+    // ancestors[0] is the grandparent (nearest ancestor from getAncestorNodes())
+    const grandparent = ancestors[0];
+    if (isObjectElement(referencedElement) && isObjectElement(grandparent) && Array.isArray(parent) && typeof key === 'number') {
       /**
        * If the Ref Element is held by an Object Element and references an Object Element,
        * its content entries SHALL be inserted in place of the Ref Element.
@@ -153,7 +164,9 @@ class ApiDOMDereferenceVisitor {
        */
       parent[key] = referencedElement;
     }
-    return !parent ? referencedElement : false;
+    if (!parent) {
+      path.replaceWith(referencedElement);
+    }
   }
 }
 export default ApiDOMDereferenceVisitor;