perf(reference): dereference fragments as quick as possible (#3981)

Refs #3974
swagger-api · Mar 29, 2024 · 48b4eb4 · 48b4eb4
1 parent fa1493c
commit 48b4eb4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/apidom-reference/src/dereference/strategies/asyncapi-2/visitor.ts b/packages/apidom-reference/src/dereference/strategies/asyncapi-2/visitor.ts
@@ -233,7 +233,7 @@ const AsyncApi2DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -430,7 +430,7 @@ const AsyncApi2DereferenceVisitor = stampit({
        *  3. Fragment is a Channel 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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||

diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-2/visitor.ts b/packages/apidom-reference/src/dereference/strategies/openapi-2/visitor.ts
@@ -234,7 +234,7 @@ const OpenApi2DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -406,7 +406,7 @@ const OpenApi2DereferenceVisitor = stampit({
        *  3. Fragment is a Paht 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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -593,7 +593,7 @@ const OpenApi2DereferenceVisitor = stampit({
        *  3. Fragment is a JSON 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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||

diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-3-0/visitor.ts b/packages/apidom-reference/src/dereference/strategies/openapi-3-0/visitor.ts
@@ -238,7 +238,7 @@ const OpenApi3_0DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -409,7 +409,7 @@ const OpenApi3_0DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||

diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-3-1/visitor.ts b/packages/apidom-reference/src/dereference/strategies/openapi-3-1/visitor.ts
@@ -246,7 +246,7 @@ const OpenApi3_1DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -433,7 +433,7 @@ const OpenApi3_1DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||
@@ -857,7 +857,7 @@ const OpenApi3_1DereferenceVisitor = stampit({
        *  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 = reference.refSet.rootRef.uri !== reference.uri;
+      const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
       const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
       if (
         (isExternalReference ||