@zuplo/cli 3.0.1 → 3.0.3

package/dist/deploy/archive.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="38d29045-67e0-5ebe-8296-471b59ce0ea8")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ab3f5b7b-161d-51d0-839f-49bce40034b1")}catch(e){}}();
 import ignore from "ignore";
 import { minimatch } from "minimatch";
 import { randomBytes } from "node:crypto";
@@ -94,6 +94,7 @@ async function generateMetadata(argv) {
         }
         branch = status.current.trim();
         if (branch === "HEAD") {
+            await git.fetch(["--all"]);
             const branchCommit = await git.branch(["-a"]);
             const brancheRef = await git.branch([
                 "-r",
@@ -136,4 +137,4 @@ async function writeGeneratedMetadata(dir, metadata) {
     });
 }
 //# sourceMappingURL=archive.js.map
-//# debugId=38d29045-67e0-5ebe-8296-471b59ce0ea8
+//# debugId=ab3f5b7b-161d-51d0-839f-49bce40034b1

package/dist/project/import-openapi/handler.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a4e07444-c9b0-5d72-9ff0-ddd4f42e802b")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c5ad5812-058b-598b-a3a2-62b383857b12")}catch(e){}}();
 import { confirm } from "@inquirer/prompts";
 import jsYaml from "js-yaml";
 import { existsSync, writeFileSync } from "node:fs";
@@ -9,7 +9,7 @@ import { basename, dirname, extname, join, relative, sep } from "node:path";
 import prettier from "prettier";
 import { logger } from "../../common/logger.js";
 import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../../common/output.js";
-import { addOperationIdsAsNecessary, generateMergeChangeset, parseOpenApiFile, } from "./utils.js";
+import { addOperationIdsAsNecessary, generateMergeChangeset, mergeOpenApiDocuments, parseOpenApiFile, } from "./utils.js";
 const BASE_TEMPLATE = `
 {
   "openapi": "3.1.0",
@@ -132,8 +132,9 @@ export async function importOpenApi(argv) {
             await printResultToConsoleAndExitGracefully("Import cancelled.");
         }
     }
-    addOperationIdsAsNecessary(parsedOpenApiSpec);
-    const formattedOpenApi = await prettier.format(JSON.stringify(parsedOpenApiSpec), {
+    const mergedDocument = mergeOpenApiDocuments(originalDocument, parsedOpenApiSpec);
+    addOperationIdsAsNecessary(mergedDocument);
+    const formattedOpenApi = await prettier.format(JSON.stringify(mergedDocument), {
         parser: "json-stringify",
     });
     writeFileSync(destinationFilePath, formattedOpenApi, {
@@ -142,4 +143,4 @@ export async function importOpenApi(argv) {
     await printResultToConsoleAndExitGracefully(`Import successful. File written to ${destinationFilePath}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=a4e07444-c9b0-5d72-9ff0-ddd4f42e802b
+//# debugId=c5ad5812-058b-598b-a3a2-62b383857b12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",