@speclynx/apidom-reference 1.12.2 → 2.1.0

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

@@ -1,9 +1,11 @@
 import { propEq, none } from 'ramda';
 import { isUndefined } from 'ramda-adjunct';
-import { isElement, isPrimitiveElement, isStringElement, isMemberElement, isObjectElement, IdentityManager, visit, find, cloneShallow, cloneDeep, toValue, RefElement } from '@speclynx/apidom-core';
+import { isElement, isPrimitiveElement, isStringElement, isObjectElement, 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 as jsonPointerEvaluate, URIFragmentIdentifier } from '@speclynx/apidom-json-pointer';
-import { getNodeType, isReferenceLikeElement, keyMap, ReferenceElement, PathItemElement, OperationElement, SchemaElement, isPathItemElement, isReferenceElement, isSchemaElement, isOperationElement, isBooleanJsonSchemaElement } from '@speclynx/apidom-ns-openapi-3-1';
+import { isReferenceLikeElement, isPathItemElement, isReferenceElement, isSchemaElement, isOperationElement, isBooleanJsonSchemaElement, refract, refractReference, refractPathItem, refractOperation } from '@speclynx/apidom-ns-openapi-3-1';
 import { isAnchor, uriToAnchor, evaluate as $anchorEvaluate } from "./selectors/$anchor.mjs";
 import { evaluate as uriEvaluate } from "./selectors/uri.mjs";
 import MaximumDereferenceDepthError from "../../../errors/MaximumDereferenceDepthError.mjs";
@@ -15,24 +17,9 @@ import File from "../../../File.mjs";
 import { resolveSchema$refField, maybeRefractToSchemaElement } from "./util.mjs";
 import { AncestorLineage } from "../../util.mjs";
 import EvaluationJsonSchemaUriError from "../../../errors/EvaluationJsonSchemaUriError.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
  */
@@ -105,21 +92,25 @@ class OpenAPI3_1DereferenceVisitor {
     }
     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;
@@ -127,12 +118,14 @@ class OpenAPI3_1DereferenceVisitor {
     // ignore resolving internal Reference Objects
     if (!this.options.resolve.internal && isInternalReference) {
       // skip traversing this reference element 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 element 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));
@@ -151,13 +144,14 @@ class OpenAPI3_1DereferenceVisitor {
         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);
       }
     }
@@ -185,8 +179,9 @@ class OpenAPI3_1DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : false;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -212,9 +207,8 @@ class OpenAPI3_1DereferenceVisitor {
         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
@@ -227,9 +221,9 @@ class OpenAPI3_1DereferenceVisitor {
      */
     const mergedElement = cloneShallow(referencedElement);
     // assign unique id to merged element
-    mergedElement.setMetaProperty('id', identityManager.generateId());
+    mergedElement.meta.set('id', identityManager.generateId());
     // annotate fragment with info about original Reference element
-    mergedElement.setMetaProperty('ref-fields', {
+    mergedElement.meta.set('ref-fields', {
       $ref: toValue(referencingElement.$ref),
       // @ts-ignore
       description: toValue(referencingElement.description),
@@ -237,9 +231,9 @@ class OpenAPI3_1DereferenceVisitor {
       summary: toValue(referencingElement.summary)
     });
     // 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)));
 
     // override description and summary (outer has higher priority then inner)
     if (isObjectElement(referencedElement) && isObjectElement(mergedElement)) {
@@ -256,37 +250,35 @@ class OpenAPI3_1DereferenceVisitor {
     /**
      * 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;
 
-    // ignore resolving external Path Item Objects
+    // 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));
@@ -305,7 +297,7 @@ class OpenAPI3_1DereferenceVisitor {
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
-        referencedElement = PathItemElement.refract(referencedElement);
+        referencedElement = refractPathItem(referencedElement);
         this.refractCache.set(cacheKey, referencedElement);
       }
     }
@@ -333,8 +325,9 @@ class OpenAPI3_1DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : false;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -360,9 +353,8 @@ class OpenAPI3_1DereferenceVisitor {
         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
@@ -374,9 +366,9 @@ class OpenAPI3_1DereferenceVisitor {
      * 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));
@@ -385,30 +377,27 @@ class OpenAPI3_1DereferenceVisitor {
       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
@@ -426,12 +415,12 @@ class OpenAPI3_1DereferenceVisitor {
       // 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 = jsonPointerEvaluate(reference.value.result, jsonPointer);
@@ -441,31 +430,27 @@ class OpenAPI3_1DereferenceVisitor {
         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.`);
@@ -476,19 +461,15 @@ class OpenAPI3_1DereferenceVisitor {
       /**
        * 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 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
@@ -502,43 +483,41 @@ class OpenAPI3_1DereferenceVisitor {
     // ignore resolving internal 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);
   }
-  async SchemaElement(referencingElement, key, parent, path, ancestors, link) {
+  async SchemaElement(path) {
+    const referencingElement = path.node;
+
     // skip current referencing schema as $ref keyword was not defined
     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);
 
     // compute baseURI using rules around $id and $ref keywords
     let reference = await this.toReference(url.unsanitize(this.reference.uri));
@@ -571,12 +550,12 @@ class OpenAPI3_1DereferenceVisitor {
         // ignore resolving internal Schema Objects
         if (!this.options.resolve.internal && isInternalReference) {
           // skip traversing this schema element but traverse all it's child elements
-          return undefined;
+          return;
         }
         // ignore resolving external Schema Objects
         if (!this.options.resolve.external && isExternalReference) {
           // skip traversing this schema element but traverse all it's child elements
-          return undefined;
+          return;
         }
       } else {
         // we're assuming here that we're dealing with JSON Pointer here
@@ -587,12 +566,12 @@ class OpenAPI3_1DereferenceVisitor {
         // ignore resolving internal Schema Objects
         if (!this.options.resolve.internal && isInternalReference) {
           // skip traversing this schema element but traverse all it's child elements
-          return undefined;
+          return;
         }
         // ignore resolving external Schema Objects
         if (!this.options.resolve.external && isExternalReference) {
           // skip traversing this schema element but traverse all it's child elements
-          return undefined;
+          return;
         }
         reference = await this.toReference(url.unsanitize($refBaseURI));
         const selector = URIFragmentIdentifier.fromURIReference($refBaseURI);
@@ -615,12 +594,12 @@ class OpenAPI3_1DereferenceVisitor {
           // ignore resolving internal Schema Objects
           if (!this.options.resolve.internal && isInternalReference) {
             // skip traversing this schema element but traverse all it's child elements
-            return undefined;
+            return;
           }
           // ignore resolving external Schema Objects
           if (!this.options.resolve.external && isExternalReference) {
             // skip traversing this schema element but traverse all it's child elements
-            return undefined;
+            return;
           }
           reference = await this.toReference(url.unsanitize($refBaseURI));
           const selector = uriToAnchor($refBaseURI);
@@ -637,12 +616,12 @@ class OpenAPI3_1DereferenceVisitor {
           // ignore resolving internal Schema Objects
           if (!this.options.resolve.internal && isInternalReference) {
             // skip traversing this schema element but traverse all it's child elements
-            return undefined;
+            return;
           }
           // ignore resolving external Schema Objects
           if (!this.options.resolve.external && isExternalReference) {
             // skip traversing this schema element but traverse all it's child elements
-            return undefined;
+            return;
           }
           reference = await this.toReference(url.unsanitize($refBaseURI));
           const selector = URIFragmentIdentifier.fromURIReference($refBaseURI);
@@ -679,8 +658,9 @@ class OpenAPI3_1DereferenceVisitor {
         });
         const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
         const replacement = replacer(refElement);
-        link.replaceWith(replacement, mutationReplacer);
-        return !parent ? replacement : false;
+        this.indirections.pop();
+        path.replaceWith(replacement);
+        return;
       }
     }
 
@@ -706,9 +686,8 @@ class OpenAPI3_1DereferenceVisitor {
         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
@@ -720,26 +699,26 @@ class OpenAPI3_1DereferenceVisitor {
     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;
     }
 
     /**
      * Creating a new version of Schema Object by merging fields from referenced Schema Object with referencing one.
      */
     if (isSchemaElement(referencedElement)) {
-      const mergedElement = new SchemaElement([...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 schema overrides ones from referenced schema
       referencingElement.forEach((value, keyElement, item) => {
         mergedElement.remove(toValue(keyElement));
@@ -747,24 +726,19 @@ class OpenAPI3_1DereferenceVisitor {
       });
       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 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)));
       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 OpenAPI3_1DereferenceVisitor;

package/src/dereference/util.cjs

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 exports.AncestorLineage = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 /**
  * @public
  */
@@ -20,7 +20,7 @@ class AncestorLineage extends Array {
   findItem(predicate) {
     for (const set of this) {
       for (const item of set) {
-        if ((0, _apidomCore.isElement)(item) && predicate(item)) {
+        if ((0, _apidomDatamodel.isElement)(item) && predicate(item)) {
           return item;
         }
       }

package/src/dereference/util.mjs

@@ -1,4 +1,4 @@
-import { isElement } from '@speclynx/apidom-core';
+import { isElement } from '@speclynx/apidom-datamodel';
 
 /**
  * @public

package/src/parse/parsers/apidom-json/index.cjs

@@ -3,7 +3,7 @@
 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 _ParserError = _interopRequireDefault(require("../../../errors/ParserError.cjs"));
 var _Parser = _interopRequireDefault(require("../Parser.cjs"));
 /**
@@ -20,7 +20,7 @@ class ApiDOMJSONParser extends _Parser.default {
     const {
       fileExtensions = [],
       mediaTypes = ['application/vnd.apidom', 'application/vnd.apidom+json'],
-      namespace = _apidomCore.namespace,
+      namespace = new _apidomDatamodel.Namespace(),
       ...rest
     } = options ?? {};
     super({
@@ -51,13 +51,13 @@ class ApiDOMJSONParser extends _Parser.default {
 
     // allow empty files
     if (this.allowEmpty && source.trim() === '') {
-      return new _apidomCore.ParseResultElement();
+      return new _apidomDatamodel.ParseResultElement();
     }
     try {
       const element = namespace.fromRefract(JSON.parse(source));
-      if (!(0, _apidomCore.isParseResultElement)(element)) {
+      if (!(0, _apidomDatamodel.isParseResultElement)(element)) {
         element.classes.push('result');
-        return new _apidomCore.ParseResultElement([element]);
+        return new _apidomDatamodel.ParseResultElement([element]);
       }
       return element;
     } catch (error) {

package/src/parse/parsers/apidom-json/index.mjs

@@ -1,4 +1,4 @@
-import { ParseResultElement, isParseResultElement, namespace as baseNamespace } from '@speclynx/apidom-core';
+import { Namespace, ParseResultElement, isParseResultElement } from '@speclynx/apidom-datamodel';
 import ParserError from "../../../errors/ParserError.mjs";
 import Parser from "../Parser.mjs";
 /**
@@ -14,7 +14,7 @@ class ApiDOMJSONParser extends Parser {
     const {
       fileExtensions = [],
       mediaTypes = ['application/vnd.apidom', 'application/vnd.apidom+json'],
-      namespace = baseNamespace,
+      namespace = new Namespace(),
       ...rest
     } = options ?? {};
     super({

package/src/parse/parsers/arazzo-json-1/index.cjs

@@ -15,7 +15,6 @@ var _Parser = _interopRequireDefault(require("../Parser.cjs"));
  * @public
  */
 class ArazzoJSON1Parser extends _Parser.default {
-  syntacticAnalysis;
   refractorOpts;
   constructor(options) {
     const {
@@ -43,7 +42,7 @@ class ArazzoJSON1Parser extends _Parser.default {
   async parse(file) {
     const source = file.toString();
     try {
-      const parserOpts = (0, _ramda.pick)(['sourceMap', 'syntacticAnalysis', 'refractorOpts'], this);
+      const parserOpts = (0, _ramda.pick)(['sourceMap', 'refractorOpts'], this);
       return await (0, _apidomParserAdapterArazzoJson.parse)(source, parserOpts);
     } catch (error) {
       throw new _ParserError.default(`Error parsing "${file.uri}"`, {