@zuplo/cli 1.112.0 → 1.114.0

package/dist/cli.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]="59466167-0404-586c-a0b1-a43e10b758a7")}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]="b7b80df4-c767-5f13-8cfb-0f1e1b3f3d4f")}catch(e){}}();
 import * as dotenv from "dotenv";
 dotenv.config();
 import * as Sentry from "@sentry/node";
@@ -8,6 +8,7 @@ import { fileURLToPath } from "node:url";
 import { gte } from "semver";
 import { hideBin } from "yargs/helpers";
 import yargs from "yargs/yargs";
+import compile from "./cmds/compile.js";
 import convert from "./cmds/convert.js";
 import deleteZup from "./cmds/delete.js";
 import deploy from "./cmds/deploy.js";
@@ -41,6 +42,7 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
     });
     const cli = yargs(hideBin(process.argv))
         .env("ZUPLO")
+        .command(compile)
         .command(convert)
         .command(deleteZup)
         .command(deploy)
@@ -82,4 +84,4 @@ else {
     Consider using a Node.js version manager such as https://github.com/nvm-sh/nvm.`);
 }
 //# sourceMappingURL=cli.js.map
-//# debugId=59466167-0404-586c-a0b1-a43e10b758a7
+//# debugId=b7b80df4-c767-5f13-8cfb-0f1e1b3f3d4f

package/dist/cmds/compile.js

@@ -0,0 +1,42 @@
+
+!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]="8fe11cc3-3789-5833-a7f5-87287360c988")}catch(e){}}();
+import { captureEvent } from "../common/analytics/lib.js";
+import { identify } from "../common/middleware/user-identification.js";
+import setBlocking from "../common/output.js";
+import { ZuploProjectValidator } from "../common/validators/file-system-validator.js";
+import { YargsChecker } from "../common/validators/lib.js";
+import { compile } from "../compile/handler.js";
+export default {
+    desc: false,
+    command: "compile",
+    builder: (yargs) => {
+        return yargs
+            .option("dir", {
+            type: "string",
+            describe: "The directory containing your zup",
+            default: ".",
+            normalize: true,
+            hidden: true,
+        })
+            .option("port", {
+            type: "number",
+            describe: "The port to run the zup server on",
+            default: 9000,
+        })
+            .option("binary-name", {
+            type: "string",
+            describe: "The name of the binary",
+            default: "compiled-zup",
+        })
+            .middleware([setBlocking, identify])
+            .check(async (argv) => {
+            return await new YargsChecker(new ZuploProjectValidator()).check(argv);
+        });
+    },
+    handler: async (argv) => {
+        await captureEvent({ argv, event: "zup compile" });
+        await compile(argv);
+    },
+};
+//# sourceMappingURL=compile.js.map
+//# debugId=8fe11cc3-3789-5833-a7f5-87287360c988

package/dist/cmds/dev.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]="d957865b-71c7-52e9-907e-8620261193ad")}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]="cd26cd84-311b-5031-9a99-53eb489538ba")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
@@ -32,6 +32,10 @@ export default {
             type: "number",
             describe: "The port to run the route designer on",
             default: 9100,
+        })
+            .option("debug-port", {
+            type: "number",
+            describe: "The port to run the Chrome inspector on",
         })
             .middleware([setBlocking, identify])
             .check(async (argv) => {
@@ -44,4 +48,4 @@ export default {
     },
 };
 //# sourceMappingURL=dev.js.map
-//# debugId=d957865b-71c7-52e9-907e-8620261193ad
+//# debugId=cd26cd84-311b-5031-9a99-53eb489538ba

package/dist/common/utils/ports.js

@@ -0,0 +1,19 @@
+
+!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]="91c950c6-7387-5ef2-9dbb-0446c03af67f")}catch(e){}}();
+import net from "net";
+export function isPortAvailable(host, port) {
+    return new Promise((resolve, reject) => {
+        const socket = new net.Socket();
+        socket.connect(port, host);
+        socket.on("connect", () => {
+            socket.destroy();
+            resolve(false);
+        });
+        socket.on("error", (err) => {
+            socket.destroy();
+            resolve(true);
+        });
+    });
+}
+//# sourceMappingURL=ports.js.map
+//# debugId=91c950c6-7387-5ef2-9dbb-0446c03af67f

package/dist/compile/handler.js

@@ -0,0 +1,42 @@
+
+!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]="e900a4a1-10a3-56de-9a5a-905c90d64f03")}catch(e){}}();
+import { cpSync, existsSync } from "node:fs";
+import { join, relative, resolve } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { printDiagnosticsToConsole } from "../common/output.js";
+export async function compile(argv) {
+    const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));
+    const zuploRuntimePath = new URL("../../node_modules/@zuplo/runtime", import.meta.url);
+    if (existsSync(zuploRuntimePath)) {
+        cpSync(zuploRuntimePath, join(sourceDirectory, "node_modules/@zuplo/runtime"), {
+            recursive: true,
+            dereference: true,
+        });
+    }
+    process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(new URL("../../node_modules", import.meta.url));
+    const loadedEnvFiles = [];
+    const envFile = join(sourceDirectory, ".env");
+    if (existsSync(envFile)) {
+        loadedEnvFiles.push(".env");
+    }
+    const envZuploFile = join(sourceDirectory, ".env.zuplo");
+    if (existsSync(envZuploFile)) {
+        loadedEnvFiles.push(".env.zuplo");
+    }
+    const config = {
+        build_assets_url: pathToFileURL(sourceDirectory),
+    };
+    process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
+    const core = await import("@zuplo/core");
+    const zupPort = argv.port;
+    await core.default.compileWorkerdServer({
+        sourceDirectory,
+        port: zupPort,
+        binaryName: argv["binary-name"],
+        generateSourceMaps: true,
+    });
+    printDiagnosticsToConsole("📦 Compiled a self-contained zup binary");
+    printDiagnosticsToConsole(`The binary is available at ${sourceDirectory}/dist/${argv["binary-name"]}`);
+}
+//# sourceMappingURL=handler.js.map
+//# debugId=e900a4a1-10a3-56de-9a5a-905c90d64f03

package/dist/dev/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]="dde8dcee-5646-5949-b230-50ff08e9b24e")}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]="bf35816c-e91e-5014-89aa-1472b78406e4")}catch(e){}}();
 import { cpSync, existsSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { logger } from "../common/logger.js";
-import { printDiagnosticsToConsole } from "../common/output.js";
+import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, } from "../common/output.js";
+import { isPortAvailable } from "../common/utils/ports.js";
 import { ApiServer } from "../editor/server/server.js";
 export async function dev(argv) {
     const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));
@@ -30,10 +31,27 @@ export async function dev(argv) {
     };
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
     const core = await import("@zuplo/core");
-    const port = argv.port;
+    const zupPort = argv.port;
+    const zupEditorPort = argv.editorPort;
+    const zupDebugPort = argv.debugPort;
+    const isZupPortAvailable = await isPortAvailable("localhost", zupPort);
+    if (!isZupPortAvailable) {
+        printCriticalFailureToConsoleAndExit(`Port ${zupPort} is already in use. Please specify a different port using --port.`);
+    }
+    const isZupEditorPortAvailable = await isPortAvailable("localhost", zupEditorPort);
+    if (!isZupEditorPortAvailable) {
+        printCriticalFailureToConsoleAndExit(`Port ${zupEditorPort} is already in use. Please specify a different port using --editor-port.`);
+    }
+    if (zupDebugPort) {
+        const isZupDebugPortAvailable = await isPortAvailable("localhost", zupDebugPort);
+        if (!isZupDebugPortAvailable) {
+            printCriticalFailureToConsoleAndExit(`Port ${zupDebugPort} is already in use. Please specify a different port using --debug-port.`);
+        }
+    }
     await core.default.startDevServer({
         sourceDirectory,
-        port,
+        port: zupPort,
+        debugPort: argv.debugPort ?? undefined,
         devServerPort: undefined,
         generateSourceMaps: true,
         flags: {
@@ -54,7 +72,7 @@ export async function dev(argv) {
     printDiagnosticsToConsole("Started local development setup");
     printDiagnosticsToConsole("Ctrl+C to exit");
     printDiagnosticsToConsole("");
-    printDiagnosticsToConsole(`🚀 Zuplo Gateway: http://localhost:${port}`);
+    printDiagnosticsToConsole(`🚀 Zuplo Gateway: http://localhost:${zupPort}`);
     if (argv["start-editor"]) {
         printDiagnosticsToConsole(`📘 Route Designer: http://localhost:${argv.editorPort}`);
     }
@@ -77,4 +95,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=dde8dcee-5646-5949-b230-50ff08e9b24e
+//# debugId=bf35816c-e91e-5014-89aa-1472b78406e4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.112.0",
+  "version": "1.114.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",
@@ -64,10 +64,10 @@
     "@opentelemetry/api": "^1.8.0",
     "@sentry/node": "7.69.0",
     "@swc/core": "1.3.78",
-    "@zuplo/core": "5.2076.0",
+    "@zuplo/core": "5.2150.0",
     "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
-    "@zuplo/runtime": "5.2076.0",
+    "@zuplo/runtime": "5.2150.0",
     "chalk": "^5.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",
@@ -95,7 +95,7 @@
     "tar": "^6.1.13",
     "temp": "^0.9.4",
     "uuid": "^9.0.1",
-    "workerd": "1.20240405.0",
+    "workerd": "^1.20240502.0",
     "yargs": "^17.7.1"
   }
 }