fix: duplicated components created when referencing from components (#…

…1080)

__tests__/bundle/no-duplicated-components/.redocly.yaml

@@ -0,0 +1,3 @@
+apis:
+  main:
+    root: ./openapi.yaml

__tests__/bundle/no-duplicated-components/Test.yaml

@@ -0,0 +1 @@
+type: object

__tests__/bundle/no-duplicated-components/openapi.yaml

@@ -0,0 +1,8 @@
+openapi: 3.1.0
+paths:
+  /path:
+    $ref: './paths/path.yaml'
+components:
+  schemas:
+    Test:
+      $ref: './Test.yaml'

__tests__/bundle/no-duplicated-components/paths/path.yaml

@@ -0,0 +1,6 @@
+get:
+  requestBody:
+    content:
+      'application/json':
+        schema:
+          $ref: ../Test.yaml

__tests__/bundle/no-duplicated-components/snapshot.js

@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`E2E bundle no-duplicated-components 1`] = `
+openapi: 3.1.0
+paths:
+  /path:
+    get:
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Test'
+components:
+  schemas:
+    Test:
+      type: object
+
+bundling ./openapi.yaml...
+📦 Created a bundle for ./openapi.yaml at stdout <test>ms.
+
+`;

__tests__/bundle/no-self-referenced-components/.redocly.yaml

@@ -0,0 +1,3 @@
+apis:
+  main:
+    root: ./openapi.yaml

__tests__/bundle/no-self-referenced-components/openapi.yaml

@@ -0,0 +1,9 @@
+openapi: 3.0.3
+paths:
+  /pets/{petId}:
+    $ref: './paths/Pet.yaml'
+components:
+  schemas:
+    $ref: './schemas/_index.yaml'
+  parameters:
+    $ref: './parameters/_index.yaml'

__tests__/bundle/no-self-referenced-components/parameters/PetId.yaml

@@ -0,0 +1,4 @@
+name: petId
+in: path
+schema:
+  type: string

__tests__/bundle/no-self-referenced-components/parameters/_index.yaml

@@ -0,0 +1,2 @@
+PetId:
+  $ref: './PetId.yaml'

__tests__/bundle/no-self-referenced-components/paths/Pet.yaml

@@ -0,0 +1,9 @@
+get:
+  parameters:
+    - $ref: '../parameters/PetId.yaml'
+  responses:
+    '200':
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/Pet.yaml'

__tests__/bundle/no-self-referenced-components/schemas/Pet.yaml

@@ -0,0 +1 @@
+type: object

__tests__/bundle/no-self-referenced-components/schemas/_index.yaml

@@ -0,0 +1,2 @@
+Pet:
+  $ref: './Pet.yaml'

__tests__/bundle/no-self-referenced-components/snapshot.js

@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`E2E bundle no-self-referenced-components 1`] = `
+openapi: 3.0.3
+paths:
+  /pets/{petId}:
+    get:
+      parameters:
+        - $ref: '#/components/parameters/PetId'
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+components:
+  schemas:
+    Pet:
+      type: object
+  parameters:
+    PetId:
+      name: petId
+      in: path
+      schema:
+        type: string
+
+bundling ./openapi.yaml...
+📦 Created a bundle for ./openapi.yaml at stdout <test>ms.
+
+`;

__tests__/bundle/no-self-referenced-or-duplicated-components/.redocly.yaml

@@ -0,0 +1,3 @@
+apis:
+  main:
+    root: ./openapi.yaml

__tests__/bundle/no-self-referenced-or-duplicated-components/components/schemas.yaml

@@ -0,0 +1,3 @@
+schemas:
+  myObject:
+    $ref: ../folder/myObject.v2.schema.yaml

__tests__/bundle/no-self-referenced-or-duplicated-components/folder/myObject.v2.schema.yaml

@@ -0,0 +1 @@
+type: object

__tests__/bundle/no-self-referenced-or-duplicated-components/openapi.yaml

@@ -0,0 +1,3 @@
+openapi: 3.0.3
+components:
+  $ref: ./components/schemas.yaml

__tests__/bundle/no-self-referenced-or-duplicated-components/snapshot.js

@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`E2E bundle no-self-referenced-or-duplicated-components 1`] = `
+openapi: 3.0.3
+components:
+  schemas:
+    myObject.v2.schema:
+      type: object
+
+bundling ./openapi.yaml...
+📦 Created a bundle for ./openapi.yaml at stdout <test>ms.
+
+`;

packages/core/src/bundle.ts

@@ -223,6 +223,7 @@ function makeBundleVisitor(
   keepUrlRefs: boolean
 ) {
   let components: Record<string, Record<string, any>>;
+  let rootLocation: Location;
 
   const visitor: Oas3Visitor | Oas2Visitor = {
     ref: {
@@ -264,7 +265,8 @@ function makeBundleVisitor(
       },
     },
     Root: {
-      enter(root: any) {
+      enter(root: any, ctx: any) {
+        rootLocation = ctx.location;
         if (version === OasMajorVersion.Version3) {
           components = root.components = root.components || {};
         } else if (version === OasMajorVersion.Version2) {
@@ -342,7 +344,8 @@ function makeBundleVisitor(
   ) {
     if (
       isRef(node) &&
-      ctx.resolve(node).location?.absolutePointer === target.location.absolutePointer
+      ctx.resolve(node, rootLocation.absolutePointer).location?.absolutePointer ===
+        target.location.absolutePointer
     ) {
       return true;
     }