@zuplo/cli 1.119.0 → 1.121.0

package/dist/common/api/lib.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]="42cac298-fcf2-5562-897a-c038f723b42f")}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]="be0ac435-2dd7-5dd2-8b70-531169e83b20")}catch(e){}}();
 export {};
 //# sourceMappingURL=lib.js.map
-//# debugId=42cac298-fcf2-5562-897a-c038f723b42f
+//# debugId=be0ac435-2dd7-5dd2-8b70-531169e83b20

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]="73d10b24-273b-5673-84fb-1a5d0cf42473")}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]="925b9d73-a4de-58c0-8f9c-d757c8155db7")}catch(e){}}();
 import dotenv from "dotenv";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
@@ -37,10 +37,11 @@ export async function compile(argv) {
                 ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,
                 ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,
             }
-            : {},
+            :
+                undefined,
     });
     printDiagnosticsToConsole("📦 Compiled a self-contained zup binary");
     printDiagnosticsToConsole(`The binary is available at ${sourceDirectory}/dist/${argv["binary-name"]}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=73d10b24-273b-5673-84fb-1a5d0cf42473
+//# debugId=925b9d73-a4de-58c0-8f9c-d757c8155db7

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]="5bca5e0a-7dea-5646-b573-80529e630b6e")}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]="249e5ca0-cf2e-5cef-a5c8-0d053825f965")}catch(e){}}();
 import dotenv from "dotenv";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
@@ -23,7 +23,7 @@ export async function dev(argv) {
     if (existsSync(envFile)) {
         loadedEnvFiles.push(".env");
     }
-    let envZuplo = {};
+    let envZuplo;
     const envZuploFile = join(sourceDirectory, ".env.zuplo");
     if (existsSync(envZuploFile)) {
         const contents = readFileSync(envZuploFile);
@@ -34,6 +34,7 @@ export async function dev(argv) {
         build_assets_url: pathToFileURL(sourceDirectory),
     };
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
+    process.env.ZUPLO_IS_LOCAL_DEVELOPMENT = "true";
     const core = await import("@zuplo/core");
     const zupPort = argv.port;
     const zupEditorPort = argv.editorPort;
@@ -62,7 +63,8 @@ export async function dev(argv) {
                 ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,
                 ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,
             }
-            : {},
+            :
+                undefined,
     });
     let editor;
     if (argv["start-editor"]) {
@@ -100,4 +102,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=5bca5e0a-7dea-5646-b573-80529e630b6e
+//# debugId=249e5ca0-cf2e-5cef-a5c8-0d053825f965

package/dist/link/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]="ad2554cf-74a8-5032-b89f-1ffefcd558f0")}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]="ed7a03fb-41e9-565b-95ab-4e4d54930128")}catch(e){}}();
 import { select } from "@inquirer/prompts";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
@@ -9,10 +9,26 @@ import { printCriticalFailureToConsoleAndExit, printResultToConsoleAndExitGracef
 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;
+    let environmentType = env.environmentType.toLowerCase();
+    let branchName = env.branchName;
+    switch (environmentType) {
+        case "working-copy":
+        case "working_copy":
+            environmentType = "development";
+            branchName = "(via portal.zuplo.com)";
+            break;
+    }
+    return `${env.name} (${environmentType}, ${branchName})`;
+}
 export async function link(argv) {
-    const rawAuth = await readFile(join(ZUPLO_XDG_STATE_HOME, ZUPLO_AUTH_FILE_NAME), "utf-8");
-    const authJson = JSON.parse(rawAuth);
     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`, {
@@ -88,17 +104,33 @@ export async function link(argv) {
             },
         });
         const environmentJsonFromDeveloperAPI = (await environmentResponseFromDeveloperAPI.json());
-        const environments = Object.assign({}, environmentJsonFromZuploAPI.data.map((env) => env.name), environmentJsonFromDeveloperAPI.data.map((env) => env.name));
-        if (environments.length === 1) {
-            environment = environments[0];
+        const environments = Object.assign({}, environmentJsonFromZuploAPI.data
+            .map((env) => {
+            return {
+                [prettyPrintEnvironmentPrompt(env)]: env.name,
+            };
+        })
+            .reduce((acc, curr) => {
+            return { ...acc, ...curr };
+        }), environmentJsonFromDeveloperAPI.data
+            .map((env) => {
+            return {
+                [prettyPrintEnvironmentPrompt(env)]: env.name,
+            };
+        })
+            .reduce((acc, curr) => {
+            return { ...acc, ...curr };
+        }));
+        if (Object.values(environments).length === 1) {
+            environment = Object.values(environments)[0];
         }
         else {
             environment = await select({
                 message: "Select the environment to work with",
-                choices: Object.values(environments).map((env) => {
+                choices: Object.entries(environments).map(([key, value]) => {
                     return {
-                        name: env,
-                        value: env,
+                        name: key,
+                        value,
                     };
                 }),
             });
@@ -114,4 +146,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=ad2554cf-74a8-5032-b89f-1ffefcd558f0
+//# debugId=ed7a03fb-41e9-565b-95ab-4e4d54930128

package/dist/link/populate.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]="da90a012-8772-5d2a-9ae1-fcaa66577120")}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]="6b8807e2-ae71-5c69-b1b0-2b87dae3cfdb")}catch(e){}}();
 import { applyEdits, modify } from "jsonc-parser";
 import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
@@ -64,9 +64,9 @@ export async function pullSystemConfig(argv) {
 ZUPLO_ACCOUNT_NAME=${payload.accountName}
 ZUPLO_PROJECT_NAME=${payload.projectName}
 ZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}
-SYSTEM_CONFIGURATIONS=${payload["systemConfigurations"]}
+ZUPLO_SYSTEM_CONFIGURATIONS=${payload["systemConfigurations"]}
 `;
     await writeFile(zuploPreferredConfigFile, content);
 }
 //# sourceMappingURL=populate.js.map
-//# debugId=da90a012-8772-5d2a-9ae1-fcaa66577120
+//# debugId=6b8807e2-ae71-5c69-b1b0-2b87dae3cfdb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.119.0",
+  "version": "1.121.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.2249.0",
+    "@zuplo/core": "5.2251.0",
     "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
-    "@zuplo/runtime": "5.2249.0",
+    "@zuplo/runtime": "5.2251.0",
     "chalk": "^5.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",