oas-toolkit 0.6.1 → 0.6.2

package/merger.js

@@ -204,15 +204,42 @@ function ensureNoComplexObjectCollisions(objects) {
       ) {
         const k = this.path.slice(0, -1).join(".");
         allPaths[k] = allPaths[k] || [];
-        allPaths[k].push({ key: this.key, file: object.info.title });
+        allPaths[k].push({
+          key: this.key,
+          file: object.info.title,
+          value: this.node,
+        });
       }
     });
   }
 
   for (let path in allPaths) {
     if (allPaths[path].length > 1) {
+      const v = allPaths[path];
+
+      // If all entries for this path use the same special key
+      if (
+        uniqWith(
+          v.map((f) => f.key),
+          isEqual
+        ).length == 1
+      ) {
+        // Check if all the values are the same
+        const values = v.map((f) => {
+          // If it's a oneOf, order doesn't matter so sort for comparison
+          if (f.key == "oneOf") {
+            f.value.sort();
+          }
+          return f.value;
+        });
+
+        if (isEqual(...values)) {
+          continue;
+        }
+      }
+
       throw new Error(
-        `Conflicting complex object detected: ${path} (${allPaths[path]
+        `Conflicting complex object detected: ${path} (${v
           .map((f) => `${f.file}[${f.key}]`)
           .join(", ")})`
       );

package/merger.test.js

@@ -189,7 +189,90 @@ describe("#ensureNoComplexObjectCollisions", () => {
     );
   });
 
-  it("throws when $ref is detected alongside other values", () => {
+  it("does not throw when refs point to the same component", () => {
+    expect(() => {
+      ensureNoComplexObjectCollisions([
+        {
+          info: { title: "One" },
+          components: {
+            schemas: {
+              DemoError: {
+                $ref: "#/components/schemas/AnotherError",
+              },
+            },
+          },
+        },
+        {
+          info: { title: "Two" },
+          components: {
+            schemas: {
+              DemoError: {
+                $ref: "#/components/schemas/AnotherError",
+              },
+            },
+          },
+        },
+      ]);
+    }).not.toThrow();
+  });
+
+  it("does not throw when oneOf point to the same component (order independent)", () => {
+    expect(() => {
+      ensureNoComplexObjectCollisions([
+        {
+          info: { title: "One" },
+          components: {
+            schemas: {
+              DemoError: {
+                oneOf: ["#/components/schemas/One", "#/components/schemas/Two"],
+              },
+            },
+          },
+        },
+        {
+          info: { title: "Two" },
+          components: {
+            schemas: {
+              DemoError: {
+                oneOf: ["#/components/schemas/Two", "#/components/schemas/One"],
+              },
+            },
+          },
+        },
+      ]);
+    }).not.toThrow();
+  });
+
+  it("throws when allOf values are provided in different orders", () => {
+    expect(() => {
+      ensureNoComplexObjectCollisions([
+        {
+          info: { title: "One" },
+          components: {
+            schemas: {
+              DemoError: {
+                allOf: ["#/components/schemas/One", "#/components/schemas/Two"],
+              },
+            },
+          },
+        },
+        {
+          info: { title: "Two" },
+          components: {
+            schemas: {
+              DemoError: {
+                allOf: ["#/components/schemas/Two", "#/components/schemas/One"],
+              },
+            },
+          },
+        },
+      ]);
+    }).toThrow(
+      "Conflicting complex object detected: components.schemas.DemoError (One[allOf], Two[allOf])"
+    );
+  });
+
+  it("throws when oneOf is detected alongside other values", () => {
     expect(() => {
       ensureNoComplexObjectCollisions([
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oas-toolkit",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "",
   "main": "index.js",
   "bin": {