cabloy 5.1.220 → 5.1.222

package/scripts/strictGenerationDiagnostics.ts

@@ -0,0 +1,61 @@
+import type { StdioOptions } from 'node:child_process';
+
+import { Writable } from 'node:stream';
+
+import { requiresFreshTestResources } from '../vona/packages-vona/vona-core/src/lib/core/testStrictMode.ts';
+
+export type StrictGenerationStage =
+  | 'arguments'
+  | 'preparation'
+  | 'startup'
+  | 'operation'
+  | 'shutdown'
+  | 'operation-and-shutdown'
+  | 'generator'
+  | 'cleanup'
+  | 'run';
+
+const failureStages = new WeakMap<object, StrictGenerationStage>();
+
+export class StrictGenerationError extends Error {
+  readonly stage: StrictGenerationStage;
+
+  constructor(stage: StrictGenerationStage) {
+    super(`Strict contract generation failed: ${stage}`);
+    this.name = 'StrictGenerationError';
+    this.stage = stage;
+    failureStages.set(this, stage);
+  }
+}
+
+export function strictGenerationFailure(stage: StrictGenerationStage, error?: unknown) {
+  const previous = error && typeof error === 'object' ? failureStages.get(error) : undefined;
+  return new StrictGenerationError(previous ?? stage);
+}
+
+export function usesStrictGeneration(env: NodeJS.ProcessEnv): boolean {
+  try {
+    return requiresFreshTestResources(env);
+  } catch {
+    throw new StrictGenerationError('arguments');
+  }
+}
+
+export function guardianStdio(strict: boolean): StdioOptions {
+  return strict ? ['ignore', 'ignore', 'ignore', 'ipc'] : ['inherit', 'inherit', 'inherit', 'ipc'];
+}
+
+export function discardNativeOutput() {
+  const discard = () =>
+    new Writable({
+      write(_chunk, _encoding, callback) {
+        callback();
+      },
+    });
+  return { stdout: discard(), stderr: discard() };
+}
+
+export function reportIsolatedDiagnostic(strict: boolean, category: string, value?: unknown) {
+  if (strict) console.error(`Strict contract generation: ${category}`);
+  else console.error(value);
+}

package/vona/package.original.json

@@ -2,7 +2,7 @@
   "name": "vona",
   "private": true,
   "type": "module",
-  "packageManager": "pnpm@11.5.2",
+  "packageManager": "pnpm@12.14.0",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "repository": {
     "type": "git",
@@ -15,7 +15,8 @@
   },
   "homepage": "https://github.com/vonajs/vona#readme",
   "engines": {
-    "node": ">=24.4.0"
+    "node": ">=24.4.0",
+    "pnpm": ">=11.5.2"
   },
   "scripts": {
     "vona": "node ./packages-cli/cli/src/bin/vona.ts",

package/vona/packages-cli/cabloy-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/cli",
-  "version": "3.1.29",
+  "version": "3.1.30",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "@cabloy/cli",
   "keywords": [

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.166",
+  "version": "1.1.168",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.164",
+  "version": "1.1.166",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.bin.dev.ts

@@ -5,7 +5,7 @@ import { BeanCliBase } from '@cabloy/cli';
 import { spawn } from 'node:child_process';
 import nodemon from 'nodemon';
 import { rimraf } from 'rimraf';
-import { resolveVonaLocalPaths } from 'vona-core';
+import { requiresFreshTestResources, resolveVonaLocalPaths } from 'vona-core';
 
 import type { VonaBinConfigOptions } from './toolsBin/types.ts';
 
@@ -48,16 +48,21 @@ export class CliBinDev extends BeanCliBase {
     const workers = resolveTestWorkers(mode, argv.workers);
     const flavor: VonaMetaFlavor = argv.flavor || 'normal';
     const configMeta: VonaConfigMeta = { flavor, mode };
+    const strict = requiresFreshTestResources();
     const paths = resolveVonaLocalPaths(projectPath, mode);
+    if (strict && (mode !== 'test' || !paths.runId)) {
+      throw new Error('Strict generation requires an isolated test run in test mode');
+    }
     const configOptions: VonaBinConfigOptions = {
       appDir: projectPath,
       runtimeDir: paths.generatedDir,
       workers,
     };
     try {
-      const { modulesMeta } = await generateVonaMeta(configMeta, configOptions);
+      const { env, modulesMeta } = await generateVonaMeta(configMeta, configOptions);
       if (mode === 'test') {
-        await this._runTest(projectPath);
+        if (strict) await this._runTest(projectPath, env);
+        else await this._runTest(projectPath);
       } else {
         await this._run(projectPath, modulesMeta);
       }
@@ -66,7 +71,11 @@ export class CliBinDev extends BeanCliBase {
     }
   }
 
-  async _runTest(projectPath: string) {
+  async _runTest(projectPath: string, resolvedEnv?: NodeJS.ProcessEnv) {
+    const strict = requiresFreshTestResources();
+    if (strict && !resolvedEnv) {
+      throw new Error('Strict generation requires resolved environment handoff');
+    }
     const generatedDir = resolveVonaLocalPaths(projectPath, 'test').generatedDir;
     const child = spawn(
       process.execPath,
@@ -74,6 +83,7 @@ export class CliBinDev extends BeanCliBase {
       {
         cwd: projectPath,
         stdio: 'inherit',
+        ...(strict ? { env: { ...process.env, ...resolvedEnv } } : {}),
       },
     );
     const forwardSignal = (signal: NodeJS.Signals) => child.kill(signal);

package/vona/packages-cli/cli-set-api/src/lib/bean/toolsBin/generateEntryFiles.ts

@@ -10,6 +10,7 @@ import type { VonaBinConfigOptions } from './types.ts';
 
 import { resolveTemplatePath } from '../../../utils.ts';
 import { copyTemplateFile, getEnvMeta } from '../../utils.ts';
+import { validateGenerationPaths } from './validateGenerationPaths.ts';
 // import { generateZod } from './generateZod.ts';
 
 export async function generateEntryFiles(
@@ -18,6 +19,7 @@ export async function generateEntryFiles(
   modulesMeta: Awaited<ReturnType<typeof glob>>,
   env: NodeJS.ProcessEnv,
 ) {
+  const strict = validateGenerationPaths(configMeta, configOptions);
   // config
   await __generateConfig();
   // modules meta
@@ -103,7 +105,10 @@ export async function generateEntryFiles(
   }
 
   async function __generateEnvJson() {
-    const contentDest = `export default ${JSON.stringify(env, null, 2)} as unknown as NodeJS.ProcessEnv;\n`;
+    // Strict generation retains the selected app.meta.env surface, never its resolved values.
+    const contentDest = strict
+      ? `const keys = ${JSON.stringify(Object.keys(env).filter(key => env[key] !== undefined))};\nexport default Object.fromEntries(keys.filter(key => process.env[key] !== undefined).map(key => [key, process.env[key]])) as NodeJS.ProcessEnv;\n`
+      : `export default ${JSON.stringify(env, null, 2)} as unknown as NodeJS.ProcessEnv;\n`;
     // output
     const fileDest = path.join(configOptions.appDir, configOptions.runtimeDir, 'env.ts');
     fse.ensureFileSync(fileDest);

package/vona/packages-cli/cli-set-api/src/lib/bean/toolsBin/generateVonaMeta.ts

@@ -1,24 +1,16 @@
 import type { VonaConfigMeta } from '@cabloy/module-info';
 
-import { assertTestRunOwner, resolveVonaLocalPaths } from 'vona-core';
-
 import type { VonaBinConfigOptions } from './types.ts';
 
 import { createConfigUtils } from './configUtils.ts';
 import { generateEntryFiles } from './generateEntryFiles.ts';
+import { validateGenerationPaths } from './validateGenerationPaths.ts';
 
 export async function generateVonaMeta(
   configMeta: VonaConfigMeta,
   configOptions: VonaBinConfigOptions,
 ) {
-  const paths = resolveVonaLocalPaths(configOptions.appDir, configMeta.mode);
-  if (paths.runId) {
-    if (configOptions.runtimeDir !== paths.generatedDir) {
-      throw new Error('Isolated test generated directory does not match its run ID');
-    }
-    assertTestRunOwner(paths.dataRoot, paths.runId);
-    assertTestRunOwner(paths.generatedRoot, paths.runId);
-  }
+  validateGenerationPaths(configMeta, configOptions);
   // config utils
   const configUtils = createConfigUtils(configMeta, configOptions);
   // env

package/vona/packages-cli/cli-set-api/src/lib/bean/toolsBin/validateGenerationPaths.ts

@@ -0,0 +1,27 @@
+import type { VonaConfigMeta } from '@cabloy/module-info';
+
+import { assertTestRunOwner, requiresFreshTestResources, resolveVonaLocalPaths } from 'vona-core';
+
+import type { VonaBinConfigOptions } from './types.ts';
+
+export function validateGenerationPaths(
+  configMeta: VonaConfigMeta,
+  configOptions: VonaBinConfigOptions,
+) {
+  const strict = requiresFreshTestResources();
+  if (strict && configMeta.mode !== 'test') {
+    throw new Error('Strict generation requires test mode');
+  }
+  const paths = resolveVonaLocalPaths(configOptions.appDir, configMeta.mode);
+  if (strict && !paths.runId) {
+    throw new Error('Strict generation requires an isolated test run');
+  }
+  if (paths.runId) {
+    if (configOptions.runtimeDir !== paths.generatedDir) {
+      throw new Error('Isolated test generated directory does not match its run ID');
+    }
+    assertTestRunOwner(paths.dataRoot, paths.runId);
+    assertTestRunOwner(paths.generatedRoot, paths.runId);
+  }
+  return strict;
+}

package/vona/packages-cli/cli-set-api/test/binDevLifecycle.test.ts

@@ -26,7 +26,7 @@ const source = `
     '@cabloy/cli': 'export class BeanCliBase {}',
     'nodemon': 'export default globalThis.nodemonMock;',
     'rimraf': 'export function rimraf() { throw new Error("Unexpected cleanup"); }',
-    'vona-core': 'export function resolveVonaLocalPaths() { throw new Error("Unexpected app access"); }',
+    'vona-core': 'export function resolveVonaLocalPaths() { throw new Error("Unexpected app access"); } export function requiresFreshTestResources() { return false; }',
     '../utils.ts': 'export function getImportEsm() { return "--import=./.vona/register.js"; }',
     './toolsBin/generateVonaMeta.ts': 'export function generateVonaMeta() { throw new Error("Unexpected generation"); }',
   };