oas-toolkit 0.10.1 → 0.10.3

package/canonical-server.js

@@ -4,9 +4,16 @@ const url = require("url");
 function run(oas) {
   oas = JSON.parse(JSON.stringify(oas)); // Prevent modification of original object
 
+  if (!oas.servers) {
+    return oas;
+  }
+
   // Extract the base path from servers
   const basePaths = uniqWith(
     oas.servers.map((server) => {
+      if (server.variables) {
+        return null;
+      }
       const path = url.parse(server.url).pathname;
       if (path.slice(-1) === "/") {
         return path.slice(0, -1);
@@ -14,7 +21,7 @@ function run(oas) {
       return path;
     }),
     isEqual
-  );
+  ).filter((n) => n);
 
   if (basePaths.length > 1) {
     throw new Error(
@@ -32,6 +39,9 @@ function run(oas) {
 
   // Remove paths from servers
   oas.servers = oas.servers.map((server) => {
+    if (server.variables) {
+      return server;
+    }
     const u = url.parse(server.url);
     return {
       ...server,

package/canonical-server.test.js

@@ -12,15 +12,26 @@ const oas = {
   },
 };
 
-function getOas(urls) {
-  return {
-    servers: urls.map((url) => {
+function getOas(urls, variables) {
+  const o = {
+    paths: oas.paths,
+  };
+
+  if (urls.length > 0) {
+    o.servers = urls.map((url) => {
+      if (variables) {
+        return {
+          url,
+          variables,
+        };
+      }
+
       return {
         url,
       };
-    }),
-    paths: oas.paths,
-  };
+    });
+  }
+  return o;
 }
 
 describe("#run", () => {
@@ -74,4 +85,43 @@ describe("#run", () => {
       { url: "https://stagingapi.example.com/" },
     ]);
   });
+
+  it("ignores empty server blocks", () => {
+    const o = getOas([]);
+    expect(c.run(o)).toEqual({
+      paths: {
+        "/foo/hello": {},
+        "/foo/world": {},
+      },
+    });
+  });
+
+  it("ignores variable based urls", () => {
+    const vars = {
+      hostname: {
+        default: "localhost",
+        description: "Hostname for Kong's Admin API",
+      },
+      path: {
+        default: "/",
+        description: "Base path for Kong's Admin API",
+      },
+      port: {
+        default: "8001",
+        description: "Port for Kong's Admin API",
+      },
+      protocol: {
+        default: "http",
+        description: "Protocol for requests to Kong's Admin API",
+        enum: ["http", "https"],
+      },
+    };
+    const o = getOas(["{protocol}://{hostname}:{port}{path}"], vars);
+    expect(c.run(o).servers).toEqual([
+      {
+        url: "{protocol}://{hostname}:{port}{path}",
+        variables: vars,
+      },
+    ]);
+  });
 });

package/package.json

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