oas-toolkit 0.3.0 → 0.4.0

package/cli/bin.js

@@ -9,4 +9,9 @@ yargs(hideBin(process.argv))
     "merge the provided OpenAPI files",
     require("./commands/merge")
   )
+  .command(
+    "check-conflicts <openapi.yaml> <...more.yaml>",
+    "check for conflicting components, paths, tags, and security schemes",
+    require("./commands/check-conflicts")
+  )
   .parse();

package/cli/commands/check-conflicts.js

@@ -0,0 +1,26 @@
+const fs = require("fs");
+const yaml = require("js-yaml");
+
+module.exports = async function ({ argv }) {
+  try {
+    const oasFiles = argv._.slice(1);
+    if (oasFiles.length < 2) {
+      return;
+    }
+
+    const merger = require("../../merger");
+
+    const oas = [];
+    for (let f of oasFiles) {
+      oas.push(yaml.load(fs.readFileSync(f)));
+    }
+
+    merger.ensureNoComponentColissions(oas, argv);
+    merger.ensureNoPathColissions(oas, argv);
+    merger.ensureNoTagColissions(oas, argv);
+    merger.ensureNoSecurityColissions(oas, argv);
+  } catch (e) {
+    console.error(`ERROR: ${e.message}`);
+    process.exit(1);
+  }
+};

package/merger.js

@@ -3,11 +3,6 @@ const isEqual = require("lodash.isequal");
 const uniqWith = require("lodash.uniqwith");
 
 function merge(objects, options) {
-  ensureNoComponentColissions(objects, options);
-  ensureNoPathColissions(objects, options);
-  ensureNoTagColissions(objects, options);
-  ensureNoSecurityColissions(objects, options);
-
   // Do the merge
   let combinedSpec = {};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oas-toolkit",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -16,7 +16,6 @@
     "jest": "^29.5.0"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^10.1.0",
     "debug": "^4.3.4",
     "js-yaml": "^4.1.0",
     "jsonpath-plus": "^7.2.0",