oas-toolkit 0.15.4 → 0.15.6

package/filter-annotation.js

@@ -12,19 +12,27 @@ function run(oas, opts = {}) {
       }
 
       if (opts.keep?.length > 0) {
+        let containsAny = false;
         for (const keep of opts.keep) {
-          if (path[verb][keep] === undefined) {
-            delete path[verb];
+          if (path[verb][keep] !== undefined) {
+            containsAny = true;
           }
         }
+        if (!containsAny) {
+          delete path[verb];
+        }
       }
 
       if (opts.remove?.length > 0) {
+        let containsAny = false;
         for (const remove of opts.remove) {
-          if (path[verb][remove]) {
-            delete path[verb];
+          if (path[verb][remove] !== undefined) {
+            containsAny = true;
           }
         }
+        if (containsAny) {
+          delete path[verb];
+        }
       }
     }
 

package/filter-annotation.test.js

@@ -13,6 +13,7 @@ const oas = {
         description: "Hello world endpoint",
       },
       post: {
+        "x-other": true,
         description: "Create a hello world",
       },
     },
@@ -32,16 +33,37 @@ describe("#run", () => {
     });
   });
 
+  it("with multiple keep", () => {
+    expect(c.run(oas, { keep: ["x-internal", "x-other"] }).paths).toEqual({
+      "/foo/hello": {
+        get: {
+          "x-internal": true,
+          description: "Hello world endpoint",
+        },
+        post: {
+          "x-other": true,
+          description: "Create a hello world",
+        },
+      },
+    });
+  });
+
   it("with remove", () => {
     expect(c.run(oas, { remove: ["x-internal"] }).paths).toEqual({
       "/foo/hello": {
         post: {
+          "x-other": true,
           description: "Create a hello world",
         },
       },
     });
   });
 
+  it("with multiple remove", () => {
+    expect(c.run(oas, { remove: ["x-internal", "x-other"] }).paths).toEqual({
+    });
+  });
+
   it("removes empty paths", () => {
     expect(c.run(oas, { keep: ["x-missing"] }).paths).toEqual({});
   });

package/merger.js

@@ -107,7 +107,7 @@ function ensureNoPathColissions(objects) {
       // Normalise the path
       const normalisedPath = path.replace(/\{\w+\}/g, "{VAR}");
       for (let verb in object.paths[path]) {
-        const k = `${verb.toUpperCase()} ${normalisedPath}`;
+        const k = `${verb.toUpperCase()} ${normalisedPath} @ ${object.servers ? object.servers.map(s => s.url).join(",") : "No Server"}`;
         actionList[k] = actionList[k] || [];
         actionList[k].push(object.info.title);
       }

package/merger.test.js

@@ -363,6 +363,15 @@ describe("path collisions", () => {
     ).toBe(undefined);
   });
 
+  it.only("does not throw with overlapping paths and different servers", () => {
+    expect(
+      ensureNoPathColissions([
+        { info: { title: "One" }, servers: [{ url: "https://example.com/v1" }], paths: { "/foo": { get: {} } } },
+        { info: { title: "Two" }, servers: [{ url: "https://example.com/v2" }], paths: { "/foo": { get: {} } } },
+      ])
+    ).toBe(undefined);
+  });
+
   it("throws when a path has multiple implementations for a verb (static)", () => {
     expect(() => {
       ensureNoPathColissions([

package/package.json

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