@zuplo/cli 1.97.0 → 1.99.0

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

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="18229bd2-cc3c-521a-93e5-30a1d8f03044")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="91ee157c-141d-5381-a1b8-ef9f2f5625d8")}catch(e){}}();
 import { captureEvent } from "../../common/analytics/lib.js";
 import setBlocking from "../../common/output.js";
 import { ZuploProjectValidator } from "../../common/validators/file-system-validator.js";
@@ -26,6 +26,10 @@ export default {
             type: "string",
             describe: "The OpenAPI file to import",
             conflicts: ["source-url"],
+        })
+            .option("destination", {
+            type: "string",
+            describe: "The destination file name. Defaults to the inferred path from the source name",
         })
             .demandOption(["source"])
             .middleware([setBlocking])
@@ -39,4 +43,4 @@ export default {
     },
 };
 //# sourceMappingURL=import-openapi.js.map
-//# debugId=18229bd2-cc3c-521a-93e5-30a1d8f03044
+//# debugId=91ee157c-141d-5381-a1b8-ef9f2f5625d8

package/dist/dev/handler.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="693e8a63-74e3-5e0f-8ccd-e696344947e7")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="4a8615df-d2b4-5848-86ad-a1cf7f258048")}catch(e){}}();
 import { cpSync, existsSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -44,6 +44,7 @@ export async function dev(argv) {
     let editor;
     if (argv["start-editor"]) {
         editor = new ApiServer({
+            cliArgs: argv,
             workingDir: sourceDirectory,
             port: argv.editorPort,
             isStandalone: false,
@@ -77,4 +78,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=693e8a63-74e3-5e0f-8ccd-e696344947e7
+//# debugId=4a8615df-d2b4-5848-86ad-a1cf7f258048

package/dist/editor/handler.js

@@ -1,10 +1,11 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="fc77d1b3-caea-5c0e-8d5d-3a380bd43f60")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="9e4106dc-1dc1-522d-9fb8-0657dd99f9f9")}catch(e){}}();
 import { logger } from "../common/logger.js";
 import { ApiServer } from "./server/server.js";
 export async function editor(argv) {
     const workingDir = argv.dir || process.cwd();
     const server = new ApiServer({
+        cliArgs: argv,
         workingDir,
         port: argv.port,
         isStandalone: true,
@@ -22,4 +23,4 @@ export async function editor(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=fc77d1b3-caea-5c0e-8d5d-3a380bd43f60
+//# debugId=9e4106dc-1dc1-522d-9fb8-0657dd99f9f9

package/dist/editor/server/server.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5ab9ac05-f559-54b5-b7df-cad35032f993")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="421dfa2f-b392-5e9d-9e07-f810a3e4295f")}catch(e){}}();
 import fastifyStatic from "@fastify/static";
 import chokidar from "chokidar";
 import Fastify from "fastify";
@@ -7,6 +7,7 @@ import { FastifySSEPlugin } from "fastify-sse-v2";
 import fs, { readFile, readdir } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { captureEvent, shutdownAnalytics } from "../../common/analytics/lib.js";
 import { logger } from "../../common/logger.js";
 import { printDiagnosticsToConsole } from "../../common/output.js";
 import { corsPlugin } from "./cors-plugin.js";
@@ -15,17 +16,20 @@ const POLICIES_FILENAME = "policies.json";
 const CONFIG_DIR = "config";
 export class ApiServer {
     fastify;
-    listenerPort;
-    isStandalone;
     listenerHost;
-    workingDir;
     watcher;
     sseContext;
+    cliArgs;
+    workingDir;
+    listenerPort;
+    isStandalone;
     constructor(options = {
+        cliArgs: {},
         workingDir: ".",
         port: 9100,
         isStandalone: true,
     }) {
+        this.cliArgs = options.cliArgs;
         this.workingDir = options.workingDir;
         this.listenerPort = options.port;
         this.isStandalone = options.isStandalone;
@@ -38,6 +42,7 @@ export class ApiServer {
         });
     }
     init = async () => {
+        const cliArgs = this.cliArgs;
         this.fastify.register(corsPlugin, { origin: true });
         this.fastify.register(FastifySSEPlugin);
         const editorRootPath = fileURLToPath(new URL("../", import.meta.url));
@@ -47,6 +52,7 @@ export class ApiServer {
         this.fastify.register((instance, _options, done) => {
             instance.get("/", {
                 handler: async (_request, reply) => {
+                    await captureEvent({ argv: cliArgs, event: "route-designer: /" });
                     let html = await readFile(path.join(editorRootPath, "index.html"), "utf-8");
                     html = html.replace("__SERVER_DATA__", JSON.stringify({
                         server_address: this.listenerHost,
@@ -57,6 +63,10 @@ export class ApiServer {
             });
             instance.get("/open-api-content", {
                 handler: async (request, reply) => {
+                    await captureEvent({
+                        argv: cliArgs,
+                        event: "route-designer: /open-api-content",
+                    });
                     const { path: filePath } = request.query;
                     if (filePath === null || filePath === undefined) {
                         return reply.code(404).send("You must select a file to work with");
@@ -90,6 +100,10 @@ export class ApiServer {
             });
             instance.get("/open-api-files", {
                 handler: async (request, reply) => {
+                    await captureEvent({
+                        argv: cliArgs,
+                        event: "route-designer: /open-api-files",
+                    });
                     const projectConfigPath = path.join(this.workingDir, CONFIG_DIR);
                     if (!(await dirExists(projectConfigPath))) {
                         request.log.warn(`Cannot find the project '${CONFIG_DIR}' folder. Make sure '${this.workingDir}' has a '${CONFIG_DIR}' folder.`);
@@ -106,6 +120,10 @@ export class ApiServer {
                 method: "POST",
                 url: "/save-open-api-updates",
                 handler: async (request, reply) => {
+                    await captureEvent({
+                        argv: cliArgs,
+                        event: "route-designer: /save-open-api-updates",
+                    });
                     const bodyContent = request.body;
                     bodyContent.forEach(async (fileData) => {
                         const openApiFilePath = path.join(this.workingDir, "config", fileData.filePath);
@@ -121,6 +139,10 @@ export class ApiServer {
             });
             instance.get("/updates", {
                 handler: async (request, reply) => {
+                    await captureEvent({
+                        argv: cliArgs,
+                        event: "route-designer: /updates",
+                    });
                     if (this.watcher && this.watcher.closed === true) {
                         this.watcher = chokidar.watch(path.join(this.workingDir, CONFIG_DIR));
                     }
@@ -141,6 +163,10 @@ export class ApiServer {
             });
             instance.get("/modules-data", {
                 handler: async (request, reply) => {
+                    await captureEvent({
+                        argv: cliArgs,
+                        event: "route-designer: /modules-data",
+                    });
                     const projectModulesPath = path.join(this.workingDir, "modules");
                     if (!(await dirExists(projectModulesPath))) {
                         request.log.warn(`Cannot find the project 'modules' folder. Make sure '${this.workingDir}' has a 'modules' folder.`);
@@ -211,6 +237,7 @@ export class ApiServer {
             printDiagnosticsToConsole("Closing route designer");
         }
         try {
+            shutdownAnalytics();
             if (this.sseContext) {
                 this.sseContext.source.end();
             }
@@ -226,4 +253,4 @@ export class ApiServer {
     };
 }
 //# sourceMappingURL=server.js.map
-//# debugId=5ab9ac05-f559-54b5-b7df-cad35032f993
+//# debugId=421dfa2f-b392-5e9d-9e07-f810a3e4295f

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

@@ -1,11 +1,11 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="df049bf3-685f-5110-ad16-56cbf1132b2c")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="084826a4-e8ee-5dc8-9b9b-486425443698")}catch(e){}}();
 import { confirm } from "@inquirer/prompts";
 import jsYaml from "js-yaml";
 import { existsSync, writeFileSync } from "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { basename, dirname, extname, join, relative } from "node:path";
+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";
@@ -76,7 +76,19 @@ export async function importOpenApi(argv) {
     const basePath = basename(normalizedFilePath, extName);
     const fileContent = rawOpenApiSpec.toString();
     const parsedOpenApiSpec = await parseOpenApiFile(extName, fileContent);
-    const destinationFilePath = join(process.cwd(), "config", `${basePath.replace("oas", "")}.oas.json`);
+    let destinationFilePath = join(process.cwd(), "config", `${basePath.replace(".oas", "")}.oas.json`);
+    if (argv.destination) {
+        const destination = argv.destination;
+        if (destination.includes(sep)) {
+            await printCriticalFailureToConsoleAndExit(`File names should not be nested with file separators.`);
+        }
+        if (destination.endsWith("oas.json")) {
+            destinationFilePath = join(process.cwd(), "config", destination);
+        }
+        else {
+            destinationFilePath = join(process.cwd(), "config", `${destination.replace(".oas", "")}.oas.json`);
+        }
+    }
     let originalDocument;
     if (!existsSync(destinationFilePath)) {
         originalDocument = (await parseOpenApiFile(".json", BASE_TEMPLATE));
@@ -130,4 +142,4 @@ export async function importOpenApi(argv) {
     await printResultToConsoleAndExitGracefully(`Import successful. File written to ${destinationFilePath}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=df049bf3-685f-5110-ad16-56cbf1132b2c
+//# debugId=084826a4-e8ee-5dc8-9b9b-486425443698

package/package.json

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