@qpqjs/cli 0.3.0 → 0.5.0

package/lib/commonjs/commands/setup.js

@@ -10,23 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommand = void 0;
-// `qpq setup` — takes a cloud environment from empty to deployed, in order, with
-// every step checked first so the menu shows what is already in place and a
-// rerun on a half-set-up account is safe. The platform (from the deployment's
-// entry in deploy.config.json) contributes the steps.
-//   --check      print each step's status and exit, run nothing
-//   --yes        run every step without the menu
-//   --only a,b   run only the named step ids (no menu)
 const args_1 = require("../lib/args");
+const createOutput_1 = require("../lib/createOutput");
 const prompts_1 = require("../lib/prompts");
-const resolveAppSelection_1 = require("../lib/resolveAppSelection");
-const resolveDeployment_1 = require("../lib/resolveDeployment");
-const platforms_1 = require("../platforms");
+const resolveCommandContext_1 = require("../lib/resolveCommandContext");
+const out = (0, createOutput_1.createOutput)('setup');
 const statusLabel = (result) => (result === null ? '?' : result.done ? 'done' : 'todo');
 const printChecklist = (checked) => {
     for (const { step, result } of checked) {
         const detail = (result === null || result === void 0 ? void 0 : result.detail) ? `  ${result.detail}` : '';
-        console.log(`  [${statusLabel(result).padEnd(4)}] ${step.name}${detail}`);
+        out.log(`  [${statusLabel(result).padEnd(4)}] ${step.name}${detail}`);
     }
 };
 const checkAll = (steps) => __awaiter(void 0, void 0, void 0, function* () {
@@ -63,40 +56,39 @@ const selectFromArgs = (steps, argv) => {
     const ids = only.split(',').map((id) => id.trim());
     const unknown = ids.filter((id) => !steps.some((step) => step.id === id));
     if (unknown.length > 0) {
-        console.error(`Unknown setup step id(s): ${unknown.join(', ')}. Known: ${steps.map((step) => step.id).join(', ')}`);
+        out.error(`Unknown setup step id(s): ${unknown.join(', ')}. Known: ${steps.map((step) => step.id).join(', ')}`);
         process.exit(1);
     }
     return steps.filter((step) => ids.includes(step.id));
 };
 const setupCommand = (argv) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const appName = yield (0, resolveAppSelection_1.resolveAppSelection)({ argv, envVar: 'DEPLOY_APP_NAME' });
-    const { deploymentName, deployment } = yield (0, resolveDeployment_1.resolveDeployment)(argv, appName);
-    const driver = (0, platforms_1.getPlatformDriver)(deployment.platform);
+    const { appName, deploymentName, deployment, driver } = yield (0, resolveCommandContext_1.resolveCommandContext)(argv);
+    // Nothing to set up is a normal outcome here, not a refused command.
     if (!driver.setupSteps) {
-        console.log(`The '${deployment.platform}' platform has nothing to set up for deployment '${deploymentName}'.`);
+        out.log(`The '${deployment.platform}' platform has nothing to set up for deployment '${deploymentName}'.`);
         return;
     }
     const steps = yield driver.setupSteps(appName, deploymentName);
-    console.log(`\nSetup for app '${appName}', deployment '${deploymentName}' (${deployment.platform})\n`);
+    out.log(`\nSetup for app '${appName}', deployment '${deploymentName}' (${deployment.platform})\n`);
     const checked = yield checkAll(steps);
     printChecklist(checked);
-    console.log('');
+    out.log('');
     if (argv.includes('--check')) {
         return;
     }
     const toRun = (_a = selectFromArgs(steps, argv)) !== null && _a !== void 0 ? _a : (yield chooseSteps(checked));
     if (toRun.length === 0) {
-        console.log('Nothing selected.');
+        out.log('Nothing selected.');
         return;
     }
     for (const step of toRun) {
-        console.log(`\n== ${step.name}\n`);
+        out.log(`\n== ${step.name}\n`);
         yield step.run();
     }
-    console.log('\nSetup complete. Final state:\n');
+    out.log('\nSetup complete. Final state:\n');
     printChecklist(yield checkAll(steps));
-    console.log(`\nNext: deploy the services with  npx qpq go:docker all all --app ${appName} --deployment ${deploymentName}`);
+    out.log(`\nNext: deploy the services with  npx qpq go:docker all all --app ${appName} --deployment ${deploymentName}`);
 });
 exports.setupCommand = setupCommand;
 //# sourceMappingURL=setup.js.map

package/lib/commonjs/commands/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"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","sourcesContent":["// `qpq setup` — takes a cloud environment from empty to deployed, in order, with\n// every step checked first so the menu shows what is already in place and a\n// rerun on a half-set-up account is safe. The platform (from the deployment's\n// entry in deploy.config.json) contributes the steps.\n//   --check      print each step's status and exit, run nothing\n//   --yes        run every step without the menu\n//   --only a,b   run only the named step ids (no menu)\nimport { getArgValue } from '../lib/args';\nimport { promptCheckbox } from '../lib/prompts';\nimport { resolveAppSelection } from '../lib/resolveAppSelection';\nimport { resolveDeployment } from '../lib/resolveDeployment';\nimport { SetupCheckResult, SetupStep } from '../lib/setupStep';\nimport { getPlatformDriver } from '../platforms';\n\ntype CheckedStep = { step: SetupStep; result: SetupCheckResult | null };\n\nconst statusLabel = (result: SetupCheckResult | null): string => (result === null ? '?' : result.done ? 'done' : 'todo');\n\nconst printChecklist = (checked: CheckedStep[]): void => {\n  for (const { step, result } of checked) {\n    const detail = result?.detail ? `  ${result.detail}` : '';\n    console.log(`  [${statusLabel(result).padEnd(4)}] ${step.name}${detail}`);\n  }\n};\n\nconst checkAll = async (steps: SetupStep[]): Promise<CheckedStep[]> => {\n  const checked: CheckedStep[] = [];\n  for (const step of steps) {\n    try {\n      checked.push({ step, result: await step.check() });\n    } catch (error) {\n      checked.push({ step, result: { done: false, detail: `check failed: ${error instanceof Error ? error.message : String(error)}` } });\n    }\n  }\n  return checked;\n};\n\n// Steps not yet done are preselected; done ones can still be picked to rerun.\nconst chooseSteps = async (checked: CheckedStep[]): Promise<SetupStep[]> => {\n  const chosen = await promptCheckbox(\n    'Setup steps to run (space toggles, enter runs in order)',\n    checked.map(({ step, result }) => ({\n      name: `[${statusLabel(result).padEnd(4)}] ${step.name}`,\n      value: step,\n      checked: !result?.done,\n      description: result?.detail,\n    })),\n  );\n\n  // Always run in checklist order, whatever order they were ticked in.\n  return checked.map(({ step }) => step).filter((step) => chosen.includes(step));\n};\n\nconst selectFromArgs = (steps: SetupStep[], argv: string[]): SetupStep[] | null => {\n  if (argv.includes('--yes')) {\n    return steps;\n  }\n\n  const only = getArgValue(argv, '--only');\n  if (!only) {\n    return null;\n  }\n\n  const ids = only.split(',').map((id) => id.trim());\n  const unknown = ids.filter((id) => !steps.some((step) => step.id === id));\n  if (unknown.length > 0) {\n    console.error(`Unknown setup step id(s): ${unknown.join(', ')}. Known: ${steps.map((step) => step.id).join(', ')}`);\n    process.exit(1);\n  }\n\n  return steps.filter((step) => ids.includes(step.id));\n};\n\nexport const setupCommand = async (argv: string[]): Promise<void> => {\n  const appName = await resolveAppSelection({ argv, envVar: 'DEPLOY_APP_NAME' });\n  const { deploymentName, deployment } = await resolveDeployment(argv, appName);\n  const driver = getPlatformDriver(deployment.platform);\n\n  if (!driver.setupSteps) {\n    console.log(`The '${deployment.platform}' platform has nothing to set up for deployment '${deploymentName}'.`);\n    return;\n  }\n\n  const steps = await driver.setupSteps(appName, deploymentName);\n\n  console.log(`\\nSetup for app '${appName}', deployment '${deploymentName}' (${deployment.platform})\\n`);\n  const checked = await checkAll(steps);\n  printChecklist(checked);\n  console.log('');\n\n  if (argv.includes('--check')) {\n    return;\n  }\n\n  const toRun = selectFromArgs(steps, argv) ?? (await chooseSteps(checked));\n  if (toRun.length === 0) {\n    console.log('Nothing selected.');\n    return;\n  }\n\n  for (const step of toRun) {\n    console.log(`\\n== ${step.name}\\n`);\n    await step.run();\n  }\n\n  console.log('\\nSetup complete. Final state:\\n');\n  printChecklist(await checkAll(steps));\n  console.log(`\\nNext: deploy the services with  npx qpq go:docker all all --app ${appName} --deployment ${deploymentName}`);\n};\n"]}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"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","sourcesContent":["// `qpq setup`, takes a cloud environment from empty to deployed, in order, with\n// every step checked first so the menu shows what is already in place and a\n// rerun on a half-set-up account is safe. The platform (from the deployment's\n// entry in deploy.config.json) contributes the steps.\n//   --check      print each step's status and exit, run nothing\n//   --yes        run every step without the menu\n//   --only a,b   run only the named step ids (no menu)\nimport { Nullable } from '@qpqjs/core';\n\nimport { getArgValue } from '../lib/args';\nimport { createOutput } from '../lib/createOutput';\nimport { promptCheckbox } from '../lib/prompts';\nimport { resolveCommandContext } from '../lib/resolveCommandContext';\nimport { SetupCheckResult, SetupStep } from '../lib/setupStep';\n\nconst out = createOutput('setup');\n\ntype CheckedStep = { step: SetupStep; result: Nullable<SetupCheckResult> };\n\nconst statusLabel = (result: Nullable<SetupCheckResult>): string => (result === null ? '?' : result.done ? 'done' : 'todo');\n\nconst printChecklist = (checked: CheckedStep[]): void => {\n  for (const { step, result } of checked) {\n    const detail = result?.detail ? `  ${result.detail}` : '';\n    out.log(`  [${statusLabel(result).padEnd(4)}] ${step.name}${detail}`);\n  }\n};\n\nconst checkAll = async (steps: SetupStep[]): Promise<CheckedStep[]> => {\n  const checked: CheckedStep[] = [];\n  for (const step of steps) {\n    try {\n      checked.push({ step, result: await step.check() });\n    } catch (error) {\n      checked.push({ step, result: { done: false, detail: `check failed: ${error instanceof Error ? error.message : String(error)}` } });\n    }\n  }\n  return checked;\n};\n\n// Steps not yet done are preselected; done ones can still be picked to rerun.\nconst chooseSteps = async (checked: CheckedStep[]): Promise<SetupStep[]> => {\n  const chosen = await promptCheckbox(\n    'Setup steps to run (space toggles, enter runs in order)',\n    checked.map(({ step, result }) => ({\n      name: `[${statusLabel(result).padEnd(4)}] ${step.name}`,\n      value: step,\n      checked: !result?.done,\n      description: result?.detail,\n    })),\n  );\n\n  // Always run in checklist order, whatever order they were ticked in.\n  return checked.map(({ step }) => step).filter((step) => chosen.includes(step));\n};\n\nconst selectFromArgs = (steps: SetupStep[], argv: string[]): Nullable<SetupStep[]> => {\n  if (argv.includes('--yes')) {\n    return steps;\n  }\n\n  const only = getArgValue(argv, '--only');\n  if (!only) {\n    return null;\n  }\n\n  const ids = only.split(',').map((id) => id.trim());\n  const unknown = ids.filter((id) => !steps.some((step) => step.id === id));\n  if (unknown.length > 0) {\n    out.error(`Unknown setup step id(s): ${unknown.join(', ')}. Known: ${steps.map((step) => step.id).join(', ')}`);\n    process.exit(1);\n  }\n\n  return steps.filter((step) => ids.includes(step.id));\n};\n\nexport const setupCommand = async (argv: string[]): Promise<void> => {\n  const { appName, deploymentName, deployment, driver } = await resolveCommandContext(argv);\n\n  // Nothing to set up is a normal outcome here, not a refused command.\n  if (!driver.setupSteps) {\n    out.log(`The '${deployment.platform}' platform has nothing to set up for deployment '${deploymentName}'.`);\n    return;\n  }\n\n  const steps = await driver.setupSteps(appName, deploymentName);\n\n  out.log(`\\nSetup for app '${appName}', deployment '${deploymentName}' (${deployment.platform})\\n`);\n  const checked = await checkAll(steps);\n  printChecklist(checked);\n  out.log('');\n\n  if (argv.includes('--check')) {\n    return;\n  }\n\n  const toRun = selectFromArgs(steps, argv) ?? (await chooseSteps(checked));\n  if (toRun.length === 0) {\n    out.log('Nothing selected.');\n    return;\n  }\n\n  for (const step of toRun) {\n    out.log(`\\n== ${step.name}\\n`);\n    await step.run();\n  }\n\n  out.log('\\nSetup complete. Final state:\\n');\n  printChecklist(await checkAll(steps));\n  out.log(`\\nNext: deploy the services with  npx qpq go:docker all all --app ${appName} --deployment ${deploymentName}`);\n};\n"]}

package/lib/commonjs/commands/synth.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.synthCommand = void 0;
-// `qpq synth [service]` — synthesizes each backend service's QPQ config to
+// `qpq synth [service]`, synthesizes each backend service's QPQ config to
 // dist/apps/<app>/infrastructure/<module>-config.json.
 //
 // Runs with ts-node hooks registered (see runCli), which transpiles each
@@ -23,53 +23,49 @@ const core_1 = require("@qpqjs/core");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const args_1 = require("../lib/args");
+const createOutput_1 = require("../lib/createOutput");
 const discovery_1 = require("../lib/discovery");
 const qpqConfigs_1 = require("../lib/qpqConfigs");
 const resolveAppSelection_1 = require("../lib/resolveAppSelection");
 const resolveDeployment_1 = require("../lib/resolveDeployment");
+const out = (0, createOutput_1.createOutput)('synth');
 const processConfig = (folderName, appName) => {
-    console.log(`Processing infrastructure: [${folderName}] for app [${appName}]`);
+    out.log(`Processing infrastructure: [${folderName}] for app [${appName}]`);
     const qpqConfig = (0, qpqConfigs_1.loadServiceQpqConfig)(appName, folderName);
     const moduleName = core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    const directoryPath = path_1.default.join((0, discovery_1.getRoot)(), 'dist', 'apps', appName, 'infrastructure');
+    const directoryPath = (0, core_1.getInfrastructureConfigPath)((0, discovery_1.getRoot)(), appName);
     fs_1.default.mkdirSync(directoryPath, { recursive: true });
     fs_1.default.writeFileSync(path_1.default.join(directoryPath, `${moduleName}-config.json`), JSON.stringify(qpqConfig, null, 2));
-    console.log(`  -> ${appName}/infrastructure/${moduleName}-config.json`);
+    out.log(`  -> ${appName}/infrastructure/${moduleName}-config.json`);
 };
 const synthCommand = (argv) => __awaiter(void 0, void 0, void 0, function* () {
     const [specifiedServiceName] = (0, args_1.getPositionalArgs)(argv, ['--app', '--deployment']);
-    const hasExplicitApp = argv.includes('--app') || argv.some((a) => a.startsWith('--app=')) || !!process.env.npm_config_app || !!process.env.DEPLOY_APP_NAME;
     let appNames;
-    if (specifiedServiceName && !hasExplicitApp) {
-        // A bare service name is unambiguous — synth it in whichever app owns it.
+    if (specifiedServiceName && !(0, resolveAppSelection_1.getRequestedAppName)(argv, core_1.QpqDeployEnvVar.deployAppName)) {
+        // A bare service name is unambiguous, synth it in whichever app owns it.
         const appWithService = (0, discovery_1.getAvailableApps)().find((appName) => (0, discovery_1.getServiceNamesWithSubdir)(appName, 'service').includes(specifiedServiceName));
         if (!appWithService) {
-            console.error(`Service '${specifiedServiceName}' not found in any app`);
+            out.error(`Service '${specifiedServiceName}' not found in any app`);
             process.exit(1);
         }
         appNames = [appWithService];
     }
     else {
-        const selection = yield (0, resolveAppSelection_1.resolveAppSelection)({
-            argv,
-            envVar: 'DEPLOY_APP_NAME',
-            allowAll: true,
-        });
+        const selection = yield (0, resolveAppSelection_1.resolveAppSelection)({ argv, envVar: core_1.QpqDeployEnvVar.deployAppName, allowAll: true });
         appNames = selection === 'all' ? (0, discovery_1.getAvailableApps)() : [selection];
     }
-    console.log(`QPQ synthesizing apps: ${appNames.join(', ')}`);
+    out.log(`QPQ synthesizing apps: ${appNames.join(', ')}`);
     for (const appName of appNames) {
         // Service configs read the deployment env vars at require time, so the
         // deployment is resolved (and primed) before any infrastructure.ts loads.
         yield (0, resolveDeployment_1.resolveDeployment)(argv, appName);
         // Validate a specified service against the app's discovered services before it
-        // reaches loadServiceQpqConfig -> require. The bare-service-name branch above
-        // already checks this; the --app/env branch used to skip it, letting a typo hit
-        // a cryptic module-resolution error and a `../` value normalize into an arbitrary
-        // require target. Both paths now validate identically.
+        // reaches loadServiceQpqConfig -> require, exactly as the bare-service-name branch
+        // above does: an unchecked typo hits a cryptic module-resolution error and a `../`
+        // value normalizes into an arbitrary require target.
         const appServices = (0, discovery_1.getServiceNamesWithSubdir)(appName, 'service');
         if (specifiedServiceName && !appServices.includes(specifiedServiceName)) {
-            console.error(`Service '${specifiedServiceName}' not found in app '${appName}'`);
+            out.error(`Service '${specifiedServiceName}' not found in app '${appName}'`);
             process.exitCode = 1;
             continue;
         }
@@ -79,7 +75,7 @@ const synthCommand = (argv) => __awaiter(void 0, void 0, void 0, function* () {
                 processConfig(folderName, appName);
             }
             catch (error) {
-                console.error(`Failed to process ${folderName} in ${appName}:`, error);
+                out.error(`Failed to process ${folderName} in ${appName}:`, error);
                 process.exitCode = 1;
             }
         }

package/lib/commonjs/commands/synth.js.map

@@ -1 +1 @@
-{"version":3,"file":"synth.js","sourceRoot":"","sources":["../../../src/commands/synth.ts"],"names":[],"mappings":"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","sourcesContent":["// `qpq synth [service]` — synthesizes each backend service's QPQ config to\n// dist/apps/<app>/infrastructure/<module>-config.json.\n//\n// Runs with ts-node hooks registered (see runCli), which transpiles each\n// service's infrastructure.ts on require. Cross-package `@scope/*` imports\n// resolve through the workspace node_modules symlinks to already-built dist.\nimport { qpqCoreUtils } from '@qpqjs/core';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { getPositionalArgs } from '../lib/args';\nimport { getAvailableApps, getRoot, getServiceNamesWithSubdir } from '../lib/discovery';\nimport { loadServiceQpqConfig } from '../lib/qpqConfigs';\nimport { resolveAppSelection } from '../lib/resolveAppSelection';\nimport { resolveDeployment } from '../lib/resolveDeployment';\n\nconst processConfig = (folderName: string, appName: string): void => {\n  console.log(`Processing infrastructure: [${folderName}] for app [${appName}]`);\n  const qpqConfig = loadServiceQpqConfig(appName, folderName);\n  const moduleName = qpqCoreUtils.getApplicationModuleName(qpqConfig);\n\n  const directoryPath = path.join(getRoot(), 'dist', 'apps', appName, 'infrastructure');\n  fs.mkdirSync(directoryPath, { recursive: true });\n  fs.writeFileSync(path.join(directoryPath, `${moduleName}-config.json`), JSON.stringify(qpqConfig, null, 2));\n  console.log(`  -> ${appName}/infrastructure/${moduleName}-config.json`);\n};\n\nexport const synthCommand = async (argv: string[]): Promise<void> => {\n  const [specifiedServiceName] = getPositionalArgs(argv, ['--app', '--deployment']);\n\n  const hasExplicitApp =\n    argv.includes('--app') || argv.some((a) => a.startsWith('--app=')) || !!process.env.npm_config_app || !!process.env.DEPLOY_APP_NAME;\n\n  let appNames: string[];\n  if (specifiedServiceName && !hasExplicitApp) {\n    // A bare service name is unambiguous — synth it in whichever app owns it.\n    const appWithService = getAvailableApps().find((appName) => getServiceNamesWithSubdir(appName, 'service').includes(specifiedServiceName));\n    if (!appWithService) {\n      console.error(`Service '${specifiedServiceName}' not found in any app`);\n      process.exit(1);\n    }\n    appNames = [appWithService];\n  } else {\n    const selection = await resolveAppSelection({\n      argv,\n      envVar: 'DEPLOY_APP_NAME',\n      allowAll: true,\n    });\n    appNames = selection === 'all' ? getAvailableApps() : [selection];\n  }\n\n  console.log(`QPQ synthesizing apps: ${appNames.join(', ')}`);\n\n  for (const appName of appNames) {\n    // Service configs read the deployment env vars at require time, so the\n    // deployment is resolved (and primed) before any infrastructure.ts loads.\n    await resolveDeployment(argv, appName);\n\n    // Validate a specified service against the app's discovered services before it\n    // reaches loadServiceQpqConfig -> require. The bare-service-name branch above\n    // already checks this; the --app/env branch used to skip it, letting a typo hit\n    // a cryptic module-resolution error and a `../` value normalize into an arbitrary\n    // require target. Both paths now validate identically.\n    const appServices = getServiceNamesWithSubdir(appName, 'service');\n    if (specifiedServiceName && !appServices.includes(specifiedServiceName)) {\n      console.error(`Service '${specifiedServiceName}' not found in app '${appName}'`);\n      process.exitCode = 1;\n      continue;\n    }\n\n    const serviceNames = specifiedServiceName ? [specifiedServiceName] : appServices;\n\n    for (const folderName of serviceNames) {\n      try {\n        processConfig(folderName, appName);\n      } catch (error) {\n        console.error(`Failed to process ${folderName} in ${appName}:`, error);\n        process.exitCode = 1;\n      }\n    }\n  }\n};\n"]}
+{"version":3,"file":"synth.js","sourceRoot":"","sources":["../../../src/commands/synth.ts"],"names":[],"mappings":"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","sourcesContent":["// `qpq synth [service]`, synthesizes each backend service's QPQ config to\n// dist/apps/<app>/infrastructure/<module>-config.json.\n//\n// Runs with ts-node hooks registered (see runCli), which transpiles each\n// service's infrastructure.ts on require. Cross-package `@scope/*` imports\n// resolve through the workspace node_modules symlinks to already-built dist.\nimport { getInfrastructureConfigPath, qpqCoreUtils, QpqDeployEnvVar } from '@qpqjs/core';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { getPositionalArgs } from '../lib/args';\nimport { createOutput } from '../lib/createOutput';\nimport { getAvailableApps, getRoot, getServiceNamesWithSubdir } from '../lib/discovery';\nimport { loadServiceQpqConfig } from '../lib/qpqConfigs';\nimport { getRequestedAppName, resolveAppSelection } from '../lib/resolveAppSelection';\nimport { resolveDeployment } from '../lib/resolveDeployment';\n\nconst out = createOutput('synth');\n\nconst processConfig = (folderName: string, appName: string): void => {\n  out.log(`Processing infrastructure: [${folderName}] for app [${appName}]`);\n  const qpqConfig = loadServiceQpqConfig(appName, folderName);\n  const moduleName = qpqCoreUtils.getApplicationModuleName(qpqConfig);\n\n  const directoryPath = getInfrastructureConfigPath(getRoot(), appName);\n  fs.mkdirSync(directoryPath, { recursive: true });\n  fs.writeFileSync(path.join(directoryPath, `${moduleName}-config.json`), JSON.stringify(qpqConfig, null, 2));\n  out.log(`  -> ${appName}/infrastructure/${moduleName}-config.json`);\n};\n\nexport const synthCommand = async (argv: string[]): Promise<void> => {\n  const [specifiedServiceName] = getPositionalArgs(argv, ['--app', '--deployment']);\n\n  let appNames: string[];\n  if (specifiedServiceName && !getRequestedAppName(argv, QpqDeployEnvVar.deployAppName)) {\n    // A bare service name is unambiguous, synth it in whichever app owns it.\n    const appWithService = getAvailableApps().find((appName) => getServiceNamesWithSubdir(appName, 'service').includes(specifiedServiceName));\n    if (!appWithService) {\n      out.error(`Service '${specifiedServiceName}' not found in any app`);\n      process.exit(1);\n    }\n    appNames = [appWithService];\n  } else {\n    const selection = await resolveAppSelection({ argv, envVar: QpqDeployEnvVar.deployAppName, allowAll: true });\n    appNames = selection === 'all' ? getAvailableApps() : [selection];\n  }\n\n  out.log(`QPQ synthesizing apps: ${appNames.join(', ')}`);\n\n  for (const appName of appNames) {\n    // Service configs read the deployment env vars at require time, so the\n    // deployment is resolved (and primed) before any infrastructure.ts loads.\n    await resolveDeployment(argv, appName);\n\n    // Validate a specified service against the app's discovered services before it\n    // reaches loadServiceQpqConfig -> require, exactly as the bare-service-name branch\n    // above does: an unchecked typo hits a cryptic module-resolution error and a `../`\n    // value normalizes into an arbitrary require target.\n    const appServices = getServiceNamesWithSubdir(appName, 'service');\n    if (specifiedServiceName && !appServices.includes(specifiedServiceName)) {\n      out.error(`Service '${specifiedServiceName}' not found in app '${appName}'`);\n      process.exitCode = 1;\n      continue;\n    }\n\n    const serviceNames = specifiedServiceName ? [specifiedServiceName] : appServices;\n\n    for (const folderName of serviceNames) {\n      try {\n        processConfig(folderName, appName);\n      } catch (error) {\n        out.error(`Failed to process ${folderName} in ${appName}:`, error);\n        process.exitCode = 1;\n      }\n    }\n  }\n};\n"]}

package/lib/commonjs/commands/teardown.js

@@ -10,24 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.teardownCommand = void 0;
-// `qpq teardown` — interactive destroy, the counterpart of `qpq go`. Resolves
+// `qpq teardown`, interactive destroy, the counterpart of `qpq go`. Resolves
 // the app + deployment the same way, asks which services to tear down (with
-// a typed confirmation — this deletes stored data), then hands off to the
+// a typed confirmation, this deletes stored data), then hands off to the
 // platform driver to destroy the web, api and inf stacks in that order.
 const deployPrompts_1 = require("../lib/deployPrompts");
-const resolveAppSelection_1 = require("../lib/resolveAppSelection");
-const resolveDeployment_1 = require("../lib/resolveDeployment");
-const platforms_1 = require("../platforms");
+const requireDriverCapability_1 = require("../lib/requireDriverCapability");
+const resolveCommandContext_1 = require("../lib/resolveCommandContext");
 const teardownCommand = (argv) => __awaiter(void 0, void 0, void 0, function* () {
-    const appName = yield (0, resolveAppSelection_1.resolveAppSelection)({ argv, envVar: 'DEPLOY_APP_NAME' });
-    const { deployment } = yield (0, resolveDeployment_1.resolveDeployment)(argv, appName);
-    const driver = (0, platforms_1.getPlatformDriver)(deployment.platform);
-    if (!driver.teardown) {
-        console.error(`The '${deployment.platform}' platform has no teardown strategy.`);
-        process.exit(1);
-    }
-    const plan = yield (0, deployPrompts_1.promptTeardownPlan)(appName);
-    yield driver.teardown(appName, plan);
+    const context = yield (0, resolveCommandContext_1.resolveCommandContext)(argv);
+    const teardown = (0, requireDriverCapability_1.requireDriverCapability)(context, 'teardown');
+    const plan = yield (0, deployPrompts_1.promptTeardownPlan)(context.appName);
+    yield teardown(context.appName, plan);
 });
 exports.teardownCommand = teardownCommand;
 //# sourceMappingURL=teardown.js.map

package/lib/commonjs/commands/teardown.js.map

@@ -1 +1 @@
-{"version":3,"file":"teardown.js","sourceRoot":"","sources":["../../../src/commands/teardown.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8EAA8E;AAC9E,4EAA4E;AAC5E,0EAA0E;AAC1E,wEAAwE;AACxE,wDAA0D;AAC1D,oEAAiE;AACjE,gEAA6D;AAC7D,4CAAiD;AAE1C,MAAM,eAAe,GAAG,CAAO,IAAc,EAAiB,EAAE;IACrE,MAAM,OAAO,GAAG,MAAM,IAAA,yCAAmB,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/E,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,IAAA,6BAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEtD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,KAAK,CAAC,QAAQ,UAAU,CAAC,QAAQ,sCAAsC,CAAC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAkB,EAAC,OAAO,CAAC,CAAC;IAE/C,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC,CAAA,CAAC;AAbW,QAAA,eAAe,mBAa1B","sourcesContent":["// `qpq teardown` — interactive destroy, the counterpart of `qpq go`. Resolves\n// the app + deployment the same way, asks which services to tear down (with\n// a typed confirmation — this deletes stored data), then hands off to the\n// platform driver to destroy the web, api and inf stacks in that order.\nimport { promptTeardownPlan } from '../lib/deployPrompts';\nimport { resolveAppSelection } from '../lib/resolveAppSelection';\nimport { resolveDeployment } from '../lib/resolveDeployment';\nimport { getPlatformDriver } from '../platforms';\n\nexport const teardownCommand = async (argv: string[]): Promise<void> => {\n  const appName = await resolveAppSelection({ argv, envVar: 'DEPLOY_APP_NAME' });\n  const { deployment } = await resolveDeployment(argv, appName);\n  const driver = getPlatformDriver(deployment.platform);\n\n  if (!driver.teardown) {\n    console.error(`The '${deployment.platform}' platform has no teardown strategy.`);\n    process.exit(1);\n  }\n\n  const plan = await promptTeardownPlan(appName);\n\n  await driver.teardown(appName, plan);\n};\n"]}
+{"version":3,"file":"teardown.js","sourceRoot":"","sources":["../../../src/commands/teardown.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAA6E;AAC7E,4EAA4E;AAC5E,yEAAyE;AACzE,wEAAwE;AACxE,wDAA0D;AAC1D,4EAAyE;AACzE,wEAAqE;AAE9D,MAAM,eAAe,GAAG,CAAO,IAAc,EAAiB,EAAE;IACrE,MAAM,OAAO,GAAG,MAAM,IAAA,6CAAqB,EAAC,IAAI,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAA,iDAAuB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAkB,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC,CAAA,CAAC;AAPW,QAAA,eAAe,mBAO1B","sourcesContent":["// `qpq teardown`, interactive destroy, the counterpart of `qpq go`. Resolves\n// the app + deployment the same way, asks which services to tear down (with\n// a typed confirmation, this deletes stored data), then hands off to the\n// platform driver to destroy the web, api and inf stacks in that order.\nimport { promptTeardownPlan } from '../lib/deployPrompts';\nimport { requireDriverCapability } from '../lib/requireDriverCapability';\nimport { resolveCommandContext } from '../lib/resolveCommandContext';\n\nexport const teardownCommand = async (argv: string[]): Promise<void> => {\n  const context = await resolveCommandContext(argv);\n  const teardown = requireDriverCapability(context, 'teardown');\n\n  const plan = await promptTeardownPlan(context.appName);\n\n  await teardown(context.appName, plan);\n};\n"]}

package/lib/commonjs/lib/CliError.d.ts

@@ -0,0 +1,4 @@
+export declare class CliError extends Error {
+    readonly exitCode: number;
+    constructor(message: string, exitCode?: number);
+}

package/lib/commonjs/lib/CliError.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CliError = void 0;
+// A failure the command layer turns into an exit code and one line of output. Library code
+// throws this instead of printing and exiting itself, so it stays usable from anywhere.
+class CliError extends Error {
+    constructor(message, exitCode = 1) {
+        super(message);
+        this.name = 'CliError';
+        this.exitCode = exitCode;
+    }
+}
+exports.CliError = CliError;
+//# sourceMappingURL=CliError.js.map

package/lib/commonjs/lib/CliError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CliError.js","sourceRoot":"","sources":["../../../src/lib/CliError.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAC3F,wFAAwF;AACxF,MAAa,QAAS,SAAQ,KAAK;IAGjC,YAAY,OAAe,EAAE,WAAmB,CAAC;QAC/C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AARD,4BAQC","sourcesContent":["// A failure the command layer turns into an exit code and one line of output. Library code\n// throws this instead of printing and exiting itself, so it stays usable from anywhere.\nexport class CliError extends Error {\n  readonly exitCode: number;\n\n  constructor(message: string, exitCode: number = 1) {\n    super(message);\n    this.name = 'CliError';\n    this.exitCode = exitCode;\n  }\n}\n"]}

package/lib/commonjs/lib/Output.d.ts

@@ -0,0 +1,12 @@
+type Print = (...parts: unknown[]) => void;
+/** The prefixed console every cli command prints through. */
+export type Output = {
+    log: Print;
+    info: Print;
+    warn: Print;
+    error: Print;
+    time: (label: string) => void;
+    timeEnd: (label: string) => void;
+    rewriteLineAbove: (linesUp: number, text: string) => void;
+};
+export {};

package/lib/commonjs/lib/Output.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Output.js.map

package/lib/commonjs/lib/Output.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Output.js","sourceRoot":"","sources":["../../../src/lib/Output.ts"],"names":[],"mappings":"","sourcesContent":["type Print = (...parts: unknown[]) => void;\n\n/** The prefixed console every cli command prints through. */\nexport type Output = {\n  log: Print;\n  info: Print;\n  warn: Print;\n  error: Print;\n  // A named stopwatch, printed on end.\n  time: (label: string) => void;\n  timeEnd: (label: string) => void;\n  // Rewrites a line printed `linesUp` rows above the cursor in place (a status chip appended to a row that is\n  // already on screen), prefixed like every other line. Terminal only: the caller falls back to a plain line otherwise.\n  rewriteLineAbove: (linesUp: number, text: string) => void;\n};\n"]}

package/lib/commonjs/lib/circularImports.d.ts

@@ -1,3 +1,2 @@
 export type ImportCycle = string[];
-export declare const getWorkspaceDirectories: (root: string) => string[];
 export declare const findWorkspaceImportCycles: (root: string) => Promise<ImportCycle[]>;

package/lib/commonjs/lib/circularImports.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findWorkspaceImportCycles = exports.getWorkspaceDirectories = void 0;
+exports.findWorkspaceImportCycles = void 0;
 // Source-level circular import detection over the consumer repo's npm
 // workspaces, powered by madge (AST-based dependency graph + cycle detection).
 // Complements the rspack CircularCheckRspackPlugin (which needs a bundle to
@@ -20,7 +20,7 @@ exports.findWorkspaceImportCycles = exports.getWorkspaceDirectories = void 0;
 // flows like `npm run validate-ts` with no bundling.
 //
 // Scope: each workspace's src, relative imports. Cross-package cycles are
-// already impossible — TypeScript project references refuse to build them — so
+// already impossible, TypeScript project references refuse to build them, so
 // every runtime-relevant cycle lives inside one package's src. Type-only
 // imports are skipped (skipTypeImports): tsc erases them, so they never create
 // a runtime cycle.
@@ -29,7 +29,7 @@ const path_1 = __importDefault(require("path"));
 // madge ships no type definitions; declare the narrow slice we use.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const madge = require('madge');
-// Expand npm workspace globs (plain path segments and `*` segments only — the
+// Expand npm workspace globs (plain path segments and `*` segments only, the
 // only forms npm workspaces use in practice) into existing directories.
 const expandWorkspaceGlob = (root, pattern) => {
     let candidates = [root];
@@ -54,14 +54,13 @@ const getWorkspaceDirectories = (root) => {
     const patterns = (_a = packageJson.workspaces) !== null && _a !== void 0 ? _a : [];
     return patterns.flatMap((pattern) => expandWorkspaceGlob(root, pattern));
 };
-exports.getWorkspaceDirectories = getWorkspaceDirectories;
 const findWorkspaceImportCycles = (root) => __awaiter(void 0, void 0, void 0, function* () {
-    const sourceDirs = (0, exports.getWorkspaceDirectories)(root)
+    const sourceDirs = getWorkspaceDirectories(root)
         .map((dir) => path_1.default.join(dir, 'src'))
         .filter((dir) => fs_1.default.existsSync(dir));
     // Excludes: node_modules and built output (dist/lib), declaration files
     // (type-only, can't cycle at runtime), and anything madge resolves to outside
-    // the repo root (linked framework packages — their cycles surface through the
+    // the repo root (linked framework packages, their cycles surface through the
     // rspack CircularCheckRspackPlugin instead, this command owns the consumer
     // repo). Out-of-root paths start with '..' because baseDir is the repo root.
     const result = yield madge(sourceDirs, {

package/lib/commonjs/lib/circularImports.js.map

@@ -1 +1 @@
-{"version":3,"file":"circularImports.js","sourceRoot":"","sources":["../../../src/lib/circularImports.ts"],"names":[],"mappings":"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","sourcesContent":["// Source-level circular import detection over the consumer repo's npm\n// workspaces, powered by madge (AST-based dependency graph + cycle detection).\n// Complements the rspack CircularCheckRspackPlugin (which needs a bundle to\n// run): this scans TypeScript sources directly, so it can run inside tsc-only\n// flows like `npm run validate-ts` with no bundling.\n//\n// Scope: each workspace's src, relative imports. Cross-package cycles are\n// already impossible — TypeScript project references refuse to build them — so\n// every runtime-relevant cycle lives inside one package's src. Type-only\n// imports are skipped (skipTypeImports): tsc erases them, so they never create\n// a runtime cycle.\nimport fs from 'fs';\nimport path from 'path';\n\n// madge ships no type definitions; declare the narrow slice we use.\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst madge = require('madge') as (paths: string[], config: object) => Promise<{ circular(): string[][] }>;\n\nexport type ImportCycle = string[];\n\n// Expand npm workspace globs (plain path segments and `*` segments only — the\n// only forms npm workspaces use in practice) into existing directories.\nconst expandWorkspaceGlob = (root: string, pattern: string): string[] => {\n  let candidates = [root];\n\n  for (const segment of pattern.split('/')) {\n    if (segment === '*') {\n      candidates = candidates.flatMap((dir) =>\n        fs.existsSync(dir)\n          ? fs\n              .readdirSync(dir, { withFileTypes: true })\n              .filter((entry) => entry.isDirectory())\n              .map((entry) => path.join(dir, entry.name))\n          : [],\n      );\n    } else {\n      candidates = candidates.map((dir) => path.join(dir, segment));\n    }\n  }\n\n  return candidates.filter((dir) => fs.existsSync(dir) && fs.statSync(dir).isDirectory());\n};\n\nexport const getWorkspaceDirectories = (root: string): string[] => {\n  const packageJson = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));\n  const patterns: string[] = packageJson.workspaces ?? [];\n  return patterns.flatMap((pattern) => expandWorkspaceGlob(root, pattern));\n};\n\nexport const findWorkspaceImportCycles = async (root: string): Promise<ImportCycle[]> => {\n  const sourceDirs = getWorkspaceDirectories(root)\n    .map((dir) => path.join(dir, 'src'))\n    .filter((dir) => fs.existsSync(dir));\n\n  // Excludes: node_modules and built output (dist/lib), declaration files\n  // (type-only, can't cycle at runtime), and anything madge resolves to outside\n  // the repo root (linked framework packages — their cycles surface through the\n  // rspack CircularCheckRspackPlugin instead, this command owns the consumer\n  // repo). Out-of-root paths start with '..' because baseDir is the repo root.\n  const result = await madge(sourceDirs, {\n    baseDir: root,\n    fileExtensions: ['ts', 'tsx'],\n    excludeRegExp: [/node_modules/, /(^|\\/)(dist|lib)\\//, /\\.d\\.ts$/, /^\\.\\./],\n    detectiveOptions: {\n      ts: { skipTypeImports: true },\n      tsx: { skipTypeImports: true },\n    },\n  });\n\n  return result.circular();\n};\n"]}
+{"version":3,"file":"circularImports.js","sourceRoot":"","sources":["../../../src/lib/circularImports.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAsE;AACtE,+EAA+E;AAC/E,4EAA4E;AAC5E,8EAA8E;AAC9E,qDAAqD;AACrD,EAAE;AACF,0EAA0E;AAC1E,6EAA6E;AAC7E,yEAAyE;AACzE,+EAA+E;AAC/E,mBAAmB;AACnB,4CAAoB;AACpB,gDAAwB;AAExB,oEAAoE;AACpE,iEAAiE;AACjE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAA6E,CAAC;AAI3G,6EAA6E;AAC7E,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,OAAe,EAAY,EAAE;IACtE,IAAI,UAAU,GAAG,CAAC,IAAI,CAAC,CAAC;IAExB,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACzC,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;YACpB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CACtC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC;gBAChB,CAAC,CAAC,YAAE;qBACC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;qBACzC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;qBACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/C,CAAC,CAAC,EAAE,CACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,YAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC1F,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAY,EAAE;;IACzD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACzF,MAAM,QAAQ,GAAa,MAAA,WAAW,CAAC,UAAU,mCAAI,EAAE,CAAC;IACxD,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC,CAAC;AAEK,MAAM,yBAAyB,GAAG,CAAO,IAAY,EAA0B,EAAE;IACtF,MAAM,UAAU,GAAG,uBAAuB,CAAC,IAAI,CAAC;SAC7C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACnC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAEvC,wEAAwE;IACxE,8EAA8E;IAC9E,6EAA6E;IAC7E,2EAA2E;IAC3E,6EAA6E;IAC7E,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE;QACrC,OAAO,EAAE,IAAI;QACb,cAAc,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;QAC7B,aAAa,EAAE,CAAC,cAAc,EAAE,oBAAoB,EAAE,UAAU,EAAE,OAAO,CAAC;QAC1E,gBAAgB,EAAE;YAChB,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;YAC7B,GAAG,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;SAC/B;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC,CAAA,CAAC;AArBW,QAAA,yBAAyB,6BAqBpC","sourcesContent":["// Source-level circular import detection over the consumer repo's npm\n// workspaces, powered by madge (AST-based dependency graph + cycle detection).\n// Complements the rspack CircularCheckRspackPlugin (which needs a bundle to\n// run): this scans TypeScript sources directly, so it can run inside tsc-only\n// flows like `npm run validate-ts` with no bundling.\n//\n// Scope: each workspace's src, relative imports. Cross-package cycles are\n// already impossible, TypeScript project references refuse to build them, so\n// every runtime-relevant cycle lives inside one package's src. Type-only\n// imports are skipped (skipTypeImports): tsc erases them, so they never create\n// a runtime cycle.\nimport fs from 'fs';\nimport path from 'path';\n\n// madge ships no type definitions; declare the narrow slice we use.\n// eslint-disable-next-line @typescript-eslint/no-require-imports\nconst madge = require('madge') as (paths: string[], config: object) => Promise<{ circular(): string[][] }>;\n\nexport type ImportCycle = string[];\n\n// Expand npm workspace globs (plain path segments and `*` segments only, the\n// only forms npm workspaces use in practice) into existing directories.\nconst expandWorkspaceGlob = (root: string, pattern: string): string[] => {\n  let candidates = [root];\n\n  for (const segment of pattern.split('/')) {\n    if (segment === '*') {\n      candidates = candidates.flatMap((dir) =>\n        fs.existsSync(dir)\n          ? fs\n              .readdirSync(dir, { withFileTypes: true })\n              .filter((entry) => entry.isDirectory())\n              .map((entry) => path.join(dir, entry.name))\n          : [],\n      );\n    } else {\n      candidates = candidates.map((dir) => path.join(dir, segment));\n    }\n  }\n\n  return candidates.filter((dir) => fs.existsSync(dir) && fs.statSync(dir).isDirectory());\n};\n\nconst getWorkspaceDirectories = (root: string): string[] => {\n  const packageJson = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));\n  const patterns: string[] = packageJson.workspaces ?? [];\n  return patterns.flatMap((pattern) => expandWorkspaceGlob(root, pattern));\n};\n\nexport const findWorkspaceImportCycles = async (root: string): Promise<ImportCycle[]> => {\n  const sourceDirs = getWorkspaceDirectories(root)\n    .map((dir) => path.join(dir, 'src'))\n    .filter((dir) => fs.existsSync(dir));\n\n  // Excludes: node_modules and built output (dist/lib), declaration files\n  // (type-only, can't cycle at runtime), and anything madge resolves to outside\n  // the repo root (linked framework packages, their cycles surface through the\n  // rspack CircularCheckRspackPlugin instead, this command owns the consumer\n  // repo). Out-of-root paths start with '..' because baseDir is the repo root.\n  const result = await madge(sourceDirs, {\n    baseDir: root,\n    fileExtensions: ['ts', 'tsx'],\n    excludeRegExp: [/node_modules/, /(^|\\/)(dist|lib)\\//, /\\.d\\.ts$/, /^\\.\\./],\n    detectiveOptions: {\n      ts: { skipTypeImports: true },\n      tsx: { skipTypeImports: true },\n    },\n  });\n\n  return result.circular();\n};\n"]}

package/lib/commonjs/lib/clearResourcesPlan.d.ts

@@ -11,5 +11,4 @@ export type ClearResourcesPlan = {
     appName: string;
     resources: ClearableResource[];
 };
-export declare const getClearableResources: (appName: string) => ClearableResource[];
 export declare const promptClearResourcesPlan: (appName: string) => Promise<ClearResourcesPlan>;

package/lib/commonjs/lib/clearResourcesPlan.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptClearResourcesPlan = exports.getClearableResources = void 0;
+exports.promptClearResourcesPlan = void 0;
 // The question flow for `qpq clear-resources`: enumerate every service's OWNED
 // data resources (storage drives -> buckets, key value stores -> tables) from
 // its live qpq config, multi-select which to empty, then type the deploy
@@ -18,25 +18,26 @@ exports.promptClearResourcesPlan = exports.getClearableResources = void 0;
 // table every service declares against one owner) appears exactly once, on
 // the service that owns it.
 const core_1 = require("@qpqjs/core");
+const createOutput_1 = require("./createOutput");
 const discovery_1 = require("./discovery");
+const getDeployTargetLabel_1 = require("./getDeployTargetLabel");
 const prompts_1 = require("./prompts");
 const qpqConfigs_1 = require("./qpqConfigs");
-const getDeployTargetLabel_1 = require("./getDeployTargetLabel");
+const out = (0, createOutput_1.createOutput)('clear-resources-plan');
 // Every owned data resource across the app's services, in service order.
 const getClearableResources = (appName) => {
     const resources = [];
     for (const service of (0, discovery_1.getServiceNames)(appName)) {
         const qpqConfig = (0, qpqConfigs_1.loadServiceQpqConfig)(appName, service);
-        for (const drive of core_1.qpqCoreUtils.getOwnedStorageDrives(qpqConfig)) {
+        for (const drive of core_1.qpqCoreUtils.getOwnedStorageDriveConfigs(qpqConfig)) {
             resources.push({ service, kind: 'storageDrive', resourceName: drive.storageDrive });
         }
-        for (const store of core_1.qpqCoreUtils.getOwnedKeyValueStores(qpqConfig)) {
+        for (const store of core_1.qpqCoreUtils.getOwnedKeyValueStoreConfigs(qpqConfig)) {
             resources.push({ service, kind: 'keyValueStore', resourceName: store.keyValueStoreName });
         }
     }
     return resources;
 };
-exports.getClearableResources = getClearableResources;
 const BY_SERVICE = 'By service — empty everything the selected services own';
 const BY_RESOURCE = 'By resource — pick individual buckets/tables';
 // Service mode: pick services, take every resource each one owns.
@@ -53,24 +54,22 @@ const pickByResource = (clearable) => (0, prompts_1.promptCheckbox)('Select reso
 })));
 const promptClearResourcesPlan = (appName) => __awaiter(void 0, void 0, void 0, function* () {
     const deployInfo = (0, getDeployTargetLabel_1.getDeployTargetLabel)();
-    const clearable = (0, exports.getClearableResources)(appName);
+    const clearable = getClearableResources(appName);
     if (clearable.length === 0) {
-        console.log('No storage drives or key value stores found in this app.');
+        out.log('No storage drives or key value stores found in this app.');
         return { kind: 'cancelled' };
     }
     const mode = yield (0, prompts_1.promptSelect)('How do you want to select what to empty?', [BY_SERVICE, BY_RESOURCE]);
     const resources = mode === BY_SERVICE ? yield pickByService(clearable) : yield pickByResource(clearable);
     if (resources.length === 0) {
-        console.log('Nothing selected. Exiting!');
+        out.log('Nothing selected. Exiting!');
         return { kind: 'cancelled' };
     }
-    console.log(`\nThis will EMPTY (delete all stored data from) ${resources.length} resource(s) in [${deployInfo}]:`);
+    out.log(`\nThis will EMPTY (delete all stored data from) ${resources.length} resource(s) in [${deployInfo}]:`);
     for (const resource of resources) {
-        console.log(`  ${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`);
+        out.log(`  ${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`);
     }
-    const confirmation = yield (0, prompts_1.promptText)(`Type '${deployInfo}' to confirm`);
-    if (confirmation !== deployInfo) {
-        console.log('Confirmation did not match. Exiting!');
+    if (!(yield (0, prompts_1.promptTypedConfirmation)(deployInfo))) {
         return { kind: 'cancelled' };
     }
     return { kind: 'resources', appName, resources };

package/lib/commonjs/lib/clearResourcesPlan.js.map

@@ -1 +1 @@
-{"version":3,"file":"clearResourcesPlan.js","sourceRoot":"","sources":["../../../src/lib/clearResourcesPlan.ts"],"names":[],"mappings":"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","sourcesContent":["// The question flow for `qpq clear-resources`: enumerate every service's OWNED\n// data resources (storage drives -> buckets, key value stores -> tables) from\n// its live qpq config, multi-select which to empty, then type the deploy\n// target back to confirm - emptying deletes stored data, so a y/n prompt\n// isn't enough friction. Owned-only so a cross-module ref (e.g. a membership\n// table every service declares against one owner) appears exactly once, on\n// the service that owns it.\nimport { qpqCoreUtils } from '@qpqjs/core';\n\nimport { getServiceNames } from './discovery';\nimport { promptCheckbox, promptSelect, promptText } from './prompts';\nimport { loadServiceQpqConfig } from './qpqConfigs';\nimport { getDeployTargetLabel } from './getDeployTargetLabel';\n\nexport type ClearableResourceKind = 'storageDrive' | 'keyValueStore';\n\nexport type ClearableResource = {\n  service: string;\n  kind: ClearableResourceKind;\n  // The config-level resource name (e.g. 'templateTestAssets', 'userTenantLinks');\n  // the platform driver resolves it to the concrete runtime name (bucket/table).\n  resourceName: string;\n};\n\nexport type ClearResourcesPlan =\n  | { kind: 'cancelled' }\n  // Empty (not destroy) the selected resources' stored data.\n  | { kind: 'resources'; appName: string; resources: ClearableResource[] };\n\n// Every owned data resource across the app's services, in service order.\nexport const getClearableResources = (appName: string): ClearableResource[] => {\n  const resources: ClearableResource[] = [];\n\n  for (const service of getServiceNames(appName)) {\n    const qpqConfig = loadServiceQpqConfig(appName, service);\n\n    for (const drive of qpqCoreUtils.getOwnedStorageDrives(qpqConfig)) {\n      resources.push({ service, kind: 'storageDrive', resourceName: drive.storageDrive });\n    }\n\n    for (const store of qpqCoreUtils.getOwnedKeyValueStores(qpqConfig)) {\n      resources.push({ service, kind: 'keyValueStore', resourceName: store.keyValueStoreName });\n    }\n  }\n\n  return resources;\n};\n\nconst BY_SERVICE = 'By service — empty everything the selected services own';\nconst BY_RESOURCE = 'By resource — pick individual buckets/tables';\n\n// Service mode: pick services, take every resource each one owns.\nconst pickByService = async (clearable: ClearableResource[]): Promise<ClearableResource[]> => {\n  const services = [...new Set(clearable.map((resource) => resource.service))];\n\n  const countFor = (service: string) => clearable.filter((resource) => resource.service === service).length;\n\n  const picked = await promptCheckbox(\n    'Select services to EMPTY (every bucket/table the service owns)',\n    services.map((service) => ({ name: `${service} (${countFor(service)} resources)`, value: service })),\n  );\n\n  return clearable.filter((resource) => picked.includes(resource.service));\n};\n\n// Resource mode: pick individual buckets/tables.\nconst pickByResource = (clearable: ClearableResource[]): Promise<ClearableResource[]> =>\n  promptCheckbox(\n    'Select resources to EMPTY (all stored data will be deleted)',\n    clearable.map((resource) => ({\n      name: `${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`,\n      value: resource,\n    })),\n  );\n\nexport const promptClearResourcesPlan = async (appName: string): Promise<ClearResourcesPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  const clearable = getClearableResources(appName);\n\n  if (clearable.length === 0) {\n    console.log('No storage drives or key value stores found in this app.');\n    return { kind: 'cancelled' };\n  }\n\n  const mode = await promptSelect('How do you want to select what to empty?', [BY_SERVICE, BY_RESOURCE]);\n\n  const resources = mode === BY_SERVICE ? await pickByService(clearable) : await pickByResource(clearable);\n\n  if (resources.length === 0) {\n    console.log('Nothing selected. Exiting!');\n    return { kind: 'cancelled' };\n  }\n\n  console.log(`\\nThis will EMPTY (delete all stored data from) ${resources.length} resource(s) in [${deployInfo}]:`);\n  for (const resource of resources) {\n    console.log(`  ${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`);\n  }\n\n  const confirmation = await promptText(`Type '${deployInfo}' to confirm`);\n\n  if (confirmation !== deployInfo) {\n    console.log('Confirmation did not match. Exiting!');\n    return { kind: 'cancelled' };\n  }\n\n  return { kind: 'resources', appName, resources };\n};\n"]}
+{"version":3,"file":"clearResourcesPlan.js","sourceRoot":"","sources":["../../../src/lib/clearResourcesPlan.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAA+E;AAC/E,8EAA8E;AAC9E,yEAAyE;AACzE,yEAAyE;AACzE,6EAA6E;AAC7E,2EAA2E;AAC3E,4BAA4B;AAC5B,sCAA2C;AAE3C,iDAA8C;AAC9C,2CAA8C;AAC9C,iEAA8D;AAC9D,uCAAkF;AAClF,6CAAoD;AAEpD,MAAM,GAAG,GAAG,IAAA,2BAAY,EAAC,sBAAsB,CAAC,CAAC;AAiBjD,yEAAyE;AACzE,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAuB,EAAE;IACrE,MAAM,SAAS,GAAwB,EAAE,CAAC;IAE1C,KAAK,MAAM,OAAO,IAAI,IAAA,2BAAe,EAAC,OAAO,CAAC,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAA,iCAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEzD,KAAK,MAAM,KAAK,IAAI,mBAAY,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAAE,CAAC;YACxE,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,KAAK,MAAM,KAAK,IAAI,mBAAY,CAAC,4BAA4B,CAAC,SAAS,CAAC,EAAE,CAAC;YACzE,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,yDAAyD,CAAC;AAC7E,MAAM,WAAW,GAAG,8CAA8C,CAAC;AAEnE,kEAAkE;AAClE,MAAM,aAAa,GAAG,CAAO,SAA8B,EAAgC,EAAE;IAC3F,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7E,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,MAAM,CAAC;IAE1G,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAc,EACjC,gEAAgE,EAChE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CACrG,CAAC;IAEF,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC,CAAA,CAAC;AAEF,iDAAiD;AACjD,MAAM,cAAc,GAAG,CAAC,SAA8B,EAAgC,EAAE,CACtF,IAAA,wBAAc,EACZ,6DAA6D,EAC7D,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC3B,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,MAAM,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,GAAG;IACjH,KAAK,EAAE,QAAQ;CAChB,CAAC,CAAC,CACJ,CAAC;AAEG,MAAM,wBAAwB,GAAG,CAAO,OAAe,EAA+B,EAAE;IAC7F,MAAM,UAAU,GAAG,IAAA,2CAAoB,GAAE,CAAC;IAE1C,MAAM,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAEjD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,0DAA0D,CAAC,CAAC;QACpE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAY,EAAC,0CAA0C,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IAEvG,MAAM,SAAS,GAAG,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;IAEzG,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,GAAG,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QACtC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,mDAAmD,SAAS,CAAC,MAAM,oBAAoB,UAAU,IAAI,CAAC,CAAC;IAC/G,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,CAAC,OAAO,MAAM,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;IACzH,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,IAAA,iCAAuB,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AACnD,CAAC,CAAA,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC","sourcesContent":["// The question flow for `qpq clear-resources`: enumerate every service's OWNED\n// data resources (storage drives -> buckets, key value stores -> tables) from\n// its live qpq config, multi-select which to empty, then type the deploy\n// target back to confirm - emptying deletes stored data, so a y/n prompt\n// isn't enough friction. Owned-only so a cross-module ref (e.g. a membership\n// table every service declares against one owner) appears exactly once, on\n// the service that owns it.\nimport { qpqCoreUtils } from '@qpqjs/core';\n\nimport { createOutput } from './createOutput';\nimport { getServiceNames } from './discovery';\nimport { getDeployTargetLabel } from './getDeployTargetLabel';\nimport { promptCheckbox, promptSelect, promptTypedConfirmation } from './prompts';\nimport { loadServiceQpqConfig } from './qpqConfigs';\n\nconst out = createOutput('clear-resources-plan');\n\nexport type ClearableResourceKind = 'storageDrive' | 'keyValueStore';\n\nexport type ClearableResource = {\n  service: string;\n  kind: ClearableResourceKind;\n  // The config-level resource name (e.g. 'templateTestAssets', 'userTenantLinks');\n  // the platform driver resolves it to the concrete runtime name (bucket/table).\n  resourceName: string;\n};\n\nexport type ClearResourcesPlan =\n  | { kind: 'cancelled' }\n  // Empty (not destroy) the selected resources' stored data.\n  | { kind: 'resources'; appName: string; resources: ClearableResource[] };\n\n// Every owned data resource across the app's services, in service order.\nconst getClearableResources = (appName: string): ClearableResource[] => {\n  const resources: ClearableResource[] = [];\n\n  for (const service of getServiceNames(appName)) {\n    const qpqConfig = loadServiceQpqConfig(appName, service);\n\n    for (const drive of qpqCoreUtils.getOwnedStorageDriveConfigs(qpqConfig)) {\n      resources.push({ service, kind: 'storageDrive', resourceName: drive.storageDrive });\n    }\n\n    for (const store of qpqCoreUtils.getOwnedKeyValueStoreConfigs(qpqConfig)) {\n      resources.push({ service, kind: 'keyValueStore', resourceName: store.keyValueStoreName });\n    }\n  }\n\n  return resources;\n};\n\nconst BY_SERVICE = 'By service — empty everything the selected services own';\nconst BY_RESOURCE = 'By resource — pick individual buckets/tables';\n\n// Service mode: pick services, take every resource each one owns.\nconst pickByService = async (clearable: ClearableResource[]): Promise<ClearableResource[]> => {\n  const services = [...new Set(clearable.map((resource) => resource.service))];\n\n  const countFor = (service: string) => clearable.filter((resource) => resource.service === service).length;\n\n  const picked = await promptCheckbox(\n    'Select services to EMPTY (every bucket/table the service owns)',\n    services.map((service) => ({ name: `${service} (${countFor(service)} resources)`, value: service })),\n  );\n\n  return clearable.filter((resource) => picked.includes(resource.service));\n};\n\n// Resource mode: pick individual buckets/tables.\nconst pickByResource = (clearable: ClearableResource[]): Promise<ClearableResource[]> =>\n  promptCheckbox(\n    'Select resources to EMPTY (all stored data will be deleted)',\n    clearable.map((resource) => ({\n      name: `${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`,\n      value: resource,\n    })),\n  );\n\nexport const promptClearResourcesPlan = async (appName: string): Promise<ClearResourcesPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  const clearable = getClearableResources(appName);\n\n  if (clearable.length === 0) {\n    out.log('No storage drives or key value stores found in this app.');\n    return { kind: 'cancelled' };\n  }\n\n  const mode = await promptSelect('How do you want to select what to empty?', [BY_SERVICE, BY_RESOURCE]);\n\n  const resources = mode === BY_SERVICE ? await pickByService(clearable) : await pickByResource(clearable);\n\n  if (resources.length === 0) {\n    out.log('Nothing selected. Exiting!');\n    return { kind: 'cancelled' };\n  }\n\n  out.log(`\\nThis will EMPTY (delete all stored data from) ${resources.length} resource(s) in [${deployInfo}]:`);\n  for (const resource of resources) {\n    out.log(`  ${resource.service} — ${resource.resourceName} (${resource.kind === 'storageDrive' ? 'bucket' : 'table'})`);\n  }\n\n  if (!(await promptTypedConfirmation(deployInfo))) {\n    return { kind: 'cancelled' };\n  }\n\n  return { kind: 'resources', appName, resources };\n};\n"]}

package/lib/commonjs/lib/createOutput.d.ts

@@ -0,0 +1,2 @@
+import { Output } from './Output';
+export declare const createOutput: (area: string) => Output;

package/lib/commonjs/lib/createOutput.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOutput = void 0;
+// Every line the cli prints carries `[qpq:<area>]`, so output from the concurrent and nested
+// commands reads as one program. This is the only place the cli touches the console.
+const createOutput = (area) => {
+    const prefix = `[qpq:${area}]`;
+    // Every line of a leading string gets the prefix, and a blank line stays blank, so a message with leading or
+    // embedded newlines reads as prefixed lines rather than a lone prefix followed by bare text.
+    const prefixLines = (text) => text
+        .split('\n')
+        .map((line) => (line === '' ? '' : `${prefix} ${line}`))
+        .join('\n');
+    // A leading string is prefixed line by line; anything else (an error, an object) is printed
+    // after the prefix as its own argument so the console keeps formatting it. The console method is
+    // looked up per call, not captured, so a test can spy on it after this module loads.
+    const withPrefix = (method) => {
+        return (...parts) => {
+            const [first, ...rest] = parts;
+            if (typeof first === 'string') {
+                return console[method](prefixLines(first), ...rest);
+            }
+            return console[method](prefix, ...parts);
+        };
+    };
+    return {
+        log: withPrefix('log'),
+        info: withPrefix('info'),
+        warn: withPrefix('warn'),
+        error: withPrefix('error'),
+        time: (label) => console.time(`${prefix} ${label}`),
+        timeEnd: (label) => console.timeEnd(`${prefix} ${label}`),
+        rewriteLineAbove: (linesUp, text) => {
+            process.stdout.write(`\x1b[${linesUp}F\x1b[2K${prefixLines(text)}\x1b[${linesUp}E`);
+        },
+    };
+};
+exports.createOutput = createOutput;
+//# sourceMappingURL=createOutput.js.map