@nmakarov/cli-toolkit 0.55.0 → 0.59.0

package/dist/index.js

@@ -1081,6 +1081,10 @@ var Args = class _Args {
     this.parseArgs(args);
     this.env = this.get("env")?.toLowerCase() || "local";
     this.loadDotEnv();
+    const envAfterDotEnv = this.get("env")?.toLowerCase();
+    if (envAfterDotEnv) {
+      this.env = envAfterDotEnv;
+    }
     this.loadConfigFiles();
     this.checkConflicts();
     if (context && typeof context.registerCleanup === "function") {
@@ -3541,6 +3545,12 @@ var Db = class _Db {
       }
       if (!dbConnectionString) {
         if (!dbName) {
+          const env = context?.args?.env;
+          if (env && String(env).toLowerCase() !== "local") {
+            throw new ParamError(
+              `Db: dbName not set for env="${env}" (set --dbName or DB_NAME_${String(env).toUpperCase()})`
+            );
+          }
           dbName = "local";
         }
         const paramName = `dbConnectionString${capitalizeFirstLetter(dbName)}`;
@@ -5269,6 +5279,8 @@ function servicePaths(service) {
     current: join2(root, "current"),
     sharedEnv: join2(root, "shared", ".env"),
     ecosystem: join2(root, "shared", "ecosystem.config.cjs"),
+    /** Preloaded by pm2 `node_args --require` so ENV survives flaky restarts. */
+    ensureEnv: join2(root, "shared", "ensure-env.cjs"),
     deployLog: join2(root, "logs", "deploy.log"),
     lockHashFile: join2(root, "shared", ".package-lock.sha256")
   };
@@ -5658,7 +5670,10 @@ async function reloadPm2(paths, options = {}) {
       logger.info(`pm2 ${appName}: reloading (old pid=${oldPid})`);
     }
   }
-  await runShell(`pm2 startOrReload "${paths.ecosystem}" --update-env`, { logger });
+  await runShell(
+    `ENV=production NODE_ENV=production pm2 startOrReload "${paths.ecosystem}" --update-env`,
+    { logger }
+  );
   logger.info("pm2 reloaded");
   if (appName) {
     const proc = await waitPm2(
@@ -5707,7 +5722,10 @@ async function startPm2(paths, options = {}) {
     logger.info(`[dryRun] would pm2 start ${paths.ecosystem} --update-env`);
     return;
   }
-  await runShell(`pm2 start "${paths.ecosystem}" --update-env`, { logger });
+  await runShell(
+    `ENV=production NODE_ENV=production pm2 start "${paths.ecosystem}" --update-env`,
+    { logger }
+  );
   logger.info("pm2 started");
   if (appName) {
     const proc = await waitPm2(
@@ -5959,12 +5977,24 @@ function resolvePm2Args(pm2) {
   if (/(?:^|\s)--stopAllowance=/.test(base)) return base;
   return `${base}${base ? " " : ""}--stopAllowance=${Math.floor(stopSec)}`.trim();
 }
+function buildEnsureEnvScript() {
+  return `/**
+ * Written by cli-toolkit deploy (init-structure). Do not hand-edit.
+ * Preloaded via pm2 node_args --require. Always set (do not only fill when unset):
+ * \`pm2 startOrReload --update-env\` can inject a non-production ENV from the
+ * deploy shell / prior dump, and a conditional assign would leave it in place.
+ */
+process.env.ENV = "production";
+process.env.NODE_ENV = "production";
+`;
+}
 function buildEcosystemConfig(service, paths) {
   const { pm2 } = service;
   const outLog = join9(paths.logs, `${pm2.appName}.out.log`);
   const errLog = join9(paths.logs, `${pm2.appName}.err.log`);
   const killTimeoutMs = resolveKillTimeoutMs(pm2);
   const args = resolvePm2Args(pm2);
+  const ensureEnv = paths.ensureEnv;
   return `/**
  * pm2 ecosystem for ${service.name} \u2014 written by cli-toolkit deploy from the
  * service manifest (init/deploy). Do not hand-edit; change pm2.* in the
@@ -5977,6 +6007,8 @@ module.exports = {
             script: "${pm2.script}",
             cwd: "${paths.current}",
             args: ${JSON.stringify(args)},
+            // Absolute --require so ENV is set before Args constructs (see shared/ensure-env.cjs).
+            node_args: ${JSON.stringify(`--require ${ensureEnv}`)},
             instances: 1,
             exec_mode: "fork",
             autorestart: true,
@@ -6018,9 +6050,17 @@ async function initServiceStructure(service, options = {}) {
     created.push(dir);
   }
   const ecosystemExisted = await pathExists4(paths.ecosystem);
+  const ensureEnvExisted = await pathExists4(paths.ensureEnv);
   if (!dryRun) {
+    await writeFile5(paths.ensureEnv, buildEnsureEnvScript(), { mode: 420 });
     await writeFile5(paths.ecosystem, buildEcosystemConfig(service, paths), { mode: 420 });
   }
+  if (ensureEnvExisted) {
+    logger.info(`synced ${paths.ensureEnv}`);
+  } else {
+    created.push(paths.ensureEnv);
+    logger.info(`seeded ${paths.ensureEnv}`);
+  }
   if (ecosystemExisted) {
     logger.info(`synced ${paths.ecosystem} from manifest`);
   } else {