@speclynx/apidom-reference 1.12.1 → 2.0.1

package/src/dereference/strategies/openapi-3-0/visitor.mjs

@@ -1,33 +1,20 @@
 import { propEq } from 'ramda';
 import { isUndefined } from 'ramda-adjunct';
-import { isPrimitiveElement, isStringElement, isMemberElement, isElement, IdentityManager, visit, find, cloneShallow, cloneDeep, toValue, RefElement } from '@speclynx/apidom-core';
+import { isPrimitiveElement, isStringElement, isElement, RefElement, cloneShallow, cloneDeep } from '@speclynx/apidom-datamodel';
+import { IdentityManager, toValue } from '@speclynx/apidom-core';
 import { ApiDOMError } from '@speclynx/apidom-error';
+import { traverseAsync, find } from '@speclynx/apidom-traverse';
 import { evaluate, URIFragmentIdentifier } from '@speclynx/apidom-json-pointer';
-import { getNodeType, keyMap, ReferenceElement, OperationElement, PathItemElement, isReferenceElement, isOperationElement, isPathItemElement, isReferenceLikeElement } from '@speclynx/apidom-ns-openapi-3-0';
+import { isReferenceElement, isOperationElement, isPathItemElement, isReferenceLikeElement, refract, refractReference, refractPathItem, refractOperation } from '@speclynx/apidom-ns-openapi-3-0';
 import MaximumDereferenceDepthError from "../../../errors/MaximumDereferenceDepthError.mjs";
 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 { AncestorLineage } from "../../util.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
  */
@@ -100,21 +87,25 @@ class OpenAPI3_0DereferenceVisitor {
     }
     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;
@@ -122,12 +113,14 @@ class OpenAPI3_0DereferenceVisitor {
     // ignore resolving internal Reference Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this reference element
-      return false;
+      path.skip();
+      return;
     }
     // ignore resolving external Reference Objects
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this reference element
-      return false;
+      path.skip();
+      return;
     }
     const reference = await this.toReference(toValue(referencingElement.$ref));
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
@@ -148,13 +141,14 @@ class OpenAPI3_0DereferenceVisitor {
         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);
       }
     }
@@ -182,8 +176,9 @@ class OpenAPI3_0DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : false;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -209,9 +204,8 @@ class OpenAPI3_0DereferenceVisitor {
         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
@@ -224,37 +218,35 @@ class OpenAPI3_0DereferenceVisitor {
      */
     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 PathItemElement(referencingElement, key, parent, path, ancestors, link) {
+  async PathItemElement(path) {
+    const referencingElement = path.node;
+
     // ignore PathItemElement 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;
@@ -262,12 +254,12 @@ class OpenAPI3_0DereferenceVisitor {
     // ignore resolving internal Path Item Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this Path Item element but traverse all it's child elements
-      return undefined;
+      return;
     }
     // ignore resolving external Path Item Objects
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this Path Item element 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));
@@ -286,7 +278,7 @@ class OpenAPI3_0DereferenceVisitor {
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
-        referencedElement = PathItemElement.refract(referencedElement);
+        referencedElement = refractPathItem(referencedElement);
         this.refractCache.set(cacheKey, referencedElement);
       }
     }
@@ -314,8 +306,9 @@ class OpenAPI3_0DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : undefined;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -341,9 +334,8 @@ class OpenAPI3_0DereferenceVisitor {
         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
@@ -355,9 +347,9 @@ class OpenAPI3_0DereferenceVisitor {
      * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
      */
     if (isPathItemElement(referencedElement)) {
-      const mergedElement = new PathItemElement([...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 PathItemElement overrides ones from referenced element
       referencingElement.forEach((value, keyElement, item) => {
         mergedElement.remove(toValue(keyElement));
@@ -366,30 +358,27 @@ class OpenAPI3_0DereferenceVisitor {
       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 element 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);
   }
-  async LinkElement(linkElement, key, parent, path, ancestors, link) {
+  async LinkElement(path) {
+    const linkElement = path.node;
+
     // ignore LinkElement without operationRef or operationId field
     if (!isStringElement(linkElement.operationRef) && !isStringElement(linkElement.operationId)) {
-      return undefined;
+      return;
     }
 
     // operationRef and operationId fields are mutually exclusive
@@ -407,12 +396,12 @@ class OpenAPI3_0DereferenceVisitor {
       // ignore resolving internal Operation Object reference
       if (!this.options.resolve.internal && isInternalReference) {
         // skip traversing this Link element but traverse all it's child elements
-        return undefined;
+        return;
       }
       // ignore resolving external Operation Object reference
       if (!this.options.resolve.external && isExternalReference) {
         // skip traversing this Link element but traverse all it's child elements
-        return undefined;
+        return;
       }
       const reference = await this.toReference(toValue(linkElement.operationRef));
       operationElement = evaluate(reference.value.result, jsonPointer);
@@ -422,31 +411,27 @@ class OpenAPI3_0DereferenceVisitor {
         if (this.refractCache.has(cacheKey)) {
           operationElement = this.refractCache.get(cacheKey);
         } else {
-          operationElement = OperationElement.refract(operationElement);
+          operationElement = refractOperation(operationElement);
           this.refractCache.set(cacheKey, operationElement);
         }
       }
       // create shallow clone to be able to annotate with metadata
       operationElement = cloneShallow(operationElement);
       // annotate operation element with info about origin
-      operationElement.setMetaProperty('ref-origin', reference.uri);
+      operationElement.meta.set('ref-origin', reference.uri);
       const linkElementCopy = cloneShallow(linkElement);
       linkElementCopy.operationRef?.meta.set('operation', operationElement);
 
       /**
        * Transclude Link Object containing Operation Object in its meta.
        */
-      link.replaceWith(linkElementCopy, mutationReplacer);
-
-      /**
-       * We're at the root of the tree, so we're just replacing the entire tree.
-       */
-      return !parent ? linkElementCopy : undefined;
+      path.replaceWith(linkElementCopy);
+      return;
     }
     if (isStringElement(linkElement.operationId)) {
       const operationId = toValue(linkElement.operationId);
       const reference = await this.toReference(url.unsanitize(this.reference.uri));
-      operationElement = find(e => isOperationElement(e) && isElement(e.operationId) && e.operationId.equals(operationId), reference.value.result);
+      operationElement = find(reference.value.result, e => isOperationElement(e) && isElement(e.operationId) && e.operationId.equals(operationId));
       // OperationElement not found by its operationId
       if (isUndefined(operationElement)) {
         throw new ApiDOMError(`OperationElement(operationId=${operationId}) not found.`);
@@ -457,19 +442,16 @@ class OpenAPI3_0DereferenceVisitor {
       /**
        * Transclude Link Object containing Operation Object in its meta.
        */
-      link.replaceWith(linkElementCopy, mutationReplacer);
-
-      /**
-       * We're at the root of the tree, so we're just replacing the entire tree.
-       */
-      return !parent ? linkElementCopy : undefined;
+      path.replaceWith(linkElementCopy);
+      return;
     }
-    return undefined;
   }
-  async ExampleElement(exampleElement, key, parent, path, ancestors, link) {
+  async ExampleElement(path) {
+    const exampleElement = path.node;
+
     // ignore ExampleElement without externalValue field
     if (!isStringElement(exampleElement.externalValue)) {
-      return undefined;
+      return;
     }
 
     // value and externalValue fields are mutually exclusive
@@ -483,31 +465,26 @@ class OpenAPI3_0DereferenceVisitor {
     // ignore resolving external Example Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this Example element but traverse all it's child elements
-      return undefined;
+      return;
     }
     // ignore resolving external Example Objects
     if (!this.options.resolve.external && isExternalReference) {
       // skip traversing this Example element but traverse all it's child elements
-      return undefined;
+      return;
     }
     const reference = await this.toReference(toValue(exampleElement.externalValue));
 
     // shallow clone of the referenced element
     const valueElement = cloneShallow(reference.value.result);
     // annotate operation element with info about origin
-    valueElement.setMetaProperty('ref-origin', reference.uri);
+    valueElement.meta.set('ref-origin', reference.uri);
     const exampleElementCopy = cloneShallow(exampleElement);
     exampleElementCopy.value = valueElement;
 
     /**
      * Transclude Example Object containing external value.
      */
-    link.replaceWith(exampleElementCopy, mutationReplacer);
-
-    /**
-     * We're at the root of the tree, so we're just replacing the entire tree.
-     */
-    return !parent ? exampleElementCopy : undefined;
+    path.replaceWith(exampleElementCopy);
   }
 }
 export default OpenAPI3_0DereferenceVisitor;

package/src/dereference/strategies/openapi-3-1/index.cjs

@@ -5,7 +5,8 @@ var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopReq
 exports.__esModule = true;
 exports.resolveSchema$refField = exports.resolveSchema$idField = exports.maybeRefractToSchemaElement = exports.default = void 0;
 var _ramda = require("ramda");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _apidomNsOpenapi = _interopRequireWildcard(require("@speclynx/apidom-ns-openapi-3-1"));
 var _DereferenceStrategy = _interopRequireDefault(require("../DereferenceStrategy.cjs"));
 var _Reference = _interopRequireDefault(require("../../../Reference.cjs"));
@@ -16,9 +17,6 @@ var _util = require("./util.cjs");
 exports.resolveSchema$refField = _util.resolveSchema$refField;
 exports.resolveSchema$idField = _util.resolveSchema$idField;
 exports.maybeRefractToSchemaElement = _util.maybeRefractToSchemaElement;
-// @ts-ignore
-const visitAsync = _apidomCore.visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
@@ -43,7 +41,7 @@ class OpenAPI3_1DereferenceStrategy extends _DereferenceStrategy.default {
     return (0, _apidomNsOpenapi.isOpenApi3_1Element)(file.parseResult?.result);
   }
   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;
@@ -66,7 +64,7 @@ class OpenAPI3_1DereferenceStrategy 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;
@@ -76,9 +74,8 @@ class OpenAPI3_1DereferenceStrategy 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-3-1/index.mjs

@@ -1,17 +1,14 @@
 import { propEq } from 'ramda';
-import { createNamespace, visit, cloneDeep } from '@speclynx/apidom-core';
-import openApi3_1Namespace, { getNodeType, isOpenApi3_1Element, keyMap, mediaTypes } from '@speclynx/apidom-ns-openapi-3-1';
+import { Namespace, cloneDeep } from '@speclynx/apidom-datamodel';
+import { traverseAsync } from '@speclynx/apidom-traverse';
+import openApi3_1Namespace, { isOpenApi3_1Element, mediaTypes } from '@speclynx/apidom-ns-openapi-3-1';
 import DereferenceStrategy from "../DereferenceStrategy.mjs";
 import Reference from "../../../Reference.mjs";
 import ReferenceSet from "../../../ReferenceSet.mjs";
 import OpenAPI3_1DereferenceVisitor from "./visitor.mjs";
-// @ts-ignore
-const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-
 /**
  * @public
  */
-
 /**
  * @public
  */
@@ -32,7 +29,7 @@ class OpenAPI3_1DereferenceStrategy extends DereferenceStrategy {
     return isOpenApi3_1Element(file.parseResult?.result);
   }
   async dereference(file, options) {
-    const namespace = createNamespace(openApi3_1Namespace);
+    const namespace = new Namespace().use(openApi3_1Namespace);
     const immutableRefSet = options.dereference.refSet ?? new ReferenceSet();
     const mutableRefSet = new ReferenceSet();
     let refSet = immutableRefSet;
@@ -65,9 +62,8 @@ class OpenAPI3_1DereferenceStrategy 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
     });
 
     /**

package/src/dereference/strategies/openapi-3-1/selectors/$anchor.cjs

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.uriToAnchor = exports.parse = exports.isAnchor = exports.evaluate = exports.JsonSchema$anchorError = void 0;
 var _ramdaAdjunct = require("ramda-adjunct");
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-1");
 var _url = require("../../../../util/url.cjs");
 var _EvaluationJsonSchema$anchorError = _interopRequireDefault(require("../../../../errors/EvaluationJsonSchema$anchorError.cjs"));
@@ -55,7 +56,7 @@ const evaluate = (anchor, element) => {
   const token = parse(anchor);
 
   // @ts-ignore
-  const result = (0, _apidomCore.find)(e => (0, _apidomNsOpenapi.isSchemaElement)(e) && (0, _apidomCore.toValue)(e.$anchor) === token, element);
+  const result = (0, _apidomTraverse.find)(element, e => (0, _apidomNsOpenapi.isSchemaElement)(e) && (0, _apidomCore.toValue)(e.$anchor) === token);
   if ((0, _ramdaAdjunct.isUndefined)(result)) {
     throw new _EvaluationJsonSchema$anchorError.default(`Evaluation failed on token: "${token}"`);
   }

package/src/dereference/strategies/openapi-3-1/selectors/$anchor.mjs

@@ -1,5 +1,6 @@
 import { trimCharsStart, isUndefined } from 'ramda-adjunct';
-import { find, toValue } from '@speclynx/apidom-core';
+import { toValue } from '@speclynx/apidom-core';
+import { find } from '@speclynx/apidom-traverse';
 import { isSchemaElement } from '@speclynx/apidom-ns-openapi-3-1';
 import { getHash } from "../../../../util/url.mjs";
 import EvaluationJsonSchema$anchorError from "../../../../errors/EvaluationJsonSchema$anchorError.mjs";
@@ -43,7 +44,7 @@ export const evaluate = (anchor, element) => {
   const token = parse(anchor);
 
   // @ts-ignore
-  const result = find(e => isSchemaElement(e) && toValue(e.$anchor) === token, element);
+  const result = find(element, e => isSchemaElement(e) && toValue(e.$anchor) === token);
   if (isUndefined(result)) {
     throw new EvaluationJsonSchema$anchorError(`Evaluation failed on token: "${token}"`);
   }

package/src/dereference/strategies/openapi-3-1/selectors/uri.cjs

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopReq
 exports.__esModule = true;
 exports.evaluate = exports.JsonSchemaUriError = void 0;
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-1");
 var _apidomJsonPointer = require("@speclynx/apidom-json-pointer");
 var url = _interopRequireWildcard(require("../../../../util/url.cjs"));
@@ -28,7 +28,7 @@ const evaluate = (uri, element) => {
 
   // warm the cache
   if (!cache.has(element)) {
-    const schemaObjectElements = (0, _apidomCore.filter)(isSchemaElementWith$id, element);
+    const schemaObjectElements = (0, _apidomTraverse.filter)(element, isSchemaElementWith$id);
     cache.set(element, Array.from(schemaObjectElements));
   }
 

package/src/dereference/strategies/openapi-3-1/selectors/uri.mjs

@@ -1,5 +1,5 @@
 import { isUndefined } from 'ramda-adjunct';
-import { filter } from '@speclynx/apidom-core';
+import { filter } from '@speclynx/apidom-traverse';
 import { isSchemaElement } from '@speclynx/apidom-ns-openapi-3-1';
 import { URIFragmentIdentifier, evaluate as jsonPointerEvaluate } from '@speclynx/apidom-json-pointer';
 import * as url from "../../../../util/url.mjs";
@@ -19,7 +19,7 @@ export const evaluate = (uri, element) => {
 
   // warm the cache
   if (!cache.has(element)) {
-    const schemaObjectElements = filter(isSchemaElementWith$id, element);
+    const schemaObjectElements = filter(element, isSchemaElementWith$id);
     cache.set(element, Array.from(schemaObjectElements));
   }
 

package/src/dereference/strategies/openapi-3-1/util.cjs

@@ -4,6 +4,7 @@ var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopReq
 exports.__esModule = true;
 exports.resolveSchema$refField = exports.resolveSchema$idField = exports.refractToSchemaElement = exports.maybeRefractToSchemaElement = void 0;
 var _ramda = require("ramda");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-1");
 var url = _interopRequireWildcard(require("../../../util/url.cjs"));
@@ -44,7 +45,7 @@ const refractToSchemaElement = element => {
   if (refractToSchemaElement.cache.has(element)) {
     return refractToSchemaElement.cache.get(element);
   }
-  const refracted = _apidomNsOpenapi.SchemaElement.refract(element);
+  const refracted = (0, _apidomNsOpenapi.refractSchema)(element);
   refractToSchemaElement.cache.set(element, refracted);
   return refracted;
 };
@@ -59,7 +60,7 @@ const maybeRefractToSchemaElement = element => {
    * Conditional version of refractToSchemaElement, that acts as an identity
    * function for all non-primitive Element instances.
    */
-  if ((0, _apidomCore.isPrimitiveElement)(element)) {
+  if ((0, _apidomDatamodel.isPrimitiveElement)(element)) {
     return refractToSchemaElement(element);
   }
   return element;

package/src/dereference/strategies/openapi-3-1/util.mjs

@@ -1,6 +1,7 @@
 import { reduce } from 'ramda';
-import { isPrimitiveElement, toValue } from '@speclynx/apidom-core';
-import { SchemaElement } from '@speclynx/apidom-ns-openapi-3-1';
+import { isPrimitiveElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { refractSchema } from '@speclynx/apidom-ns-openapi-3-1';
 import * as url from "../../../util/url.mjs";
 /**
  * @public
@@ -37,7 +38,7 @@ export const refractToSchemaElement = element => {
   if (refractToSchemaElement.cache.has(element)) {
     return refractToSchemaElement.cache.get(element);
   }
-  const refracted = SchemaElement.refract(element);
+  const refracted = refractSchema(element);
   refractToSchemaElement.cache.set(element, refracted);
   return refracted;
 };