swagger-client 3.22.2 → 3.23.0

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/dereference.js

@@ -37,53 +37,47 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
     this.basePath = basePath;
   },
   methods: {
-    async ReferenceElement(referenceElement, key, parent, path, ancestors) {
+    async ReferenceElement(referencingElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath, _referenceElement$$re, _referenceElement$des, _referenceElement$sum;
+        var _this$basePath;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
-        // skip already identified cycled Path Item Objects
-        if ((0, _apidomCore.includesClasses)(['cycle'], referenceElement.$ref)) {
-          return false;
-        }
-
         // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.some(ancs => ancs.has(referenceElement))) {
-          // skip processing this schema and all it's child schemas
+        if (ancestorsLineage.includesCycle(referencingElement)) {
           return false;
         }
 
         // ignore resolving external Reference Objects
-        if (!this.options.resolve.external && (0, _apidomNsOpenapi.isReferenceElementExternal)(referenceElement)) {
+        if (!this.options.resolve.external && (0, _apidomNsOpenapi.isReferenceElementExternal)(referencingElement)) {
           return false;
         }
-        const reference = await this.toReference(referenceElement.$ref.toValue());
+        const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
         const {
           uri: retrievalURI
         } = reference;
-        const $refBaseURI = _empty.url.resolve(retrievalURI, referenceElement.$ref.toValue());
-        this.indirections.push(referenceElement);
+        const $refBaseURI = _empty.url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+        this.indirections.push(referencingElement);
         const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
 
         // possibly non-semantic fragment
-        let fragment = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
+        let referencedElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
 
         // applying semantics to a fragment
-        if ((0, _apidomCore.isPrimitiveElement)(fragment)) {
-          const referencedElementType = referenceElement.meta.get('referenced-element').toValue();
-          if ((0, _apidomNsOpenapi.isReferenceLikeElement)(fragment)) {
+        if ((0, _apidomCore.isPrimitiveElement)(referencedElement)) {
+          const referencedElementType = (0, _apidomCore.toValue)(referencingElement.meta.get('referenced-element'));
+          if ((0, _apidomNsOpenapi.isReferenceLikeElement)(referencedElement)) {
             // handling indirect references
-            fragment = _apidomNsOpenapi.ReferenceElement.refract(fragment);
-            fragment.setMetaProperty('referenced-element', referencedElementType);
+            referencedElement = _apidomNsOpenapi.ReferenceElement.refract(referencedElement);
+            referencedElement.setMetaProperty('referenced-element', referencedElementType);
           } else {
             // handling direct references
             const ElementClass = this.namespace.getElementClass(referencedElementType);
-            fragment = ElementClass.refract(fragment);
+            referencedElement = ElementClass.refract(referencedElement);
           }
         }
 
         // detect direct or indirect reference
-        if (this.indirections.includes(fragment)) {
+        if (this.indirections.includes(referencedElement)) {
           throw new Error('Recursive JSON Pointer detected');
         }
 
@@ -92,23 +86,21 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           throw new _empty.MaximumDereferenceDepthError(`Maximum dereference depth of "${this.options.dereference.maxDepth}" has been exceeded in file "${this.reference.uri}"`);
         }
         if (!this.useCircularStructures) {
-          const hasCycles = ancestorsLineage.some(ancs => ancs.has(fragment));
+          const hasCycles = ancestorsLineage.includes(referencedElement);
           if (hasCycles) {
             if (_empty.url.isHttpUrl(retrievalURI) || _empty.url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
-              const cycledReferenceElement = new _apidomNsOpenapi.ReferenceElement({
+              return new _apidomNsOpenapi.ReferenceElement({
                 $ref: $refBaseURI
-              }, referenceElement.meta.clone(), referenceElement.attributes.clone());
-              cycledReferenceElement.get('$ref').classes.push('cycle');
-              return cycledReferenceElement;
+              }, (0, _apidomCore.cloneDeep)(referencingElement.meta), (0, _apidomCore.cloneDeep)(referencingElement.attributes));
             }
-            // skip processing this schema and all it's child schemas
+            // skip processing this reference
             return false;
           }
         }
 
         // append referencing schema to ancestors lineage
-        directAncestors.add(referenceElement);
+        directAncestors.add(referencingElement);
 
         // dive deep into the fragment
         const visitor = OpenApi3_1SwaggerClientDereferenceVisitor({
@@ -119,55 +111,78 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           ancestors: ancestorsLineage,
           allowMetaPatches: this.allowMetaPatches,
           useCircularStructures: this.useCircularStructures,
-          basePath: (_this$basePath = this.basePath) != null ? _this$basePath : [...(0, _toPath.default)([...ancestors, parent, referenceElement]), '$ref']
+          basePath: (_this$basePath = this.basePath) != null ? _this$basePath : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
         });
-        fragment = await visitAsync(fragment, visitor, {
+        referencedElement = await visitAsync(referencedElement, visitor, {
           keyMap: _apidomNsOpenapi.keyMap,
           nodeTypeGetter: _apidomNsOpenapi.getNodeType
         });
 
         // remove referencing schema from ancestors lineage
-        directAncestors.delete(referenceElement);
+        directAncestors.delete(referencingElement);
         this.indirections.pop();
-        fragment = fragment.clone();
-        fragment.setMetaProperty('ref-fields', {
-          $ref: (_referenceElement$$re = referenceElement.$ref) == null ? void 0 : _referenceElement$$re.toValue(),
-          description: (_referenceElement$des = referenceElement.description) == null ? void 0 : _referenceElement$des.toValue(),
-          summary: (_referenceElement$sum = referenceElement.summary) == null ? void 0 : _referenceElement$sum.toValue()
-        });
-        // annotate fragment with info about origin
-        fragment.setMetaProperty('ref-origin', reference.uri);
-
-        // override description and summary (outer has higher priority then inner)
-        const hasDescription = typeof referenceElement.description !== 'undefined';
-        const hasSummary = typeof referenceElement.summary !== 'undefined';
-        if (hasDescription && 'description' in fragment) {
-          fragment.description = referenceElement.description;
-        }
-        if (hasSummary && 'summary' in fragment) {
-          fragment.summary = referenceElement.summary;
-        }
+        const mergeAndAnnotateReferencedElement = refedElement => {
+          const copy = (0, _apidomCore.cloneShallow)(refedElement);
+
+          // annotate fragment with info about original Reference element
+          copy.setMetaProperty('ref-fields', {
+            $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
+            // @ts-ignore
+            description: (0, _apidomCore.toValue)(referencingElement.description),
+            // @ts-ignore
+            summary: (0, _apidomCore.toValue)(referencingElement.summary)
+          });
+          // annotate fragment with info about origin
+          copy.setMetaProperty('ref-origin', reference.uri);
+
+          // override description and summary (outer has higher priority then inner)
+          if ((0, _apidomCore.isObjectElement)(refedElement)) {
+            if (referencingElement.hasKey('description') && 'description' in refedElement) {
+              // @ts-ignore
+              copy.remove('description');
+              // @ts-ignore
+              copy.set('description', referencingElement.get('description'));
+            }
+            if (referencingElement.hasKey('summary') && 'summary' in refedElement) {
+              // @ts-ignore
+              copy.remove('summary');
+              // @ts-ignore
+              copy.set('summary', referencingElement.get('summary'));
+            }
+          }
 
-        // apply meta patches
-        if (this.allowMetaPatches && (0, _apidomCore.isObjectElement)(fragment)) {
-          const objectFragment = fragment;
-          // apply meta patch only when not already applied
-          if (typeof objectFragment.get('$$ref') === 'undefined') {
-            const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
-            objectFragment.set('$$ref', baseURI);
+          // apply meta patches
+          if (this.allowMetaPatches && (0, _apidomCore.isObjectElement)(copy)) {
+            // apply meta patch only when not already applied
+            if (!copy.hasKey('$$ref')) {
+              const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
+              copy.set('$$ref', baseURI);
+            }
+          }
+          return copy;
+        };
+
+        // attempting to create cycle
+        if (ancestorsLineage.includes(referencedElement)) {
+          if ((0, _apidomCore.isMemberElement)(parent)) {
+            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+          } else if (Array.isArray(parent)) {
+            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
           }
+
+          return false;
         }
 
         // transclude the element for a fragment
-        return fragment;
+        return mergeAndAnnotateReferencedElement(referencedElement);
       } catch (error) {
         var _this$basePath2, _this$options$derefer;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
-          $ref: referenceElement.$ref.toValue(),
-          pointer: (0, _apidomJsonPointer.uriToPointer)(referenceElement.$ref.toValue()),
-          fullPath: (_this$basePath2 = this.basePath) != null ? _this$basePath2 : [...(0, _toPath.default)([...ancestors, parent, referenceElement]), '$ref']
+          $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
+          pointer: (0, _apidomJsonPointer.uriToPointer)((0, _apidomCore.toValue)(referencingElement.$ref)),
+          fullPath: (_this$basePath2 = this.basePath) != null ? _this$basePath2 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
         });
         (_this$options$derefer = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer = _this$options$derefer.errors) == null || _this$options$derefer.push == null || _this$options$derefer.push(wrappedError);
         return undefined;
@@ -175,7 +190,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
     },
     async PathItemElement(pathItemElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath3, _pathItemElement$$ref;
+        var _this$basePath3;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // ignore PathItemElement without $ref field
@@ -183,14 +198,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           return undefined;
         }
 
-        // skip already identified cycled Path Item Objects
-        if ((0, _apidomCore.includesClasses)(['cycle'], pathItemElement.$ref)) {
-          return false;
-        }
-
         // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.some(ancs => ancs.has(pathItemElement))) {
-          // skip processing this schema and all it's child schemas
+        if (ancestorsLineage.includesCycle(pathItemElement)) {
           return false;
         }
 
@@ -198,11 +207,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         if (!this.options.resolve.external && (0, _apidomNsOpenapi.isPathItemElementExternal)(pathItemElement)) {
           return undefined;
         }
-        const reference = await this.toReference(pathItemElement.$ref.toValue());
+        const reference = await this.toReference((0, _apidomCore.toValue)(pathItemElement.$ref));
         const {
           uri: retrievalURI
         } = reference;
-        const $refBaseURI = _empty.url.resolve(retrievalURI, pathItemElement.$ref.toValue());
+        const $refBaseURI = _empty.url.resolve(retrievalURI, (0, _apidomCore.toValue)(pathItemElement.$ref));
         this.indirections.push(pathItemElement);
         const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
 
@@ -224,17 +233,15 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           throw new _empty.MaximumDereferenceDepthError(`Maximum dereference depth of "${this.options.dereference.maxDepth}" has been exceeded in file "${this.reference.uri}"`);
         }
         if (!this.useCircularStructures) {
-          const hasCycles = ancestorsLineage.some(ancs => ancs.has(referencedElement));
+          const hasCycles = ancestorsLineage.includes(referencedElement);
           if (hasCycles) {
             if (_empty.url.isHttpUrl(retrievalURI) || _empty.url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
-              const cycledPathItemElement = new _apidomNsOpenapi.PathItemElement({
+              return new _apidomNsOpenapi.PathItemElement({
                 $ref: $refBaseURI
-              }, pathItemElement.meta.clone(), pathItemElement.attributes.clone());
-              cycledPathItemElement.get('$ref').classes.push('cycle');
-              return cycledPathItemElement;
+              }, (0, _apidomCore.cloneDeep)(pathItemElement.meta), (0, _apidomCore.cloneDeep)(pathItemElement.attributes));
             }
-            // skip processing this schema and all it's child schemas
+            // skip processing this path item and all it's child elements
             return false;
           }
         }
@@ -261,41 +268,54 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         // remove referencing schema from ancestors lineage
         directAncestors.delete(pathItemElement);
         this.indirections.pop();
+        const mergeAndAnnotateReferencedElement = refedElement => {
+          // merge fields from referenced Path Item with referencing one
+          const mergedElement = new _apidomNsOpenapi.PathItemElement([...refedElement.content], (0, _apidomCore.cloneDeep)(refedElement.meta), (0, _apidomCore.cloneDeep)(refedElement.attributes));
+          // existing keywords from referencing PathItemElement overrides ones from referenced element
+          pathItemElement.forEach((value, keyElement, item) => {
+            mergedElement.remove((0, _apidomCore.toValue)(keyElement));
+            mergedElement.content.push(item);
+          });
+          mergedElement.remove('$ref');
 
-        // merge fields from referenced Path Item with referencing one
-        const mergedPathItemElement = new _apidomNsOpenapi.PathItemElement([...referencedElement.content], referencedElement.meta.clone(), referencedElement.attributes.clone());
-        // existing keywords from referencing PathItemElement overrides ones from referenced element
-        pathItemElement.forEach((valueElement, keyElement, item) => {
-          mergedPathItemElement.remove(keyElement.toValue());
-          mergedPathItemElement.content.push(item);
-        });
-        mergedPathItemElement.remove('$ref');
+          // annotate referenced element with info about original referencing element
+          mergedElement.setMetaProperty('ref-fields', {
+            $ref: (0, _apidomCore.toValue)(pathItemElement.$ref)
+          });
+          // annotate referenced element with info about origin
+          mergedElement.setMetaProperty('ref-origin', reference.uri);
 
-        // annotate referenced element with info about original referencing element
-        mergedPathItemElement.setMetaProperty('ref-fields', {
-          $ref: (_pathItemElement$$ref = pathItemElement.$ref) == null ? void 0 : _pathItemElement$$ref.toValue()
-        });
-        // annotate referenced element with info about origin
-        mergedPathItemElement.setMetaProperty('ref-origin', reference.uri);
-
-        // apply meta patches
-        if (this.allowMetaPatches) {
-          // apply meta patch only when not already applied
-          if (typeof mergedPathItemElement.get('$$ref') === 'undefined') {
-            const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
-            mergedPathItemElement.set('$$ref', baseURI);
+          // apply meta patches
+          if (this.allowMetaPatches) {
+            // apply meta patch only when not already applied
+            if (typeof mergedElement.get('$$ref') === 'undefined') {
+              const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
+              mergedElement.set('$$ref', baseURI);
+            }
+          }
+          return mergedElement;
+        };
+
+        // attempting to create cycle
+        if (ancestorsLineage.includes(referencedElement)) {
+          if ((0, _apidomCore.isMemberElement)(parent)) {
+            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+          } else if (Array.isArray(parent)) {
+            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
           }
+
+          return false;
         }
 
         // transclude referencing element with merged referenced element
-        return mergedPathItemElement;
+        return mergeAndAnnotateReferencedElement(referencedElement);
       } catch (error) {
         var _this$basePath4, _this$options$derefer2;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
-          $ref: pathItemElement.$ref.toValue(),
-          pointer: (0, _apidomJsonPointer.uriToPointer)(pathItemElement.$ref.toValue()),
+          $ref: (0, _apidomCore.toValue)(pathItemElement.$ref),
+          pointer: (0, _apidomJsonPointer.uriToPointer)((0, _apidomCore.toValue)(pathItemElement.$ref)),
           fullPath: (_this$basePath4 = this.basePath) != null ? _this$basePath4 : [...(0, _toPath.default)([...ancestors, parent, pathItemElement]), '$ref']
         });
         (_this$options$derefer2 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer2 = _this$options$derefer2.errors) == null || _this$options$derefer2.push == null || _this$options$derefer2.push(wrappedError);
@@ -304,7 +324,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
     },
     async SchemaElement(referencingElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath5, _referencingElement$$2;
+        var _this$basePath5;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // skip current referencing schema as $ref keyword was not defined
@@ -313,14 +333,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           return undefined;
         }
 
-        // skip already identified cycled schemas
-        if ((0, _apidomCore.includesClasses)(['cycle'], referencingElement.$ref)) {
-          return false;
-        }
-
         // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.some(ancs => ancs.has(referencingElement))) {
-          // skip processing this schema and all it's child schemas
+        if (ancestorsLineage.includesCycle(referencingElement)) {
           return false;
         }
 
@@ -400,11 +414,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
             if (_empty.url.isHttpUrl(retrievalURI) || _empty.url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
               const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
-              const cycledSchemaElement = new _apidomNsOpenapi.SchemaElement({
+              return new _apidomNsOpenapi.SchemaElement({
                 $ref: baseURI
-              }, referencingElement.meta.clone(), referencingElement.attributes.clone());
-              cycledSchemaElement.get('$ref').classes.push('cycle');
-              return cycledSchemaElement;
+              }, (0, _apidomCore.cloneDeep)(referencingElement.meta), (0, _apidomCore.cloneDeep)(referencingElement.attributes));
             }
             // skip processing this schema and all it's child schemas
             return false;
@@ -434,51 +446,61 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         directAncestors.delete(referencingElement);
         this.indirections.pop();
         if ((0, _apidomNsOpenapi.isBooleanJsonSchemaElement)(referencedElement)) {
-          var _referencingElement$$;
-          // Boolean JSON Schema
-          const jsonSchemaBooleanElement = referencedElement.clone();
+          const booleanJsonSchemaElement = (0, _apidomCore.cloneDeep)(referencedElement);
           // annotate referenced element with info about original referencing element
-          jsonSchemaBooleanElement.setMetaProperty('ref-fields', {
-            $ref: (_referencingElement$$ = referencingElement.$ref) == null ? void 0 : _referencingElement$$.toValue()
+          booleanJsonSchemaElement.setMetaProperty('ref-fields', {
+            $ref: (0, _apidomCore.toValue)(referencingElement.$ref)
           });
           // annotate referenced element with info about origin
-          jsonSchemaBooleanElement.setMetaProperty('ref-origin', retrievalURI);
-          return jsonSchemaBooleanElement;
+          booleanJsonSchemaElement.setMetaProperty('ref-origin', reference.uri);
+          return booleanJsonSchemaElement;
         }
+        const mergeAndAnnotateReferencedElement = refedElement => {
+          // Schema Object - merge keywords from referenced schema with referencing schema
+          const mergedElement = new _apidomNsOpenapi.SchemaElement([...refedElement.content], (0, _apidomCore.cloneDeep)(refedElement.meta), (0, _apidomCore.cloneDeep)(refedElement.attributes));
+          // existing keywords from referencing schema overrides ones from referenced schema
+          referencingElement.forEach((value, keyElement, item) => {
+            mergedElement.remove((0, _apidomCore.toValue)(keyElement));
+            mergedElement.content.push(item);
+          });
+          mergedElement.remove('$ref');
+          // annotate referenced element with info about original referencing element
+          mergedElement.setMetaProperty('ref-fields', {
+            $ref: (0, _apidomCore.toValue)(referencingElement.$ref)
+          });
+          // annotate fragment with info about origin
+          mergedElement.setMetaProperty('ref-origin', reference.uri);
 
-        // Schema Object - merge keywords from referenced schema with referencing schema
-        const mergedSchemaElement = new _apidomNsOpenapi.SchemaElement([...referencedElement.content], referencedElement.meta.clone(), referencedElement.attributes.clone());
-        // existing keywords from referencing schema overrides ones from referenced schema
-        referencingElement.forEach((memberValue, memberKey, member) => {
-          mergedSchemaElement.remove(memberKey.toValue());
-          mergedSchemaElement.content.push(member);
-        });
-        mergedSchemaElement.remove('$ref');
-
-        // annotate referenced element with info about original referencing element
-        mergedSchemaElement.setMetaProperty('ref-fields', {
-          $ref: (_referencingElement$$2 = referencingElement.$ref) == null ? void 0 : _referencingElement$$2.toValue()
-        });
-        // annotate fragment with info about origin
-        mergedSchemaElement.setMetaProperty('ref-origin', retrievalURI);
-
-        // allowMetaPatches option processing
-        if (this.allowMetaPatches) {
-          // apply meta patch only when not already applied
-          if (typeof mergedSchemaElement.get('$$ref') === 'undefined') {
-            const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
-            mergedSchemaElement.set('$$ref', baseURI);
+          // allowMetaPatches option processing
+          if (this.allowMetaPatches) {
+            // apply meta patch only when not already applied
+            if (typeof mergedElement.get('$$ref') === 'undefined') {
+              const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
+              mergedElement.set('$$ref', baseURI);
+            }
           }
+          return mergedElement;
+        };
+
+        // attempting to create cycle
+        if (ancestorsLineage.includes(referencedElement)) {
+          if ((0, _apidomCore.isMemberElement)(parent)) {
+            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+          } else if (Array.isArray(parent)) {
+            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+          }
+
+          return false;
         }
 
         // transclude referencing element with merged referenced element
-        return mergedSchemaElement;
+        return mergeAndAnnotateReferencedElement(referencedElement);
       } catch (error) {
         var _this$basePath6, _this$options$derefer3;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = new _index.SchemaRefError(`Could not resolve reference: ${rootCause.message}`, {
           baseDoc: this.reference.uri,
-          $ref: referencingElement.$ref.toValue(),
+          $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
           fullPath: (_this$basePath6 = this.basePath) != null ? _this$basePath6 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
         }, rootCause);
         (_this$options$derefer3 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer3 = _this$options$derefer3.errors) == null || _this$options$derefer3.push == null || _this$options$derefer3.push(wrappedError);
@@ -497,11 +519,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
       try {
         return await _openapi.OpenApi3_1DereferenceVisitor.compose.methods.ExampleElement.call(this, exampleElement, key, parent, path, ancestors);
       } catch (error) {
-        var _exampleElement$exter, _this$basePath7, _this$options$derefer4;
+        var _this$basePath7, _this$options$derefer4;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
-          externalValue: (_exampleElement$exter = exampleElement.externalValue) == null ? void 0 : _exampleElement$exter.toValue(),
+          externalValue: (0, _apidomCore.toValue)(exampleElement.externalValue),
           fullPath: (_this$basePath7 = this.basePath) != null ? _this$basePath7 : [...(0, _toPath.default)([...ancestors, parent, exampleElement]), 'externalValue']
         });
         (_this$options$derefer4 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer4 = _this$options$derefer4.errors) == null || _this$options$derefer4.push == null || _this$options$derefer4.push(wrappedError);
@@ -510,6 +532,5 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
     }
   }
 });
-var _default = OpenApi3_1SwaggerClientDereferenceVisitor;
-/* eslint-enable camelcase */
-exports.default = _default;
+var _default = exports.default = OpenApi3_1SwaggerClientDereferenceVisitor;
+/* eslint-enable camelcase */

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/parameters.js

@@ -46,5 +46,4 @@ const ParameterMacroVisitor = (0, _compose.default)({
     }
   }
 });
-var _default = ParameterMacroVisitor;
-exports.default = _default;
+var _default = exports.default = ParameterMacroVisitor;

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/properties.js

@@ -40,5 +40,4 @@ const ModelPropertyMacroVisitor = (0, _compose.default)({
     }
   }
 });
-var _default = ModelPropertyMacroVisitor;
-exports.default = _default;
+var _default = exports.default = ModelPropertyMacroVisitor;

package/lib/resolver/apidom/reference/parse/parsers/json/index.js

@@ -50,5 +50,4 @@ const JsonParser = _empty.Parser.compose({
     }
   }
 });
-var _default = JsonParser;
-exports.default = _default;
+var _default = exports.default = JsonParser;

package/lib/resolver/apidom/reference/parse/parsers/openapi-json-3-1/index.js

@@ -56,6 +56,5 @@ const OpenApiJson3_1Parser = _empty.Parser.compose({
     }
   }
 });
-var _default = OpenApiJson3_1Parser;
-/* eslint-enable camelcase */
-exports.default = _default;
+var _default = exports.default = OpenApiJson3_1Parser;
+/* eslint-enable camelcase */

package/lib/resolver/apidom/reference/parse/parsers/openapi-yaml-3-1/index.js

@@ -58,6 +58,5 @@ const OpenApiYaml3_1Parser = _empty.Parser.compose({
     }
   }
 });
-var _default = OpenApiYaml3_1Parser;
-/* eslint-enable camelcase */
-exports.default = _default;
+var _default = exports.default = OpenApiYaml3_1Parser;
+/* eslint-enable camelcase */

package/lib/resolver/apidom/reference/parse/parsers/yaml-1-2/index.js

@@ -55,5 +55,4 @@ const YamlParser = _empty.Parser.compose({
     }
   }
 });
-var _default = YamlParser;
-exports.default = _default;
+var _default = exports.default = YamlParser;

package/lib/resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js

@@ -70,5 +70,4 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
     }
   }
 });
-var _default = HttpResolverSwaggerClient;
-exports.default = _default;
+var _default = exports.default = HttpResolverSwaggerClient;

package/lib/resolver/index.js

@@ -36,7 +36,6 @@ const makeResolve = defaultOptions => async options => {
   return resolve(mergedOptions);
 };
 exports.makeResolve = makeResolve;
-var _default = makeResolve({
+var _default = exports.default = makeResolve({
   strategies: [_index4.default, _index3.default, _index2.default]
-});
-exports.default = _default;
+});

package/lib/resolver/strategies/generic/index.js

@@ -30,5 +30,4 @@ const genericStrategy = {
     return (0, _resolve.default)(options);
   }
 };
-var _default = genericStrategy;
-exports.default = _default;
+var _default = exports.default = genericStrategy;

package/lib/resolver/strategies/openapi-2/index.js

@@ -31,5 +31,4 @@ const openApi2Strategy = {
     return (0, _resolve.default)(options);
   }
 };
-var _default = openApi2Strategy;
-exports.default = _default;
+var _default = exports.default = openApi2Strategy;

package/lib/resolver/strategies/openapi-3-0/index.js

@@ -31,5 +31,4 @@ const openApi30Strategy = {
     return (0, _resolve.default)(options);
   }
 };
-var _default = openApi30Strategy;
-exports.default = _default;
+var _default = exports.default = openApi30Strategy;

package/lib/resolver/strategies/openapi-3-1-apidom/index.js

@@ -25,5 +25,4 @@ const openApi31ApiDOMStrategy = {
     return (0, _resolve.default)(options);
   }
 };
-var _default = openApi31ApiDOMStrategy;
-exports.default = _default;
+var _default = exports.default = openApi31ApiDOMStrategy;

package/lib/resolver/strategies/openapi-3-1-apidom/normalize.js

@@ -45,6 +45,5 @@ const pojoAdapter = normalizeFn => spec => {
 };
 exports.pojoAdapter = pojoAdapter;
 pojoAdapter.cache = new WeakMap();
-var _default = normalize;
-/* eslint-enable camelcase */
-exports.default = _default;
+var _default = exports.default = normalize;
+/* eslint-enable camelcase */