@zuplo/cli 6.59.0 → 6.59.2

package/dist/common/populate.d.ts

@@ -1,8 +1,4 @@
 import { Arguments } from "../link/handler.js";
-export declare function safeMergeConfig(
-  dir: string,
-  project: string
-): Promise<void>;
 export declare function pullSystemConfig(
   argv: Pick<Arguments, "dir" | "environment" | "authToken">
 ): Promise<void>;

package/dist/common/populate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/common/populate.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAwB/C,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAkDjE;AASD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,aAAa,GAAG,WAAW,CAAC,iBAiD3D;AAUD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,aAAa,GAAG,WAAW,CAAC,iBAwF3D"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../src/common/populate.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AA+B/C,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,aAAa,GAAG,WAAW,CAAC,iBAiD3D;AAUD,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,aAAa,GAAG,WAAW,CAAC,iBAwF3D"}

package/dist/common/populate.js

@@ -1,9 +1,6 @@
-import { existsSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
+import { writeFile } from "node:fs/promises";
 import { join, relative } from "node:path";
-import { applyEdits, modify } from "jsonc-parser";
-import { format } from "prettier";
-import { ZUPLO_FALLBACK_JSON_FILE, ZUPLO_PREFERRED_JSON_FILE, ZUPLO_SYSTEM_ENV_VAR, } from "./constants.js";
+import { ZUPLO_SYSTEM_ENV_VAR } from "./constants.js";
 import { logger } from "./logger.js";
 import { printCriticalFailureToConsoleAndExit } from "./output.js";
 import settings from "./settings.js";
@@ -17,46 +14,6 @@ function wrapEnvValue(value) {
     const escapedValue = value.replace(/"/g, '\\"');
     return `"${escapedValue}"`;
 }
-export async function safeMergeConfig(dir, project) {
-    const normalizedDir = join(relative(process.cwd(), dir));
-    const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_PREFERRED_JSON_FILE);
-    const zuploFallbackConfigFile = join(normalizedDir, ZUPLO_FALLBACK_JSON_FILE);
-    if (existsSync(zuploPreferredConfigFile)) {
-        const originalContents = await readFile(zuploPreferredConfigFile, "utf-8");
-        const modifyProjectEdit = modify(originalContents, ["project"], project, {
-            getInsertionIndex: () => 2,
-        });
-        const contentsPostProject = applyEdits(originalContents, modifyProjectEdit);
-        const formatted = await format(contentsPostProject, {
-            parser: "json",
-            quoteProps: "as-needed",
-        });
-        await writeFile(zuploPreferredConfigFile, formatted);
-    }
-    else if (existsSync(zuploFallbackConfigFile)) {
-        const config = JSON.parse(await readFile(zuploFallbackConfigFile, "utf-8"));
-        const formatted = await format(JSON.stringify({
-            version: 1,
-            project: project,
-            compatibilityDate: config.compatibilityDate,
-        }), {
-            parser: "json",
-            quoteProps: "as-needed",
-        });
-        await writeFile(zuploPreferredConfigFile, formatted);
-    }
-    else {
-        const formatted = await format(JSON.stringify({
-            version: 1,
-            project: project,
-            compatibilityDate: "2023-03-14",
-        }), {
-            parser: "json",
-            quoteProps: "as-needed",
-        });
-        await writeFile(zuploPreferredConfigFile, formatted);
-    }
-}
 export async function pullSystemConfig(argv) {
     const normalizedDir = join(relative(process.cwd(), argv.dir));
     const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);

package/dist/common/populate.js.map

@@ -1 +1 @@
-{"version":3,"file":"populate.js","sourceRoot":"","sources":["../../src/common/populate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oCAAoC,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,QAAQ,MAAM,eAAe,CAAC;AAGrC,MAAM,WAAW,GAAG;IAClB,aAAa;IACb,aAAa;IACb,iBAAiB;IACjB,sBAAsB;CACvB,CAAC;AAUF,SAAS,YAAY,CAAC,KAAa;IAEjC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhD,OAAO,IAAI,YAAY,GAAG,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW,EAAE,OAAe;IAChE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;IACzD,MAAM,wBAAwB,GAAG,IAAI,CACnC,aAAa,EACb,yBAAyB,CAC1B,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAI,CAAC,aAAa,EAAE,wBAAwB,CAAC,CAAC;IAC9E,IAAI,UAAU,CAAC,wBAAwB,CAAC,EAAE,CAAC;QAGzC,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE;YACvE,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,mBAAmB,GAAG,UAAU,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,mBAAmB,EAAE;YAClD,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;SAAM,IAAI,UAAU,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAG,MAAM,MAAM,CAC5B,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;SAC5C,CAAC,EACF;YACE,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,WAAW;SACxB,CACF,CAAC;QACF,MAAM,SAAS,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;SAAM,CAAC;QAEN,MAAM,SAAS,GAAG,MAAM,MAAM,CAC5B,IAAI,CAAC,SAAS,CAAC;YACb,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,OAAO;YAChB,iBAAiB,EAAE,YAAY;SAChC,CAAC,EACF;YACE,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,WAAW;SACxB,CACF,CAAC;QACF,MAAM,SAAS,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAA0D;IAE1D,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,wBAAwB,GAAG,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IAE3E,MAAM,mCAAmC,GAAG,MAAM,KAAK,CACrD,GAAG,QAAQ,CAAC,4BAA4B,oBAAoB,IAAI,CAAC,WAAW,iBAAiB,EAC7F;QACE,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE;SAC1C;KACF,CACF,CAAC;IAEF,IAAI,CAAC,mCAAmC,CAAC,EAAE,EAAE,CAAC;QAC5C,IACE,mCAAmC,CAAC,MAAM,KAAK,GAAG;YAClD,mCAAmC,CAAC,MAAM,KAAK,GAAG,EAClD,CAAC;YACD,MAAM,oCAAoC,CACxC,8HAA8H,CAC/H,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CACV;gBACE,MAAM,EAAE,mCAAmC,CAAC,MAAM;gBAClD,UAAU,EAAE,mCAAmC,CAAC,UAAU;aAC3D,EACD,4BAA4B,IAAI,CAAC,WAAW,EAAE,CAC/C,CAAC;YACF,MAAM,oCAAoC,CACxC,0EAA0E,CAC3E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,mCAAmC,CAAC,IAAI,EAAE,CAAC;IAEjE,MAAM,OAAO,GAAG;;;;qBAIG,OAAO,CAAC,WAAW;qBACnB,OAAO,CAAC,WAAW;yBACf,OAAO,CAAC,eAAe;8BAClB,OAAO,CAAC,sBAAsB,CAAC;CAC5D,CAAC;IAEA,MAAM,SAAS,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AAUD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAA0D;IAE1D,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,wBAAwB,GAAG,IAAI,CAAC,aAAa,EAAE,oBAAoB,CAAC,CAAC;IAE3E,MAAM,mCAAmC,GAAG,MAAM,KAAK,CACrD,GAAG,QAAQ,CAAC,4BAA4B,oBAAoB,IAAI,CAAC,WAAW,uBAAuB,EACnG;QACE,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,IAAI,CAAC,SAAS,EAAE;SAC1C;KACF,CACF,CAAC;IAEF,IAAI,CAAC,mCAAmC,CAAC,EAAE,EAAE,CAAC;QAC5C,IACE,mCAAmC,CAAC,MAAM,KAAK,GAAG;YAClD,mCAAmC,CAAC,MAAM,KAAK,GAAG,EAClD,CAAC;YACD,MAAM,oCAAoC,CACxC,8HAA8H,CAC/H,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CACV;gBACE,MAAM,EAAE,mCAAmC,CAAC,MAAM;gBAClD,UAAU,EAAE,mCAAmC,CAAC,UAAU;aAC3D,EACD,4BAA4B,IAAI,CAAC,WAAW,EAAE,CAC/C,CAAC;YACF,MAAM,oCAAoC,CACxC,0EAA0E,CAC3E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,mCAAmC,CAAC,IAAI,EAAE,CAAC;IAIjE,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SACrC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxE,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,OAAO,GAAG,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IAEL,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;SAC5C,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAEd,OAAO,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,OAAO,GAAG,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IAEL,IAAI,OAAO,GAAG;;;;qBAIK,OAAO,CAAC,WAAW;qBACnB,OAAO,CAAC,WAAW;yBACf,OAAO,CAAC,eAAe;8BAClB,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;IAG9D,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI;;;EAGb,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAChC,CAAC;IAGD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAI;;;;;EAKb,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACzB,CAAC;IAGD,OAAO,IAAI,IAAI,CAAC;IAEhB,MAAM,SAAS,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC","sourcesContent":["import { existsSync } from \"node:fs\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join, relative } from \"node:path\";\nimport { applyEdits, modify } from \"jsonc-parser\";\nimport { format } from \"prettier\";\nimport {\n  ZUPLO_FALLBACK_JSON_FILE,\n  ZUPLO_PREFERRED_JSON_FILE,\n  ZUPLO_SYSTEM_ENV_VAR,\n} from \"./constants.js\";\nimport { logger } from \"./logger.js\";\nimport { printCriticalFailureToConsoleAndExit } from \"./output.js\";\nimport settings from \"./settings.js\";\nimport { Arguments } from \"../link/handler.js\";\n\nconst SYSTEM_KEYS = [\n  \"accountName\",\n  \"projectName\",\n  \"environmentType\",\n  \"systemConfigurations\",\n];\n\n/**\n * Wraps environment variable values in single quotes for dotenv compatibility.\n * Escapes any single quotes within the value by replacing them with \\'.\n * This ensures proper parsing while preserving special characters.\n *\n * @param value The environment variable value to wrap\n * @returns The value wrapped in single quotes with escaped single quotes\n */\nfunction wrapEnvValue(value: string): string {\n  // Escape single quotes by replacing them with \\'\n  const escapedValue = value.replace(/\"/g, '\\\\\"');\n  // Always use single quotes\n  return `\"${escapedValue}\"`;\n}\n\nexport async function safeMergeConfig(dir: string, project: string) {\n  const normalizedDir = join(relative(process.cwd(), dir));\n  const zuploPreferredConfigFile = join(\n    normalizedDir,\n    ZUPLO_PREFERRED_JSON_FILE\n  );\n  const zuploFallbackConfigFile = join(normalizedDir, ZUPLO_FALLBACK_JSON_FILE);\n  if (existsSync(zuploPreferredConfigFile)) {\n    // Process the file, while respecting comments\n    // Apply the edits sequentially\n    const originalContents = await readFile(zuploPreferredConfigFile, \"utf-8\");\n    const modifyProjectEdit = modify(originalContents, [\"project\"], project, {\n      getInsertionIndex: () => 2,\n    });\n    const contentsPostProject = applyEdits(originalContents, modifyProjectEdit);\n    const formatted = await format(contentsPostProject, {\n      parser: \"json\",\n      quoteProps: \"as-needed\",\n    });\n    await writeFile(zuploPreferredConfigFile, formatted);\n  } else if (existsSync(zuploFallbackConfigFile)) {\n    // Copy the file over\n    const config = JSON.parse(await readFile(zuploFallbackConfigFile, \"utf-8\"));\n    const formatted = await format(\n      JSON.stringify({\n        version: 1,\n        project: project,\n        compatibilityDate: config.compatibilityDate,\n      }),\n      {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      }\n    );\n    await writeFile(zuploPreferredConfigFile, formatted);\n  } else {\n    // Create new file\n    const formatted = await format(\n      JSON.stringify({\n        version: 1,\n        project: project,\n        compatibilityDate: \"2023-03-14\",\n      }),\n      {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      }\n    );\n    await writeFile(zuploPreferredConfigFile, formatted);\n  }\n}\n\n/**\n * Pulls the system configuration from the API and writes it to the .env.zuplo file.\n * All the system environment variables are encoded in base58. Use this wherever\n * we need to *make sure* that the system environment variables are preserved correctly,\n * e.g in deployments.\n * @param argv\n */\nexport async function pullSystemConfig(\n  argv: Pick<Arguments, \"dir\" | \"environment\" | \"authToken\">\n) {\n  const normalizedDir = join(relative(process.cwd(), argv.dir));\n  const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n\n  const environmentResponseFromDeveloperAPI = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments/${argv.environment}/configurations`,\n    {\n      headers: {\n        authorization: `Bearer ${argv.authToken}`,\n      },\n    }\n  );\n\n  if (!environmentResponseFromDeveloperAPI.ok) {\n    if (\n      environmentResponseFromDeveloperAPI.status === 404 ||\n      environmentResponseFromDeveloperAPI.status === 401\n    ) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. The environment you specified doesn't exist or you don't have access to it.\"\n      );\n    } else {\n      logger.error(\n        {\n          status: environmentResponseFromDeveloperAPI.status,\n          statusText: environmentResponseFromDeveloperAPI.statusText,\n        },\n        `Failed to link data from ${argv.environment}`\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. Please try again later.\"\n      );\n    }\n  }\n\n  const payload = await environmentResponseFromDeveloperAPI.json();\n\n  const content = `\n# This file is auto-generated from zuplo link. Please do not edit it manually.\n# It will be auto-generated afresh the next time you run zuplo link.\n# If you wish to add your own environment variables, create a separate .env file.\nZUPLO_ACCOUNT_NAME=${payload.accountName}\nZUPLO_PROJECT_NAME=${payload.projectName}\nZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}\nZUPLO_SYSTEM_CONFIGURATIONS=${payload[\"systemConfigurations\"]}\n`;\n\n  await writeFile(zuploPreferredConfigFile, content);\n}\n\n/**\n * Pulls the local configuration from dev-api and writes it to the .env.zuplo file.\n * This method differs from pullSystemConfig in that it writes the user defined\n * environment variables, as well as the public variables explicitly to the\n * file instead of getting all variable in the base58 encoded ZUPLO_SYSTEM_CONFIGURATIONS\n * variable.\n * @param argv\n */\nexport async function pullLocalConfig(\n  argv: Pick<Arguments, \"dir\" | \"environment\" | \"authToken\">\n) {\n  const normalizedDir = join(relative(process.cwd(), argv.dir));\n  const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n\n  const environmentResponseFromDeveloperAPI = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments/${argv.environment}/local-configurations`,\n    {\n      headers: {\n        authorization: `Bearer ${argv.authToken}`,\n      },\n    }\n  );\n\n  if (!environmentResponseFromDeveloperAPI.ok) {\n    if (\n      environmentResponseFromDeveloperAPI.status === 404 ||\n      environmentResponseFromDeveloperAPI.status === 401\n    ) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. The environment you specified doesn't exist or you don't have access to it.\"\n      );\n    } else {\n      logger.error(\n        {\n          status: environmentResponseFromDeveloperAPI.status,\n          statusText: environmentResponseFromDeveloperAPI.statusText,\n        },\n        `Failed to link data from ${argv.environment}`\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. Please try again later.\"\n      );\n    }\n  }\n\n  const payload = await environmentResponseFromDeveloperAPI.json();\n\n  // We wrap the env vars in appropriate quotes to preserve special characters\n  // and handle single quotes properly for dotenv parsing.\n  const userEnvVars = Object.keys(payload)\n    .filter((key) => {\n      return !key.startsWith(\"ZUPLO_PUBLIC_\") && !SYSTEM_KEYS.includes(key);\n    })\n    .map((key) => {\n      return `${key}=${wrapEnvValue(payload[key])}`;\n    });\n\n  const zuploPublicEnvVars = Object.keys(payload)\n    .filter((key) => {\n      // These start with ZUPLO_PUBLIC_ and are not system variables\n      return key.startsWith(\"ZUPLO_PUBLIC_\");\n    })\n    .map((key) => {\n      return `${key}=${wrapEnvValue(payload[key])}`;\n    });\n\n  let content = `# This file is auto-generated from zuplo link. Please do not edit it manually.\n# It will be auto-generated afresh the next time you run zuplo link.\n# If you wish to add your own environment variables, create a separate .env file.\n\nZUPLO_ACCOUNT_NAME=${payload.accountName}\nZUPLO_PROJECT_NAME=${payload.projectName}\nZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}\nZUPLO_SYSTEM_CONFIGURATIONS=${payload[\"systemConfigurations\"]}`;\n\n  // Only add public environment variables section if there are any\n  if (zuploPublicEnvVars.length > 0) {\n    content += `\n\n# Public Zuplo environment variables\n${zuploPublicEnvVars.join(\"\\n\")}`;\n  }\n\n  // Only add user environment variables section if there are any\n  if (userEnvVars.length > 0) {\n    content += `\n\n# Environment variables defined in the Zuplo UI for the environment\n# Note that \" characters are escaped with a backslash and escaped double quotes\n# will show up as \\\\\" in the value.\n${userEnvVars.join(\"\\n\")}`;\n  }\n\n  // Add final newline\n  content += \"\\n\";\n\n  await writeFile(zuploPreferredConfigFile, content);\n}\n"]}
+{"version":3,"file":"populate.js","sourceRoot":"","sources":["../../src/common/populate.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeFile } from \"node:fs/promises\";\nimport { join, relative } from \"node:path\";\nimport { ZUPLO_SYSTEM_ENV_VAR } from \"./constants.js\";\nimport { logger } from \"./logger.js\";\nimport { printCriticalFailureToConsoleAndExit } from \"./output.js\";\nimport settings from \"./settings.js\";\nimport { Arguments } from \"../link/handler.js\";\n\nconst SYSTEM_KEYS = [\n  \"accountName\",\n  \"projectName\",\n  \"environmentType\",\n  \"systemConfigurations\",\n];\n\n/**\n * Wraps environment variable values in single quotes for dotenv compatibility.\n * Escapes any single quotes within the value by replacing them with \\'.\n * This ensures proper parsing while preserving special characters.\n *\n * @param value The environment variable value to wrap\n * @returns The value wrapped in single quotes with escaped single quotes\n */\nfunction wrapEnvValue(value: string): string {\n  // Escape single quotes by replacing them with \\'\n  const escapedValue = value.replace(/\"/g, '\\\\\"');\n  // Always use single quotes\n  return `\"${escapedValue}\"`;\n}\n\n/**\n * Pulls the system configuration from the API and writes it to the .env.zuplo file.\n * All the system environment variables are encoded in base58. Use this wherever\n * we need to *make sure* that the system environment variables are preserved correctly,\n * e.g in deployments.\n * @param argv\n */\nexport async function pullSystemConfig(\n  argv: Pick<Arguments, \"dir\" | \"environment\" | \"authToken\">\n) {\n  const normalizedDir = join(relative(process.cwd(), argv.dir));\n  const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n\n  const environmentResponseFromDeveloperAPI = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments/${argv.environment}/configurations`,\n    {\n      headers: {\n        authorization: `Bearer ${argv.authToken}`,\n      },\n    }\n  );\n\n  if (!environmentResponseFromDeveloperAPI.ok) {\n    if (\n      environmentResponseFromDeveloperAPI.status === 404 ||\n      environmentResponseFromDeveloperAPI.status === 401\n    ) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. The environment you specified doesn't exist or you don't have access to it.\"\n      );\n    } else {\n      logger.error(\n        {\n          status: environmentResponseFromDeveloperAPI.status,\n          statusText: environmentResponseFromDeveloperAPI.statusText,\n        },\n        `Failed to link data from ${argv.environment}`\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. Please try again later.\"\n      );\n    }\n  }\n\n  const payload = await environmentResponseFromDeveloperAPI.json();\n\n  const content = `\n# This file is auto-generated from zuplo link. Please do not edit it manually.\n# It will be auto-generated afresh the next time you run zuplo link.\n# If you wish to add your own environment variables, create a separate .env file.\nZUPLO_ACCOUNT_NAME=${payload.accountName}\nZUPLO_PROJECT_NAME=${payload.projectName}\nZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}\nZUPLO_SYSTEM_CONFIGURATIONS=${payload[\"systemConfigurations\"]}\n`;\n\n  await writeFile(zuploPreferredConfigFile, content);\n}\n\n/**\n * Pulls the local configuration from dev-api and writes it to the .env.zuplo file.\n * This method differs from pullSystemConfig in that it writes the user defined\n * environment variables, as well as the public variables explicitly to the\n * file instead of getting all variable in the base58 encoded ZUPLO_SYSTEM_CONFIGURATIONS\n * variable.\n * @param argv\n */\nexport async function pullLocalConfig(\n  argv: Pick<Arguments, \"dir\" | \"environment\" | \"authToken\">\n) {\n  const normalizedDir = join(relative(process.cwd(), argv.dir));\n  const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n\n  const environmentResponseFromDeveloperAPI = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments/${argv.environment}/local-configurations`,\n    {\n      headers: {\n        authorization: `Bearer ${argv.authToken}`,\n      },\n    }\n  );\n\n  if (!environmentResponseFromDeveloperAPI.ok) {\n    if (\n      environmentResponseFromDeveloperAPI.status === 404 ||\n      environmentResponseFromDeveloperAPI.status === 401\n    ) {\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. The environment you specified doesn't exist or you don't have access to it.\"\n      );\n    } else {\n      logger.error(\n        {\n          status: environmentResponseFromDeveloperAPI.status,\n          statusText: environmentResponseFromDeveloperAPI.statusText,\n        },\n        `Failed to link data from ${argv.environment}`\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to link data from the environment. Please try again later.\"\n      );\n    }\n  }\n\n  const payload = await environmentResponseFromDeveloperAPI.json();\n\n  // We wrap the env vars in appropriate quotes to preserve special characters\n  // and handle single quotes properly for dotenv parsing.\n  const userEnvVars = Object.keys(payload)\n    .filter((key) => {\n      return !key.startsWith(\"ZUPLO_PUBLIC_\") && !SYSTEM_KEYS.includes(key);\n    })\n    .map((key) => {\n      return `${key}=${wrapEnvValue(payload[key])}`;\n    });\n\n  const zuploPublicEnvVars = Object.keys(payload)\n    .filter((key) => {\n      // These start with ZUPLO_PUBLIC_ and are not system variables\n      return key.startsWith(\"ZUPLO_PUBLIC_\");\n    })\n    .map((key) => {\n      return `${key}=${wrapEnvValue(payload[key])}`;\n    });\n\n  let content = `# This file is auto-generated from zuplo link. Please do not edit it manually.\n# It will be auto-generated afresh the next time you run zuplo link.\n# If you wish to add your own environment variables, create a separate .env file.\n\nZUPLO_ACCOUNT_NAME=${payload.accountName}\nZUPLO_PROJECT_NAME=${payload.projectName}\nZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}\nZUPLO_SYSTEM_CONFIGURATIONS=${payload[\"systemConfigurations\"]}`;\n\n  // Only add public environment variables section if there are any\n  if (zuploPublicEnvVars.length > 0) {\n    content += `\n\n# Public Zuplo environment variables\n${zuploPublicEnvVars.join(\"\\n\")}`;\n  }\n\n  // Only add user environment variables section if there are any\n  if (userEnvVars.length > 0) {\n    content += `\n\n# Environment variables defined in the Zuplo UI for the environment\n# Note that \" characters are escaped with a backslash and escaped double quotes\n# will show up as \\\\\" in the value.\n${userEnvVars.join(\"\\n\")}`;\n  }\n\n  // Add final newline\n  content += \"\\n\";\n\n  await writeFile(zuploPreferredConfigFile, content);\n}\n"]}

package/dist/link/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/link/handler.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,iBAoBzC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/link/handler.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,iBAiBzC"}

package/dist/link/handler.js

@@ -1,5 +1,5 @@
 import { printResultToConsoleAndExitGracefully } from "../common/output.js";
-import { pullLocalConfig, safeMergeConfig } from "../common/populate.js";
+import { pullLocalConfig } from "../common/populate.js";
 export async function link(argv) {
     const account = argv.account;
     const project = argv.project;
@@ -7,7 +7,6 @@ export async function link(argv) {
     if (!account || !project || !environment) {
         throw new Error("Invalid state: account, project, or environment is not set.");
     }
-    await safeMergeConfig(argv.dir, project);
     await pullLocalConfig(argv);
     await printResultToConsoleAndExitGracefully(`
 Successfully linked your local directory to the ${project} project in the ${account} account.

package/dist/link/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/link/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAUzE,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAe;IACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IAErC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IACJ,CAAC;IAGD,MAAM,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAGzC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,qCAAqC,CAAC;kDACI,OAAO,mBAAmB,OAAO;kEACjB,CAAC,CAAC;AACpE,CAAC","sourcesContent":["import { printResultToConsoleAndExitGracefully } from \"../common/output.js\";\nimport { pullLocalConfig, safeMergeConfig } from \"../common/populate.js\";\n\nexport interface Arguments {\n  dir: string;\n  authToken: string;\n  account?: string;\n  project?: string;\n  environment?: string;\n}\n\nexport async function link(argv: Arguments) {\n  const account = argv.account;\n  const project = argv.project;\n  const environment = argv.environment;\n\n  if (!account || !project || !environment) {\n    throw new Error(\n      \"Invalid state: account, project, or environment is not set.\"\n    );\n  }\n\n  // Create a zuplo.jsonc file if it doesn't exist\n  await safeMergeConfig(argv.dir, project);\n\n  // Safely merge in other auxiliary files\n  await pullLocalConfig(argv);\n\n  await printResultToConsoleAndExitGracefully(`\nSuccessfully linked your local directory to the ${project} project in the ${account} account.\n.env.zuplo and zuplo.jsonc have been updated with the new values.`);\n}\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/link/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAUxD,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAAe;IACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IAErC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IACJ,CAAC;IAGD,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,qCAAqC,CAAC;kDACI,OAAO,mBAAmB,OAAO;kEACjB,CAAC,CAAC;AACpE,CAAC","sourcesContent":["import { printResultToConsoleAndExitGracefully } from \"../common/output.js\";\nimport { pullLocalConfig } from \"../common/populate.js\";\n\nexport interface Arguments {\n  dir: string;\n  authToken: string;\n  account?: string;\n  project?: string;\n  environment?: string;\n}\n\nexport async function link(argv: Arguments) {\n  const account = argv.account;\n  const project = argv.project;\n  const environment = argv.environment;\n\n  if (!account || !project || !environment) {\n    throw new Error(\n      \"Invalid state: account, project, or environment is not set.\"\n    );\n  }\n\n  // Safely merge in other auxiliary files\n  await pullLocalConfig(argv);\n\n  await printResultToConsoleAndExitGracefully(`\nSuccessfully linked your local directory to the ${project} project in the ${account} account.\n.env.zuplo and zuplo.jsonc have been updated with the new values.`);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "6.59.0",
+  "version": "6.59.2",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "type": "module",
@@ -29,9 +29,9 @@
     "@opentelemetry/api": "1.9.0",
     "@sentry/node": "9.22.0",
     "@swc/core": "1.10.18",
-    "@zuplo/core": "6.59.0",
-    "@zuplo/openapi-tools": "6.59.0",
-    "@zuplo/runtime": "6.59.0",
+    "@zuplo/core": "6.59.2",
+    "@zuplo/openapi-tools": "6.59.2",
+    "@zuplo/runtime": "6.59.2",
     "as-table": "1.0.55",
     "chalk": "5.4.1",
     "chokidar": "3.5.3",