@speclynx/apidom-reference 3.1.0 → 3.2.0

package/package.json

@@ -1,7 +1,30 @@
 {
   "name": "@speclynx/apidom-reference",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Advanced algorithms for semantic ApiDOM manipulations like dereferencing or resolution.",
+  "keywords": [
+    "apidom",
+    "api",
+    "$ref",
+    "dereference",
+    "reference",
+    "resolve",
+    "resolver",
+    "bundle",
+    "openapi",
+    "swagger",
+    "oas",
+    "asyncapi",
+    "arazzo",
+    "json-schema",
+    "json",
+    "yaml",
+    "spec",
+    "specification",
+    "parse",
+    "typescript",
+    "javascript"
+  ],
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org",
@@ -231,29 +254,29 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
-    "@speclynx/apidom-core": "3.1.0",
-    "@speclynx/apidom-datamodel": "3.1.0",
-    "@speclynx/apidom-error": "3.1.0",
-    "@speclynx/apidom-json-pointer": "3.1.0",
-    "@speclynx/apidom-ns-arazzo-1": "3.1.0",
-    "@speclynx/apidom-ns-asyncapi-2": "3.1.0",
-    "@speclynx/apidom-ns-json-schema-2020-12": "3.1.0",
-    "@speclynx/apidom-ns-openapi-2": "3.1.0",
-    "@speclynx/apidom-ns-openapi-3-0": "3.1.0",
-    "@speclynx/apidom-ns-openapi-3-1": "3.1.0",
-    "@speclynx/apidom-parser-adapter-arazzo-json-1": "3.1.0",
-    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "3.1.0",
-    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "3.1.0",
-    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "3.1.0",
-    "@speclynx/apidom-parser-adapter-json": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-2": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "3.1.0",
-    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "3.1.0",
-    "@speclynx/apidom-parser-adapter-yaml-1-2": "3.1.0",
-    "@speclynx/apidom-traverse": "3.1.0",
+    "@speclynx/apidom-core": "3.2.0",
+    "@speclynx/apidom-datamodel": "3.2.0",
+    "@speclynx/apidom-error": "3.2.0",
+    "@speclynx/apidom-json-pointer": "3.2.0",
+    "@speclynx/apidom-ns-arazzo-1": "3.2.0",
+    "@speclynx/apidom-ns-asyncapi-2": "3.2.0",
+    "@speclynx/apidom-ns-json-schema-2020-12": "3.2.0",
+    "@speclynx/apidom-ns-openapi-2": "3.2.0",
+    "@speclynx/apidom-ns-openapi-3-0": "3.2.0",
+    "@speclynx/apidom-ns-openapi-3-1": "3.2.0",
+    "@speclynx/apidom-parser-adapter-arazzo-json-1": "3.2.0",
+    "@speclynx/apidom-parser-adapter-arazzo-yaml-1": "3.2.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-json-2": "3.2.0",
+    "@speclynx/apidom-parser-adapter-asyncapi-yaml-2": "3.2.0",
+    "@speclynx/apidom-parser-adapter-json": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-2": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-0": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-json-3-1": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-2": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-0": "3.2.0",
+    "@speclynx/apidom-parser-adapter-openapi-yaml-3-1": "3.2.0",
+    "@speclynx/apidom-parser-adapter-yaml-1-2": "3.2.0",
+    "@speclynx/apidom-traverse": "3.2.0",
     "@swaggerexpert/arazzo-runtime-expression": "^2.0.3",
     "axios": "^1.13.5",
     "picomatch": "^4.0.3",
@@ -275,5 +298,5 @@
     "README.md",
     "CHANGELOG.md"
   ],
-  "gitHead": "c0807dd0b7770eaaf594bd0013be65e2c28c504a"
+  "gitHead": "eeb2f01cd34fb0a95617f02bc1b6683aefc028f2"
 }

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

@@ -274,6 +274,7 @@ class Arazzo1DereferenceVisitor {
       path.skip();
       return;
     }
+    const indirectionsSize = this.indirections.length;
     try {
       // compute baseURI using rules around $id and $ref keywords
       let reference = await this.toReference(url.unsanitize(this.reference.uri));
@@ -418,7 +419,6 @@ class Arazzo1DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['arazzo-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -451,7 +451,6 @@ class Arazzo1DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       // Boolean JSON Schemas
       if ((0, _apidomNsArazzo.isBooleanJSONSchemaElement)(referencedElement)) {
@@ -494,6 +493,8 @@ class Arazzo1DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Schema Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -267,6 +267,7 @@ class Arazzo1DereferenceVisitor {
       path.skip();
       return;
     }
+    const indirectionsSize = this.indirections.length;
     try {
       // compute baseURI using rules around $id and $ref keywords
       let reference = await this.toReference(url.unsanitize(this.reference.uri));
@@ -411,7 +412,6 @@ class Arazzo1DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['arazzo-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -444,7 +444,6 @@ class Arazzo1DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       // Boolean JSON Schemas
       if (isBooleanJSONSchemaElement(referencedElement)) {
@@ -487,6 +486,8 @@ class Arazzo1DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Schema Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -213,6 +213,7 @@ class AsyncAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -273,7 +274,6 @@ class AsyncAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -307,7 +307,6 @@ class AsyncAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       // Boolean JSON Schemas
       if ((0, _apidomNsAsyncapi.isBooleanJSONSchemaElement)(referencedElement)) {
@@ -342,6 +341,8 @@ class AsyncAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async ChannelItemElement(path) {
@@ -372,6 +373,7 @@ class AsyncAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -422,7 +424,6 @@ class AsyncAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -456,7 +457,6 @@ class AsyncAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Channel Item by merging fields from referenced Channel Item with referencing one.
@@ -487,6 +487,8 @@ class AsyncAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Channel Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -206,6 +206,7 @@ class AsyncAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -266,7 +267,6 @@ class AsyncAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -300,7 +300,6 @@ class AsyncAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       // Boolean JSON Schemas
       if (isBooleanJSONSchemaElement(referencedElement)) {
@@ -335,6 +334,8 @@ class AsyncAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async ChannelItemElement(path) {
@@ -365,6 +366,7 @@ class AsyncAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -415,7 +417,6 @@ class AsyncAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['asyncapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -449,7 +450,6 @@ class AsyncAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Channel Item by merging fields from referenced Channel Item with referencing one.
@@ -480,6 +480,8 @@ class AsyncAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Channel Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -213,6 +213,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -273,7 +274,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -305,7 +305,6 @@ class OpenAPI2DereferenceVisitor {
         });
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -326,6 +325,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async PathItemElement(path) {
@@ -356,6 +357,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -406,7 +408,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -440,7 +441,6 @@ class OpenAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
@@ -472,6 +472,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Path Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async JSONReferenceElement(path) {
@@ -499,6 +501,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -559,7 +562,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -593,7 +595,6 @@ class OpenAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -614,6 +615,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing JSON Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -206,6 +206,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -266,7 +267,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -298,7 +298,6 @@ class OpenAPI2DereferenceVisitor {
         });
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -319,6 +318,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async PathItemElement(path) {
@@ -349,6 +350,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -399,7 +401,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -433,7 +434,6 @@ class OpenAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
@@ -465,6 +465,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Path Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async JSONReferenceElement(path) {
@@ -492,6 +494,7 @@ class OpenAPI2DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -552,7 +555,6 @@ class OpenAPI2DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-2']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -586,7 +588,6 @@ class OpenAPI2DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -607,6 +608,8 @@ class OpenAPI2DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing JSON Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
 }

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

@@ -214,6 +214,7 @@ class OpenAPI3_0DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -274,7 +275,6 @@ class OpenAPI3_0DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -308,7 +308,6 @@ class OpenAPI3_0DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -329,6 +328,8 @@ class OpenAPI3_0DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async PathItemElement(path) {
@@ -359,6 +360,7 @@ class OpenAPI3_0DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -409,7 +411,6 @@ class OpenAPI3_0DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -443,7 +444,6 @@ class OpenAPI3_0DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
@@ -474,6 +474,8 @@ class OpenAPI3_0DereferenceVisitor {
     } catch (error) {
       const $ref = (0, _apidomCore.toValue)(referencingElement.$ref);
       this.handleError(`Error while dereferencing Path Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async LinkElement(path) {

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

@@ -207,6 +207,7 @@ class OpenAPI3_0DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -267,7 +268,6 @@ class OpenAPI3_0DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -301,7 +301,6 @@ class OpenAPI3_0DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of referenced element to avoid modifying the original one.
@@ -322,6 +321,8 @@ class OpenAPI3_0DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Reference Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async PathItemElement(path) {
@@ -352,6 +353,7 @@ class OpenAPI3_0DereferenceVisitor {
       return;
     }
     const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
+    const indirectionsSize = this.indirections.length;
     try {
       const reference = await this.toReference(toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
@@ -402,7 +404,6 @@ class OpenAPI3_0DereferenceVisitor {
           });
           const replacer = this.options.dereference.strategyOpts['openapi-3-0']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
-          this.indirections.pop();
           path.replaceWith(replacement);
           return;
         }
@@ -436,7 +437,6 @@ class OpenAPI3_0DereferenceVisitor {
         // remove referencing reference from ancestors lineage
         directAncestors.delete(referencingElement);
       }
-      this.indirections.pop();
 
       /**
        * Creating a new version of Path Item by merging fields from referenced Path Item with referencing one.
@@ -467,6 +467,8 @@ class OpenAPI3_0DereferenceVisitor {
     } catch (error) {
       const $ref = toValue(referencingElement.$ref);
       this.handleError(`Error while dereferencing Path Item Object. Cannot resolve $ref "${$ref}": ${error.message}`, error, referencingElement, '$ref', $ref, path);
+    } finally {
+      if (this.indirections.length > indirectionsSize) this.indirections.pop();
     }
   }
   async LinkElement(path) {