create-op-node 0.12.0 → 0.12.2

package/dist/cli.js

@@ -7,7 +7,7 @@ import { Octokit } from '@octokit/rest';
 import _sodium from 'libsodium-wrappers';
 import { randomBytes, createHmac } from 'crypto';
 import { join, resolve, dirname } from 'path';
-import { mkdir, writeFile, access, chmod, rename, rm } from 'fs/promises';
+import { readFile, mkdir, writeFile, access, chmod, rename, rm } from 'fs/promises';
 import { homedir } from 'os';
 import { readFileSync } from 'fs';
 import * as tls from 'tls';
@@ -2271,7 +2271,7 @@ var bootstrapCommand = new Command("bootstrap").description(
   new Option(
     "--compose-file <path>",
     "Repeatable. Compose file relative to repo root. Default: prod + backup (production), prod only (--local-only)."
-  )
+  ).argParser(collectComposeFile)
 ).addOption(new Option("--env-file <path>", "Compose --env-file. Default: .env.production")).addOption(new Option("--skip-brew", "Skip the Homebrew package install pass").default(false)).addOption(
   new Option(
     "--skip-launch-agent",
@@ -3011,6 +3011,9 @@ function resolveComposeFiles(repoPath, composeFile) {
   const inputs = composeFile ?? ["docker-compose-prod.yml"];
   return inputs.map((f) => f.startsWith("/") ? f : join(repoPath, f));
 }
+function collectComposeFile(value, previous) {
+  return [...previous ?? [], value];
+}
 function resolveModels(opts) {
   return [
     opts.embeddingModel ?? DEFAULT_EMBEDDING_MODEL,
@@ -3256,6 +3259,9 @@ async function resetStopStackPhase(input, deps) {
     files: input.stack.composeFiles,
     cwd: input.stack.repoPath,
     ...input.stack.envFile ? { envFile: input.stack.envFile } : {},
+    // Hydrate placeholder values for the template's `${VAR:?…}` required vars
+    // so interpolation succeeds; `down` doesn't use the values. (#85)
+    ...input.stack.env ? { env: input.stack.env } : {},
     wipeVolumes: input.stack.wipeVolumes,
     removeOrphans: input.stack.removeOrphans,
     ...input.stack.wipeImages ? { removeImages: "all" } : {}
@@ -3344,7 +3350,7 @@ var resetCommand = new Command("reset").description(
   new Option(
     "--compose-file <path>",
     "Repeatable. Compose file relative to repo root. Default: docker-compose-prod.yml"
-  ).default(["docker-compose-prod.yml"])
+  ).argParser(collectComposeFile)
 ).addOption(new Option("--env-file <path>", "Compose --env-file. Default: .env.production")).addOption(
   new Option(
     "--wipe-data",
@@ -3395,6 +3401,7 @@ var resetCommand = new Command("reset").description(
     wipeImages
   });
   await confirmReset({ opts, region, wipeData });
+  const teardownEnv = repoPath ? await computeTeardownEnv(resolveComposeFiles(repoPath, opts.composeFile)) : void 0;
   const input = buildResetInput({
     opts,
     repoPath,
@@ -3402,7 +3409,8 @@ var resetCommand = new Command("reset").description(
     launchAgentPaths,
     wipeData,
     wipeImages,
-    removeOrphans
+    removeOrphans,
+    ...teardownEnv ? { teardownEnv } : {}
   });
   await runResetWithSpinners({ opts, region, wipeData, input });
 });
@@ -3511,15 +3519,41 @@ async function confirmReset(args) {
     }
   }
 }
+var TEARDOWN_PLACEHOLDER = "reset-teardown-placeholder";
+var REQUIRED_VAR_RE = /\$\{([A-Za-z_]\w*):?\?/g;
+function buildTeardownEnv(composeFileContents, baseEnv = process.env) {
+  const overlay = {};
+  for (const text6 of composeFileContents) {
+    for (const match of text6.matchAll(REQUIRED_VAR_RE)) {
+      const name = match[1];
+      const existing = baseEnv[name];
+      if (existing === void 0 || existing === "") {
+        overlay[name] = TEARDOWN_PLACEHOLDER;
+      }
+    }
+  }
+  return overlay;
+}
+async function computeTeardownEnv(composeFiles) {
+  const contents = [];
+  for (const file of composeFiles) {
+    try {
+      contents.push(await readFile(file, "utf8"));
+    } catch {
+    }
+  }
+  return buildTeardownEnv(contents);
+}
 function buildResetInput(args) {
-  const { opts, repoPath, plistExists, launchAgentPaths, wipeData, wipeImages, removeOrphans } = args;
+  const { opts, repoPath, plistExists, launchAgentPaths, wipeData, wipeImages, removeOrphans, teardownEnv } = args;
   const stack = repoPath ? {
     repoPath,
     composeFiles: resolveComposeFiles(repoPath, opts.composeFile),
     wipeVolumes: wipeData,
     wipeImages,
     removeOrphans,
-    ...opts.envFile ? { envFile: opts.envFile } : {}
+    ...opts.envFile ? { envFile: opts.envFile } : {},
+    ...teardownEnv ? { env: teardownEnv } : {}
   } : void 0;
   const launchAgent = plistExists && !opts.skipLaunchAgent ? {
     paths: launchAgentPaths,
@@ -5087,7 +5121,7 @@ function withDefaultSubcommand(argv, known) {
 }
 
 // src/cli.ts
-var VERSION = "0.12.0";
+var VERSION = "0.12.2";
 var program = new Command();
 program.name("create-op-node").description(
   "Interactive bootstrap for an Opus Populi federation node.\nCloudflare infrastructure \u2192 Mac Studio \u2192 live public API."