@speclynx/apidom-reference 2.13.0 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@speclynx/apidom-reference",
-  "version": "2.13.0",
+  "version": "3.0.0",
   "description": "Advanced algorithms for semantic ApiDOM manipulations like dereferencing or resolution.",
   "publishConfig": {
     "access": "public",
@@ -231,29 +231,29 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@speclynx/apidom-core": "2.13.0",
-    "@speclynx/apidom-datamodel": "2.13.0",
-    "@speclynx/apidom-error": "2.13.0",
-    "@speclynx/apidom-json-pointer": "2.13.0",
-    "@speclynx/apidom-ns-arazzo-1": "2.13.0",
-    "@speclynx/apidom-ns-asyncapi-2": "2.13.0",
-    "@speclynx/apidom-ns-json-schema-2020-12": "2.13.0",
-    "@speclynx/apidom-ns-openapi-2": "2.13.0",
-    "@speclynx/apidom-ns-openapi-3-0": "2.13.0",
-    "@speclynx/apidom-ns-openapi-3-1": "2.13.0",
-    "@speclynx/apidom-parser-adapter-arazzo-json-1": "2.13.0",
-    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "2.13.0",
-    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "2.13.0",
-    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "2.13.0",
-    "@speclynx/apidom-parser-adapter-json": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-2": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "2.13.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "2.13.0",
-    "@speclynx/apidom-parser-adapter-yaml-1-2": "2.13.0",
-    "@speclynx/apidom-traverse": "2.13.0",
+    "@speclynx/apidom-core": "3.0.0",
+    "@speclynx/apidom-datamodel": "3.0.0",
+    "@speclynx/apidom-error": "3.0.0",
+    "@speclynx/apidom-json-pointer": "3.0.0",
+    "@speclynx/apidom-ns-arazzo-1": "3.0.0",
+    "@speclynx/apidom-ns-asyncapi-2": "3.0.0",
+    "@speclynx/apidom-ns-json-schema-2020-12": "3.0.0",
+    "@speclynx/apidom-ns-openapi-2": "3.0.0",
+    "@speclynx/apidom-ns-openapi-3-0": "3.0.0",
+    "@speclynx/apidom-ns-openapi-3-1": "3.0.0",
+    "@speclynx/apidom-parser-adapter-arazzo-json-1": "3.0.0",
+    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "3.0.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "3.0.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "3.0.0",
+    "@speclynx/apidom-parser-adapter-json": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-2": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "3.0.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "3.0.0",
+    "@speclynx/apidom-parser-adapter-yaml-1-2": "3.0.0",
+    "@speclynx/apidom-traverse": "3.0.0",
     "@swaggerexpert/arazzo-runtime-expression": "^2.0.3",
     "axios": "^1.13.5",
     "picomatch": "^4.0.3",
@@ -275,5 +275,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "3c92eda7e227426c3a40c918c418c14dc20fca7e"
+  "gitHead": "cb94ec84ea789d121801065876e7a91799a363d0"
 }

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

@@ -9,7 +9,16 @@ 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.hasMetaProperty('id') && (0, _apidomDatamodel.isStringElement)(element.meta.id);
+const getElementID = element => {
+  const id = element.meta.get('id');
+  // handle both raw string (new format) and StringElement (legacy Refract without __meta_raw__)
+  return (0, _apidomDatamodel.isElement)(id) ? (0, _apidomCore.toValue)(id) : id;
+};
+const hasElementID = element => {
+  if (!element.hasMetaProperty('id')) return false;
+  const id = getElementID(element);
+  return typeof id === 'string' && id !== '';
+};
 
 /**
  * Evaluates element ID against ApiDOM fragment.
@@ -27,7 +36,7 @@ const evaluate = (elementID, element) => {
 
   // search for the matching element
   const result = cache.get(element).find(e => {
-    return String((0, _apidomCore.toValue)(e.id)) === elementID;
+    return getElementID(e) === elementID;
   });
   if ((0, _ramdaAdjunct.isUndefined)(result)) {
     throw new _EvaluationElementIdError.default(`Evaluation failed on element ID: "${elementID}"`);

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

@@ -1,9 +1,18 @@
 import { isUndefined } from 'ramda-adjunct';
-import { isStringElement } from '@speclynx/apidom-datamodel';
+import { isElement } 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.hasMetaProperty('id') && isStringElement(element.meta.id);
+const getElementID = element => {
+  const id = element.meta.get('id');
+  // handle both raw string (new format) and StringElement (legacy Refract without __meta_raw__)
+  return isElement(id) ? toValue(id) : id;
+};
+const hasElementID = element => {
+  if (!element.hasMetaProperty('id')) return false;
+  const id = getElementID(element);
+  return typeof id === 'string' && id !== '';
+};
 
 /**
  * Evaluates element ID against ApiDOM fragment.
@@ -21,7 +30,7 @@ export const evaluate = (elementID, element) => {
 
   // search for the matching element
   const result = cache.get(element).find(e => {
-    return String(toValue(e.id)) === elementID;
+    return getElementID(e) === elementID;
   });
   if (isUndefined(result)) {
     throw new EvaluationElementIdError(`Evaluation failed on element ID: "${elementID}"`);

package/src/dereference/strategies/arazzo-1/source-descriptions.cjs

@@ -27,8 +27,8 @@ async function dereferenceSourceDescription(sourceDescription, ctx) {
 
   // set class and metadata from source description element
   parseResult.classes.push('source-description');
-  if ((0, _apidomDatamodel.isStringElement)(sourceDescription.name)) parseResult.setMetaProperty('name', (0, _apidomDatamodel.cloneDeep)(sourceDescription.name));
-  if ((0, _apidomDatamodel.isStringElement)(sourceDescription.type)) parseResult.setMetaProperty('type', (0, _apidomDatamodel.cloneDeep)(sourceDescription.type));
+  if ((0, _apidomDatamodel.isStringElement)(sourceDescription.name)) parseResult.setMetaProperty('name', (0, _apidomCore.toValue)(sourceDescription.name));
+  if ((0, _apidomDatamodel.isStringElement)(sourceDescription.type)) parseResult.setMetaProperty('type', (0, _apidomCore.toValue)(sourceDescription.type));
   const sourceDescriptionURI = (0, _apidomCore.toValue)(sourceDescription.url);
   if (typeof sourceDescriptionURI !== 'string') {
     const annotation = new _apidomDatamodel.AnnotationElement('Source description URL is missing or not a string. Skipping');

package/src/dereference/strategies/arazzo-1/source-descriptions.mjs

@@ -1,4 +1,4 @@
-import { ParseResultElement, AnnotationElement, isArrayElement, isStringElement, isParseResultElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { ParseResultElement, AnnotationElement, isArrayElement, isStringElement, isParseResultElement } from '@speclynx/apidom-datamodel';
 import { isArazzoSpecification1Element, isSourceDescriptionElement } from '@speclynx/apidom-ns-arazzo-1';
 import { isSwaggerElement } from '@speclynx/apidom-ns-openapi-2';
 import { isOpenApi3_0Element } from '@speclynx/apidom-ns-openapi-3-0';
@@ -22,8 +22,8 @@ async function dereferenceSourceDescription(sourceDescription, ctx) {
 
   // set class and metadata from source description element
   parseResult.classes.push('source-description');
-  if (isStringElement(sourceDescription.name)) parseResult.setMetaProperty('name', cloneDeep(sourceDescription.name));
-  if (isStringElement(sourceDescription.type)) parseResult.setMetaProperty('type', cloneDeep(sourceDescription.type));
+  if (isStringElement(sourceDescription.name)) parseResult.setMetaProperty('name', toValue(sourceDescription.name));
+  if (isStringElement(sourceDescription.type)) parseResult.setMetaProperty('type', toValue(sourceDescription.type));
   const sourceDescriptionURI = toValue(sourceDescription.url);
   if (typeof sourceDescriptionURI !== 'string') {
     const annotation = new AnnotationElement('Source description URL is missing or not a string. Skipping');

package/src/dereference/strategies/arazzo-1/visitor.cjs

@@ -374,7 +374,7 @@ class Arazzo1DereferenceVisitor {
       // annotate referenced element with info about origin
       booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       path.replaceWith(booleanJsonSchemaElement);
       return;
     }
@@ -399,7 +399,7 @@ class Arazzo1DereferenceVisitor {
       // annotate fragment with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
     /**

package/src/dereference/strategies/arazzo-1/visitor.mjs

@@ -368,7 +368,7 @@ class Arazzo1DereferenceVisitor {
       // annotate referenced element with info about origin
       booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       path.replaceWith(booleanJsonSchemaElement);
       return;
     }
@@ -393,7 +393,7 @@ class Arazzo1DereferenceVisitor {
       // annotate fragment with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
     /**

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

@@ -140,8 +140,8 @@ class AsyncAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if ((0, _apidomNsAsyncapi.isReferenceLikeElement)(referencedElement)) {
@@ -230,7 +230,7 @@ class AsyncAPI2DereferenceVisitor {
       // annotate referenced element with info about origin
       booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       path.replaceWith(booleanJsonSchemaElement);
       return;
     }
@@ -248,7 +248,7 @@ class AsyncAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -296,7 +296,7 @@ class AsyncAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const cacheKey = `channel-item-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const cacheKey = `channel-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -386,7 +386,7 @@ class AsyncAPI2DereferenceVisitor {
       // annotate referenced with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 

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

@@ -134,8 +134,8 @@ class AsyncAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const referencedElementType = toValue(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${toValue(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if (isReferenceLikeElement(referencedElement)) {
@@ -224,7 +224,7 @@ class AsyncAPI2DereferenceVisitor {
       // annotate referenced element with info about origin
       booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       path.replaceWith(booleanJsonSchemaElement);
       return;
     }
@@ -242,7 +242,7 @@ class AsyncAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -290,7 +290,7 @@ class AsyncAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const cacheKey = `channel-item-${toValue(identityManager.identify(referencedElement))}`;
+      const cacheKey = `channel-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -380,7 +380,7 @@ class AsyncAPI2DereferenceVisitor {
       // annotate referenced with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 

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

@@ -140,8 +140,8 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if ((0, _apidomNsOpenapi.isReferenceLikeElement)(referencedElement)) {
@@ -232,7 +232,7 @@ class OpenAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -281,7 +281,7 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const cacheKey = `pathItem-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const cacheKey = `pathItem-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -369,7 +369,7 @@ class OpenAPI2DereferenceVisitor {
       // annotate referenced element with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 
@@ -417,8 +417,8 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `path-item-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `path-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if ((0, _apidomNsOpenapi.isJSONReferenceLikeElement)(referencedElement)) {
@@ -509,7 +509,7 @@ class OpenAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.

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

@@ -134,8 +134,8 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const referencedElementType = toValue(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${toValue(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if (isReferenceLikeElement(referencedElement)) {
@@ -226,7 +226,7 @@ class OpenAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -275,7 +275,7 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const cacheKey = `pathItem-${toValue(identityManager.identify(referencedElement))}`;
+      const cacheKey = `pathItem-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -363,7 +363,7 @@ class OpenAPI2DereferenceVisitor {
       // annotate referenced element with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 
@@ -411,8 +411,8 @@ class OpenAPI2DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const referencedElementType = toValue(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `path-item-${toValue(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `path-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if (isJSONReferenceLikeElement(referencedElement)) {
@@ -503,7 +503,7 @@ class OpenAPI2DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.

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

@@ -141,8 +141,8 @@ class OpenAPI3_0DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if ((0, _apidomNsOpenapi.isReferenceLikeElement)(referencedElement)) {
@@ -232,7 +232,7 @@ class OpenAPI3_0DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -280,7 +280,7 @@ class OpenAPI3_0DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (!(0, _apidomNsOpenapi.isPathItemElement)(referencedElement)) {
-      const cacheKey = `path-item-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const cacheKey = `path-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -370,7 +370,7 @@ class OpenAPI3_0DereferenceVisitor {
       // annotate referenced element with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 
@@ -413,7 +413,7 @@ class OpenAPI3_0DereferenceVisitor {
       operationElement = (0, _apidomJsonPointer.evaluate)(reference.value.result, jsonPointer);
       // applying semantics to a referenced element
       if ((0, _apidomDatamodel.isPrimitiveElement)(operationElement)) {
-        const cacheKey = `operation-${(0, _apidomCore.toValue)(identityManager.identify(operationElement))}`;
+        const cacheKey = `operation-${identityManager.identify(operationElement)}`;
         if (this.refractCache.has(cacheKey)) {
           operationElement = this.refractCache.get(cacheKey);
         } else {

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

@@ -135,8 +135,8 @@ class OpenAPI3_0DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (isPrimitiveElement(referencedElement)) {
-      const referencedElementType = toValue(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${toValue(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if (isReferenceLikeElement(referencedElement)) {
@@ -226,7 +226,7 @@ class OpenAPI3_0DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     /**
      * Transclude referencing element with merged referenced element.
@@ -274,7 +274,7 @@ class OpenAPI3_0DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if (!isPathItemElement(referencedElement)) {
-      const cacheKey = `path-item-${toValue(identityManager.identify(referencedElement))}`;
+      const cacheKey = `path-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -364,7 +364,7 @@ class OpenAPI3_0DereferenceVisitor {
       // annotate referenced element with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 
@@ -407,7 +407,7 @@ class OpenAPI3_0DereferenceVisitor {
       operationElement = evaluate(reference.value.result, jsonPointer);
       // applying semantics to a referenced element
       if (isPrimitiveElement(operationElement)) {
-        const cacheKey = `operation-${toValue(identityManager.identify(operationElement))}`;
+        const cacheKey = `operation-${identityManager.identify(operationElement)}`;
         if (this.refractCache.has(cacheKey)) {
           operationElement = this.refractCache.get(cacheKey);
         } else {

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

@@ -16,7 +16,7 @@ const resolveSchema$refField = (retrievalURI, schemaElement) => {
     return undefined;
   }
   const hash = url.getHash((0, _apidomCore.toValue)(schemaElement.$ref));
-  const ancestorsSchemaIdentifiers = (0, _apidomCore.toValue)(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   const $refBaseURI = (0, _ramda.reduce)((acc, uri) => {
     return url.resolve(acc, url.sanitize(url.stripHash(uri)));
   }, retrievalURI, [...ancestorsSchemaIdentifiers, (0, _apidomCore.toValue)(schemaElement.$ref)]);
@@ -31,7 +31,7 @@ const resolveSchema$idField = (retrievalURI, schemaElement) => {
   if (typeof schemaElement.$id === 'undefined') {
     return undefined;
   }
-  const ancestorsSchemaIdentifiers = (0, _apidomCore.toValue)(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   return (0, _ramda.reduce)((acc, $id) => {
     return url.resolve(acc, url.sanitize(url.stripHash($id)));
   }, retrievalURI, ancestorsSchemaIdentifiers);

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

@@ -11,7 +11,7 @@ export const resolveSchema$refField = (retrievalURI, schemaElement) => {
     return undefined;
   }
   const hash = url.getHash(toValue(schemaElement.$ref));
-  const ancestorsSchemaIdentifiers = toValue(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   const $refBaseURI = reduce((acc, uri) => {
     return url.resolve(acc, url.sanitize(url.stripHash(uri)));
   }, retrievalURI, [...ancestorsSchemaIdentifiers, toValue(schemaElement.$ref)]);
@@ -25,7 +25,7 @@ export const resolveSchema$idField = (retrievalURI, schemaElement) => {
   if (typeof schemaElement.$id === 'undefined') {
     return undefined;
   }
-  const ancestorsSchemaIdentifiers = toValue(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   return reduce((acc, $id) => {
     return url.resolve(acc, url.sanitize(url.stripHash($id)));
   }, retrievalURI, ancestorsSchemaIdentifiers);

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

@@ -144,8 +144,8 @@ class OpenAPI3_1DereferenceVisitor {
 
     // applying semantics to a fragment
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
-      const cacheKey = `${referencedElementType}-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const referencedElementType = referencingElement.meta.get('referenced-element');
+      const cacheKey = `${referencedElementType}-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else if ((0, _apidomNsOpenapi.isReferenceLikeElement)(referencedElement)) {
@@ -239,7 +239,7 @@ class OpenAPI3_1DereferenceVisitor {
     // annotate fragment with info about origin
     mergedElement.meta.set('ref-origin', reference.uri);
     // annotate fragment with info about referencing element
-    mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+    mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
 
     // override description and summary (outer has higher priority then inner)
     if ((0, _apidomDatamodel.isObjectElement)(referencedElement) && (0, _apidomDatamodel.isObjectElement)(mergedElement)) {
@@ -302,7 +302,7 @@ class OpenAPI3_1DereferenceVisitor {
      * Applying semantics to a referenced element if semantics are missing.
      */
     if ((0, _apidomDatamodel.isPrimitiveElement)(referencedElement)) {
-      const cacheKey = `path-item-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+      const cacheKey = `path-item-${identityManager.identify(referencedElement)}`;
       if (this.refractCache.has(cacheKey)) {
         referencedElement = this.refractCache.get(cacheKey);
       } else {
@@ -392,7 +392,7 @@ class OpenAPI3_1DereferenceVisitor {
       // annotate referenced element with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
 
@@ -435,7 +435,7 @@ class OpenAPI3_1DereferenceVisitor {
       operationElement = (0, _apidomJsonPointer.evaluate)(reference.value.result, jsonPointer);
       // applying semantics to a referenced element
       if ((0, _apidomDatamodel.isPrimitiveElement)(operationElement)) {
-        const cacheKey = `operation-${(0, _apidomCore.toValue)(identityManager.identify(operationElement))}`;
+        const cacheKey = `operation-${identityManager.identify(operationElement)}`;
         if (this.refractCache.has(cacheKey)) {
           operationElement = this.refractCache.get(cacheKey);
         } else {
@@ -716,7 +716,7 @@ class OpenAPI3_1DereferenceVisitor {
       // annotate referenced element with info about origin
       booleanJsonSchemaElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      booleanJsonSchemaElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       path.replaceWith(booleanJsonSchemaElement);
       return;
     }
@@ -741,7 +741,7 @@ class OpenAPI3_1DereferenceVisitor {
       // annotate fragment with info about origin
       mergedElement.meta.set('ref-origin', reference.uri);
       // annotate fragment with info about referencing element
-      mergedElement.meta.set('ref-referencing-element-id', (0, _apidomDatamodel.cloneDeep)(identityManager.identify(referencingElement)));
+      mergedElement.meta.set('ref-referencing-element-id', identityManager.identify(referencingElement));
       referencedElement = mergedElement;
     }
     /**