@qpqjs/cli 0.3.0 → 0.5.0

package/lib/commonjs/lib/resolveDeployment.js

@@ -9,35 +9,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveDeployment = exports.DEPLOYMENT_FLAG = void 0;
+exports.resolveDeployment = void 0;
 const config_aws_1 = require("@qpqjs/config-aws");
 const core_1 = require("@qpqjs/core");
 const platforms_1 = require("../platforms");
 const args_1 = require("./args");
+const CliError_1 = require("./CliError");
+const createOutput_1 = require("./createOutput");
 const discovery_1 = require("./discovery");
 const prompts_1 = require("./prompts");
-exports.DEPLOYMENT_FLAG = '--deployment';
+const out = (0, createOutput_1.createOutput)('resolve-deployment');
+const DEPLOYMENT_FLAG = '--deployment';
 // Which entry to use: the flag, then DEPLOY_NAME (set by a parent qpq command or CI: a
 // selector, never a value), then the sole entry, then a prompt. Headless with several
 // entries and no selection is an error rather than a guess.
 const selectDeploymentName = (argv, appName, configuredNames) => __awaiter(void 0, void 0, void 0, function* () {
-    const requested = (0, args_1.getArgValue)(argv, exports.DEPLOYMENT_FLAG) || process.env[core_1.QpqDeployEnvVar.deployName];
+    const requested = (0, args_1.getArgValue)(argv, DEPLOYMENT_FLAG) || process.env[core_1.QpqDeployEnvVar.deployName];
     if (requested) {
         if (!configuredNames.includes(requested)) {
-            console.error(`Unknown deployment '${requested}' in ${(0, config_aws_1.getQpqAppDeployConfigPath)((0, discovery_1.getRoot)(), appName)}. Configured: ${configuredNames.join(', ')}`);
-            process.exit(1);
+            throw new CliError_1.CliError(`Unknown deployment '${requested}' in ${(0, config_aws_1.getQpqAppDeployConfigPath)((0, discovery_1.getRoot)(), appName)}. Configured: ${configuredNames.join(', ')}`);
         }
         return requested;
     }
-    if (configuredNames.length === 1) {
-        console.log(`Using deployment: ${configuredNames[0]}`);
-        return configuredNames[0];
+    const [onlyName] = configuredNames;
+    if (configuredNames.length === 1 && onlyName !== undefined) {
+        out.log(`Using deployment: ${onlyName}`);
+        return onlyName;
     }
     if (process.stdin.isTTY) {
         return (0, prompts_1.promptSelect)('Select deployment', configuredNames);
     }
-    console.error(`No deployment selected. Pass ${exports.DEPLOYMENT_FLAG} <name>. Configured: ${configuredNames.join(', ')}`);
-    return process.exit(1);
+    throw new CliError_1.CliError(`No deployment selected. Pass ${DEPLOYMENT_FLAG} <name>. Configured: ${configuredNames.join(', ')}`);
 });
 /**
  * Selects an entry of the app's deploy.config.json and writes it into process.env
@@ -50,6 +52,9 @@ const resolveDeployment = (argv, appName) => __awaiter(void 0, void 0, void 0, f
     const { deployments } = (0, config_aws_1.getQpqAppDeployConfig)((0, discovery_1.getRoot)(), appName);
     const deploymentName = yield selectDeploymentName(argv, appName, Object.keys(deployments));
     const deployment = deployments[deploymentName];
+    if (!deployment) {
+        throw new Error(`Deployment [${deploymentName}] is not in ${appName}'s deploy.config.json`);
+    }
     (0, config_aws_1.primeDeploymentEnv)(appName, deploymentName, deployment);
     (0, platforms_1.getPlatformDriver)(deployment.platform).prepareDeployment(deploymentName, deployment);
     return { deploymentName, deployment };

package/lib/commonjs/lib/resolveDeployment.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolveDeployment.js","sourceRoot":"","sources":["../../../src/lib/resolveDeployment.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAyG;AACzG,sCAAgE;AAEhE,4CAAiD;AACjD,iCAAqC;AACrC,2CAAsC;AACtC,uCAAyC;AAE5B,QAAA,eAAe,GAAG,cAAc,CAAC;AAO9C,uFAAuF;AACvF,sFAAsF;AACtF,4DAA4D;AAC5D,MAAM,oBAAoB,GAAG,CAAO,IAAc,EAAE,OAAe,EAAE,eAAyB,EAAmB,EAAE;IACjH,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,IAAI,EAAE,uBAAe,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAe,CAAC,UAAU,CAAC,CAAC;IAEhG,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,KAAK,CAAC,uBAAuB,SAAS,QAAQ,IAAA,sCAAyB,EAAC,IAAA,mBAAO,GAAE,EAAE,OAAO,CAAC,iBAAiB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClJ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,qBAAqB,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACvD,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,IAAA,sBAAY,EAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,gCAAgC,uBAAe,wBAAwB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACnH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACzB,CAAC,CAAA,CAAC;AAEF;;;;;;GAMG;AACI,MAAM,iBAAiB,GAAG,CAAO,IAAc,EAAE,OAAe,EAA+B,EAAE;IACtG,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kCAAqB,EAAC,IAAA,mBAAO,GAAE,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;IAE/C,IAAA,+BAAkB,EAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IACxD,IAAA,6BAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAErF,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC;AACxC,CAAC,CAAA,CAAC;AATW,QAAA,iBAAiB,qBAS5B","sourcesContent":["import { getQpqAppDeployConfig, getQpqAppDeployConfigPath, primeDeploymentEnv } from '@qpqjs/config-aws';\nimport { QpqAppDeployment, QpqDeployEnvVar } from '@qpqjs/core';\n\nimport { getPlatformDriver } from '../platforms';\nimport { getArgValue } from './args';\nimport { getRoot } from './discovery';\nimport { promptSelect } from './prompts';\n\nexport const DEPLOYMENT_FLAG = '--deployment';\n\nexport type ResolvedDeployment = {\n  deploymentName: string;\n  deployment: QpqAppDeployment;\n};\n\n// Which entry to use: the flag, then DEPLOY_NAME (set by a parent qpq command or CI: a\n// selector, never a value), then the sole entry, then a prompt. Headless with several\n// entries and no selection is an error rather than a guess.\nconst selectDeploymentName = async (argv: string[], appName: string, configuredNames: string[]): Promise<string> => {\n  const requested = getArgValue(argv, DEPLOYMENT_FLAG) || process.env[QpqDeployEnvVar.deployName];\n\n  if (requested) {\n    if (!configuredNames.includes(requested)) {\n      console.error(`Unknown deployment '${requested}' in ${getQpqAppDeployConfigPath(getRoot(), appName)}. Configured: ${configuredNames.join(', ')}`);\n      process.exit(1);\n    }\n    return requested;\n  }\n\n  if (configuredNames.length === 1) {\n    console.log(`Using deployment: ${configuredNames[0]}`);\n    return configuredNames[0];\n  }\n\n  if (process.stdin.isTTY) {\n    return promptSelect('Select deployment', configuredNames);\n  }\n\n  console.error(`No deployment selected. Pass ${DEPLOYMENT_FLAG} <name>. Configured: ${configuredNames.join(', ')}`);\n  return process.exit(1);\n};\n\n/**\n * Selects an entry of the app's deploy.config.json and writes it into process.env\n * (identity, environment, feature, settings) before any service config is loaded.\n * The file is the source of truth: nothing in the shell overrides a value in it.\n * The platform driver validates its own settings, so an aws entry missing its\n * account or region fails here, not inside cdk.\n */\nexport const resolveDeployment = async (argv: string[], appName: string): Promise<ResolvedDeployment> => {\n  const { deployments } = getQpqAppDeployConfig(getRoot(), appName);\n  const deploymentName = await selectDeploymentName(argv, appName, Object.keys(deployments));\n  const deployment = deployments[deploymentName];\n\n  primeDeploymentEnv(appName, deploymentName, deployment);\n  getPlatformDriver(deployment.platform).prepareDeployment(deploymentName, deployment);\n\n  return { deploymentName, deployment };\n};\n"]}
+{"version":3,"file":"resolveDeployment.js","sourceRoot":"","sources":["../../../src/lib/resolveDeployment.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAyG;AACzG,sCAAgE;AAEhE,4CAAiD;AACjD,iCAAqC;AACrC,yCAAsC;AACtC,iDAA8C;AAC9C,2CAAsC;AACtC,uCAAyC;AAEzC,MAAM,GAAG,GAAG,IAAA,2BAAY,EAAC,oBAAoB,CAAC,CAAC;AAE/C,MAAM,eAAe,GAAG,cAAc,CAAC;AAOvC,uFAAuF;AACvF,sFAAsF;AACtF,4DAA4D;AAC5D,MAAM,oBAAoB,GAAG,CAAO,IAAc,EAAE,OAAe,EAAE,eAAyB,EAAmB,EAAE;IACjH,MAAM,SAAS,GAAG,IAAA,kBAAW,EAAC,IAAI,EAAE,eAAe,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAe,CAAC,UAAU,CAAC,CAAC;IAEhG,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,mBAAQ,CAChB,uBAAuB,SAAS,QAAQ,IAAA,sCAAyB,EAAC,IAAA,mBAAO,GAAE,EAAE,OAAO,CAAC,iBAAiB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACnI,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC;IACnC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3D,GAAG,CAAC,GAAG,CAAC,qBAAqB,QAAQ,EAAE,CAAC,CAAC;QACzC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,IAAA,sBAAY,EAAC,mBAAmB,EAAE,eAAe,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,IAAI,mBAAQ,CAAC,gCAAgC,eAAe,wBAAwB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC1H,CAAC,CAAA,CAAC;AAEF;;;;;;GAMG;AACI,MAAM,iBAAiB,GAAG,CAAO,IAAc,EAAE,OAAe,EAA+B,EAAE;IACtG,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,kCAAqB,EAAC,IAAA,mBAAO,GAAE,EAAE,OAAO,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3F,MAAM,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;IAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,eAAe,cAAc,eAAe,OAAO,uBAAuB,CAAC,CAAC;IAC9F,CAAC;IAED,IAAA,+BAAkB,EAAC,OAAO,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IACxD,IAAA,6BAAiB,EAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAErF,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC;AACxC,CAAC,CAAA,CAAC;AAZW,QAAA,iBAAiB,qBAY5B","sourcesContent":["import { getQpqAppDeployConfig, getQpqAppDeployConfigPath, primeDeploymentEnv } from '@qpqjs/config-aws';\nimport { QpqAppDeployment, QpqDeployEnvVar } from '@qpqjs/core';\n\nimport { getPlatformDriver } from '../platforms';\nimport { getArgValue } from './args';\nimport { CliError } from './CliError';\nimport { createOutput } from './createOutput';\nimport { getRoot } from './discovery';\nimport { promptSelect } from './prompts';\n\nconst out = createOutput('resolve-deployment');\n\nconst DEPLOYMENT_FLAG = '--deployment';\n\nexport type ResolvedDeployment = {\n  deploymentName: string;\n  deployment: QpqAppDeployment;\n};\n\n// Which entry to use: the flag, then DEPLOY_NAME (set by a parent qpq command or CI: a\n// selector, never a value), then the sole entry, then a prompt. Headless with several\n// entries and no selection is an error rather than a guess.\nconst selectDeploymentName = async (argv: string[], appName: string, configuredNames: string[]): Promise<string> => {\n  const requested = getArgValue(argv, DEPLOYMENT_FLAG) || process.env[QpqDeployEnvVar.deployName];\n\n  if (requested) {\n    if (!configuredNames.includes(requested)) {\n      throw new CliError(\n        `Unknown deployment '${requested}' in ${getQpqAppDeployConfigPath(getRoot(), appName)}. Configured: ${configuredNames.join(', ')}`,\n      );\n    }\n    return requested;\n  }\n\n  const [onlyName] = configuredNames;\n  if (configuredNames.length === 1 && onlyName !== undefined) {\n    out.log(`Using deployment: ${onlyName}`);\n    return onlyName;\n  }\n\n  if (process.stdin.isTTY) {\n    return promptSelect('Select deployment', configuredNames);\n  }\n\n  throw new CliError(`No deployment selected. Pass ${DEPLOYMENT_FLAG} <name>. Configured: ${configuredNames.join(', ')}`);\n};\n\n/**\n * Selects an entry of the app's deploy.config.json and writes it into process.env\n * (identity, environment, feature, settings) before any service config is loaded.\n * The file is the source of truth: nothing in the shell overrides a value in it.\n * The platform driver validates its own settings, so an aws entry missing its\n * account or region fails here, not inside cdk.\n */\nexport const resolveDeployment = async (argv: string[], appName: string): Promise<ResolvedDeployment> => {\n  const { deployments } = getQpqAppDeployConfig(getRoot(), appName);\n  const deploymentName = await selectDeploymentName(argv, appName, Object.keys(deployments));\n  const deployment = deployments[deploymentName];\n  if (!deployment) {\n    throw new Error(`Deployment [${deploymentName}] is not in ${appName}'s deploy.config.json`);\n  }\n\n  primeDeploymentEnv(appName, deploymentName, deployment);\n  getPlatformDriver(deployment.platform).prepareDeployment(deploymentName, deployment);\n\n  return { deploymentName, deployment };\n};\n"]}

package/lib/commonjs/lib/runCommand.d.ts

@@ -1,8 +1,28 @@
+import { ChildProcess, StdioOptions } from 'child_process';
 export type RunCommandOptions = {
     env?: Record<string, string>;
     cwd?: string;
     logCommand?: boolean;
 };
+export type SpawnCommandOptions = RunCommandOptions & {
+    stdio?: StdioOptions;
+};
+/**
+ * Starts a long-running child (a dev server, a watcher) and hands back its handle; the caller
+ * owns its lifetime. Every process the cli starts goes through here or one of the runners
+ * below, so the shell and env rules are in one place.
+ */
+export declare const spawnCommand: (command: string, args: string[], options?: SpawnCommandOptions) => ChildProcess;
+/** Runs a command to completion, inheriting stdio; throws on a non-zero exit. For code that cannot await. */
+export declare const runCommandSync: (command: string, args: string[], options?: RunCommandOptions) => void;
+/**
+ * Runs a command to completion and returns its stdout (stderr is dropped); throws when it
+ * cannot start or exits non-zero. For the short probes (`ps`, `lsof`, `npm --version`) whose
+ * output decides what the cli does next.
+ */
+export declare const runCommandCaptureSync: (command: string, args: string[], options?: RunCommandOptions) => string;
+/** Blocks the current thread for `ms`; only for the short polls in synchronous cleanup code. */
+export declare const sleepSync: (ms: number) => void;
 export declare const runCommand: (command: string, args: string[], options?: RunCommandOptions) => Promise<void>;
 export declare const runCommandBestEffort: (command: string, args: string[], options?: RunCommandOptions) => Promise<void>;
 export type RunCommandPrefixedOptions = {

package/lib/commonjs/lib/runCommand.js

@@ -1,25 +1,69 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runCommandPrefixed = exports.nextPrefixColor = exports.runCommandBestEffort = exports.runCommand = void 0;
+exports.runCommandPrefixed = exports.nextPrefixColor = exports.runCommandBestEffort = exports.runCommand = exports.sleepSync = exports.runCommandCaptureSync = exports.runCommandSync = exports.spawnCommand = void 0;
 const child_process_1 = require("child_process");
+const createOutput_1 = require("./createOutput");
+const out = (0, createOutput_1.createOutput)('run-command');
+// Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run without a shell so
+// the already-array args are passed straight to the program and can't be re-interpreted by
+// `sh -c`, no command injection via interpolated values (stack names, CI-supplied env, etc.).
+const useShell = process.platform === 'win32';
+const toSpawnOptions = (options) => {
+    var _a, _b;
+    return ({
+        shell: useShell,
+        cwd: (_a = options.cwd) !== null && _a !== void 0 ? _a : process.cwd(),
+        env: Object.assign(Object.assign({}, process.env), ((_b = options.env) !== null && _b !== void 0 ? _b : {})),
+    });
+};
+/**
+ * Starts a long-running child (a dev server, a watcher) and hands back its handle; the caller
+ * owns its lifetime. Every process the cli starts goes through here or one of the runners
+ * below, so the shell and env rules are in one place.
+ */
+const spawnCommand = (command, args, options = {}) => {
+    var _a;
+    return (0, child_process_1.spawn)(command, args.filter((a) => !!a), Object.assign({ stdio: (_a = options.stdio) !== null && _a !== void 0 ? _a : 'inherit' }, toSpawnOptions(options)));
+};
+exports.spawnCommand = spawnCommand;
+/** Runs a command to completion, inheriting stdio; throws on a non-zero exit. For code that cannot await. */
+const runCommandSync = (command, args, options = {}) => {
+    const validArgs = args.filter((a) => !!a);
+    const result = (0, child_process_1.spawnSync)(command, validArgs, Object.assign({ stdio: 'inherit' }, toSpawnOptions(options)));
+    if (result.error)
+        throw result.error;
+    if (result.status)
+        throw new Error(`${command} ${validArgs.join(' ')} exited with code ${result.status}`);
+};
+exports.runCommandSync = runCommandSync;
+/**
+ * Runs a command to completion and returns its stdout (stderr is dropped); throws when it
+ * cannot start or exits non-zero. For the short probes (`ps`, `lsof`, `npm --version`) whose
+ * output decides what the cli does next.
+ */
+const runCommandCaptureSync = (command, args, options = {}) => {
+    const validArgs = args.filter((a) => !!a);
+    const result = (0, child_process_1.spawnSync)(command, validArgs, Object.assign({ stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8' }, toSpawnOptions(options)));
+    if (result.error)
+        throw result.error;
+    if (result.status)
+        throw new Error(`${command} ${validArgs.join(' ')} exited with code ${result.status}`);
+    return result.stdout;
+};
+exports.runCommandCaptureSync = runCommandCaptureSync;
+/** Blocks the current thread for `ms`; only for the short polls in synchronous cleanup code. */
+const sleepSync = (ms) => {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+};
+exports.sleepSync = sleepSync;
 // Spawn a command, inheriting stdio, resolving on success. A non-zero exit
 // REJECTS so a failed build/deploy stops the run.
 const runCommand = (command, args, options = {}) => new Promise((resolve, reject) => {
-    var _a, _b;
     const validArgs = args.filter((a) => !!a);
     if (options.logCommand) {
-        console.log(`Running command: ${command} ${validArgs.join(' ')}`);
+        out.log(`Running command: ${command} ${validArgs.join(' ')}`);
     }
-    const child = (0, child_process_1.spawn)(command, validArgs, {
-        stdio: 'inherit',
-        // Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run
-        // without a shell so the already-array args are passed straight to the
-        // program and can't be re-interpreted by `sh -c` — no command injection via
-        // interpolated values (stack names, CI-supplied env, etc.).
-        shell: process.platform === 'win32',
-        cwd: (_a = options.cwd) !== null && _a !== void 0 ? _a : process.cwd(),
-        env: Object.assign(Object.assign({}, process.env), ((_b = options.env) !== null && _b !== void 0 ? _b : {})),
-    });
+    const child = (0, exports.spawnCommand)(command, validArgs, options);
     child.on('error', (error) => reject(error));
     child.on('exit', (code, signal) => {
         if (signal)
@@ -31,18 +75,12 @@ const runCommand = (command, args, options = {}) => new Promise((resolve, reject
 });
 exports.runCommand = runCommand;
 // Run a command for its side effect only, swallowing both its output and its
-// exit code — for best-effort cleanup steps (e.g. `docker rm -f` of a container
+// exit code, for best-effort cleanup steps (e.g. `docker rm -f` of a container
 // that may not exist) that must never fail the run. Without a shell there's no
 // `>/dev/null 2>&1 || true`, so quieting and non-failing happen here instead.
 const runCommandBestEffort = (command, args, options = {}) => new Promise((resolve) => {
-    var _a, _b;
     const validArgs = args.filter((a) => !!a);
-    const child = (0, child_process_1.spawn)(command, validArgs, {
-        stdio: 'ignore',
-        shell: process.platform === 'win32',
-        cwd: (_a = options.cwd) !== null && _a !== void 0 ? _a : process.cwd(),
-        env: Object.assign(Object.assign({}, process.env), ((_b = options.env) !== null && _b !== void 0 ? _b : {})),
-    });
+    const child = (0, exports.spawnCommand)(command, validArgs, Object.assign(Object.assign({}, options), { stdio: 'ignore' }));
     child.on('error', () => resolve());
     child.on('exit', () => resolve());
 });
@@ -52,28 +90,20 @@ let colorIndex = 0;
 // Hand each concurrent task a distinct prefix color so interleaved output is
 // scannable.
 const nextPrefixColor = () => {
-    const color = PREFIX_COLORS[colorIndex % PREFIX_COLORS.length];
+    var _a;
+    const color = (_a = PREFIX_COLORS[colorIndex % PREFIX_COLORS.length]) !== null && _a !== void 0 ? _a : 0;
     colorIndex += 1;
     return color;
 };
 exports.nextPrefixColor = nextPrefixColor;
 // Like runCommand, but pipes output and prefixes every line with a colored
-// [label] — for running many commands concurrently without unreadable
+// [label], for running many commands concurrently without unreadable
 // interleaving. Rejects on non-zero exit.
 const runCommandPrefixed = (label, command, args, options = {}) => new Promise((resolve, reject) => {
-    var _a, _b, _c;
+    var _a;
     const validArgs = args.filter((a) => !!a);
     const prefix = `\x1b[${(_a = options.color) !== null && _a !== void 0 ? _a : 36}m[${label}]\x1b[0m `;
-    const child = (0, child_process_1.spawn)(command, validArgs, {
-        stdio: ['ignore', 'pipe', 'pipe'],
-        // Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run
-        // without a shell so the already-array args are passed straight to the
-        // program and can't be re-interpreted by `sh -c` — no command injection via
-        // interpolated values (stack names, CI-supplied env, etc.).
-        shell: process.platform === 'win32',
-        cwd: (_b = options.cwd) !== null && _b !== void 0 ? _b : process.cwd(),
-        env: Object.assign(Object.assign({}, process.env), ((_c = options.env) !== null && _c !== void 0 ? _c : {})),
-    });
+    const child = (0, exports.spawnCommand)(command, validArgs, Object.assign(Object.assign({}, options), { stdio: ['ignore', 'pipe', 'pipe'] }));
     const attach = (stream, out) => {
         let buffered = '';
         stream.on('data', (chunk) => {

package/lib/commonjs/lib/runCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../../src/lib/runCommand.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from 'child_process';\nimport type { Readable } from 'stream';\n\nexport type RunCommandOptions = {\n  // Extra environment variables merged over the parent process env.\n  env?: Record<string, string>;\n  // Working directory for the child (defaults to cwd).\n  cwd?: string;\n  // Echo the command before running it.\n  logCommand?: boolean;\n};\n\n// Spawn a command, inheriting stdio, resolving on success. A non-zero exit\n// REJECTS so a failed build/deploy stops the run.\nexport const runCommand = (command: string, args: string[], options: RunCommandOptions = {}): Promise<void> =>\n  new Promise((resolve, reject) => {\n    const validArgs = args.filter((a) => !!a);\n\n    if (options.logCommand) {\n      console.log(`Running command: ${command} ${validArgs.join(' ')}`);\n    }\n\n    const child = spawn(command, validArgs, {\n      stdio: 'inherit',\n      // Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run\n      // without a shell so the already-array args are passed straight to the\n      // program and can't be re-interpreted by `sh -c` — no command injection via\n      // interpolated values (stack names, CI-supplied env, etc.).\n      shell: process.platform === 'win32',\n      cwd: options.cwd ?? process.cwd(),\n      env: { ...process.env, ...(options.env ?? {}) },\n    });\n\n    child.on('error', (error) => reject(error));\n\n    child.on('exit', (code, signal) => {\n      if (signal) return reject(new Error(`${command} was killed with signal ${signal}`));\n      if (code) return reject(new Error(`${command} ${validArgs.join(' ')} exited with code ${code}`));\n      return resolve();\n    });\n  });\n\n// Run a command for its side effect only, swallowing both its output and its\n// exit code — for best-effort cleanup steps (e.g. `docker rm -f` of a container\n// that may not exist) that must never fail the run. Without a shell there's no\n// `>/dev/null 2>&1 || true`, so quieting and non-failing happen here instead.\nexport const runCommandBestEffort = (command: string, args: string[], options: RunCommandOptions = {}): Promise<void> =>\n  new Promise((resolve) => {\n    const validArgs = args.filter((a) => !!a);\n\n    const child = spawn(command, validArgs, {\n      stdio: 'ignore',\n      shell: process.platform === 'win32',\n      cwd: options.cwd ?? process.cwd(),\n      env: { ...process.env, ...(options.env ?? {}) },\n    });\n\n    child.on('error', () => resolve());\n    child.on('exit', () => resolve());\n  });\n\nexport type RunCommandPrefixedOptions = {\n  env?: Record<string, string>;\n  cwd?: string;\n  // ANSI color code for the prefix (see nextPrefixColor).\n  color?: number;\n};\n\nconst PREFIX_COLORS = [36, 32, 33, 35, 34, 96, 92, 93, 95, 94];\nlet colorIndex = 0;\n\n// Hand each concurrent task a distinct prefix color so interleaved output is\n// scannable.\nexport const nextPrefixColor = (): number => {\n  const color = PREFIX_COLORS[colorIndex % PREFIX_COLORS.length];\n  colorIndex += 1;\n  return color;\n};\n\n// Like runCommand, but pipes output and prefixes every line with a colored\n// [label] — for running many commands concurrently without unreadable\n// interleaving. Rejects on non-zero exit.\nexport const runCommandPrefixed = (label: string, command: string, args: string[], options: RunCommandPrefixedOptions = {}): Promise<void> =>\n  new Promise((resolve, reject) => {\n    const validArgs = args.filter((a) => !!a);\n    const prefix = `\\x1b[${options.color ?? 36}m[${label}]\\x1b[0m `;\n\n    const child = spawn(command, validArgs, {\n      stdio: ['ignore', 'pipe', 'pipe'],\n      // Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run\n      // without a shell so the already-array args are passed straight to the\n      // program and can't be re-interpreted by `sh -c` — no command injection via\n      // interpolated values (stack names, CI-supplied env, etc.).\n      shell: process.platform === 'win32',\n      cwd: options.cwd ?? process.cwd(),\n      env: { ...process.env, ...(options.env ?? {}) },\n    });\n\n    const attach = (stream: Readable, out: NodeJS.WriteStream): void => {\n      let buffered = '';\n      stream.on('data', (chunk: Buffer) => {\n        buffered += chunk.toString();\n        const lines = buffered.split('\\n');\n        buffered = lines.pop() ?? '';\n        lines.forEach((line) => out.write(`${prefix}${line}\\n`));\n      });\n      stream.on('end', () => {\n        if (buffered) out.write(`${prefix}${buffered}\\n`);\n      });\n    };\n\n    attach(child.stdout as Readable, process.stdout);\n    attach(child.stderr as Readable, process.stderr);\n\n    child.on('error', (error) => reject(error));\n\n    child.on('exit', (code, signal) => {\n      if (signal) return reject(new Error(`[${label}] ${command} was killed with signal ${signal}`));\n      if (code) return reject(new Error(`[${label}] ${command} exited with code ${code}`));\n      return resolve();\n    });\n  });\n"]}
+{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../../src/lib/runCommand.ts"],"names":[],"mappings":";;;AAAA,iDAA6E;AAG7E,iDAA8C;AAE9C,MAAM,GAAG,GAAG,IAAA,2BAAY,EAAC,aAAa,CAAC,CAAC;AAgBxC,8FAA8F;AAC9F,2FAA2F;AAC3F,8FAA8F;AAC9F,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;AAE9C,MAAM,cAAc,GAAG,CAAC,OAA4B,EAAE,EAAE;;IAAC,OAAA,CAAC;QACxD,KAAK,EAAE,QAAQ;QACf,GAAG,EAAE,MAAA,OAAO,CAAC,GAAG,mCAAI,OAAO,CAAC,GAAG,EAAE;QACjC,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,CAAC,MAAA,OAAO,CAAC,GAAG,mCAAI,EAAE,CAAC,CAAE;KAChD,CAAC,CAAA;CAAA,CAAC;AAEH;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,UAA+B,EAAE,EAAgB,EAAE;;IAC/G,OAAA,IAAA,qBAAK,EACH,OAAO,EACP,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,kBACrB,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,SAAS,IAAK,cAAc,CAAC,OAAO,CAAC,EAChE,CAAA;CAAA,CAAC;AALS,QAAA,YAAY,gBAKrB;AAEJ,6GAA6G;AACtG,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,UAA6B,EAAE,EAAQ,EAAE;IACvG,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,SAAS,kBAAI,KAAK,EAAE,SAAS,IAAK,cAAc,CAAC,OAAO,CAAC,EAAG,CAAC;IAE/F,IAAI,MAAM,CAAC,KAAK;QAAE,MAAM,MAAM,CAAC,KAAK,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAC5G,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB;AAEF;;;;GAIG;AACI,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,UAA6B,EAAE,EAAU,EAAE;IAChH,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,OAAO,EAAE,SAAS,kBAAI,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,IAAK,cAAc,CAAC,OAAO,CAAC,EAAG,CAAC;IAEpI,IAAI,MAAM,CAAC,KAAK;QAAE,MAAM,MAAM,CAAC,KAAK,CAAC;IACrC,IAAI,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAE1G,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC,CAAC;AARW,QAAA,qBAAqB,yBAQhC;AAEF,gGAAgG;AACzF,MAAM,SAAS,GAAG,CAAC,EAAU,EAAQ,EAAE;IAC5C,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,SAAS,aAEpB;AAEF,2EAA2E;AAC3E,kDAAkD;AAC3C,MAAM,UAAU,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,UAA6B,EAAE,EAAiB,EAAE,CAC5G,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,GAAG,CAAC,GAAG,CAAC,oBAAoB,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAExD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAChC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,OAAO,2BAA2B,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,IAAI,IAAI;YAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACjG,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAjBQ,QAAA,UAAU,cAiBlB;AAEL,6EAA6E;AAC7E,+EAA+E;AAC/E,+EAA+E;AAC/E,8EAA8E;AACvE,MAAM,oBAAoB,GAAG,CAAC,OAAe,EAAE,IAAc,EAAE,UAA6B,EAAE,EAAiB,EAAE,CACtH,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IACtB,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,SAAS,kCAAO,OAAO,KAAE,KAAK,EAAE,QAAQ,IAAG,CAAC;IAEhF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AARQ,QAAA,oBAAoB,wBAQ5B;AASL,MAAM,aAAa,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAC/D,IAAI,UAAU,GAAG,CAAC,CAAC;AAEnB,6EAA6E;AAC7E,aAAa;AACN,MAAM,eAAe,GAAG,GAAW,EAAE;;IAC1C,MAAM,KAAK,GAAG,MAAA,aAAa,CAAC,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,mCAAI,CAAC,CAAC;IACpE,UAAU,IAAI,CAAC,CAAC;IAChB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAEF,2EAA2E;AAC3E,qEAAqE;AACrE,0CAA0C;AACnC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAE,OAAe,EAAE,IAAc,EAAE,UAAqC,EAAE,EAAiB,EAAE,CAC3I,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;IAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,QAAQ,MAAA,OAAO,CAAC,KAAK,mCAAI,EAAE,KAAK,KAAK,WAAW,CAAC;IAEhE,MAAM,KAAK,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,SAAS,kCAAO,OAAO,KAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAG,CAAC;IAElG,MAAM,MAAM,GAAG,CAAC,MAAgB,EAAE,GAAuB,EAAQ,EAAE;QACjE,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;;YAClC,QAAQ,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnC,QAAQ,GAAG,MAAA,KAAK,CAAC,GAAG,EAAE,mCAAI,EAAE,CAAC;YAC7B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACpB,IAAI,QAAQ;gBAAE,GAAG,CAAC,KAAK,CAAC,GAAG,MAAM,GAAG,QAAQ,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,MAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,CAAC,KAAK,CAAC,MAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEjD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAE5C,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAChC,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,OAAO,2BAA2B,MAAM,EAAE,CAAC,CAAC,CAAC;QAC/F,IAAI,IAAI;YAAE,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,OAAO,qBAAqB,IAAI,EAAE,CAAC,CAAC,CAAC;QACrF,OAAO,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AA9BQ,QAAA,kBAAkB,sBA8B1B","sourcesContent":["import { ChildProcess, spawn, spawnSync, StdioOptions } from 'child_process';\nimport type { Readable } from 'stream';\n\nimport { createOutput } from './createOutput';\n\nconst out = createOutput('run-command');\n\nexport type RunCommandOptions = {\n  // Extra environment variables merged over the parent process env.\n  env?: Record<string, string>;\n  // Working directory for the child (defaults to cwd).\n  cwd?: string;\n  // Echo the command before running it.\n  logCommand?: boolean;\n};\n\nexport type SpawnCommandOptions = RunCommandOptions & {\n  // Defaults to inheriting the parent's stdio.\n  stdio?: StdioOptions;\n};\n\n// Shell only on Windows (to resolve npm/aws/cdk .cmd shims). On posix, run without a shell so\n// the already-array args are passed straight to the program and can't be re-interpreted by\n// `sh -c`, no command injection via interpolated values (stack names, CI-supplied env, etc.).\nconst useShell = process.platform === 'win32';\n\nconst toSpawnOptions = (options: SpawnCommandOptions) => ({\n  shell: useShell,\n  cwd: options.cwd ?? process.cwd(),\n  env: { ...process.env, ...(options.env ?? {}) },\n});\n\n/**\n * Starts a long-running child (a dev server, a watcher) and hands back its handle; the caller\n * owns its lifetime. Every process the cli starts goes through here or one of the runners\n * below, so the shell and env rules are in one place.\n */\nexport const spawnCommand = (command: string, args: string[], options: SpawnCommandOptions = {}): ChildProcess =>\n  spawn(\n    command,\n    args.filter((a) => !!a),\n    { stdio: options.stdio ?? 'inherit', ...toSpawnOptions(options) },\n  );\n\n/** Runs a command to completion, inheriting stdio; throws on a non-zero exit. For code that cannot await. */\nexport const runCommandSync = (command: string, args: string[], options: RunCommandOptions = {}): void => {\n  const validArgs = args.filter((a) => !!a);\n  const result = spawnSync(command, validArgs, { stdio: 'inherit', ...toSpawnOptions(options) });\n\n  if (result.error) throw result.error;\n  if (result.status) throw new Error(`${command} ${validArgs.join(' ')} exited with code ${result.status}`);\n};\n\n/**\n * Runs a command to completion and returns its stdout (stderr is dropped); throws when it\n * cannot start or exits non-zero. For the short probes (`ps`, `lsof`, `npm --version`) whose\n * output decides what the cli does next.\n */\nexport const runCommandCaptureSync = (command: string, args: string[], options: RunCommandOptions = {}): string => {\n  const validArgs = args.filter((a) => !!a);\n  const result = spawnSync(command, validArgs, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8', ...toSpawnOptions(options) });\n\n  if (result.error) throw result.error;\n  if (result.status) throw new Error(`${command} ${validArgs.join(' ')} exited with code ${result.status}`);\n\n  return result.stdout;\n};\n\n/** Blocks the current thread for `ms`; only for the short polls in synchronous cleanup code. */\nexport const sleepSync = (ms: number): void => {\n  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);\n};\n\n// Spawn a command, inheriting stdio, resolving on success. A non-zero exit\n// REJECTS so a failed build/deploy stops the run.\nexport const runCommand = (command: string, args: string[], options: RunCommandOptions = {}): Promise<void> =>\n  new Promise((resolve, reject) => {\n    const validArgs = args.filter((a) => !!a);\n\n    if (options.logCommand) {\n      out.log(`Running command: ${command} ${validArgs.join(' ')}`);\n    }\n\n    const child = spawnCommand(command, validArgs, options);\n\n    child.on('error', (error) => reject(error));\n\n    child.on('exit', (code, signal) => {\n      if (signal) return reject(new Error(`${command} was killed with signal ${signal}`));\n      if (code) return reject(new Error(`${command} ${validArgs.join(' ')} exited with code ${code}`));\n      return resolve();\n    });\n  });\n\n// Run a command for its side effect only, swallowing both its output and its\n// exit code, for best-effort cleanup steps (e.g. `docker rm -f` of a container\n// that may not exist) that must never fail the run. Without a shell there's no\n// `>/dev/null 2>&1 || true`, so quieting and non-failing happen here instead.\nexport const runCommandBestEffort = (command: string, args: string[], options: RunCommandOptions = {}): Promise<void> =>\n  new Promise((resolve) => {\n    const validArgs = args.filter((a) => !!a);\n\n    const child = spawnCommand(command, validArgs, { ...options, stdio: 'ignore' });\n\n    child.on('error', () => resolve());\n    child.on('exit', () => resolve());\n  });\n\nexport type RunCommandPrefixedOptions = {\n  env?: Record<string, string>;\n  cwd?: string;\n  // ANSI color code for the prefix (see nextPrefixColor).\n  color?: number;\n};\n\nconst PREFIX_COLORS = [36, 32, 33, 35, 34, 96, 92, 93, 95, 94];\nlet colorIndex = 0;\n\n// Hand each concurrent task a distinct prefix color so interleaved output is\n// scannable.\nexport const nextPrefixColor = (): number => {\n  const color = PREFIX_COLORS[colorIndex % PREFIX_COLORS.length] ?? 0;\n  colorIndex += 1;\n  return color;\n};\n\n// Like runCommand, but pipes output and prefixes every line with a colored\n// [label], for running many commands concurrently without unreadable\n// interleaving. Rejects on non-zero exit.\nexport const runCommandPrefixed = (label: string, command: string, args: string[], options: RunCommandPrefixedOptions = {}): Promise<void> =>\n  new Promise((resolve, reject) => {\n    const validArgs = args.filter((a) => !!a);\n    const prefix = `\\x1b[${options.color ?? 36}m[${label}]\\x1b[0m `;\n\n    const child = spawnCommand(command, validArgs, { ...options, stdio: ['ignore', 'pipe', 'pipe'] });\n\n    const attach = (stream: Readable, out: NodeJS.WriteStream): void => {\n      let buffered = '';\n      stream.on('data', (chunk: Buffer) => {\n        buffered += chunk.toString();\n        const lines = buffered.split('\\n');\n        buffered = lines.pop() ?? '';\n        lines.forEach((line) => out.write(`${prefix}${line}\\n`));\n      });\n      stream.on('end', () => {\n        if (buffered) out.write(`${prefix}${buffered}\\n`);\n      });\n    };\n\n    attach(child.stdout as Readable, process.stdout);\n    attach(child.stderr as Readable, process.stderr);\n\n    child.on('error', (error) => reject(error));\n\n    child.on('exit', (code, signal) => {\n      if (signal) return reject(new Error(`[${label}] ${command} was killed with signal ${signal}`));\n      if (code) return reject(new Error(`[${label}] ${command} exited with code ${code}`));\n      return resolve();\n    });\n  });\n"]}

package/lib/commonjs/lib/runTasks.js

@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNoFailures = exports.runDependencyTasks = exports.runTasks = void 0;
-// Run tasks with at most `limit` in flight; never rejects — failures come back
+const createOutput_1 = require("./createOutput");
+const out = (0, createOutput_1.createOutput)('run-tasks');
+// Run tasks with at most `limit` in flight; never rejects, failures come back
 // labelled so a whole wave can finish before we report what broke.
 const runTasks = (tasks, limit) => __awaiter(void 0, void 0, void 0, function* () {
     const failures = [];
@@ -20,6 +22,8 @@ const runTasks = (tasks, limit) => __awaiter(void 0, void 0, void 0, function* (
         while (nextIndex < tasks.length) {
             const task = tasks[nextIndex];
             nextIndex += 1;
+            if (!task)
+                continue;
             try {
                 yield task.run();
             }
@@ -87,7 +91,7 @@ const runDependencyTasks = (tasks, limit) => __awaiter(void 0, void 0, void 0, f
                 if (task.deps.some((dep) => failed.has(dep))) {
                     started.add(task.id);
                     failed.add(task.id); // cascade so transitive dependents skip too
-                    console.log(`Skipping ${task.label} (a dependency failed)`);
+                    out.log(`Skipping ${task.label} (a dependency failed)`);
                     changed = true;
                 }
                 else if (task.deps.every((dep) => succeeded.has(dep))) {
@@ -115,8 +119,8 @@ exports.runDependencyTasks = runDependencyTasks;
 const assertNoFailures = (phaseName, failures) => {
     if (failures.length === 0)
         return;
-    console.error(`\n${phaseName} failed for:`);
-    failures.forEach((failure) => console.error(`  ${failure.label}: ${failure.error.message}`));
+    out.error(`\n${phaseName} failed for:`);
+    failures.forEach((failure) => out.error(`  ${failure.label}: ${failure.error.message}`));
     throw new Error(`${phaseName}: ${failures.length} task(s) failed`);
 };
 exports.assertNoFailures = assertNoFailures;

package/lib/commonjs/lib/runTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"runTasks.js","sourceRoot":"","sources":["../../../src/lib/runTasks.ts"],"names":[],"mappings":"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","sourcesContent":["export type Task = { label: string; run: () => Promise<void> };\nexport type TaskFailure = { label: string; error: Error };\n\n// Run tasks with at most `limit` in flight; never rejects — failures come back\n// labelled so a whole wave can finish before we report what broke.\nexport const runTasks = async (tasks: Task[], limit: number): Promise<TaskFailure[]> => {\n  const failures: TaskFailure[] = [];\n  let nextIndex = 0;\n\n  const workerCount = Math.max(1, Math.min(limit, tasks.length));\n  await Promise.all(\n    Array.from({ length: workerCount }, async () => {\n      while (nextIndex < tasks.length) {\n        const task = tasks[nextIndex];\n        nextIndex += 1;\n        try {\n          await task.run();\n        } catch (error) {\n          failures.push({ label: task.label, error: error as Error });\n        }\n      }\n    }),\n  );\n\n  return failures;\n};\n\nexport type DependencyTask = Task & {\n  // Unique id other tasks reference in `deps` (e.g. a package name).\n  id: string;\n  // Ids of tasks that must succeed before this one starts. Ids not present in\n  // the task list should be filtered out by the caller.\n  deps: string[];\n};\n\n// Run tasks with at most `limit` in flight, but a task only starts once every\n// task in its `deps` has succeeded. A failure doesn't stop unrelated tasks;\n// dependents of the failed task are skipped (logged, not returned as failures,\n// the root cause already is). Never rejects. Tasks left unstartable by a\n// dependency cycle come back as failures.\nexport const runDependencyTasks = async (tasks: DependencyTask[], limit: number): Promise<TaskFailure[]> => {\n  const failures: TaskFailure[] = [];\n  const succeeded = new Set<string>();\n  const failed = new Set<string>();\n  const started = new Set<string>();\n  const pipelines: Array<Promise<void>> = [];\n\n  let slots = Math.max(1, limit);\n  const waiting: Array<() => void> = [];\n\n  const acquire = async (): Promise<void> => {\n    if (slots > 0) {\n      slots -= 1;\n      return;\n    }\n    await new Promise<void>((resolve) => waiting.push(resolve));\n  };\n\n  const release = (): void => {\n    const next = waiting.shift();\n    if (next) {\n      next();\n    } else {\n      slots += 1;\n    }\n  };\n\n  const runOne = async (task: DependencyTask): Promise<void> => {\n    await acquire();\n    try {\n      await task.run();\n      succeeded.add(task.id);\n    } catch (error) {\n      failed.add(task.id);\n      failures.push({ label: task.label, error: error as Error });\n    } finally {\n      release();\n    }\n    launchReady();\n  };\n\n  // Repeatedly sweep until stable: launching one task or cascading one skip can\n  // unblock (or block) tasks earlier in the list.\n  const launchReady = (): void => {\n    let changed = true;\n    while (changed) {\n      changed = false;\n      for (const task of tasks) {\n        if (started.has(task.id)) continue;\n        if (task.deps.some((dep) => failed.has(dep))) {\n          started.add(task.id);\n          failed.add(task.id); // cascade so transitive dependents skip too\n          console.log(`Skipping ${task.label} (a dependency failed)`);\n          changed = true;\n        } else if (task.deps.every((dep) => succeeded.has(dep))) {\n          started.add(task.id);\n          pipelines.push(runOne(task));\n          changed = true;\n        }\n      }\n    }\n  };\n\n  launchReady();\n  // runOne re-invokes launchReady as tasks finish, pushing newly unblocked\n  // pipelines while earlier ones are being awaited; drain until it stays empty.\n  while (pipelines.length > 0) {\n    await Promise.all(pipelines.splice(0, pipelines.length));\n  }\n\n  for (const task of tasks) {\n    if (!started.has(task.id)) {\n      failures.push({ label: task.label, error: new Error('unstartable: dependency cycle') });\n    }\n  }\n\n  return failures;\n};\n\nexport const assertNoFailures = (phaseName: string, failures: TaskFailure[]): void => {\n  if (failures.length === 0) return;\n  console.error(`\\n${phaseName} failed for:`);\n  failures.forEach((failure) => console.error(`  ${failure.label}: ${failure.error.message}`));\n  throw new Error(`${phaseName}: ${failures.length} task(s) failed`);\n};\n"]}
+{"version":3,"file":"runTasks.js","sourceRoot":"","sources":["../../../src/lib/runTasks.ts"],"names":[],"mappings":"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","sourcesContent":["import { createOutput } from './createOutput';\n\nconst out = createOutput('run-tasks');\nexport type Task = { label: string; run: () => Promise<void> };\nexport type TaskFailure = { label: string; error: Error };\n\n// Run tasks with at most `limit` in flight; never rejects, failures come back\n// labelled so a whole wave can finish before we report what broke.\nexport const runTasks = async (tasks: Task[], limit: number): Promise<TaskFailure[]> => {\n  const failures: TaskFailure[] = [];\n  let nextIndex = 0;\n\n  const workerCount = Math.max(1, Math.min(limit, tasks.length));\n  await Promise.all(\n    Array.from({ length: workerCount }, async () => {\n      while (nextIndex < tasks.length) {\n        const task = tasks[nextIndex];\n        nextIndex += 1;\n        if (!task) continue;\n        try {\n          await task.run();\n        } catch (error) {\n          failures.push({ label: task.label, error: error as Error });\n        }\n      }\n    }),\n  );\n\n  return failures;\n};\n\nexport type DependencyTask = Task & {\n  // Unique id other tasks reference in `deps` (e.g. a package name).\n  id: string;\n  // Ids of tasks that must succeed before this one starts. Ids not present in\n  // the task list should be filtered out by the caller.\n  deps: string[];\n};\n\n// Run tasks with at most `limit` in flight, but a task only starts once every\n// task in its `deps` has succeeded. A failure doesn't stop unrelated tasks;\n// dependents of the failed task are skipped (logged, not returned as failures,\n// the root cause already is). Never rejects. Tasks left unstartable by a\n// dependency cycle come back as failures.\nexport const runDependencyTasks = async (tasks: DependencyTask[], limit: number): Promise<TaskFailure[]> => {\n  const failures: TaskFailure[] = [];\n  const succeeded = new Set<string>();\n  const failed = new Set<string>();\n  const started = new Set<string>();\n  const pipelines: Array<Promise<void>> = [];\n\n  let slots = Math.max(1, limit);\n  const waiting: Array<() => void> = [];\n\n  const acquire = async (): Promise<void> => {\n    if (slots > 0) {\n      slots -= 1;\n      return;\n    }\n    await new Promise<void>((resolve) => waiting.push(resolve));\n  };\n\n  const release = (): void => {\n    const next = waiting.shift();\n    if (next) {\n      next();\n    } else {\n      slots += 1;\n    }\n  };\n\n  const runOne = async (task: DependencyTask): Promise<void> => {\n    await acquire();\n    try {\n      await task.run();\n      succeeded.add(task.id);\n    } catch (error) {\n      failed.add(task.id);\n      failures.push({ label: task.label, error: error as Error });\n    } finally {\n      release();\n    }\n    launchReady();\n  };\n\n  // Repeatedly sweep until stable: launching one task or cascading one skip can\n  // unblock (or block) tasks earlier in the list.\n  const launchReady = (): void => {\n    let changed = true;\n    while (changed) {\n      changed = false;\n      for (const task of tasks) {\n        if (started.has(task.id)) continue;\n        if (task.deps.some((dep) => failed.has(dep))) {\n          started.add(task.id);\n          failed.add(task.id); // cascade so transitive dependents skip too\n          out.log(`Skipping ${task.label} (a dependency failed)`);\n          changed = true;\n        } else if (task.deps.every((dep) => succeeded.has(dep))) {\n          started.add(task.id);\n          pipelines.push(runOne(task));\n          changed = true;\n        }\n      }\n    }\n  };\n\n  launchReady();\n  // runOne re-invokes launchReady as tasks finish, pushing newly unblocked\n  // pipelines while earlier ones are being awaited; drain until it stays empty.\n  while (pipelines.length > 0) {\n    await Promise.all(pipelines.splice(0, pipelines.length));\n  }\n\n  for (const task of tasks) {\n    if (!started.has(task.id)) {\n      failures.push({ label: task.label, error: new Error('unstartable: dependency cycle') });\n    }\n  }\n\n  return failures;\n};\n\nexport const assertNoFailures = (phaseName: string, failures: TaskFailure[]): void => {\n  if (failures.length === 0) return;\n  out.error(`\\n${phaseName} failed for:`);\n  failures.forEach((failure) => out.error(`  ${failure.label}: ${failure.error.message}`));\n  throw new Error(`${phaseName}: ${failures.length} task(s) failed`);\n};\n"]}

package/lib/commonjs/lib/timing.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logTimeEnd = exports.logTimeStart = void 0;
-const logTimeStart = (name) => console.time(name);
+const createOutput_1 = require("./createOutput");
+const out = (0, createOutput_1.createOutput)('timing');
+const logTimeStart = (name) => out.time(name);
 exports.logTimeStart = logTimeStart;
 const logTimeEnd = (name) => {
-    console.log('When:', new Date().toLocaleTimeString());
-    console.timeEnd(name);
+    out.log('When:', new Date().toLocaleTimeString());
+    out.timeEnd(name);
 };
 exports.logTimeEnd = logTimeEnd;
 //# sourceMappingURL=timing.js.map

package/lib/commonjs/lib/timing.js.map

@@ -1 +1 @@
-{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../../src/lib/timing.ts"],"names":[],"mappings":";;;AAAO,MAAM,YAAY,GAAG,CAAC,IAAY,EAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAA1D,QAAA,YAAY,gBAA8C;AAEhE,MAAM,UAAU,GAAG,CAAC,IAAY,EAAQ,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,UAAU,cAGrB","sourcesContent":["export const logTimeStart = (name: string): void => console.time(name);\n\nexport const logTimeEnd = (name: string): void => {\n  console.log('When:', new Date().toLocaleTimeString());\n  console.timeEnd(name);\n};\n"]}
+{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../../src/lib/timing.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAE9C,MAAM,GAAG,GAAG,IAAA,2BAAY,EAAC,QAAQ,CAAC,CAAC;AAC5B,MAAM,YAAY,GAAG,CAAC,IAAY,EAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAAtD,QAAA,YAAY,gBAA0C;AAE5D,MAAM,UAAU,GAAG,CAAC,IAAY,EAAQ,EAAE;IAC/C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAClD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC,CAAC;AAHW,QAAA,UAAU,cAGrB","sourcesContent":["import { createOutput } from './createOutput';\n\nconst out = createOutput('timing');\nexport const logTimeStart = (name: string): void => out.time(name);\n\nexport const logTimeEnd = (name: string): void => {\n  out.log('When:', new Date().toLocaleTimeString());\n  out.timeEnd(name);\n};\n"]}

package/lib/commonjs/lib/typeWatcher.d.ts

@@ -1,2 +1,3 @@
+import { Nullable } from '@qpqjs/core';
 import { ChildProcess } from 'child_process';
-export declare const startTypeWatcher: (root: string) => ChildProcess | null;
+export declare const startTypeWatcher: (root: string) => Nullable<ChildProcess>;

package/lib/commonjs/lib/typeWatcher.js

@@ -4,18 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startTypeWatcher = void 0;
-// Keeps workspace packages' declaration output (dist/*.d.ts) fresh while
-// `qpq go:dev` runs. The rspack dev builds bundle workspace source directly,
-// so this watcher only feeds the editor and validate-ts, which resolve
-// cross-package types through each package's built declarations.
-//
-// One `tsc -b --watch` over every workspace package that ships types; routine
-// watch chatter is dropped so only real compile errors reach the shared
-// terminal. Opt out with `--no-types`.
 const deploy_rspack_1 = require("@qpqjs/deploy-rspack");
-const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const createOutput_1 = require("./createOutput");
+const runCommand_1 = require("./runCommand");
+const out = (0, createOutput_1.createOutput)('type-watcher');
 // Routine tsc watch status lines; everything else is worth showing.
 const routineTscPatterns = [/Starting compilation in watch mode/, /File change detected/, /Found 0 errors/];
 const isRoutineTscLine = (line) => routineTscPatterns.some((pattern) => pattern.test(line));
@@ -25,7 +19,7 @@ const forwardTscOutput = (chunk) => {
         if (line.trim().length === 0 || isRoutineTscLine(line)) {
             continue;
         }
-        console.log(`[types] ${line}`);
+        out.log(`[types] ${line}`);
     }
 };
 // A workspace package wants declaration watching when it has a tsconfig and
@@ -45,14 +39,13 @@ const startTypeWatcher = (root) => {
         return null;
     }
     const relativeDirs = projectDirs.map((dir) => path_1.default.relative(root, dir));
-    const child = (0, child_process_1.spawn)('npx', ['tsc', '-b', ...relativeDirs, '--watch', '--preserveWatchOutput', '--pretty'], {
+    const child = (0, runCommand_1.spawnCommand)('npx', ['tsc', '-b', ...relativeDirs, '--watch', '--preserveWatchOutput', '--pretty'], {
         cwd: root,
         stdio: ['ignore', 'pipe', 'pipe'],
-        shell: process.platform === 'win32',
     });
     (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on('data', forwardTscOutput);
     (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on('data', forwardTscOutput);
-    console.log(`Type watcher: tsc -b --watch over ${relativeDirs.length} workspace packages (disable with --no-types).`);
+    out.log(`Type watcher: tsc -b --watch over ${relativeDirs.length} workspace packages (disable with --no-types).`);
     return child;
 };
 exports.startTypeWatcher = startTypeWatcher;

package/lib/commonjs/lib/typeWatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeWatcher.js","sourceRoot":"","sources":["../../../src/lib/typeWatcher.ts"],"names":[],"mappings":";;;;;;AAAA,yEAAyE;AACzE,6EAA6E;AAC7E,uEAAuE;AACvE,iEAAiE;AACjE,EAAE;AACF,8EAA8E;AAC9E,wEAAwE;AACxE,uCAAuC;AACvC,wDAA+D;AAE/D,iDAAoD;AACpD,4CAAoB;AACpB,gDAAwB;AAExB,oEAAoE;AACpE,MAAM,kBAAkB,GAAG,CAAC,oCAAoC,EAAE,sBAAsB,EAAE,gBAAgB,CAAC,CAAC;AAE5G,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAE7G,uEAAuE;AACvE,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAQ,EAAE;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,SAAS;QACX,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;AACH,CAAC,CAAC;AAEF,4EAA4E;AAC5E,4EAA4E;AAC5E,sDAAsD;AACtD,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAW,EAAE;IACvD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACzF,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAuB,EAAE;;IACpE,MAAM,WAAW,GAAG,IAAA,uCAAuB,EAAC,IAAI,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IAClF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE,UAAU,CAAC,EAAE;QACzG,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;QACjC,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;KACpC,CAAC,CAAC;IAEH,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC3C,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE3C,OAAO,CAAC,GAAG,CAAC,qCAAqC,YAAY,CAAC,MAAM,gDAAgD,CAAC,CAAC;IAEtH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B","sourcesContent":["// Keeps workspace packages' declaration output (dist/*.d.ts) fresh while\n// `qpq go:dev` runs. The rspack dev builds bundle workspace source directly,\n// so this watcher only feeds the editor and validate-ts, which resolve\n// cross-package types through each package's built declarations.\n//\n// One `tsc -b --watch` over every workspace package that ships types; routine\n// watch chatter is dropped so only real compile errors reach the shared\n// terminal. Opt out with `--no-types`.\nimport { getWorkspacePackageDirs } from '@qpqjs/deploy-rspack';\n\nimport { ChildProcess, spawn } from 'child_process';\nimport fs from 'fs';\nimport path from 'path';\n\n// Routine tsc watch status lines; everything else is worth showing.\nconst routineTscPatterns = [/Starting compilation in watch mode/, /File change detected/, /Found 0 errors/];\n\nconst isRoutineTscLine = (line: string): boolean => routineTscPatterns.some((pattern) => pattern.test(line));\n\n// Forwards non-routine tsc output line by line under a [types] prefix.\nconst forwardTscOutput = (chunk: Buffer): void => {\n  for (const line of chunk.toString().split('\\n')) {\n    if (line.trim().length === 0 || isRoutineTscLine(line)) {\n      continue;\n    }\n    console.log(`[types] ${line}`);\n  }\n};\n\n// A workspace package wants declaration watching when it has a tsconfig and\n// publishes types from its build output. Packages bundled by rspack (views,\n// service handlers) don't ship types and are skipped.\nconst isTypedWorkspacePackage = (dir: string): boolean => {\n  if (!fs.existsSync(path.join(dir, 'tsconfig.json'))) {\n    return false;\n  }\n\n  const packageJson = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf-8'));\n  return !!(packageJson.types || packageJson.typings);\n};\n\nexport const startTypeWatcher = (root: string): ChildProcess | null => {\n  const projectDirs = getWorkspacePackageDirs(root).filter(isTypedWorkspacePackage);\n  if (projectDirs.length === 0) {\n    return null;\n  }\n\n  const relativeDirs = projectDirs.map((dir) => path.relative(root, dir));\n  const child = spawn('npx', ['tsc', '-b', ...relativeDirs, '--watch', '--preserveWatchOutput', '--pretty'], {\n    cwd: root,\n    stdio: ['ignore', 'pipe', 'pipe'],\n    shell: process.platform === 'win32',\n  });\n\n  child.stdout?.on('data', forwardTscOutput);\n  child.stderr?.on('data', forwardTscOutput);\n\n  console.log(`Type watcher: tsc -b --watch over ${relativeDirs.length} workspace packages (disable with --no-types).`);\n\n  return child;\n};\n"]}
+{"version":3,"file":"typeWatcher.js","sourceRoot":"","sources":["../../../src/lib/typeWatcher.ts"],"names":[],"mappings":";;;;;;AASA,wDAA+D;AAG/D,4CAAoB;AACpB,gDAAwB;AAExB,iDAA8C;AAC9C,6CAA4C;AAE5C,MAAM,GAAG,GAAG,IAAA,2BAAY,EAAC,cAAc,CAAC,CAAC;AAEzC,oEAAoE;AACpE,MAAM,kBAAkB,GAAG,CAAC,oCAAoC,EAAE,sBAAsB,EAAE,gBAAgB,CAAC,CAAC;AAE5G,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAE7G,uEAAuE;AACvE,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAQ,EAAE;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YACvD,SAAS;QACX,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC,CAAC;AAEF,4EAA4E;AAC5E,4EAA4E;AAC5E,sDAAsD;AACtD,MAAM,uBAAuB,GAAG,CAAC,GAAW,EAAW,EAAE;IACvD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACzF,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAA0B,EAAE;;IACvE,MAAM,WAAW,GAAG,IAAA,uCAAuB,EAAC,IAAI,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;IAClF,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,IAAA,yBAAY,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE,UAAU,CAAC,EAAE;QAChH,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;KAClC,CAAC,CAAC;IAEH,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC3C,MAAA,KAAK,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAE3C,GAAG,CAAC,GAAG,CAAC,qCAAqC,YAAY,CAAC,MAAM,gDAAgD,CAAC,CAAC;IAElH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAlBW,QAAA,gBAAgB,oBAkB3B","sourcesContent":["// Keeps workspace packages' declaration output (dist/*.d.ts) fresh while\n// `qpq go:dev` runs. The rspack dev builds bundle workspace source directly,\n// so this watcher only feeds the editor and validate-ts, which resolve\n// cross-package types through each package's built declarations.\n//\n// One `tsc -b --watch` over every workspace package that ships types; routine\n// watch chatter is dropped so only real compile errors reach the shared\n// terminal. Opt out with `--no-types`.\nimport { Nullable } from '@qpqjs/core';\nimport { getWorkspacePackageDirs } from '@qpqjs/deploy-rspack';\n\nimport { ChildProcess } from 'child_process';\nimport fs from 'fs';\nimport path from 'path';\n\nimport { createOutput } from './createOutput';\nimport { spawnCommand } from './runCommand';\n\nconst out = createOutput('type-watcher');\n\n// Routine tsc watch status lines; everything else is worth showing.\nconst routineTscPatterns = [/Starting compilation in watch mode/, /File change detected/, /Found 0 errors/];\n\nconst isRoutineTscLine = (line: string): boolean => routineTscPatterns.some((pattern) => pattern.test(line));\n\n// Forwards non-routine tsc output line by line under a [types] prefix.\nconst forwardTscOutput = (chunk: Buffer): void => {\n  for (const line of chunk.toString().split('\\n')) {\n    if (line.trim().length === 0 || isRoutineTscLine(line)) {\n      continue;\n    }\n    out.log(`[types] ${line}`);\n  }\n};\n\n// A workspace package wants declaration watching when it has a tsconfig and\n// publishes types from its build output. Packages bundled by rspack (views,\n// service handlers) don't ship types and are skipped.\nconst isTypedWorkspacePackage = (dir: string): boolean => {\n  if (!fs.existsSync(path.join(dir, 'tsconfig.json'))) {\n    return false;\n  }\n\n  const packageJson = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf-8'));\n  return !!(packageJson.types || packageJson.typings);\n};\n\nexport const startTypeWatcher = (root: string): Nullable<ChildProcess> => {\n  const projectDirs = getWorkspacePackageDirs(root).filter(isTypedWorkspacePackage);\n  if (projectDirs.length === 0) {\n    return null;\n  }\n\n  const relativeDirs = projectDirs.map((dir) => path.relative(root, dir));\n  const child = spawnCommand('npx', ['tsc', '-b', ...relativeDirs, '--watch', '--preserveWatchOutput', '--pretty'], {\n    cwd: root,\n    stdio: ['ignore', 'pipe', 'pipe'],\n  });\n\n  child.stdout?.on('data', forwardTscOutput);\n  child.stderr?.on('data', forwardTscOutput);\n\n  out.log(`Type watcher: tsc -b --watch over ${relativeDirs.length} workspace packages (disable with --no-types).`);\n\n  return child;\n};\n"]}

package/lib/commonjs/lib/userScriptBuilderLayer.d.ts

@@ -4,8 +4,6 @@ export type BuilderLayerInstallOptions = {
     architecture: JavascriptRuntimeArchitecture;
     rspackVersion: string;
 };
-/** The npm cpu name for a lambda architecture. */
-export declare const getBuilderLayerCpu: (architecture: JavascriptRuntimeArchitecture) => "arm64" | "x64";
 /**
  * The npm argv that installs rspack for linux and the lambda's cpu into the layer's
  * nodejs directory. Pure, so the exact invocation is testable without running npm.

package/lib/commonjs/lib/userScriptBuilderLayer.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildUserScriptBuilderLayer = exports.getBuilderLayerInstallArgs = exports.getBuilderLayerCpu = void 0;
+exports.buildUserScriptBuilderLayer = exports.getBuilderLayerInstallArgs = void 0;
 const core_1 = require("@qpqjs/core");
 const user_script_1 = require("@qpqjs/user-script");
-const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const runCommand_1 = require("./runCommand");
 const MIN_NPM_MAJOR = 9;
 // Lambda's layer layout: /opt/nodejs/node_modules is on the function's module path.
 const LAYER_NODE_DIR = 'nodejs';
@@ -18,7 +18,6 @@ const npmCpuByArchitecture = {
 };
 /** The npm cpu name for a lambda architecture. */
 const getBuilderLayerCpu = (architecture) => npmCpuByArchitecture[architecture];
-exports.getBuilderLayerCpu = getBuilderLayerCpu;
 /**
  * The npm argv that installs rspack for linux and the lambda's cpu into the layer's
  * nodejs directory. Pure, so the exact invocation is testable without running npm.
@@ -28,7 +27,7 @@ const getBuilderLayerInstallArgs = ({ outDir, architecture, rspackVersion }) =>
     '--prefix',
     path_1.default.join(outDir, LAYER_NODE_DIR),
     '--os=linux',
-    `--cpu=${(0, exports.getBuilderLayerCpu)(architecture)}`,
+    `--cpu=${getBuilderLayerCpu(architecture)}`,
     '--libc=glibc',
     '--omit=dev',
     '--no-save',
@@ -38,11 +37,11 @@ const getBuilderLayerInstallArgs = ({ outDir, architecture, rspackVersion }) =>
     `@rspack/core@${rspackVersion}`,
 ];
 exports.getBuilderLayerInstallArgs = getBuilderLayerInstallArgs;
-const parseMajor = (version) => parseInt(version.split('.')[0], 10);
+const parseMajor = (version) => { var _a; return parseInt((_a = version.split('.')[0]) !== null && _a !== void 0 ? _a : '', 10); };
 const defaultRunners = {
-    getNpmVersion: () => (0, child_process_1.execFileSync)('npm', ['--version'], { encoding: 'utf8' }).trim(),
+    getNpmVersion: () => (0, runCommand_1.runCommandCaptureSync)('npm', ['--version']).trim(),
     runNpm: (args) => {
-        (0, child_process_1.execFileSync)('npm', args, { stdio: 'inherit' });
+        (0, runCommand_1.runCommandSync)('npm', args);
     },
 };
 /**
@@ -60,7 +59,7 @@ const buildUserScriptBuilderLayer = (options, runners = defaultRunners) => {
     fs_1.default.mkdirSync(nodeDir, { recursive: true });
     fs_1.default.writeFileSync(path_1.default.join(nodeDir, 'package.json'), JSON.stringify({ name: 'user-script-builder-layer', private: true }, null, 2));
     runners.runNpm((0, exports.getBuilderLayerInstallArgs)(options));
-    const bindingDir = path_1.default.join(nodeDir, 'node_modules', '@rspack', `binding-linux-${(0, exports.getBuilderLayerCpu)(options.architecture)}-gnu`);
+    const bindingDir = path_1.default.join(nodeDir, 'node_modules', '@rspack', `binding-linux-${getBuilderLayerCpu(options.architecture)}-gnu`);
     if (!fs_1.default.existsSync(bindingDir)) {
         throw new Error(`script:builder-layer: expected the rspack binding at [${bindingDir}] after install; the layer would not load on lambda`);
     }

package/lib/commonjs/lib/userScriptBuilderLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"userScriptBuilderLayer.js","sourceRoot":"","sources":["../../../src/lib/userScriptBuilderLayer.ts"],"names":[],"mappings":"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","sourcesContent":["import { JavascriptRuntimeArchitecture } from '@qpqjs/core';\nimport { USER_SCRIPT_BUILDER_LAYER_MODULES } from '@qpqjs/user-script';\n\nimport { execFileSync } from 'child_process';\nimport fs from 'fs';\nimport path from 'path';\n\nconst MIN_NPM_MAJOR = 9;\n\n// Lambda's layer layout: /opt/nodejs/node_modules is on the function's module path.\nconst LAYER_NODE_DIR = 'nodejs';\n\nconst npmCpuByArchitecture: Record<JavascriptRuntimeArchitecture, 'arm64' | 'x64'> = {\n  [JavascriptRuntimeArchitecture.Arm64]: 'arm64',\n  [JavascriptRuntimeArchitecture.X86_64]: 'x64',\n};\n\nexport type BuilderLayerInstallOptions = {\n  outDir: string;\n  architecture: JavascriptRuntimeArchitecture;\n  rspackVersion: string;\n};\n\n/** The npm cpu name for a lambda architecture. */\nexport const getBuilderLayerCpu = (architecture: JavascriptRuntimeArchitecture): 'arm64' | 'x64' => npmCpuByArchitecture[architecture];\n\n/**\n * The npm argv that installs rspack for linux and the lambda's cpu into the layer's\n * nodejs directory. Pure, so the exact invocation is testable without running npm.\n */\nexport const getBuilderLayerInstallArgs = ({ outDir, architecture, rspackVersion }: BuilderLayerInstallOptions): string[] => [\n  'install',\n  '--prefix',\n  path.join(outDir, LAYER_NODE_DIR),\n  '--os=linux',\n  `--cpu=${getBuilderLayerCpu(architecture)}`,\n  '--libc=glibc',\n  '--omit=dev',\n  '--no-save',\n  '--no-package-lock',\n  '--no-audit',\n  '--no-fund',\n  `@rspack/core@${rspackVersion}`,\n];\n\nconst parseMajor = (version: string): number => parseInt(version.split('.')[0], 10);\n\nexport type BuilderLayerRunners = {\n  getNpmVersion: () => string;\n  runNpm: (args: string[]) => void;\n};\n\nconst defaultRunners: BuilderLayerRunners = {\n  getNpmVersion: () => execFileSync('npm', ['--version'], { encoding: 'utf8' }).trim(),\n  runNpm: (args) => {\n    execFileSync('npm', args, { stdio: 'inherit' });\n  },\n};\n\n/**\n * Produces the user-script builder layer directory: `<outDir>/nodejs/node_modules` holding\n * rspack and its linux binding for the lambda's cpu. Empties `outDir` first and verifies\n * the binding landed. Needs npm 9 or later for the `--os`/`--cpu` flags.\n */\nexport const buildUserScriptBuilderLayer = (options: BuilderLayerInstallOptions, runners: BuilderLayerRunners = defaultRunners): string => {\n  const npmVersion = runners.getNpmVersion();\n  if (parseMajor(npmVersion) < MIN_NPM_MAJOR) {\n    throw new Error(`script:builder-layer needs npm ${MIN_NPM_MAJOR} or later for --os/--cpu installs; found ${npmVersion}`);\n  }\n\n  const nodeDir = path.join(options.outDir, LAYER_NODE_DIR);\n  fs.rmSync(options.outDir, { recursive: true, force: true });\n  fs.mkdirSync(nodeDir, { recursive: true });\n  fs.writeFileSync(path.join(nodeDir, 'package.json'), JSON.stringify({ name: 'user-script-builder-layer', private: true }, null, 2));\n\n  runners.runNpm(getBuilderLayerInstallArgs(options));\n\n  const bindingDir = path.join(nodeDir, 'node_modules', '@rspack', `binding-linux-${getBuilderLayerCpu(options.architecture)}-gnu`);\n  if (!fs.existsSync(bindingDir)) {\n    throw new Error(`script:builder-layer: expected the rspack binding at [${bindingDir}] after install; the layer would not load on lambda`);\n  }\n\n  const installed = USER_SCRIPT_BUILDER_LAYER_MODULES.filter((name) => fs.existsSync(path.join(nodeDir, 'node_modules', name)));\n  if (installed.length !== USER_SCRIPT_BUILDER_LAYER_MODULES.length) {\n    throw new Error(`script:builder-layer: the layer is missing ${USER_SCRIPT_BUILDER_LAYER_MODULES.filter((name) => !installed.includes(name)).join(', ')}`);\n  }\n\n  return nodeDir;\n};\n"]}
+{"version":3,"file":"userScriptBuilderLayer.js","sourceRoot":"","sources":["../../../src/lib/userScriptBuilderLayer.ts"],"names":[],"mappings":"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","sourcesContent":["import { JavascriptRuntimeArchitecture } from '@qpqjs/core';\nimport { USER_SCRIPT_BUILDER_LAYER_MODULES } from '@qpqjs/user-script';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { runCommandCaptureSync, runCommandSync } from './runCommand';\n\nconst MIN_NPM_MAJOR = 9;\n\n// Lambda's layer layout: /opt/nodejs/node_modules is on the function's module path.\nconst LAYER_NODE_DIR = 'nodejs';\n\nconst npmCpuByArchitecture: Record<JavascriptRuntimeArchitecture, 'arm64' | 'x64'> = {\n  [JavascriptRuntimeArchitecture.Arm64]: 'arm64',\n  [JavascriptRuntimeArchitecture.X86_64]: 'x64',\n};\n\nexport type BuilderLayerInstallOptions = {\n  outDir: string;\n  architecture: JavascriptRuntimeArchitecture;\n  rspackVersion: string;\n};\n\n/** The npm cpu name for a lambda architecture. */\nconst getBuilderLayerCpu = (architecture: JavascriptRuntimeArchitecture): 'arm64' | 'x64' => npmCpuByArchitecture[architecture];\n\n/**\n * The npm argv that installs rspack for linux and the lambda's cpu into the layer's\n * nodejs directory. Pure, so the exact invocation is testable without running npm.\n */\nexport const getBuilderLayerInstallArgs = ({ outDir, architecture, rspackVersion }: BuilderLayerInstallOptions): string[] => [\n  'install',\n  '--prefix',\n  path.join(outDir, LAYER_NODE_DIR),\n  '--os=linux',\n  `--cpu=${getBuilderLayerCpu(architecture)}`,\n  '--libc=glibc',\n  '--omit=dev',\n  '--no-save',\n  '--no-package-lock',\n  '--no-audit',\n  '--no-fund',\n  `@rspack/core@${rspackVersion}`,\n];\n\nconst parseMajor = (version: string): number => parseInt(version.split('.')[0] ?? '', 10);\n\nexport type BuilderLayerRunners = {\n  getNpmVersion: () => string;\n  runNpm: (args: string[]) => void;\n};\n\nconst defaultRunners: BuilderLayerRunners = {\n  getNpmVersion: () => runCommandCaptureSync('npm', ['--version']).trim(),\n  runNpm: (args) => {\n    runCommandSync('npm', args);\n  },\n};\n\n/**\n * Produces the user-script builder layer directory: `<outDir>/nodejs/node_modules` holding\n * rspack and its linux binding for the lambda's cpu. Empties `outDir` first and verifies\n * the binding landed. Needs npm 9 or later for the `--os`/`--cpu` flags.\n */\nexport const buildUserScriptBuilderLayer = (options: BuilderLayerInstallOptions, runners: BuilderLayerRunners = defaultRunners): string => {\n  const npmVersion = runners.getNpmVersion();\n  if (parseMajor(npmVersion) < MIN_NPM_MAJOR) {\n    throw new Error(`script:builder-layer needs npm ${MIN_NPM_MAJOR} or later for --os/--cpu installs; found ${npmVersion}`);\n  }\n\n  const nodeDir = path.join(options.outDir, LAYER_NODE_DIR);\n  fs.rmSync(options.outDir, { recursive: true, force: true });\n  fs.mkdirSync(nodeDir, { recursive: true });\n  fs.writeFileSync(path.join(nodeDir, 'package.json'), JSON.stringify({ name: 'user-script-builder-layer', private: true }, null, 2));\n\n  runners.runNpm(getBuilderLayerInstallArgs(options));\n\n  const bindingDir = path.join(nodeDir, 'node_modules', '@rspack', `binding-linux-${getBuilderLayerCpu(options.architecture)}-gnu`);\n  if (!fs.existsSync(bindingDir)) {\n    throw new Error(`script:builder-layer: expected the rspack binding at [${bindingDir}] after install; the layer would not load on lambda`);\n  }\n\n  const installed = USER_SCRIPT_BUILDER_LAYER_MODULES.filter((name) => fs.existsSync(path.join(nodeDir, 'node_modules', name)));\n  if (installed.length !== USER_SCRIPT_BUILDER_LAYER_MODULES.length) {\n    throw new Error(\n      `script:builder-layer: the layer is missing ${USER_SCRIPT_BUILDER_LAYER_MODULES.filter((name) => !installed.includes(name)).join(', ')}`,\n    );\n  }\n\n  return nodeDir;\n};\n"]}