oas-toolkit 0.10.3 → 0.11.0

package/canonical-server.js

@@ -23,6 +23,10 @@ function run(oas) {
     isEqual
   ).filter((n) => n);
 
+  if (basePaths.length === 0) {
+    return oas;
+  }
+
   if (basePaths.length > 1) {
     throw new Error(
       `Base paths are different in the servers block. Found: ${basePaths.join(

package/canonical-server.test.js

@@ -43,6 +43,22 @@ describe("#run", () => {
     });
   });
 
+  it("is idempotent", () => {
+    const o = getOas(["https://api.example.com/v1"]);
+
+    const updatedOas = c.run(o);
+    expect(updatedOas.paths).toEqual({
+      "/v1/foo/hello": {},
+      "/v1/foo/world": {},
+    });
+
+    // Run a second time
+    expect(c.run(updatedOas).paths).toEqual({
+      "/v1/foo/hello": {},
+      "/v1/foo/world": {},
+    });
+  });
+
   it("handles multiple servers", () => {
     const o = getOas([
       "https://api.example.com/v1",

package/cli/bin.js

@@ -5,8 +5,14 @@ const { hideBin } = require("yargs/helpers");
 
 yargs(hideBin(process.argv))
   .command(
-    "merge <openapi> <...more.yaml>",
+    "merge <openapi...>",
     "merge the provided OpenAPI files",
+    (yargs) => {
+      yargs.option("move-path-to-operation", {
+        demandOption: false,
+        type: "boolean",
+      });
+    },
     require("./commands/merge")
   )
   .command(

package/cli/commands/merge.js

@@ -1,20 +1,22 @@
 const fs = require("fs");
 const yaml = require("js-yaml");
 
-module.exports = function ({ argv }) {
+module.exports = function (argv, b, c) {
   try {
-    const oasFiles = argv._.slice(1);
-    if (oasFiles.length < 2) {
-      return;
-    }
+    const oasFiles = argv.openapi;
 
     const merger = require("../../merger");
+    const canonical = require("../../canonical-server");
 
-    const oas = [];
+    let oas = [];
     for (let f of oasFiles) {
       oas.push(yaml.load(fs.readFileSync(f)));
     }
 
+    if (argv.movePathToOperation) {
+      oas = oas.map((o) => canonical.run(o));
+    }
+
     const combined = merger(oas, argv);
     console.log(yaml.dump(combined));
   } catch (e) {

package/package.json

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