@zuplo/cli 1.135.0 → 1.137.0

package/dist/cmds/link.js

@@ -1,10 +1,10 @@
 
-!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]="6247c8c4-d880-5d58-a70d-da8c9cd6a68a")}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]="0be777a5-8b5e-574a-8780-387d75ffa1a8")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
 import { configure } from "../common/middleware/user-configuration.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
-import { validLinkDirectoryValidator } from "../common/validators/file-system-validator.js";
+import { ZuploProjectValidator } from "../common/validators/file-system-validator.js";
 import { YargsChecker } from "../common/validators/lib.js";
 import { link } from "../link/handler.js";
 export default {
@@ -23,10 +23,6 @@ export default {
             type: "string",
             describe: "The API Key from Zuplo",
             envVar: "API_KEY",
-        })
-            .option("account", {
-            type: "string",
-            describe: "The account name",
         })
             .option("project", {
             type: "string",
@@ -39,7 +35,7 @@ export default {
             .demandOption(["api-key"])
             .middleware([setBlocking, configure, identify])
             .check(async (argv) => {
-            return await new YargsChecker(validLinkDirectoryValidator).check(argv);
+            return await new YargsChecker(new ZuploProjectValidator()).check(argv);
         });
     },
     handler: async (argv) => {
@@ -48,4 +44,4 @@ export default {
     },
 };
 //# sourceMappingURL=link.js.map
-//# debugId=6247c8c4-d880-5d58-a70d-da8c9cd6a68a
+//# debugId=0be777a5-8b5e-574a-8780-387d75ffa1a8

package/dist/cmds/login.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]="06344ac3-9b00-5aab-b199-3e6faa6f3a3d")}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]="9e5192b9-6633-50a5-9d82-31772de9bdcc")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
 import { login } from "../login/handler.js";
 export default {
-    desc: "Authenticates the user",
+    desc: false,
     command: "login",
     builder: (yargs) => {
         return yargs
@@ -21,4 +21,4 @@ export default {
     },
 };
 //# sourceMappingURL=login.js.map
-//# debugId=06344ac3-9b00-5aab-b199-3e6faa6f3a3d
+//# debugId=9e5192b9-6633-50a5-9d82-31772de9bdcc

package/dist/common/validators/file-system-validator.js

@@ -1,12 +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]="ec896cd1-5086-5370-b8b3-2b5276946dee")}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]="a750d299-a353-5bcd-b91f-5638e7666ba6")}catch(e){}}();
 import fg from "fast-glob";
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { simpleGit } from "simple-git";
 import { TEST_IN_FOLDER } from "../constants.js";
 import { CompositeValidator } from "./lib.js";
-import { IsZupLinkInvocableValidator } from "./login-state-validator.js";
 import { ProjectIsSetValidator } from "./project-name-validator.js";
 export class NotAGitRepoError extends Error {
     constructor() {
@@ -161,6 +160,5 @@ export class ZuploProjectHasTestsValidator {
 }
 export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new GitVersionControlValidator(), new GitCommitValidator(), new GitBranchValidator(), new GitRemoteValidator(), new ProjectIsSetValidator());
 export const validTestDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());
-export const validLinkDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new IsZupLinkInvocableValidator());
 //# sourceMappingURL=file-system-validator.js.map
-//# debugId=ec896cd1-5086-5370-b8b3-2b5276946dee
+//# debugId=a750d299-a353-5bcd-b91f-5638e7666ba6

package/dist/compile/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]="925b9d73-a4de-58c0-8f9c-d757c8155db7")}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]="5c4fd488-f729-519e-94c7-406abc7a3013")}catch(e){}}();
 import dotenv from "dotenv";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
@@ -27,7 +27,7 @@ export async function compile(argv) {
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
     const core = await import("@zuplo/core");
     const zupPort = argv.port;
-    await core.default.compileWorkerdServer({
+    await core.compileWorkerdServer({
         sourceDirectory,
         port: zupPort,
         binaryName: argv["binary-name"],
@@ -44,4 +44,4 @@ export async function compile(argv) {
     printDiagnosticsToConsole(`The binary is available at ${sourceDirectory}/dist/${argv["binary-name"]}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=925b9d73-a4de-58c0-8f9c-d757c8155db7
+//# debugId=5c4fd488-f729-519e-94c7-406abc7a3013

package/dist/deploy/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]="cb40a32c-281e-5053-b199-7372a7cf977b")}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]="fe162c2d-58d1-5c9a-908d-f03546eabbc5")}catch(e){}}();
 import { readFileSync } from "node:fs";
 import { parse } from "node:path";
 import { MAX_PRETTY_BRANCH_NAME as MAX_PRETTY_BRANCH_LENGTH } from "../common/constants.js";
@@ -66,7 +66,7 @@ async function deployToSaas(argv) {
     }
 }
 async function deployToSelfHosted(argv) {
-    let endpoint = normalizeUrl(argv["self-hosted-endpoint"]);
+    const endpoint = normalizeUrl(argv["self-hosted-endpoint"]);
     const archiveMetadata = await archive(argv);
     logger.debug(`Tarball created locally at ${archiveMetadata}`);
     const { project } = argv;
@@ -102,7 +102,7 @@ async function deployToSelfHosted(argv) {
         }
     }
     else {
-        logger.error(JSON.stringify(await uploadUrlResponse.json(), null, 2), "Failed to upload to self-hosted build endpoint");
+        logger.error(await uploadUrlResponse.text(), "Failed to upload to self-hosted build endpoint");
         await printCriticalFailureToConsoleAndExit("Error: Failed to upload to self-hosted build endpoint");
     }
 }
@@ -117,4 +117,4 @@ export const getPrettyBranch = (branch) => {
         .substring(0, MAX_PRETTY_BRANCH_LENGTH));
 };
 //# sourceMappingURL=handler.js.map
-//# debugId=cb40a32c-281e-5053-b199-7372a7cf977b
+//# debugId=fe162c2d-58d1-5c9a-908d-f03546eabbc5

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]="249e5ca0-cf2e-5cef-a5c8-0d053825f965")}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]="578699eb-40b5-5250-9349-02c17f8b59b6")}catch(e){}}();
 import dotenv from "dotenv";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
@@ -41,19 +41,19 @@ export async function dev(argv) {
     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.`);
+        await 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.`);
+        await 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 printCriticalFailureToConsoleAndExit(`Port ${zupDebugPort} is already in use. Please specify a different port using --debug-port.`);
         }
     }
-    await core.default.startDevServer({
+    await core.startDevServer({
         sourceDirectory,
         port: zupPort,
         debugPort: argv.debugPort ?? undefined,
@@ -102,4 +102,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=249e5ca0-cf2e-5cef-a5c8-0d053825f965
+//# debugId=578699eb-40b5-5250-9349-02c17f8b59b6

package/dist/link/handler.js

@@ -1,70 +1,40 @@
 
-!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]="ed7a03fb-41e9-565b-95ab-4e4d54930128")}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]="f5e0af3e-c906-5b69-ba89-acd89c389920")}catch(e){}}();
 import { select } from "@inquirer/prompts";
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
-import { ZUPLO_AUTH_FILE_NAME } from "../common/constants.js";
 import { logger } from "../common/logger.js";
 import { printCriticalFailureToConsoleAndExit, printResultToConsoleAndExitGracefully, textOrJson, } from "../common/output.js";
 import settings from "../common/settings.js";
-import { ZUPLO_XDG_STATE_HOME } from "../common/xdg/lib.js";
 import { pullSystemConfig, safeMergeConfig } from "./populate.js";
-function prettyPrintEnvironmentPrompt(env) {
-    const name = env.name;
+function prettyPrintEnvironmentPrompt(env, hasSingleDevelopmentInstance) {
     let environmentType = env.environmentType.toLowerCase();
     let branchName = env.branchName;
+    let name = env.name;
     switch (environmentType) {
         case "working-copy":
         case "working_copy":
-            environmentType = "development";
-            branchName = "(via portal.zuplo.com)";
-            break;
+        case "development":
+            if (hasSingleDevelopmentInstance) {
+                name = "Default for local development";
+                environmentType = "development";
+                branchName = "";
+                return `${name} (${environmentType})`;
+            }
+            else {
+                environmentType = "development";
+                branchName = "";
+                return `${name} (${environmentType})`;
+            }
     }
-    return `${env.name} (${environmentType}, ${branchName})`;
+    return `${name} (${environmentType}, ${branchName})`;
 }
 export async function link(argv) {
+    const account = argv.account;
     let environment = argv.environment;
-    let authJson = undefined;
-    if (!environment) {
-        const rawAuth = await readFile(join(ZUPLO_XDG_STATE_HOME, ZUPLO_AUTH_FILE_NAME), "utf-8");
-        authJson = JSON.parse(rawAuth);
-    }
-    let account = argv.account;
-    if (!environment && !account) {
-        const accountResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts`, {
-            headers: {
-                authorization: `Bearer ${authJson.access_token}`,
-            },
-        });
-        if (!accountResponse.ok) {
-            logger.error({
-                status: accountResponse.status,
-                statusText: accountResponse.statusText,
-                response: textOrJson(await accountResponse.text()),
-            }, "Failed to list accounts.");
-            await printCriticalFailureToConsoleAndExit("Error: Failed to list your accounts. Try again later.");
-        }
-        const accountJson = (await accountResponse.json());
-        if (accountJson.length === 1) {
-            account = accountJson[0].name;
-        }
-        else {
-            account = await select({
-                message: "Select the account to work with",
-                choices: accountJson.map((acc) => {
-                    return {
-                        name: acc.name,
-                        value: acc.name,
-                    };
-                }),
-            });
-        }
-    }
     let project = argv.project;
     if (!environment && !project) {
-        const projectResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts/${account}/projects`, {
+        const projectResponse = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/projects`, {
             headers: {
-                authorization: `Bearer ${authJson.access_token}`,
+                authorization: `Bearer ${argv["api-key"]}`,
             },
         });
         if (!projectResponse.ok) {
@@ -92,30 +62,55 @@ export async function link(argv) {
         }
     }
     if (!environment) {
-        const environmentResponseFromZuploAPI = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
-            headers: {
-                authorization: `Bearer ${authJson.access_token}`,
-            },
-        });
-        const environmentJsonFromZuploAPI = (await environmentResponseFromZuploAPI.json());
-        const environmentResponseFromDeveloperAPI = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
+        const baseUrl = `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments`;
+        const queryParams = {
+            accountName: account,
+            projectName: project,
+        };
+        const url = new URL(baseUrl);
+        url.search = new URLSearchParams(queryParams).toString();
+        let environmentResponseFromDeveloperAPI = await fetch(url, {
             headers: {
                 authorization: `Bearer ${argv["api-key"]}`,
             },
         });
-        const environmentJsonFromDeveloperAPI = (await environmentResponseFromDeveloperAPI.json());
-        const environments = Object.assign({}, environmentJsonFromZuploAPI.data
-            .map((env) => {
-            return {
-                [prettyPrintEnvironmentPrompt(env)]: env.name,
-            };
-        })
-            .reduce((acc, curr) => {
-            return { ...acc, ...curr };
-        }), environmentJsonFromDeveloperAPI.data
+        let environmentJsonFromDeveloperAPI = (await environmentResponseFromDeveloperAPI.json());
+        let numDevelopmentEnvironments = environmentJsonFromDeveloperAPI.data.filter((env) => {
+            return env.environmentType === "development";
+        }).length;
+        if (numDevelopmentEnvironments <= 0) {
+            const createDevelopmenEnvironmentResponse = await fetch(`${baseUrl}`, {
+                method: "POST",
+                headers: {
+                    authorization: `Bearer ${argv["api-key"]}`,
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                    accountName: account,
+                    projectName: project,
+                    environmentType: "development",
+                }),
+            });
+            if (!createDevelopmenEnvironmentResponse.ok) {
+                logger.debug({
+                    status: createDevelopmenEnvironmentResponse.status,
+                    statusText: createDevelopmenEnvironmentResponse.statusText,
+                }, "Failed to create a new instance of development environment");
+                await printCriticalFailureToConsoleAndExit("Failed to create a new development environment. Please try again later.");
+            }
+            numDevelopmentEnvironments++;
+            environmentResponseFromDeveloperAPI = await fetch(url, {
+                headers: {
+                    authorization: `Bearer ${argv["api-key"]}`,
+                },
+            });
+            environmentJsonFromDeveloperAPI =
+                (await environmentResponseFromDeveloperAPI.json());
+        }
+        const environments = Object.assign({}, environmentJsonFromDeveloperAPI.data
             .map((env) => {
             return {
-                [prettyPrintEnvironmentPrompt(env)]: env.name,
+                [prettyPrintEnvironmentPrompt(env, numDevelopmentEnvironments == 1)]: env.name,
             };
         })
             .reduce((acc, curr) => {
@@ -146,4 +141,4 @@ Successfully linked your local directory to the ${project} project in the ${acco
 .env.zuplo and zuplo.jsonc have been updated with the new values.`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=ed7a03fb-41e9-565b-95ab-4e4d54930128
+//# debugId=f5e0af3e-c906-5b69-ba89-acd89c389920

package/dist/list/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]="9bf817d9-a39a-5f35-9cdf-764d79d64533")}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]="f2551837-2c92-5d06-a4ed-dc11de482182")}catch(e){}}();
 import { logger } from "../common/logger.js";
 import { printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, textOrJson, } from "../common/output.js";
 import settings from "../common/settings.js";
@@ -36,7 +36,7 @@ async function listFromSaas(argv) {
     }
 }
 async function listFromSelfHosted(argv) {
-    let endpoint = normalizeUrl(argv["self-hosted-endpoint"]);
+    const endpoint = normalizeUrl(argv["self-hosted-endpoint"]);
     const listResponse = await fetch(`${endpoint}/v1/deployments`, {
         method: "GET",
         headers: {
@@ -56,4 +56,4 @@ async function listFromSelfHosted(argv) {
     }
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=9bf817d9-a39a-5f35-9cdf-764d79d64533
+//# debugId=f2551837-2c92-5d06-a4ed-dc11de482182

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.135.0",
+  "version": "1.137.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.2393.0",
+    "@zuplo/core": "5.2458.0",
     "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
-    "@zuplo/runtime": "5.2393.0",
+    "@zuplo/runtime": "5.2458.0",
     "chalk": "^5.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",