swagger-client 3.26.8 → 3.27.1

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

@@ -24,12 +24,6 @@ const visitAsync = _apidomCore.visit[Symbol.for('nodejs.util.promisify.custom')]
 
 // initialize element identity manager
 const identityManager = (0, _apidomCore.IdentityManager)();
-
-/**
- * Predicate for detecting if element was created by merging referencing
- * element with particular element identity with a referenced element.
- */
-const wasReferencedBy = referencingElement => element => element.meta.hasKey('ref-referencing-element-id') && element.meta.get('ref-referencing-element-id').equals((0, _apidomCore.toValue)(identityManager.identify(referencingElement)));
 const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1DereferenceVisitor.compose({
   props: {
     useCircularStructures: true,
@@ -48,18 +42,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
   methods: {
     async ReferenceElement(referencingElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath;
-        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
-
-        // skip already identified cycled Path Item Objects
-        if ((0, _apidomCore.includesClasses)(['cycle'], referencingElement.$ref)) {
-          return false;
-        }
-
-        // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.includesCycle(referencingElement)) {
+        // skip current referencing element as it's already been access
+        if (this.indirections.includes(referencingElement)) {
           return false;
         }
+        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
         const retrievalURI = this.toBaseURI((0, _apidomCore.toValue)(referencingElement.$ref));
         const isInternalReference = _empty.url.stripHash(this.reference.uri) === retrievalURI;
         const isExternalReference = !isInternalReference;
@@ -79,6 +66,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
 
         // possibly non-semantic fragment
         let referencedElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
+        referencedElement.id = identityManager.identify(referencedElement);
 
         // applying semantics to a fragment
         if ((0, _apidomCore.isPrimitiveElement)(referencedElement)) {
@@ -100,105 +88,124 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         }
 
         // detect direct or indirect reference
-        if (this.indirections.includes(referencedElement)) {
-          throw new _apidomError.ApiDOMError('Recursive JSON Pointer detected');
+        if (referencingElement === referencedElement) {
+          throw new _apidomError.ApiDOMError('Recursive Reference Object detected');
         }
 
         // detect maximum depth of dereferencing
         if (this.indirections.length > this.options.dereference.maxDepth) {
           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.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({
-                $ref: $refBaseURI
-              }, (0, _apidomCore.cloneDeep)(referencingElement.meta), (0, _apidomCore.cloneDeep)(referencingElement.attributes));
-              cycledReferenceElement.get('$ref').classes.push('cycle');
-              return cycledReferenceElement;
+
+        // detect second deep dive into the same fragment and avoid it
+        if (ancestorsLineage.includes(referencedElement)) {
+          reference.refSet.circular = true;
+          if (this.options.dereference.circular === 'error') {
+            throw new _apidomError.ApiDOMError('Circular reference detected');
+          } else if (this.options.dereference.circular === 'replace') {
+            var _this$options$derefer, _this$options$derefer2;
+            const refElement = new _apidomCore.RefElement(referencedElement.id, {
+              type: 'reference',
+              uri: reference.uri,
+              $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
+              baseURI: $refBaseURI,
+              referencingElement
+            });
+            const replacer = (_this$options$derefer = (_this$options$derefer2 = this.options.dereference.strategyOpts['openapi-3-1']) == null ? void 0 : _this$options$derefer2.circularReplacer) != null ? _this$options$derefer : this.options.dereference.circularReplacer;
+            const replacement = replacer(refElement);
+            if ((0, _apidomCore.isMemberElement)(parent)) {
+              parent.value = replacement; // eslint-disable-line no-param-reassign
+            } else if (Array.isArray(parent)) {
+              parent[key] = replacement; // eslint-disable-line no-param-reassign
             }
-            // skip processing this reference
-            return false;
+            return !parent ? replacement : false;
           }
         }
 
-        // append referencing schema to ancestors lineage
-        directAncestors.add(referencingElement);
-
-        // dive deep into the fragment
-        const visitor = OpenApi3_1SwaggerClientDereferenceVisitor({
-          reference,
-          namespace: this.namespace,
-          indirections: [...this.indirections],
-          options: this.options,
-          ancestors: ancestorsLineage,
-          allowMetaPatches: this.allowMetaPatches,
-          useCircularStructures: this.useCircularStructures,
-          basePath: (_this$basePath = this.basePath) != null ? _this$basePath : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
-        });
-        referencedElement = await visitAsync(referencedElement, visitor, {
-          keyMap: _apidomNsOpenapi.keyMap,
-          nodeTypeGetter: _apidomNsOpenapi.getNodeType
-        });
+        /**
+         * Dive deep into the fragment.
+         *
+         * Cases to consider:
+         *  1. We're crossing document boundary
+         *  2. Fragment is from non-root document
+         *  3. Fragment is a Reference Object. We need to follow it to get the eventual value
+         *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
+         */
+        const isNonRootDocument = _empty.url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
+        const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+        if ((isExternalReference || isNonRootDocument || (0, _apidomNsOpenapi.isReferenceElement)(referencedElement) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
+          var _this$basePath;
+          // append referencing reference to ancestors lineage
+          directAncestors.add(referencingElement);
+          const visitor = OpenApi3_1SwaggerClientDereferenceVisitor({
+            reference,
+            namespace: this.namespace,
+            indirections: [...this.indirections],
+            options: this.options,
+            refractCache: this.refractCache,
+            ancestors: ancestorsLineage,
+            allowMetaPatches: this.allowMetaPatches,
+            useCircularStructures: this.useCircularStructures,
+            basePath: (_this$basePath = this.basePath) != null ? _this$basePath : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
+          });
+          referencedElement = await visitAsync(referencedElement, visitor, {
+            keyMap: _apidomNsOpenapi.keyMap,
+            nodeTypeGetter: _apidomNsOpenapi.getNodeType
+          });
 
-        // remove referencing schema from ancestors lineage
-        directAncestors.delete(referencingElement);
+          // remove referencing reference from ancestors lineage
+          directAncestors.delete(referencingElement);
+        }
         this.indirections.pop();
-        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),
-            description: (0, _apidomCore.toValue)(referencingElement.description),
-            summary: (0, _apidomCore.toValue)(referencingElement.summary)
-          });
-          // annotate fragment with info about origin
-          copy.setMetaProperty('ref-origin', reference.uri);
-          // annotate fragment with info about referencing element
-          copy.setMetaProperty('ref-referencing-element-id', (0, _apidomCore.cloneDeep)(identityManager.identify(referencingElement)));
+        const mergedElement = (0, _apidomCore.cloneShallow)(referencedElement);
 
-          // override description and summary (outer has higher priority then inner)
-          if ((0, _apidomCore.isObjectElement)(refedElement)) {
-            if (referencingElement.hasKey('description') && 'description' in refedElement) {
-              copy.remove('description');
-              copy.set('description', referencingElement.get('description'));
-            }
-            if (referencingElement.hasKey('summary') && 'summary' in refedElement) {
-              copy.remove('summary');
-              copy.set('summary', referencingElement.get('summary'));
-            }
+        // annotate fragment with info about original Reference element
+        mergedElement.setMetaProperty('ref-fields', {
+          $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
+          description: (0, _apidomCore.toValue)(referencingElement.description),
+          summary: (0, _apidomCore.toValue)(referencingElement.summary)
+        });
+        // annotate fragment with info about origin
+        mergedElement.setMetaProperty('ref-origin', reference.uri);
+        // annotate fragment with info about referencing element
+        mergedElement.setMetaProperty('ref-referencing-element-id', (0, _apidomCore.cloneDeep)(identityManager.identify(referencingElement)));
+
+        // override description and summary (outer has higher priority then inner)
+        if ((0, _apidomCore.isObjectElement)(referencedElement)) {
+          if (referencingElement.hasKey('description') && 'description' in referencedElement) {
+            mergedElement.remove('description');
+            mergedElement.set('description', referencingElement.get('description'));
           }
-
-          // 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);
-            }
+          if (referencingElement.hasKey('summary') && 'summary' in referencedElement) {
+            mergedElement.remove('summary');
+            mergedElement.set('summary', referencingElement.get('summary'));
           }
-          return copy;
-        };
+        }
 
-        // attempting to create cycle
-        if (ancestorsLineage.includes(referencingElement) || ancestorsLineage.includes(referencedElement)) {
-          var _ancestorsLineage$fin;
-          const replaceWith = (_ancestorsLineage$fin = ancestorsLineage.findItem(wasReferencedBy(referencingElement))) != null ? _ancestorsLineage$fin : mergeAndAnnotateReferencedElement(referencedElement);
-          if ((0, _apidomCore.isMemberElement)(parent)) {
-            parent.value = replaceWith; // eslint-disable-line no-param-reassign
-          } else if (Array.isArray(parent)) {
-            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
+        // apply meta patches
+        if (this.allowMetaPatches && (0, _apidomCore.isObjectElement)(mergedElement)) {
+          // apply meta patch only when not already applied
+          if (!mergedElement.hasKey('$$ref')) {
+            const baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
+            mergedElement.set('$$ref', baseURI);
           }
-          return false;
         }
 
-        // transclude the element for a fragment
-        return mergeAndAnnotateReferencedElement(referencedElement);
+        /**
+         * Transclude referencing element with merged referenced element.
+         */
+        if ((0, _apidomCore.isMemberElement)(parent)) {
+          parent.value = mergedElement; // eslint-disable-line no-param-reassign
+        } else if (Array.isArray(parent)) {
+          parent[key] = mergedElement; // eslint-disable-line no-param-reassign
+        }
+
+        /**
+         * We're at the root of the tree, so we're just replacing the entire tree.
+         */
+        return !parent ? mergedElement : false;
       } catch (error) {
-        var _this$basePath2, _this$options$derefer;
+        var _this$basePath2, _this$options$derefer3;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
@@ -206,29 +213,27 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           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);
+        (_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);
         return undefined;
       }
     },
     async PathItemElement(pathItemElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath3;
-        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
-
         // ignore PathItemElement without $ref field
         if (!(0, _apidomCore.isStringElement)(pathItemElement.$ref)) {
           return undefined;
         }
 
-        // skip already identified cycled Path Item Objects
-        if ((0, _apidomCore.includesClasses)(['cycle'], pathItemElement.$ref)) {
+        // skip current referencing element as it's already been access
+        if (this.indirections.includes(pathItemElement)) {
           return false;
         }
 
-        // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.includesCycle(pathItemElement)) {
+        // skip already identified cycled Path Item Objects
+        if ((0, _apidomCore.includesClasses)(['cycle'], pathItemElement.$ref)) {
           return false;
         }
+        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
         const retrievalURI = this.toBaseURI((0, _apidomCore.toValue)(pathItemElement.$ref));
         const isInternalReference = _empty.url.stripHash(this.reference.uri) === retrievalURI;
         const isExternalReference = !isInternalReference;
@@ -248,10 +253,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
 
         // possibly non-semantic referenced element
         let referencedElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
+        referencedElement.id = identityManager.identify(referencedElement);
 
         // applying semantics to a referenced element
         if ((0, _apidomCore.isPrimitiveElement)(referencedElement)) {
-          const cacheKey = `pathItem-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
+          const cacheKey = `path-item-${(0, _apidomCore.toValue)(identityManager.identify(referencedElement))}`;
           if (this.refractCache.has(cacheKey)) {
             referencedElement = this.refractCache.get(cacheKey);
           } else {
@@ -261,55 +267,82 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         }
 
         // detect direct or indirect reference
-        if (this.indirections.includes(referencedElement)) {
-          throw new _apidomError.ApiDOMError('Recursive JSON Pointer detected');
+        if (pathItemElement === referencedElement) {
+          throw new _apidomError.ApiDOMError('Recursive Path Item Object reference detected');
         }
 
         // detect maximum depth of dereferencing
         if (this.indirections.length > this.options.dereference.maxDepth) {
           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.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({
-                $ref: $refBaseURI
-              }, (0, _apidomCore.cloneDeep)(pathItemElement.meta), (0, _apidomCore.cloneDeep)(pathItemElement.attributes));
-              cycledPathItemElement.get('$ref').classes.push('cycle');
-              return cycledPathItemElement;
+
+        // detect second deep dive into the same fragment and avoid it
+        if (ancestorsLineage.includes(referencedElement)) {
+          reference.refSet.circular = true;
+          if (this.options.dereference.circular === 'error') {
+            throw new _apidomError.ApiDOMError('Circular reference detected');
+          } else if (this.options.dereference.circular === 'replace') {
+            var _this$options$derefer4, _this$options$derefer5;
+            const refElement = new _apidomCore.RefElement(referencedElement.id, {
+              type: 'path-item',
+              uri: reference.uri,
+              $ref: (0, _apidomCore.toValue)(pathItemElement.$ref),
+              baseURI: $refBaseURI,
+              referencingElement: pathItemElement
+            });
+            const replacer = (_this$options$derefer4 = (_this$options$derefer5 = this.options.dereference.strategyOpts['openapi-3-1']) == null ? void 0 : _this$options$derefer5.circularReplacer) != null ? _this$options$derefer4 : this.options.dereference.circularReplacer;
+            const replacement = replacer(refElement);
+            if ((0, _apidomCore.isMemberElement)(parent)) {
+              parent.value = replacement; // eslint-disable-line no-param-reassign
+            } else if (Array.isArray(parent)) {
+              parent[key] = replacement; // eslint-disable-line no-param-reassign
             }
-            // skip processing this path item and all it's child elements
-            return false;
+            return !parent ? replacement : false;
           }
         }
 
-        // append referencing schema to ancestors lineage
-        directAncestors.add(pathItemElement);
-
-        // dive deep into the referenced element
-        const visitor = OpenApi3_1SwaggerClientDereferenceVisitor({
-          reference,
-          namespace: this.namespace,
-          indirections: [...this.indirections],
-          options: this.options,
-          ancestors: ancestorsLineage,
-          allowMetaPatches: this.allowMetaPatches,
-          useCircularStructures: this.useCircularStructures,
-          basePath: (_this$basePath3 = this.basePath) != null ? _this$basePath3 : [...(0, _toPath.default)([...ancestors, parent, pathItemElement]), '$ref']
-        });
-        referencedElement = await visitAsync(referencedElement, visitor, {
-          keyMap: _apidomNsOpenapi.keyMap,
-          nodeTypeGetter: _apidomNsOpenapi.getNodeType
-        });
+        /**
+         * Dive deep into the fragment.
+         *
+         * Cases to consider:
+         *  1. We're crossing document boundary
+         *  2. Fragment is from non-root document
+         *  3. Fragment is a Path Item Object with $ref field. We need to follow it to get the eventual value
+         *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
+         */
+        const isNonRootDocument = _empty.url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
+        const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+        if ((isExternalReference || isNonRootDocument || (0, _apidomNsOpenapi.isPathItemElement)(referencedElement) && (0, _apidomCore.isStringElement)(referencedElement.$ref) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
+          var _this$basePath3;
+          // append referencing schema to ancestors lineage
+          directAncestors.add(pathItemElement);
+
+          // dive deep into the referenced element
+          const visitor = OpenApi3_1SwaggerClientDereferenceVisitor({
+            reference,
+            namespace: this.namespace,
+            indirections: [...this.indirections],
+            options: this.options,
+            ancestors: ancestorsLineage,
+            allowMetaPatches: this.allowMetaPatches,
+            useCircularStructures: this.useCircularStructures,
+            basePath: (_this$basePath3 = this.basePath) != null ? _this$basePath3 : [...(0, _toPath.default)([...ancestors, parent, pathItemElement]), '$ref']
+          });
+          referencedElement = await visitAsync(referencedElement, visitor, {
+            keyMap: _apidomNsOpenapi.keyMap,
+            nodeTypeGetter: _apidomNsOpenapi.getNodeType
+          });
 
-        // remove referencing schema from ancestors lineage
-        directAncestors.delete(pathItemElement);
+          // 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));
+
+        /**
+         * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
+         */
+        if ((0, _apidomNsOpenapi.isPathItemElement)(referencedElement)) {
+          const mergedElement = new _apidomNsOpenapi.PathItemElement([...referencedElement.content], (0, _apidomCore.cloneDeep)(referencedElement.meta), (0, _apidomCore.cloneDeep)(referencedElement.attributes));
           // existing keywords from referencing PathItemElement overrides ones from referenced element
           pathItemElement.forEach((value, keyElement, item) => {
             mergedElement.remove((0, _apidomCore.toValue)(keyElement));
@@ -334,25 +367,24 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
               mergedElement.set('$$ref', baseURI);
             }
           }
-          return mergedElement;
-        };
+          referencedElement = mergedElement;
+        }
 
-        // attempting to create cycle
-        if (ancestorsLineage.includes(pathItemElement) || ancestorsLineage.includes(referencedElement)) {
-          var _ancestorsLineage$fin2;
-          const replaceWith = (_ancestorsLineage$fin2 = ancestorsLineage.findItem(wasReferencedBy(pathItemElement))) != null ? _ancestorsLineage$fin2 : mergeAndAnnotateReferencedElement(referencedElement);
-          if ((0, _apidomCore.isMemberElement)(parent)) {
-            parent.value = replaceWith; // eslint-disable-line no-param-reassign
-          } else if (Array.isArray(parent)) {
-            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
-          }
-          return false;
+        /**
+         * Transclude referencing element with merged referenced element.
+         */
+        if ((0, _apidomCore.isMemberElement)(parent)) {
+          parent.value = referencedElement; // eslint-disable-line no-param-reassign
+        } else if (Array.isArray(parent)) {
+          parent[key] = referencedElement; // eslint-disable-line no-param-reassign
         }
 
-        // transclude referencing element with merged referenced element
-        return mergeAndAnnotateReferencedElement(referencedElement);
+        /**
+         * We're at the root of the tree, so we're just replacing the entire tree.
+         */
+        return !parent ? referencedElement : undefined;
       } catch (error) {
-        var _this$basePath4, _this$options$derefer2;
+        var _this$basePath4, _this$options$derefer6;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
@@ -360,30 +392,23 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           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);
+        (_this$options$derefer6 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer6 = _this$options$derefer6.errors) == null || _this$options$derefer6.push == null || _this$options$derefer6.push(wrappedError);
         return undefined;
       }
     },
     async SchemaElement(referencingElement, key, parent, path, ancestors) {
       try {
-        var _this$basePath5;
-        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
-
         // skip current referencing schema as $ref keyword was not defined
         if (!(0, _apidomCore.isStringElement)(referencingElement.$ref)) {
           // skip traversing this schema but traverse all it's child schemas
           return undefined;
         }
 
-        // skip already identified cycled Path Item Objects
-        if ((0, _apidomCore.includesClasses)(['cycle'], referencingElement.$ref)) {
-          return false;
-        }
-
-        // detect possible cycle in traversal and avoid it
-        if (ancestorsLineage.includesCycle(referencingElement)) {
+        // skip current referencing element as it's already been access
+        if (this.indirections.includes(referencingElement)) {
           return false;
         }
+        const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // compute baseURI using rules around $id and $ref keywords
         let reference = await this.toReference(_empty.url.unsanitize(this.reference.uri));
@@ -397,8 +422,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         });
         const isUnknownURI = !this.options.resolve.resolvers.some(r => r.canRead(file));
         const isURL = !isUnknownURI;
-        const isInternalReference = uri => _empty.url.stripHash(this.reference.uri) === uri;
-        const isExternalReference = uri => !isInternalReference(uri);
+        let isInternalReference = _empty.url.stripHash(this.reference.uri) === $refBaseURI;
+        let isExternalReference = !isInternalReference;
         this.indirections.push(referencingElement);
 
         // determining reference, proper evaluation and selection mechanism
@@ -406,25 +431,45 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         try {
           if (isUnknownURI || isURL) {
             // we're dealing with canonical URI or URL with possible fragment
+            retrievalURI = this.toBaseURI($refBaseURI);
             const selector = $refBaseURI;
-            referencedElement = (0, _uri.evaluate)(selector, (0, _openapi.maybeRefractToSchemaElement)(reference.value.result));
+            const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
+            referencedElement = (0, _uri.evaluate)(selector, referenceAsSchema);
+            referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
+            referencedElement.id = identityManager.identify(referencedElement);
+
+            // 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;
+            }
+            // 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;
+            }
           } else {
             // we're assuming here that we're dealing with JSON Pointer here
-            retrievalURI = this.toBaseURI((0, _apidomCore.toValue)($refBaseURI));
+            retrievalURI = this.toBaseURI($refBaseURI);
+            isInternalReference = _empty.url.stripHash(this.reference.uri) === retrievalURI;
+            isExternalReference = !isInternalReference;
 
             // ignore resolving internal Schema Objects
-            if (!this.options.resolve.internal && isInternalReference(retrievalURI)) {
+            if (!this.options.resolve.internal && isInternalReference) {
               // skip traversing this schema element but traverse all it's child elements
               return undefined;
             }
             // ignore resolving external Schema Objects
-            if (!this.options.resolve.external && isExternalReference(retrievalURI)) {
+            if (!this.options.resolve.external && isExternalReference) {
               // skip traversing this schema element but traverse all it's child elements
               return undefined;
             }
             reference = await this.toReference(_empty.url.unsanitize($refBaseURI));
             const selector = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
-            referencedElement = (0, _openapi.maybeRefractToSchemaElement)((0, _apidomJsonPointer.evaluate)(selector, reference.value.result));
+            const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
+            referencedElement = (0, _apidomJsonPointer.evaluate)(selector, referenceAsSchema);
+            referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
+            referencedElement.id = identityManager.identify(referencedElement);
           }
         } catch (error) {
           /**
@@ -434,38 +479,47 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           if (isURL && error instanceof _uri.EvaluationJsonSchemaUriError) {
             if ((0, _$anchor.isAnchor)((0, _$anchor.uriToAnchor)($refBaseURI))) {
               // we're dealing with JSON Schema $anchor here
-              retrievalURI = this.toBaseURI((0, _apidomCore.toValue)($refBaseURI));
+              isInternalReference = _empty.url.stripHash(this.reference.uri) === retrievalURI;
+              isExternalReference = !isInternalReference;
 
               // ignore resolving internal Schema Objects
-              if (!this.options.resolve.internal && isInternalReference(retrievalURI)) {
+              if (!this.options.resolve.internal && isInternalReference) {
                 // skip traversing this schema element but traverse all it's child elements
                 return undefined;
               }
               // ignore resolving external Schema Objects
-              if (!this.options.resolve.external && isExternalReference(retrievalURI)) {
+              if (!this.options.resolve.external && isExternalReference) {
                 // skip traversing this schema element but traverse all it's child elements
                 return undefined;
               }
               reference = await this.toReference(_empty.url.unsanitize($refBaseURI));
               const selector = (0, _$anchor.uriToAnchor)($refBaseURI);
-              referencedElement = (0, _$anchor.evaluate)(selector, (0, _openapi.maybeRefractToSchemaElement)(reference.value.result));
+              const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
+              referencedElement = (0, _$anchor.evaluate)(selector, referenceAsSchema);
+              referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
+              referencedElement.id = identityManager.identify(referencedElement);
             } else {
               // we're assuming here that we're dealing with JSON Pointer here
               retrievalURI = this.toBaseURI((0, _apidomCore.toValue)($refBaseURI));
+              isInternalReference = _empty.url.stripHash(this.reference.uri) === retrievalURI;
+              isExternalReference = !isInternalReference;
 
               // ignore resolving internal Schema Objects
-              if (!this.options.resolve.internal && isInternalReference(retrievalURI)) {
+              if (!this.options.resolve.internal && isInternalReference) {
                 // skip traversing this schema element but traverse all it's child elements
                 return undefined;
               }
               // ignore resolving external Schema Objects
-              if (!this.options.resolve.external && isExternalReference(retrievalURI)) {
+              if (!this.options.resolve.external && isExternalReference) {
                 // skip traversing this schema element but traverse all it's child elements
                 return undefined;
               }
               reference = await this.toReference(_empty.url.unsanitize($refBaseURI));
               const selector = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
-              referencedElement = (0, _openapi.maybeRefractToSchemaElement)((0, _apidomJsonPointer.evaluate)(selector, reference.value.result));
+              const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
+              referencedElement = (0, _apidomJsonPointer.evaluate)(selector, referenceAsSchema);
+              referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
+              referencedElement.id = identityManager.identify(referencedElement);
             }
           } else {
             throw error;
@@ -473,7 +527,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         }
 
         // detect direct or indirect reference
-        if (this.indirections.includes(referencedElement)) {
+        if (referencingElement === referencedElement) {
           throw new _apidomError.ApiDOMError('Recursive Schema Object reference detected');
         }
 
@@ -482,45 +536,66 @@ 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}"`);
         }
 
-        // useCircularStructures option processing
-        if (!this.useCircularStructures) {
-          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 baseURI = _empty.url.resolve(retrievalURI, $refBaseURI);
-              const cycledSchemaElement = new _apidomNsOpenapi.SchemaElement({
-                $ref: baseURI
-              }, (0, _apidomCore.cloneDeep)(referencingElement.meta), (0, _apidomCore.cloneDeep)(referencingElement.attributes));
-              cycledSchemaElement.get('$ref').classes.push('cycle');
-              return cycledSchemaElement;
+        // detect second deep dive into the same fragment and avoid it
+        if (ancestorsLineage.includes(referencedElement)) {
+          reference.refSet.circular = true;
+          if (this.options.dereference.circular === 'error') {
+            throw new _apidomError.ApiDOMError('Circular reference detected');
+          } else if (this.options.dereference.circular === 'replace') {
+            var _this$options$derefer7, _this$options$derefer8;
+            const refElement = new _apidomCore.RefElement(referencedElement.id, {
+              type: 'json-schema',
+              uri: reference.uri,
+              $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
+              baseURI: _empty.url.resolve(retrievalURI, $refBaseURI),
+              referencingElement
+            });
+            const replacer = (_this$options$derefer7 = (_this$options$derefer8 = this.options.dereference.strategyOpts['openapi-3-1']) == null ? void 0 : _this$options$derefer8.circularReplacer) != null ? _this$options$derefer7 : this.options.dereference.circularReplacer;
+            const replacement = replacer(refElement);
+            if ((0, _apidomCore.isMemberElement)(parent)) {
+              parent.value = replacement; // eslint-disable-line no-param-reassign
+            } else if (Array.isArray(parent)) {
+              parent[key] = replacement; // eslint-disable-line no-param-reassign
             }
-            // skip processing this schema and all it's child schemas
-            return false;
+            return !parent ? replacement : false;
           }
         }
 
-        // append referencing schema to ancestors lineage
-        directAncestors.add(referencingElement);
-
-        // dive deep into the fragment
-        const mergeVisitor = OpenApi3_1SwaggerClientDereferenceVisitor({
-          reference,
-          namespace: this.namespace,
-          indirections: [...this.indirections],
-          options: this.options,
-          useCircularStructures: this.useCircularStructures,
-          allowMetaPatches: this.allowMetaPatches,
-          ancestors: ancestorsLineage,
-          basePath: (_this$basePath5 = this.basePath) != null ? _this$basePath5 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
-        });
-        referencedElement = await visitAsync(referencedElement, mergeVisitor, {
-          keyMap: _apidomNsOpenapi.keyMap,
-          nodeTypeGetter: _apidomNsOpenapi.getNodeType
-        });
+        /**
+         * Dive deep into the fragment.
+         *
+         * Cases to consider:
+         *  1. We're crossing document boundary
+         *  2. Fragment is from non-root document
+         *  3. Fragment is a Schema Object with $ref field. We need to follow it to get the eventual value
+         *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
+         */
+        const isNonRootDocument = _empty.url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
+        const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+        if ((isExternalReference || isNonRootDocument || (0, _apidomNsOpenapi.isSchemaElement)(referencedElement) && (0, _apidomCore.isStringElement)(referencedElement.$ref) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
+          var _this$basePath5;
+          // append referencing schema to ancestors lineage
+          directAncestors.add(referencingElement);
+
+          // dive deep into the fragment
+          const mergeVisitor = OpenApi3_1SwaggerClientDereferenceVisitor({
+            reference,
+            namespace: this.namespace,
+            indirections: [...this.indirections],
+            options: this.options,
+            useCircularStructures: this.useCircularStructures,
+            allowMetaPatches: this.allowMetaPatches,
+            ancestors: ancestorsLineage,
+            basePath: (_this$basePath5 = this.basePath) != null ? _this$basePath5 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
+          });
+          referencedElement = await visitAsync(referencedElement, mergeVisitor, {
+            keyMap: _apidomNsOpenapi.keyMap,
+            nodeTypeGetter: _apidomNsOpenapi.getNodeType
+          });
 
-        // remove referencing schema from ancestors lineage
-        directAncestors.delete(referencingElement);
+          // remove referencing schema from ancestors lineage
+          directAncestors.delete(referencingElement);
+        }
         this.indirections.pop();
         if ((0, _apidomNsOpenapi.isBooleanJsonSchemaElement)(referencedElement)) {
           const booleanJsonSchemaElement = (0, _apidomCore.cloneDeep)(referencedElement);
@@ -532,11 +607,20 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           booleanJsonSchemaElement.setMetaProperty('ref-origin', reference.uri);
           // annotate fragment with info about referencing element
           booleanJsonSchemaElement.setMetaProperty('ref-referencing-element-id', (0, _apidomCore.cloneDeep)(identityManager.identify(referencingElement)));
-          return booleanJsonSchemaElement;
+          if ((0, _apidomCore.isMemberElement)(parent)) {
+            parent.value = booleanJsonSchemaElement; // eslint-disable-line no-param-reassign
+          } else if (Array.isArray(parent)) {
+            parent[key] = booleanJsonSchemaElement; // eslint-disable-line no-param-reassign
+          }
+          return !parent ? booleanJsonSchemaElement : false;
         }
-        const mergeAndAnnotateReferencedElement = refedElement => {
+
+        /**
+         * Creating a new version of Schema Object by merging fields from referenced Schema Object with referencing one.
+         */
+        if ((0, _apidomNsOpenapi.isSchemaElement)(referencedElement)) {
           // 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));
+          const mergedElement = new _apidomNsOpenapi.SchemaElement([...referencedElement.content], (0, _apidomCore.cloneDeep)(referencedElement.meta), (0, _apidomCore.cloneDeep)(referencedElement.attributes));
           // existing keywords from referencing schema overrides ones from referenced schema
           referencingElement.forEach((value, keyElement, item) => {
             mergedElement.remove((0, _apidomCore.toValue)(keyElement));
@@ -560,32 +644,31 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
               mergedElement.set('$$ref', baseURI);
             }
           }
-          return mergedElement;
-        };
+          referencedElement = mergedElement;
+        }
 
-        // attempting to create cycle
-        if (ancestorsLineage.includes(referencingElement) || ancestorsLineage.includes(referencedElement)) {
-          var _ancestorsLineage$fin3;
-          const replaceWith = (_ancestorsLineage$fin3 = ancestorsLineage.findItem(wasReferencedBy(referencingElement))) != null ? _ancestorsLineage$fin3 : mergeAndAnnotateReferencedElement(referencedElement);
-          if ((0, _apidomCore.isMemberElement)(parent)) {
-            parent.value = replaceWith; // eslint-disable-line no-param-reassign
-          } else if (Array.isArray(parent)) {
-            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
-          }
-          return false;
+        /**
+         * Transclude referencing element with merged referenced element.
+         */
+        if ((0, _apidomCore.isMemberElement)(parent)) {
+          parent.value = referencedElement; // eslint-disable-line no-param-reassign
+        } else if (Array.isArray(parent)) {
+          parent[key] = referencedElement; // eslint-disable-line no-param-reassign
         }
 
-        // transclude referencing element with merged referenced element
-        return mergeAndAnnotateReferencedElement(referencedElement);
+        /**
+         * We're at the root of the tree, so we're just replacing the entire tree.
+         */
+        return !parent ? referencedElement : undefined;
       } catch (error) {
-        var _this$basePath6, _this$options$derefer3;
+        var _this$basePath6, _this$options$derefer9;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = new _index.SchemaRefError(`Could not resolve reference: ${rootCause.message}`, {
           baseDoc: this.reference.uri,
           $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);
+        (_this$options$derefer9 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer9 = _this$options$derefer9.errors) == null || _this$options$derefer9.push == null || _this$options$derefer9.push(wrappedError);
         return undefined;
       }
     },
@@ -601,14 +684,14 @@ 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 _this$basePath7, _this$options$derefer4;
+        var _this$basePath7, _this$options$derefer10;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
           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);
+        (_this$options$derefer10 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer10 = _this$options$derefer10.errors) == null || _this$options$derefer10.push == null || _this$options$derefer10.push(wrappedError);
         return undefined;
       }
     }