@qpqjs/cli 0.3.0 → 0.4.0

package/lib/esm/commands/teardown.js

@@ -1,20 +1,14 @@
-// `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.
 import { promptTeardownPlan } from '../lib/deployPrompts';
-import { resolveAppSelection } from '../lib/resolveAppSelection';
-import { resolveDeployment } from '../lib/resolveDeployment';
-import { getPlatformDriver } from '../platforms';
+import { requireDriverCapability } from '../lib/requireDriverCapability';
+import { resolveCommandContext } from '../lib/resolveCommandContext';
 export const teardownCommand = async (argv) => {
-    const appName = await resolveAppSelection({ argv, envVar: 'DEPLOY_APP_NAME' });
-    const { deployment } = await resolveDeployment(argv, appName);
-    const driver = getPlatformDriver(deployment.platform);
-    if (!driver.teardown) {
-        console.error(`The '${deployment.platform}' platform has no teardown strategy.`);
-        process.exit(1);
-    }
-    const plan = await promptTeardownPlan(appName);
-    await driver.teardown(appName, plan);
+    const context = await resolveCommandContext(argv);
+    const teardown = requireDriverCapability(context, 'teardown');
+    const plan = await promptTeardownPlan(context.appName);
+    await teardown(context.appName, plan);
 };
 //# sourceMappingURL=teardown.js.map

package/lib/esm/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,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAc,EAAiB,EAAE;IACrE,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/E,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,iBAAiB,CAAC,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,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE/C,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC","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,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAc,EAAiB,EAAE;IACrE,MAAM,OAAO,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE9D,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvD,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC","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/esm/lib/CliError.d.ts

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

package/lib/esm/lib/CliError.js

@@ -0,0 +1,11 @@
+// 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.
+export class CliError extends Error {
+    exitCode;
+    constructor(message, exitCode = 1) {
+        super(message);
+        this.name = 'CliError';
+        this.exitCode = exitCode;
+    }
+}
+//# sourceMappingURL=CliError.js.map

package/lib/esm/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,MAAM,OAAO,QAAS,SAAQ,KAAK;IACxB,QAAQ,CAAS;IAE1B,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","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/esm/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/esm/lib/circularImports.js

@@ -5,7 +5,7 @@
 // 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.
@@ -14,7 +14,7 @@ import path from '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];
@@ -33,7 +33,7 @@ const expandWorkspaceGlob = (root, pattern) => {
     }
     return candidates.filter((dir) => fs.existsSync(dir) && fs.statSync(dir).isDirectory());
 };
-export const getWorkspaceDirectories = (root) => {
+const getWorkspaceDirectories = (root) => {
     const packageJson = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
     const patterns = packageJson.workspaces ?? [];
     return patterns.flatMap((pattern) => expandWorkspaceGlob(root, pattern));
@@ -44,7 +44,7 @@ export const findWorkspaceImportCycles = async (root) => {
         .filter((dir) => fs.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 = await madge(sourceDirs, {

package/lib/esm/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":"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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\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/esm/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/esm/lib/clearResourcesPlan.js

@@ -7,18 +7,20 @@
 // the service that owns it.
 import { qpqCoreUtils } from '@qpqjs/core';
 import { getServiceNames } from './discovery';
-import { promptCheckbox, promptSelect, promptText } from './prompts';
-import { loadServiceQpqConfig } from './qpqConfigs';
 import { getDeployTargetLabel } from './getDeployTargetLabel';
+import { promptCheckbox, promptSelect, promptTypedConfirmation } from './prompts';
+import { loadServiceQpqConfig } from './qpqConfigs';
+import { createOutput } from './out';
+const out = createOutput('clear-resources-plan');
 // Every owned data resource across the app's services, in service order.
-export const getClearableResources = (appName) => {
+const getClearableResources = (appName) => {
     const resources = [];
     for (const service of getServiceNames(appName)) {
         const qpqConfig = loadServiceQpqConfig(appName, service);
-        for (const drive of qpqCoreUtils.getOwnedStorageDrives(qpqConfig)) {
+        for (const drive of qpqCoreUtils.getOwnedStorageDriveConfigs(qpqConfig)) {
             resources.push({ service, kind: 'storageDrive', resourceName: drive.storageDrive });
         }
-        for (const store of qpqCoreUtils.getOwnedKeyValueStores(qpqConfig)) {
+        for (const store of qpqCoreUtils.getOwnedKeyValueStoreConfigs(qpqConfig)) {
             resources.push({ service, kind: 'keyValueStore', resourceName: store.keyValueStoreName });
         }
     }
@@ -42,22 +44,20 @@ export const promptClearResourcesPlan = async (appName) => {
     const deployInfo = getDeployTargetLabel();
     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 = await promptSelect('How do you want to select what to empty?', [BY_SERVICE, BY_RESOURCE]);
     const resources = mode === BY_SERVICE ? await pickByService(clearable) : await 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 = await promptText(`Type '${deployInfo}' to confirm`);
-    if (confirmation !== deployInfo) {
-        console.log('Confirmation did not match. Exiting!');
+    if (!(await promptTypedConfirmation(deployInfo))) {
         return { kind: 'cancelled' };
     }
     return { kind: 'resources', appName, resources };

package/lib/esm/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":"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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 { getDeployTargetLabel } from './getDeployTargetLabel';\nimport { promptCheckbox, promptSelect, promptTypedConfirmation } from './prompts';\nimport { loadServiceQpqConfig } from './qpqConfigs';\nimport { createOutput } from './out';\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/esm/lib/deployPrompts.d.ts

@@ -1,3 +1,4 @@
+import { Nullable } from '@qpqjs/core';
 export type StackType = 'all' | 'inf' | 'api' | 'web' | 'views';
 export type DeployPlan = {
     kind: 'cancelled';
@@ -14,7 +15,7 @@ export type DeployPlan = {
     services: string[];
     stacks: StackType;
 };
-export declare const buildDeployPlanFromArgs: (appName: string, argv: string[]) => DeployPlan | null;
+export declare const buildDeployPlanFromArgs: (appName: string, argv: string[]) => Nullable<DeployPlan>;
 export declare const promptDeployPlan: (appName: string) => Promise<DeployPlan>;
 export type TeardownPlan = {
     kind: 'cancelled';

package/lib/esm/lib/deployPrompts.js

@@ -1,11 +1,10 @@
-// The interactive question flow shared by `qpq go` (sequential AWS deploy) and
-// a future dockerized variant: pick an app, confirm the target, pick services
-// (or domain/bootstrap), pick stacks. buildDeployPlanFromArgs is the
-// non-interactive shortcut (`qpq go all all`) that skips every prompt.
 import { getPositionalArgs } from './args';
-import { getDeployTargetLabel } from './getDeployTargetLabel';
 import { getServiceNames } from './discovery';
-import { promptSelect, promptText, promptYesNo } from './prompts';
+import { getDeployTargetLabel } from './getDeployTargetLabel';
+import { promptSelect, promptTypedConfirmation, promptYesNo } from './prompts';
+import { CliError } from './CliError';
+import { createOutput } from './out';
+const out = createOutput('deploy-prompts');
 const STACK_TYPES = ['all', 'inf', 'api', 'web', 'views'];
 // Non-interactive deploy plan from positional args: `qpq go <services> [stacks]`.
 //   services: 'all' | comma-separated service names | 'account' | 'domain' | 'bootstrap'
@@ -28,23 +27,26 @@ export const buildDeployPlanFromArgs = (appName, argv) => {
         return { kind: 'bootstrap', appName, includeDomain: false };
     }
     const allServices = getServiceNames(appName);
-    const services = servicesArg === 'all' ? allServices : servicesArg.split(',').map((s) => s.trim()).filter(Boolean);
+    const services = servicesArg === 'all'
+        ? allServices
+        : servicesArg
+            .split(',')
+            .map((s) => s.trim())
+            .filter(Boolean);
     const unknownServices = services.filter((service) => !allServices.includes(service));
     if (unknownServices.length > 0) {
-        console.error(`Unknown service(s): ${unknownServices.join(', ')}. Valid services: ${allServices.join(', ')}`);
-        process.exit(1);
+        throw new CliError(`Unknown service(s): ${unknownServices.join(', ')}. Valid services: ${allServices.join(', ')}`);
     }
     const stacks = (stacksArg ?? 'all');
     if (!STACK_TYPES.includes(stacks)) {
-        console.error(`Unknown stacks '${stacksArg}'. Valid stacks: ${STACK_TYPES.join(', ')}`);
-        process.exit(1);
+        throw new CliError(`Unknown stacks '${stacksArg}'. Valid stacks: ${STACK_TYPES.join(', ')}`);
     }
     return { kind: 'services', appName, services: [...new Set(services)], stacks };
 };
 export const promptDeployPlan = async (appName) => {
     const deployInfo = getDeployTargetLabel();
     if (!(await promptYesNo(`Deploying to: [${deployInfo}]`))) {
-        console.log('Exiting!');
+        out.log('Exiting!');
         return { kind: 'cancelled' };
     }
     let services = [];
@@ -76,7 +78,7 @@ export const promptDeployPlan = async (appName) => {
     return { kind: 'services', appName, services, stacks };
 };
 // The question flow for `qpq teardown`: pick services, then type the deploy
-// target back to confirm — destroying inf stacks takes user data (key value
+// target back to confirm, destroying inf stacks takes user data (key value
 // stores, user directories) with it, so a y/n prompt isn't enough friction.
 export const promptTeardownPlan = async (appName) => {
     const deployInfo = getDeployTargetLabel();
@@ -92,10 +94,8 @@ export const promptTeardownPlan = async (appName) => {
         services.push(service);
     } while (await promptYesNo('Do you want to tear down another service?'));
     services = [...new Set(services)];
-    console.log(`\nThis will DESTROY the web, api and inf stacks (including all stored data) for: ${services.join(', ')}`);
-    const confirmation = await promptText(`Type '${deployInfo}' to confirm`);
-    if (confirmation !== deployInfo) {
-        console.log('Confirmation did not match. Exiting!');
+    out.log(`\nThis will DESTROY the web, api and inf stacks (including all stored data) for: ${services.join(', ')}`);
+    if (!(await promptTypedConfirmation(deployInfo))) {
         return { kind: 'cancelled' };
     }
     return { kind: 'services', appName, services };

package/lib/esm/lib/deployPrompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployPrompts.js","sourceRoot":"","sources":["../../../src/lib/deployPrompts.ts"],"names":[],"mappings":"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","sourcesContent":["// The interactive question flow shared by `qpq go` (sequential AWS deploy) and\n// a future dockerized variant: pick an app, confirm the target, pick services\n// (or domain/bootstrap), pick stacks. buildDeployPlanFromArgs is the\n// non-interactive shortcut (`qpq go all all`) that skips every prompt.\nimport { getPositionalArgs } from './args';\nimport { getDeployTargetLabel } from './getDeployTargetLabel';\nimport { getServiceNames } from './discovery';\nimport { promptSelect, promptText, promptYesNo } from './prompts';\n\nexport type StackType = 'all' | 'inf' | 'api' | 'web' | 'views';\n\nconst STACK_TYPES: StackType[] = ['all', 'inf', 'api', 'web', 'views'];\n\nexport type DeployPlan =\n  | { kind: 'cancelled' }\n  // Deploy only the account-level guardrails stack (one per AWS account).\n  | { kind: 'account'; appName: string }\n  // Deploy the bootstrap stack (and optionally the domain stack first).\n  | { kind: 'bootstrap'; appName: string; includeDomain: boolean }\n  // Deploy the selected stacks for the selected services.\n  | {\n      kind: 'services';\n      appName: string;\n      services: string[];\n      stacks: StackType;\n    };\n\n// Non-interactive deploy plan from positional args: `qpq go <services> [stacks]`.\n//   services: 'all' | comma-separated service names | 'account' | 'domain' | 'bootstrap'\n//   stacks:   all | inf | api | web | views          (defaults to 'all')\n// Returns null when no positional services token is given, so callers fall back\n// to the interactive promptDeployPlan. Passing args is an explicit opt-in to a\n// prompt-free deploy, so the \"Deploying to: [env]\" confirmation is skipped too.\nexport const buildDeployPlanFromArgs = (appName: string, argv: string[]): DeployPlan | null => {\n  const [servicesArg, stacksArg] = getPositionalArgs(argv, ['--app', '--deployment']);\n\n  if (!servicesArg) {\n    return null;\n  }\n\n  if (servicesArg === 'account') {\n    return { kind: 'account', appName };\n  }\n  if (servicesArg === 'domain') {\n    return { kind: 'bootstrap', appName, includeDomain: true };\n  }\n  if (servicesArg === 'bootstrap') {\n    return { kind: 'bootstrap', appName, includeDomain: false };\n  }\n\n  const allServices = getServiceNames(appName);\n  const services = servicesArg === 'all' ? allServices : servicesArg.split(',').map((s) => s.trim()).filter(Boolean);\n\n  const unknownServices = services.filter((service) => !allServices.includes(service));\n  if (unknownServices.length > 0) {\n    console.error(`Unknown service(s): ${unknownServices.join(', ')}. Valid services: ${allServices.join(', ')}`);\n    process.exit(1);\n  }\n\n  const stacks = (stacksArg ?? 'all') as StackType;\n  if (!STACK_TYPES.includes(stacks)) {\n    console.error(`Unknown stacks '${stacksArg}'. Valid stacks: ${STACK_TYPES.join(', ')}`);\n    process.exit(1);\n  }\n\n  return { kind: 'services', appName, services: [...new Set(services)], stacks };\n};\n\nexport const promptDeployPlan = async (appName: string): Promise<DeployPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  if (!(await promptYesNo(`Deploying to: [${deployInfo}]`))) {\n    console.log('Exiting!');\n    return { kind: 'cancelled' };\n  }\n\n  let services: string[] = [];\n\n  do {\n    const allServices = getServiceNames(appName);\n\n    // Bracketed so the meta options can't be mistaken for actual services.\n    const allText = '[ all ]';\n    const accountText = '[ account ]';\n    const domainEnvText = '[ domain ]';\n    const bootstrapEnvText = '[ bootstrap environment ]';\n\n    const service = await promptSelect('Select services to deploy', [allText, ...allServices, accountText, domainEnvText, bootstrapEnvText]);\n\n    if (service === allText) {\n      services = allServices;\n      break;\n    }\n    if (service === accountText) {\n      return { kind: 'account', appName };\n    }\n    if (service === domainEnvText) {\n      return { kind: 'bootstrap', appName, includeDomain: true };\n    }\n    if (service === bootstrapEnvText) {\n      return { kind: 'bootstrap', appName, includeDomain: false };\n    }\n\n    services.push(service);\n  } while (await promptYesNo('Do you want to deploy another service?'));\n\n  services = [...new Set(services)];\n\n  const stacks = (await promptSelect('Stacks to deploy', ['all', 'inf', 'api', 'web', 'views'])) as StackType;\n\n  return { kind: 'services', appName, services, stacks };\n};\n\nexport type TeardownPlan =\n  | { kind: 'cancelled' }\n  // Destroy the web, api and inf stacks for the selected services.\n  | { kind: 'services'; appName: string; services: string[] };\n\n// The question flow for `qpq teardown`: pick services, then type the deploy\n// target back to confirm — destroying inf stacks takes user data (key value\n// stores, user directories) with it, so a y/n prompt isn't enough friction.\nexport const promptTeardownPlan = async (appName: string): Promise<TeardownPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  let services: string[] = [];\n\n  do {\n    const allServices = getServiceNames(appName);\n    const allText = '[ all ]';\n\n    const service = await promptSelect('Select services to tear down', [allText, ...allServices]);\n\n    if (service === allText) {\n      services = allServices;\n      break;\n    }\n\n    services.push(service);\n  } while (await promptYesNo('Do you want to tear down another service?'));\n\n  services = [...new Set(services)];\n\n  console.log(`\\nThis will DESTROY the web, api and inf stacks (including all stored data) for: ${services.join(', ')}`);\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: 'services', appName, services };\n};\n"]}
+{"version":3,"file":"deployPrompts.js","sourceRoot":"","sources":["../../../src/lib/deployPrompts.ts"],"names":[],"mappings":"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","sourcesContent":["// The interactive question flow shared by `qpq go` (sequential AWS deploy) and\n// a future dockerized variant: pick an app, confirm the target, pick services\n// (or domain/bootstrap), pick stacks. buildDeployPlanFromArgs is the\n// non-interactive shortcut (`qpq go all all`) that skips every prompt.\nimport { Nullable } from '@qpqjs/core';\n\nimport { getPositionalArgs } from './args';\nimport { getServiceNames } from './discovery';\nimport { getDeployTargetLabel } from './getDeployTargetLabel';\nimport { promptSelect, promptTypedConfirmation, promptYesNo } from './prompts';\nimport { CliError } from './CliError';\nimport { createOutput } from './out';\n\nconst out = createOutput('deploy-prompts');\n\nexport type StackType = 'all' | 'inf' | 'api' | 'web' | 'views';\n\nconst STACK_TYPES: StackType[] = ['all', 'inf', 'api', 'web', 'views'];\n\nexport type DeployPlan =\n  | { kind: 'cancelled' }\n  // Deploy only the account-level guardrails stack (one per AWS account).\n  | { kind: 'account'; appName: string }\n  // Deploy the bootstrap stack (and optionally the domain stack first).\n  | { kind: 'bootstrap'; appName: string; includeDomain: boolean }\n  // Deploy the selected stacks for the selected services.\n  | {\n      kind: 'services';\n      appName: string;\n      services: string[];\n      stacks: StackType;\n    };\n\n// Non-interactive deploy plan from positional args: `qpq go <services> [stacks]`.\n//   services: 'all' | comma-separated service names | 'account' | 'domain' | 'bootstrap'\n//   stacks:   all | inf | api | web | views          (defaults to 'all')\n// Returns null when no positional services token is given, so callers fall back\n// to the interactive promptDeployPlan. Passing args is an explicit opt-in to a\n// prompt-free deploy, so the \"Deploying to: [env]\" confirmation is skipped too.\nexport const buildDeployPlanFromArgs = (appName: string, argv: string[]): Nullable<DeployPlan> => {\n  const [servicesArg, stacksArg] = getPositionalArgs(argv, ['--app', '--deployment']);\n\n  if (!servicesArg) {\n    return null;\n  }\n\n  if (servicesArg === 'account') {\n    return { kind: 'account', appName };\n  }\n  if (servicesArg === 'domain') {\n    return { kind: 'bootstrap', appName, includeDomain: true };\n  }\n  if (servicesArg === 'bootstrap') {\n    return { kind: 'bootstrap', appName, includeDomain: false };\n  }\n\n  const allServices = getServiceNames(appName);\n  const services =\n    servicesArg === 'all'\n      ? allServices\n      : servicesArg\n          .split(',')\n          .map((s) => s.trim())\n          .filter(Boolean);\n\n  const unknownServices = services.filter((service) => !allServices.includes(service));\n  if (unknownServices.length > 0) {\n    throw new CliError(`Unknown service(s): ${unknownServices.join(', ')}. Valid services: ${allServices.join(', ')}`);\n  }\n\n  const stacks = (stacksArg ?? 'all') as StackType;\n  if (!STACK_TYPES.includes(stacks)) {\n    throw new CliError(`Unknown stacks '${stacksArg}'. Valid stacks: ${STACK_TYPES.join(', ')}`);\n  }\n\n  return { kind: 'services', appName, services: [...new Set(services)], stacks };\n};\n\nexport const promptDeployPlan = async (appName: string): Promise<DeployPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  if (!(await promptYesNo(`Deploying to: [${deployInfo}]`))) {\n    out.log('Exiting!');\n    return { kind: 'cancelled' };\n  }\n\n  let services: string[] = [];\n\n  do {\n    const allServices = getServiceNames(appName);\n\n    // Bracketed so the meta options can't be mistaken for actual services.\n    const allText = '[ all ]';\n    const accountText = '[ account ]';\n    const domainEnvText = '[ domain ]';\n    const bootstrapEnvText = '[ bootstrap environment ]';\n\n    const service = await promptSelect('Select services to deploy', [allText, ...allServices, accountText, domainEnvText, bootstrapEnvText]);\n\n    if (service === allText) {\n      services = allServices;\n      break;\n    }\n    if (service === accountText) {\n      return { kind: 'account', appName };\n    }\n    if (service === domainEnvText) {\n      return { kind: 'bootstrap', appName, includeDomain: true };\n    }\n    if (service === bootstrapEnvText) {\n      return { kind: 'bootstrap', appName, includeDomain: false };\n    }\n\n    services.push(service);\n  } while (await promptYesNo('Do you want to deploy another service?'));\n\n  services = [...new Set(services)];\n\n  const stacks = (await promptSelect('Stacks to deploy', ['all', 'inf', 'api', 'web', 'views'])) as StackType;\n\n  return { kind: 'services', appName, services, stacks };\n};\n\nexport type TeardownPlan =\n  | { kind: 'cancelled' }\n  // Destroy the web, api and inf stacks for the selected services.\n  | { kind: 'services'; appName: string; services: string[] };\n\n// The question flow for `qpq teardown`: pick services, then type the deploy\n// target back to confirm, destroying inf stacks takes user data (key value\n// stores, user directories) with it, so a y/n prompt isn't enough friction.\nexport const promptTeardownPlan = async (appName: string): Promise<TeardownPlan> => {\n  const deployInfo = getDeployTargetLabel();\n\n  let services: string[] = [];\n\n  do {\n    const allServices = getServiceNames(appName);\n    const allText = '[ all ]';\n\n    const service = await promptSelect('Select services to tear down', [allText, ...allServices]);\n\n    if (service === allText) {\n      services = allServices;\n      break;\n    }\n\n    services.push(service);\n  } while (await promptYesNo('Do you want to tear down another service?'));\n\n  services = [...new Set(services)];\n\n  out.log(`\\nThis will DESTROY the web, api and inf stacks (including all stored data) for: ${services.join(', ')}`);\n  if (!(await promptTypedConfirmation(deployInfo))) {\n    return { kind: 'cancelled' };\n  }\n\n  return { kind: 'services', appName, services };\n};\n"]}

package/lib/esm/lib/devServerEntry.js

@@ -1,6 +1,7 @@
+import { getDevServerDistPath } from '@qpqjs/core';
+import { USER_SCRIPT_CHILD_BUNDLE_NAME } from '@qpqjs/deploy-rspack';
 import fs from 'fs';
 import path from 'path';
-import { USER_SCRIPT_CHILD_BUNDLE_NAME } from '@qpqjs/deploy-rspack';
 import { DEFAULT_DEV_SERVER_PORTS, getDevServerConfigPath } from './devServerPorts';
 /** Env vars the docker image sets so the running server knows how the outside world reaches it. */
 export const DEV_SERVER_PUBLIC_HOST_ENV = 'QPQ_PUBLIC_HOST';
@@ -43,7 +44,7 @@ const getRunCall = (mode) => {
  * shares one bundle shape, so a local migration run rehearses exactly the deployed path.
  */
 export const writeDevServerEntry = (root, appName, mode = 'serve') => {
-    const entryDir = path.join(root, 'dist', 'qpq', 'dev-server');
+    const entryDir = getDevServerDistPath(root);
     const entryPath = path.join(entryDir, ENTRY_FILE_NAMES[mode]);
     const overridesPath = getDevServerConfigPath(appName);
     const overridesImport = fs.existsSync(overridesPath)
@@ -98,11 +99,11 @@ ${getRunCall(mode)}
  * serves that one call with the service's config and module loader, then exits.
  */
 export const writeUserScriptChildEntry = (root) => {
-    const entryDir = path.join(root, 'dist', 'qpq', 'dev-server');
+    const entryDir = getDevServerDistPath(root);
     const entryPath = path.join(entryDir, USER_SCRIPT_CHILD_ENTRY_FILE_NAME);
     fs.mkdirSync(entryDir, { recursive: true });
     fs.writeFileSync(entryPath, `// GENERATED by qpq — do not edit.
-import { qpqCoreUtils } from '@qpqjs/core';
+import { getDevServerDistPath, qpqCoreUtils } from '@qpqjs/core';
 import { runUserScriptChildMain } from '@qpqjs/actionprocessor-node';
 import {
   qpqConfigs,

package/lib/esm/lib/devServerEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"devServerEntry.js","sourceRoot":"","sources":["../../../src/lib/devServerEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\nimport { USER_SCRIPT_CHILD_BUNDLE_NAME } from '@qpqjs/deploy-rspack';\n\nimport { DEFAULT_DEV_SERVER_PORTS, getDevServerConfigPath } from './devServerPorts';\n\n/**\n * What the generated bootstrap does: serve forever, run pending migrations once and exit, or\n * both in turn (the docker image, where nothing else ever deploys and so nothing else would\n * run the migrations).\n */\nexport type DevServerEntryMode = 'serve' | 'migrate' | 'migrate-then-serve';\n\n/** Env vars the docker image sets so the running server knows how the outside world reaches it. */\nexport const DEV_SERVER_PUBLIC_HOST_ENV = 'QPQ_PUBLIC_HOST';\nexport const DEV_SERVER_PUBLIC_FILE_STORAGE_PORT_ENV = 'QPQ_PUBLIC_FILE_STORAGE_PORT';\n\nconst USER_SCRIPT_CHILD_ENTRY_FILE_NAME = 'user-script-child.entry.ts';\n\nconst ENTRY_FILE_NAMES: Record<DevServerEntryMode, string> = {\n  serve: 'entry.ts',\n  migrate: 'migrate.entry.ts',\n  'migrate-then-serve': 'entry.ts',\n};\n\nconst reportMigrations = `(ran) => {\n    const total = Object.values(ran).reduce((sum, keys) => sum + keys.length, 0);\n    for (const [service, keys] of Object.entries(ran)) {\n      for (const key of keys) {\n        console.log(\\` [\\${service}] \\${key}\\`);\n      }\n    }\n    console.log(total === 0 ? 'No pending migrations.' : \\`Ran \\${total} migration(s).\\`);\n  }`;\n\nconst getRunCall = (mode: DevServerEntryMode): string => {\n  if (mode === 'serve') {\n    return 'startDevServer(devServerConfig, devServerConfigOverrides);';\n  }\n\n  const afterMigrations = mode === 'migrate' ? 'process.exit(0);' : 'return startDevServer(devServerConfig, devServerConfigOverrides);';\n\n  return `runMigrations(devServerConfig, devServerConfigOverrides)\n  .then(${reportMigrations})\n  .then(() => {\n    ${afterMigrations}\n  })\n  .catch((error) => {\n    console.error('Migration failed:', error);\n    // Non-zero so CI, shell chains and a container restart policy actually notice.\n    process.exit(1);\n  });`;\n};\n\n/**\n * Writes the dev-server bootstrap for an app and returns its path. Generated per build so it\n * can import the optional app-owned overrides file (apps/<app>/devServer.config.ts) and the\n * `quidproquo-dynamic-loader` virtual module QpqPlugin injects at bundle time. Every mode\n * shares one bundle shape, so a local migration run rehearses exactly the deployed path.\n */\nexport const writeDevServerEntry = (root: string, appName: string, mode: DevServerEntryMode = 'serve'): string => {\n  const entryDir = path.join(root, 'dist', 'qpq', 'dev-server');\n  const entryPath = path.join(entryDir, ENTRY_FILE_NAMES[mode]);\n\n  const overridesPath = getDevServerConfigPath(appName);\n  const overridesImport = fs.existsSync(overridesPath)\n    ? `import devServerConfigOverrides from ${JSON.stringify(overridesPath.replace(/\\.ts$/, ''))};`\n    : 'const devServerConfigOverrides = {};';\n\n  const imports = mode === 'serve' ? 'startDevServer' : mode === 'migrate' ? 'runMigrations' : 'runMigrations, startDevServer';\n\n  fs.mkdirSync(entryDir, { recursive: true });\n  fs.writeFileSync(\n    entryPath,\n    `// GENERATED by qpq — do not edit.\nimport { ${imports} } from '@qpqjs/dev-server';\nimport path from 'path';\nimport {\n  qpqConfigs,\n  qpqDynamicModuleLoaderForService,\n  // @ts-ignore - Special build-time virtual module\n} from 'quidproquo-dynamic-loader';\n\n${overridesImport}\n\n// Ports are defaults here; the app's devServer.config.ts \\`ports\\` win when the server resolves its config.\nconst devServerConfig = {\n  serverDomain: 'localhost',\n  serverPort: ${DEFAULT_DEV_SERVER_PORTS.api},\n  webSocketPort: ${DEFAULT_DEV_SERVER_PORTS.webSocket},\n  // Scoped per app so running the dev server for two apps out of the same\n  // repo root doesn't share kvs/file-storage/config state.\n  runtimePath: ${JSON.stringify(path.join('.qpq-runtime', appName))},\n  fileStorageConfig: {\n    // Secure file urls are absolute, so a container has to be told the address browsers use.\n    secureUrlHost: process.env.${DEV_SERVER_PUBLIC_HOST_ENV} || 'localhost',\n    secureUrlPort: ${DEFAULT_DEV_SERVER_PORTS.fileStorage},\n    secureUrlPublicPort: Number(process.env.${DEV_SERVER_PUBLIC_FILE_STORAGE_PORT_ENV}) || undefined,\n    // No fixed secret: the server mints a random one per process, so a secure url token\n    // (which names a filesystem path) cannot be forged by anyone who has read this file.\n  },\n  qpqConfigs,\n  dynamicModuleLoader: qpqDynamicModuleLoaderForService,\n  // The user-script child bundle is built beside this one (see writeUserScriptChildEntry).\n  userScriptChildModulePath: path.join(path.dirname(process.argv[1]), ${JSON.stringify(`${USER_SCRIPT_CHILD_BUNDLE_NAME}.js`)}),\n  // QPQ_WEB_ROOT (set in the docker platform image) turns on static web serving.\n  webRoot: process.env.QPQ_WEB_ROOT,\n  logServiceName: 'admin',\n  delay: { default: 0 },\n};\n\n${getRunCall(mode)}\n`,\n  );\n\n  return entryPath;\n};\n\n/**\n * Writes the dev server's user-script child entry and returns its path. The server forks the\n * bundle this becomes once per script call, with the service name as its argument; the child\n * serves that one call with the service's config and module loader, then exits.\n */\nexport const writeUserScriptChildEntry = (root: string): string => {\n  const entryDir = path.join(root, 'dist', 'qpq', 'dev-server');\n  const entryPath = path.join(entryDir, USER_SCRIPT_CHILD_ENTRY_FILE_NAME);\n\n  fs.mkdirSync(entryDir, { recursive: true });\n  fs.writeFileSync(\n    entryPath,\n    `// GENERATED by qpq — do not edit.\nimport { qpqCoreUtils } from '@qpqjs/core';\nimport { runUserScriptChildMain } from '@qpqjs/actionprocessor-node';\nimport {\n  qpqConfigs,\n  qpqDynamicModuleLoaderForService,\n  // @ts-ignore - Special build-time virtual module\n} from 'quidproquo-dynamic-loader';\n\nexport const main = (): void => {\n  const serviceName = process.argv[2];\n  const qpqConfig = qpqConfigs.find((config) => qpqCoreUtils.getApplicationModuleName(config) === serviceName);\n  if (!qpqConfig) {\n    throw new Error(\\`User script child: no service named [\\${serviceName}]\\`);\n  }\n\n  runUserScriptChildMain(qpqConfig, (runtime) => qpqDynamicModuleLoaderForService(serviceName, runtime));\n};\n\nmain();\n`,\n  );\n\n  return entryPath;\n};\n"]}
+{"version":3,"file":"devServerEntry.js","sourceRoot":"","sources":["../../../src/lib/devServerEntry.ts"],"names":[],"mappings":"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","sourcesContent":["import { getDevServerDistPath } from '@qpqjs/core';\nimport { USER_SCRIPT_CHILD_BUNDLE_NAME } from '@qpqjs/deploy-rspack';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { DEFAULT_DEV_SERVER_PORTS, getDevServerConfigPath } from './devServerPorts';\n\n/**\n * What the generated bootstrap does: serve forever, run pending migrations once and exit, or\n * both in turn (the docker image, where nothing else ever deploys and so nothing else would\n * run the migrations).\n */\nexport type DevServerEntryMode = 'serve' | 'migrate' | 'migrate-then-serve';\n\n/** Env vars the docker image sets so the running server knows how the outside world reaches it. */\nexport const DEV_SERVER_PUBLIC_HOST_ENV = 'QPQ_PUBLIC_HOST';\nexport const DEV_SERVER_PUBLIC_FILE_STORAGE_PORT_ENV = 'QPQ_PUBLIC_FILE_STORAGE_PORT';\n\nconst USER_SCRIPT_CHILD_ENTRY_FILE_NAME = 'user-script-child.entry.ts';\n\nconst ENTRY_FILE_NAMES: Record<DevServerEntryMode, string> = {\n  serve: 'entry.ts',\n  migrate: 'migrate.entry.ts',\n  'migrate-then-serve': 'entry.ts',\n};\n\nconst reportMigrations = `(ran) => {\n    const total = Object.values(ran).reduce((sum, keys) => sum + keys.length, 0);\n    for (const [service, keys] of Object.entries(ran)) {\n      for (const key of keys) {\n        console.log(\\` [\\${service}] \\${key}\\`);\n      }\n    }\n    console.log(total === 0 ? 'No pending migrations.' : \\`Ran \\${total} migration(s).\\`);\n  }`;\n\nconst getRunCall = (mode: DevServerEntryMode): string => {\n  if (mode === 'serve') {\n    return 'startDevServer(devServerConfig, devServerConfigOverrides);';\n  }\n\n  const afterMigrations = mode === 'migrate' ? 'process.exit(0);' : 'return startDevServer(devServerConfig, devServerConfigOverrides);';\n\n  return `runMigrations(devServerConfig, devServerConfigOverrides)\n  .then(${reportMigrations})\n  .then(() => {\n    ${afterMigrations}\n  })\n  .catch((error) => {\n    console.error('Migration failed:', error);\n    // Non-zero so CI, shell chains and a container restart policy actually notice.\n    process.exit(1);\n  });`;\n};\n\n/**\n * Writes the dev-server bootstrap for an app and returns its path. Generated per build so it\n * can import the optional app-owned overrides file (apps/<app>/devServer.config.ts) and the\n * `quidproquo-dynamic-loader` virtual module QpqPlugin injects at bundle time. Every mode\n * shares one bundle shape, so a local migration run rehearses exactly the deployed path.\n */\nexport const writeDevServerEntry = (root: string, appName: string, mode: DevServerEntryMode = 'serve'): string => {\n  const entryDir = getDevServerDistPath(root);\n  const entryPath = path.join(entryDir, ENTRY_FILE_NAMES[mode]);\n\n  const overridesPath = getDevServerConfigPath(appName);\n  const overridesImport = fs.existsSync(overridesPath)\n    ? `import devServerConfigOverrides from ${JSON.stringify(overridesPath.replace(/\\.ts$/, ''))};`\n    : 'const devServerConfigOverrides = {};';\n\n  const imports = mode === 'serve' ? 'startDevServer' : mode === 'migrate' ? 'runMigrations' : 'runMigrations, startDevServer';\n\n  fs.mkdirSync(entryDir, { recursive: true });\n  fs.writeFileSync(\n    entryPath,\n    `// GENERATED by qpq — do not edit.\nimport { ${imports} } from '@qpqjs/dev-server';\nimport path from 'path';\nimport {\n  qpqConfigs,\n  qpqDynamicModuleLoaderForService,\n  // @ts-ignore - Special build-time virtual module\n} from 'quidproquo-dynamic-loader';\n\n${overridesImport}\n\n// Ports are defaults here; the app's devServer.config.ts \\`ports\\` win when the server resolves its config.\nconst devServerConfig = {\n  serverDomain: 'localhost',\n  serverPort: ${DEFAULT_DEV_SERVER_PORTS.api},\n  webSocketPort: ${DEFAULT_DEV_SERVER_PORTS.webSocket},\n  // Scoped per app so running the dev server for two apps out of the same\n  // repo root doesn't share kvs/file-storage/config state.\n  runtimePath: ${JSON.stringify(path.join('.qpq-runtime', appName))},\n  fileStorageConfig: {\n    // Secure file urls are absolute, so a container has to be told the address browsers use.\n    secureUrlHost: process.env.${DEV_SERVER_PUBLIC_HOST_ENV} || 'localhost',\n    secureUrlPort: ${DEFAULT_DEV_SERVER_PORTS.fileStorage},\n    secureUrlPublicPort: Number(process.env.${DEV_SERVER_PUBLIC_FILE_STORAGE_PORT_ENV}) || undefined,\n    // No fixed secret: the server mints a random one per process, so a secure url token\n    // (which names a filesystem path) cannot be forged by anyone who has read this file.\n  },\n  qpqConfigs,\n  dynamicModuleLoader: qpqDynamicModuleLoaderForService,\n  // The user-script child bundle is built beside this one (see writeUserScriptChildEntry).\n  userScriptChildModulePath: path.join(path.dirname(process.argv[1]), ${JSON.stringify(`${USER_SCRIPT_CHILD_BUNDLE_NAME}.js`)}),\n  // QPQ_WEB_ROOT (set in the docker platform image) turns on static web serving.\n  webRoot: process.env.QPQ_WEB_ROOT,\n  logServiceName: 'admin',\n  delay: { default: 0 },\n};\n\n${getRunCall(mode)}\n`,\n  );\n\n  return entryPath;\n};\n\n/**\n * Writes the dev server's user-script child entry and returns its path. The server forks the\n * bundle this becomes once per script call, with the service name as its argument; the child\n * serves that one call with the service's config and module loader, then exits.\n */\nexport const writeUserScriptChildEntry = (root: string): string => {\n  const entryDir = getDevServerDistPath(root);\n  const entryPath = path.join(entryDir, USER_SCRIPT_CHILD_ENTRY_FILE_NAME);\n\n  fs.mkdirSync(entryDir, { recursive: true });\n  fs.writeFileSync(\n    entryPath,\n    `// GENERATED by qpq — do not edit.\nimport { getDevServerDistPath, qpqCoreUtils } from '@qpqjs/core';\nimport { runUserScriptChildMain } from '@qpqjs/actionprocessor-node';\nimport {\n  qpqConfigs,\n  qpqDynamicModuleLoaderForService,\n  // @ts-ignore - Special build-time virtual module\n} from 'quidproquo-dynamic-loader';\n\nexport const main = (): void => {\n  const serviceName = process.argv[2];\n  const qpqConfig = qpqConfigs.find((config) => qpqCoreUtils.getApplicationModuleName(config) === serviceName);\n  if (!qpqConfig) {\n    throw new Error(\\`User script child: no service named [\\${serviceName}]\\`);\n  }\n\n  runUserScriptChildMain(qpqConfig, (runtime) => qpqDynamicModuleLoaderForService(serviceName, runtime));\n};\n\nmain();\n`,\n  );\n\n  return entryPath;\n};\n"]}

package/lib/esm/lib/devServerPorts.js

@@ -1,3 +1,4 @@
+import { requireModuleDefault } from '@qpqjs/deploy-aws';
 import fs from 'fs';
 import path from 'path';
 import { getAppDirectory } from './discovery';
@@ -19,9 +20,7 @@ export const readDevServerPorts = (appName) => {
     if (!fs.existsSync(configPath)) {
         return DEFAULT_DEV_SERVER_PORTS;
     }
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const loaded = require(configPath.replace(/\.ts$/, ''));
-    const overrides = (loaded.default ?? loaded);
+    const overrides = requireModuleDefault(configPath.replace(/\.ts$/, ''));
     return { ...DEFAULT_DEV_SERVER_PORTS, ...overrides.ports };
 };
 //# sourceMappingURL=devServerPorts.js.map

package/lib/esm/lib/devServerPorts.js.map

@@ -1 +1 @@
-{"version":3,"file":"devServerPorts.js","sourceRoot":"","sources":["../../../src/lib/devServerPorts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAK9C,wHAAwH;AACxH,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,GAAG,EAAE,IAAI;IACT,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,gGAAgG;AAChG,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAE9H;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAA0B,EAAE;IAC5E,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,iEAAiE;IACjE,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAA6B,CAAC;IAEzE,OAAO,EAAE,GAAG,wBAAwB,EAAE,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;AAC7D,CAAC,CAAC","sourcesContent":["import { DevServerConfigOverrides, DevServerPorts } from '@qpqjs/dev-server';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { getAppDirectory } from './discovery';\n\n/** Every dev server listener, with the app's overrides applied. */\nexport type ResolvedDevServerPorts = Required<DevServerPorts>;\n\n/** The ports a dev server listens on when the app sets none: api + static web, websockets, file storage secure urls. */\nexport const DEFAULT_DEV_SERVER_PORTS: ResolvedDevServerPorts = {\n  api: 8080,\n  webSocket: 8888,\n  fileStorage: 3001,\n};\n\n/** Path of the app's optional dev server settings module (`apps/<app>/devServer.config.ts`). */\nexport const getDevServerConfigPath = (appName: string): string => path.join(getAppDirectory(appName), 'devServer.config.ts');\n\n/**\n * The app's dev server ports: `ports` from apps/<app>/devServer.config.ts over the defaults. The\n * same numbers the running server resolves, so builds that bake or expose ports agree with it.\n * Requiring the TS module relies on the caller running with TS require hooks, as every command does.\n */\nexport const readDevServerPorts = (appName: string): ResolvedDevServerPorts => {\n  const configPath = getDevServerConfigPath(appName);\n  if (!fs.existsSync(configPath)) {\n    return DEFAULT_DEV_SERVER_PORTS;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-require-imports\n  const loaded = require(configPath.replace(/\\.ts$/, ''));\n  const overrides = (loaded.default ?? loaded) as DevServerConfigOverrides;\n\n  return { ...DEFAULT_DEV_SERVER_PORTS, ...overrides.ports };\n};\n"]}
+{"version":3,"file":"devServerPorts.js","sourceRoot":"","sources":["../../../src/lib/devServerPorts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAK9C,wHAAwH;AACxH,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,GAAG,EAAE,IAAI;IACT,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,gGAAgG;AAChG,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,qBAAqB,CAAC,CAAC;AAE9H;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAA0B,EAAE;IAC5E,MAAM,UAAU,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,MAAM,SAAS,GAAG,oBAAoB,CAA2B,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAElG,OAAO,EAAE,GAAG,wBAAwB,EAAE,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;AAC7D,CAAC,CAAC","sourcesContent":["import { requireModuleDefault } from '@qpqjs/deploy-aws';\nimport { DevServerConfigOverrides, DevServerPorts } from '@qpqjs/dev-server';\n\nimport fs from 'fs';\nimport path from 'path';\n\nimport { getAppDirectory } from './discovery';\n\n/** Every dev server listener, with the app's overrides applied. */\nexport type ResolvedDevServerPorts = Required<DevServerPorts>;\n\n/** The ports a dev server listens on when the app sets none: api + static web, websockets, file storage secure urls. */\nexport const DEFAULT_DEV_SERVER_PORTS: ResolvedDevServerPorts = {\n  api: 8080,\n  webSocket: 8888,\n  fileStorage: 3001,\n};\n\n/** Path of the app's optional dev server settings module (`apps/<app>/devServer.config.ts`). */\nexport const getDevServerConfigPath = (appName: string): string => path.join(getAppDirectory(appName), 'devServer.config.ts');\n\n/**\n * The app's dev server ports: `ports` from apps/<app>/devServer.config.ts over the defaults. The\n * same numbers the running server resolves, so builds that bake or expose ports agree with it.\n * Requiring the TS module relies on the caller running with TS require hooks, as every command does.\n */\nexport const readDevServerPorts = (appName: string): ResolvedDevServerPorts => {\n  const configPath = getDevServerConfigPath(appName);\n  if (!fs.existsSync(configPath)) {\n    return DEFAULT_DEV_SERVER_PORTS;\n  }\n\n  const overrides = requireModuleDefault<DevServerConfigOverrides>(configPath.replace(/\\.ts$/, ''));\n\n  return { ...DEFAULT_DEV_SERVER_PORTS, ...overrides.ports };\n};\n"]}

package/lib/esm/lib/discovery.d.ts

@@ -3,8 +3,6 @@ export declare const getAppsDirectory: () => string;
 export declare const getAppDirectory: (appName: string) => string;
 export declare const getServiceDirectory: (appName: string, service: string) => string;
 export declare const getAvailableApps: () => string[];
-export declare const getAllServiceNames: (appName: string) => string[];
-export declare const serviceHasSubdir: (appName: string, service: string, subdir: string) => boolean;
 export declare const getServiceNamesWithSubdir: (appName: string, subdir: string) => string[];
 export declare const getServiceNames: (appName: string) => string[];
 export declare const getServiceNamesWithViews: (appName: string) => string[];

package/lib/esm/lib/discovery.js

@@ -1,40 +1,12 @@
-import fs from 'fs';
-import path from 'path';
-// The consumer repo root — qpq always runs from the workspace root (npm
-// scripts set cwd there).
+import { getAppPath, getAppsPath, getAvailableAppNames, getBackendServiceNames, getServiceNamesWithSubdir as getServiceNamesWithSubdirIn, getServiceNamesWithViews as getServiceNamesWithViewsIn, getServicePath, } from '@qpqjs/deploy-rspack';
+// The consumer repo root, qpq always runs from the workspace root (npm
+// scripts set cwd there). Discovery itself is deploy-rspack's; these bind it to that root.
 export const getRoot = () => process.cwd();
-export const getAppsDirectory = () => path.join(getRoot(), 'apps');
-export const getAppDirectory = (appName) => path.join(getAppsDirectory(), appName);
-export const getServiceDirectory = (appName, service) => path.join(getAppDirectory(appName), 'services', service);
-// Apps are the directories under apps/ that contain a services/ directory.
-export const getAvailableApps = () => {
-    const appsPath = getAppsDirectory();
-    if (!fs.existsSync(appsPath)) {
-        return [];
-    }
-    return fs.readdirSync(appsPath).filter((name) => {
-        const servicesPath = path.join(getAppDirectory(name), 'services');
-        return fs.statSync(getAppDirectory(name)).isDirectory() && fs.existsSync(servicesPath) && fs.statSync(servicesPath).isDirectory();
-    });
-};
-// Every service directory under an app's services/ folder (no subdir filter).
-export const getAllServiceNames = (appName) => {
-    const directoryPath = path.join(getAppDirectory(appName), 'services');
-    if (!fs.existsSync(directoryPath)) {
-        return [];
-    }
-    return fs.readdirSync(directoryPath).filter((name) => fs.statSync(getServiceDirectory(appName, name)).isDirectory());
-};
-// True when a service contains the given child directory (e.g. 'service' for a
-// backend, 'views' for a frontend).
-export const serviceHasSubdir = (appName, service, subdir) => {
-    const subdirPath = path.join(getServiceDirectory(appName, service), subdir);
-    return fs.existsSync(subdirPath) && fs.statSync(subdirPath).isDirectory();
-};
-// Services that contain a given child directory.
-export const getServiceNamesWithSubdir = (appName, subdir) => getAllServiceNames(appName).filter((service) => serviceHasSubdir(appName, service, subdir));
-// Backend services — those with a service/ subdir.
-export const getServiceNames = (appName) => getServiceNamesWithSubdir(appName, 'service');
-// Backend services that also ship a frontend (views/ subdir).
-export const getServiceNamesWithViews = (appName) => getServiceNames(appName).filter((service) => serviceHasSubdir(appName, service, 'views'));
+export const getAppsDirectory = () => getAppsPath(getRoot());
+export const getAppDirectory = (appName) => getAppPath(getRoot(), appName);
+export const getServiceDirectory = (appName, service) => getServicePath(getRoot(), appName, service);
+export const getAvailableApps = () => getAvailableAppNames(getRoot());
+export const getServiceNamesWithSubdir = (appName, subdir) => getServiceNamesWithSubdirIn(getRoot(), appName, subdir);
+export const getServiceNames = (appName) => getBackendServiceNames(getRoot(), appName);
+export const getServiceNamesWithViews = (appName) => getServiceNamesWithViewsIn(getRoot(), appName);
 //# sourceMappingURL=discovery.js.map

package/lib/esm/lib/discovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/lib/discovery.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs';\nimport path from 'path';\n\n// The consumer repo root — qpq always runs from the workspace root (npm\n// scripts set cwd there).\nexport const getRoot = (): string => process.cwd();\n\nexport const getAppsDirectory = (): string => path.join(getRoot(), 'apps');\nexport const getAppDirectory = (appName: string): string => path.join(getAppsDirectory(), appName);\nexport const getServiceDirectory = (appName: string, service: string): string => path.join(getAppDirectory(appName), 'services', service);\n\n// Apps are the directories under apps/ that contain a services/ directory.\nexport const getAvailableApps = (): string[] => {\n  const appsPath = getAppsDirectory();\n\n  if (!fs.existsSync(appsPath)) {\n    return [];\n  }\n\n  return fs.readdirSync(appsPath).filter((name) => {\n    const servicesPath = path.join(getAppDirectory(name), 'services');\n    return fs.statSync(getAppDirectory(name)).isDirectory() && fs.existsSync(servicesPath) && fs.statSync(servicesPath).isDirectory();\n  });\n};\n\n// Every service directory under an app's services/ folder (no subdir filter).\nexport const getAllServiceNames = (appName: string): string[] => {\n  const directoryPath = path.join(getAppDirectory(appName), 'services');\n\n  if (!fs.existsSync(directoryPath)) {\n    return [];\n  }\n\n  return fs.readdirSync(directoryPath).filter((name) => fs.statSync(getServiceDirectory(appName, name)).isDirectory());\n};\n\n// True when a service contains the given child directory (e.g. 'service' for a\n// backend, 'views' for a frontend).\nexport const serviceHasSubdir = (appName: string, service: string, subdir: string): boolean => {\n  const subdirPath = path.join(getServiceDirectory(appName, service), subdir);\n  return fs.existsSync(subdirPath) && fs.statSync(subdirPath).isDirectory();\n};\n\n// Services that contain a given child directory.\nexport const getServiceNamesWithSubdir = (appName: string, subdir: string): string[] =>\n  getAllServiceNames(appName).filter((service) => serviceHasSubdir(appName, service, subdir));\n\n// Backend services — those with a service/ subdir.\nexport const getServiceNames = (appName: string): string[] => getServiceNamesWithSubdir(appName, 'service');\n\n// Backend services that also ship a frontend (views/ subdir).\nexport const getServiceNamesWithViews = (appName: string): string[] =>\n  getServiceNames(appName).filter((service) => serviceHasSubdir(appName, service, 'views'));\n"]}
+{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/lib/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,WAAW,EACX,oBAAoB,EACpB,sBAAsB,EACtB,yBAAyB,IAAI,2BAA2B,EACxD,wBAAwB,IAAI,0BAA0B,EACtD,cAAc,GACf,MAAM,sBAAsB,CAAC;AAE9B,uEAAuE;AACvE,2FAA2F;AAC3F,MAAM,CAAC,MAAM,OAAO,GAAG,GAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AAEnD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAW,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;AACrE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AAC3F,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,OAAe,EAAU,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAE7H,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAa,EAAE,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC;AAEhF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAe,EAAE,MAAc,EAAY,EAAE,CAAC,2BAA2B,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAEhJ,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAY,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AAEzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,OAAe,EAAY,EAAE,CAAC,0BAA0B,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC","sourcesContent":["import {\n  getAppPath,\n  getAppsPath,\n  getAvailableAppNames,\n  getBackendServiceNames,\n  getServiceNamesWithSubdir as getServiceNamesWithSubdirIn,\n  getServiceNamesWithViews as getServiceNamesWithViewsIn,\n  getServicePath,\n} from '@qpqjs/deploy-rspack';\n\n// The consumer repo root, qpq always runs from the workspace root (npm\n// scripts set cwd there). Discovery itself is deploy-rspack's; these bind it to that root.\nexport const getRoot = (): string => process.cwd();\n\nexport const getAppsDirectory = (): string => getAppsPath(getRoot());\nexport const getAppDirectory = (appName: string): string => getAppPath(getRoot(), appName);\nexport const getServiceDirectory = (appName: string, service: string): string => getServicePath(getRoot(), appName, service);\n\nexport const getAvailableApps = (): string[] => getAvailableAppNames(getRoot());\n\nexport const getServiceNamesWithSubdir = (appName: string, subdir: string): string[] => getServiceNamesWithSubdirIn(getRoot(), appName, subdir);\n\nexport const getServiceNames = (appName: string): string[] => getBackendServiceNames(getRoot(), appName);\n\nexport const getServiceNamesWithViews = (appName: string): string[] => getServiceNamesWithViewsIn(getRoot(), appName);\n"]}