@speclynx/apidom-reference 1.12.1 → 2.0.1

package/src/dereference/strategies/asyncapi-2/visitor.mjs

@@ -1,32 +1,19 @@
 import { propEq } from 'ramda';
-import { isElement, isMemberElement, isPrimitiveElement, isStringElement, IdentityManager, cloneDeep, cloneShallow, visit, toValue, RefElement } from '@speclynx/apidom-core';
+import { isElement, isPrimitiveElement, isStringElement, RefElement, cloneDeep, cloneShallow } from '@speclynx/apidom-datamodel';
+import { IdentityManager, toValue } from '@speclynx/apidom-core';
 import { ApiDOMError } from '@speclynx/apidom-error';
+import { traverseAsync } from '@speclynx/apidom-traverse';
 import { evaluate, URIFragmentIdentifier } from '@speclynx/apidom-json-pointer';
-import { ChannelItemElement, getNodeType, isReferenceLikeElement, isBooleanJsonSchemaElement, isChannelItemElement, isReferenceElement, keyMap, ReferenceElement } from '@speclynx/apidom-ns-asyncapi-2';
+import { isReferenceLikeElement, isBooleanJsonSchemaElement, isChannelItemElement, isReferenceElement, refract, refractReference, refractChannelItem } from '@speclynx/apidom-ns-asyncapi-2';
 import MaximumDereferenceDepthError from "../../../errors/MaximumDereferenceDepthError.mjs";
 import MaximumResolveDepthError from "../../../errors/MaximumResolveDepthError.mjs";
 import { AncestorLineage } from "../../util.mjs";
 import * as url from "../../../util/url.mjs";
 import parse from "../../../parse/index.mjs";
 import Reference from "../../../Reference.mjs";
-// @ts-ignore
-const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-
 // initialize element identity manager
 const identityManager = new IdentityManager();
 
-/**
- * Custom mutation replacer.
- * @public
- */
-export const mutationReplacer = (newElement, oldElement, key, parent) => {
-  if (isMemberElement(parent)) {
-    parent.value = newElement;
-  } else if (Array.isArray(parent)) {
-    parent[key] = newElement;
-  }
-};
-
 /**
  * @public
  */
@@ -99,21 +86,25 @@ class AsyncAPI2DereferenceVisitor {
     }
     return mutableReference;
   }
-  toAncestorLineage(ancestors) {
+  toAncestorLineage(path) {
     /**
      * Compute full ancestors lineage.
      * Ancestors are flatten to unwrap all Element instances.
      */
-    const directAncestors = new Set(ancestors.filter(isElement));
+    const ancestorNodes = path.getAncestorNodes();
+    const directAncestors = new Set(ancestorNodes.filter(isElement));
     const ancestorsLineage = new AncestorLineage(...this.ancestors, directAncestors);
     return [ancestorsLineage, directAncestors];
   }
-  async ReferenceElement(referencingElement, key, parent, path, ancestors, link) {
+  async ReferenceElement(path) {
+    const referencingElement = path.node;
+
     // skip current referencing element as it's already been access
     if (this.indirections.includes(referencingElement)) {
-      return false;
+      path.skip();
+      return;
     }
-    const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
+    const [ancestorsLineage, directAncestors] = this.toAncestorLineage(path);
     const retrievalURI = this.toBaseURI(toValue(referencingElement.$ref));
     const isInternalReference = url.stripHash(this.reference.uri) === retrievalURI;
     const isExternalReference = !isInternalReference;
@@ -121,12 +112,14 @@ class AsyncAPI2DereferenceVisitor {
     // ignore resolving internal Reference Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this reference and all it's child elements
-      return false;
+      path.skip();
+      return;
     }
     // ignore resolving external Reference Objects
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this reference and all it's child elements
-      return false;
+      path.skip();
+      return;
     }
     const reference = await this.toReference(toValue(referencingElement.$ref));
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
@@ -147,13 +140,14 @@ class AsyncAPI2DereferenceVisitor {
         referencedElement = this.refractCache.get(cacheKey);
       } else if (isReferenceLikeElement(referencedElement)) {
         // handling indirect references
-        referencedElement = ReferenceElement.refract(referencedElement);
-        referencedElement.setMetaProperty('referenced-element', referencedElementType);
+        referencedElement = refractReference(referencedElement);
+        referencedElement.meta.set('referenced-element', referencedElementType);
         this.refractCache.set(cacheKey, referencedElement);
       } else {
         // handling direct references
-        const ElementClass = this.namespace.getElementClass(referencedElementType);
-        referencedElement = ElementClass.refract(referencedElement);
+        referencedElement = refract(referencedElement, {
+          element: referencedElementType
+        });
         this.refractCache.set(cacheKey, referencedElement);
       }
     }
@@ -181,8 +175,9 @@ class AsyncAPI2DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : false;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -208,9 +203,8 @@ class AsyncAPI2DereferenceVisitor {
         refractCache: this.refractCache,
         ancestors: ancestorsLineage
       });
-      referencedElement = await visitAsync(referencedElement, visitor, {
-        keyMap,
-        nodeTypeGetter: getNodeType
+      referencedElement = await traverseAsync(referencedElement, visitor, {
+        mutable: true
       });
 
       // remove referencing reference from ancestors lineage
@@ -222,17 +216,17 @@ class AsyncAPI2DereferenceVisitor {
     if (isBooleanJsonSchemaElement(referencedElement)) {
       const booleanJsonSchemaElement = cloneDeep(referencedElement);
       // assign unique id to merged element
-      booleanJsonSchemaElement.setMetaProperty('id', identityManager.generateId());
+      booleanJsonSchemaElement.meta.set('id', identityManager.generateId());
       // annotate referenced element with info about original referencing element
-      booleanJsonSchemaElement.setMetaProperty('ref-fields', {
+      booleanJsonSchemaElement.meta.set('ref-fields', {
         $ref: toValue(referencingElement.$ref)
       });
       // annotate referenced element with info about origin
-      booleanJsonSchemaElement.setMetaProperty('ref-origin', reference.uri);
+      booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
-      link.replaceWith(booleanJsonSchemaElement, mutationReplacer);
-      return !parent ? booleanJsonSchemaElement : false;
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      path.replaceWith(booleanJsonSchemaElement);
+      return;
     }
 
     /**
@@ -240,37 +234,35 @@ class AsyncAPI2DereferenceVisitor {
      */
     const mergedElement = cloneShallow(referencedElement);
     // assign unique id to merged element
-    mergedElement.setMetaProperty('id', identityManager.generateId());
+    mergedElement.meta.set('id', identityManager.generateId());
     // annotate referenced element with info about original referencing element
-    mergedElement.setMetaProperty('ref-fields', {
+    mergedElement.meta.set('ref-fields', {
       $ref: toValue(referencingElement.$ref)
     });
     // annotate fragment with info about origin
-    mergedElement.setMetaProperty('ref-origin', reference.uri);
+    mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
 
     /**
      * Transclude referencing element with merged referenced element.
      */
-    link.replaceWith(mergedElement, mutationReplacer);
-
-    /**
-     * We're at the root of the tree, so we're just replacing the entire tree.
-     */
-    return !parent ? mergedElement : false;
+    path.replaceWith(mergedElement);
   }
-  async ChannelItemElement(referencingElement, key, parent, path, ancestors, link) {
+  async ChannelItemElement(path) {
+    const referencingElement = path.node;
+
     // ignore ChannelItemElement without $ref field
     if (!isStringElement(referencingElement.$ref)) {
-      return undefined;
+      return;
     }
 
     // skip current referencing element as it's already been access
     if (this.indirections.includes(referencingElement)) {
-      return false;
+      path.skip();
+      return;
     }
-    const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
+    const [ancestorsLineage, directAncestors] = this.toAncestorLineage(path);
     const retrievalURI = this.toBaseURI(toValue(referencingElement.$ref));
     const isInternalReference = url.stripHash(this.reference.uri) === retrievalURI;
     const isExternalReference = !isInternalReference;
@@ -278,12 +270,12 @@ class AsyncAPI2DereferenceVisitor {
     // ignore resolving internal Channel Item Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this channel item but traverse all it's child elements
-      return undefined;
+      return;
     }
     // ignore resolving external Channel Item Objects
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this channel item but traverse all it's child elements
-      return undefined;
+      return;
     }
     const reference = await this.toReference(toValue(referencingElement.$ref));
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
@@ -302,7 +294,7 @@ class AsyncAPI2DereferenceVisitor {
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
-        referencedElement = ChannelItemElement.refract(referencedElement);
+        referencedElement = refractChannelItem(referencedElement);
         this.refractCache.set(cacheKey, referencedElement);
       }
     }
@@ -330,8 +322,9 @@ class AsyncAPI2DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : undefined;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -357,9 +350,8 @@ class AsyncAPI2DereferenceVisitor {
         refractCache: this.refractCache,
         ancestors: ancestorsLineage
       });
-      referencedElement = await visitAsync(referencedElement, visitor, {
-        keyMap,
-        nodeTypeGetter: getNodeType
+      referencedElement = await traverseAsync(referencedElement, visitor, {
+        mutable: true
       });
 
       // remove referencing reference from ancestors lineage
@@ -371,9 +363,9 @@ class AsyncAPI2DereferenceVisitor {
      * Creating a new version of Channel Item by merging fields from referenced Channel Item with referencing one.
      */
     if (isChannelItemElement(referencedElement)) {
-      const mergedElement = new ChannelItemElement([...referencedElement.content], cloneDeep(referencedElement.meta), cloneDeep(referencedElement.attributes));
+      const mergedElement = cloneShallow(referencedElement);
       // assign unique id to merged element
-      mergedElement.setMetaProperty('id', identityManager.generateId());
+      mergedElement.meta.set('id', identityManager.generateId());
       // existing keywords from referencing ChannelItemElement overrides ones from referenced ChannelItemElement
       referencingElement.forEach((value, keyElement, item) => {
         mergedElement.remove(toValue(keyElement));
@@ -382,25 +374,20 @@ class AsyncAPI2DereferenceVisitor {
       mergedElement.remove('$ref');
 
       // annotate referenced element with info about original referencing element
-      mergedElement.setMetaProperty('ref-fields', {
+      mergedElement.meta.set('ref-fields', {
         $ref: toValue(referencingElement.$ref)
       });
       // annotate referenced with info about origin
-      mergedElement.setMetaProperty('ref-origin', reference.uri);
+      mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
       referencedElement = mergedElement;
     }
 
     /**
      * Transclude referencing element with merged referenced element.
      */
-    link.replaceWith(referencedElement, mutationReplacer);
-
-    /**
-     * We're at the root of the tree, so we're just replacing the entire tree.
-     */
-    return !parent ? referencedElement : undefined;
+    path.replaceWith(referencedElement);
   }
 }
 export default AsyncAPI2DereferenceVisitor;

package/src/dereference/strategies/openapi-2/index.cjs

@@ -4,16 +4,14 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomNsOpenapi = _interopRequireWildcard(require("@speclynx/apidom-ns-openapi-2"));
+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.OpenAPI2DereferenceVisitor = _visitor.default;
-// @ts-ignore
-const visitAsync = _apidomCore.visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
@@ -38,7 +36,7 @@ class OpenAPI2DereferenceStrategy extends _DereferenceStrategy.default {
     return (0, _apidomNsOpenapi.isSwaggerElement)(file.parseResult?.api);
   }
   async dereference(file, options) {
-    const namespace = (0, _apidomCore.createNamespace)(_apidomNsOpenapi.default);
+    const namespace = new _apidomDatamodel.Namespace().use(_apidomNsOpenapi.default);
     const immutableRefSet = options.dereference.refSet ?? new _ReferenceSet.default();
     const mutableRefSet = new _ReferenceSet.default();
     let refSet = immutableRefSet;
@@ -61,7 +59,7 @@ class OpenAPI2DereferenceStrategy 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;
@@ -71,9 +69,8 @@ class OpenAPI2DereferenceStrategy extends _DereferenceStrategy.default {
       namespace,
       options
     });
-    const dereferencedElement = await visitAsync(refSet.rootRef.value, visitor, {
-      keyMap: _apidomNsOpenapi.keyMap,
-      nodeTypeGetter: _apidomNsOpenapi.getNodeType
+    const dereferencedElement = await (0, _apidomTraverse.traverseAsync)(refSet.rootRef.value, visitor, {
+      mutable: true
     });
 
     /**

package/src/dereference/strategies/openapi-2/index.mjs

@@ -1,16 +1,13 @@
-import { createNamespace, visit, cloneDeep } from '@speclynx/apidom-core';
-import openApi2Namespace, { getNodeType, isSwaggerElement, keyMap, mediaTypes } from '@speclynx/apidom-ns-openapi-2';
+import { Namespace, cloneDeep } from '@speclynx/apidom-datamodel';
+import openApi2Namespace, { isSwaggerElement, mediaTypes } from '@speclynx/apidom-ns-openapi-2';
+import { traverseAsync } from '@speclynx/apidom-traverse';
 import DereferenceStrategy from "../DereferenceStrategy.mjs";
 import Reference from "../../../Reference.mjs";
 import ReferenceSet from "../../../ReferenceSet.mjs";
 import OpenAPI2DereferenceVisitor from "./visitor.mjs";
-// @ts-ignore
-const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
-
 /**
  * @public
  */
@@ -31,7 +28,7 @@ class OpenAPI2DereferenceStrategy extends DereferenceStrategy {
     return isSwaggerElement(file.parseResult?.api);
   }
   async dereference(file, options) {
-    const namespace = createNamespace(openApi2Namespace);
+    const namespace = new Namespace().use(openApi2Namespace);
     const immutableRefSet = options.dereference.refSet ?? new ReferenceSet();
     const mutableRefSet = new ReferenceSet();
     let refSet = immutableRefSet;
@@ -64,9 +61,8 @@ class OpenAPI2DereferenceStrategy extends DereferenceStrategy {
       namespace,
       options
     });
-    const dereferencedElement = await visitAsync(refSet.rootRef.value, visitor, {
-      keyMap,
-      nodeTypeGetter: getNodeType
+    const dereferencedElement = await traverseAsync(refSet.rootRef.value, visitor, {
+      mutable: true
     });
 
     /**