vona-cli-set-api 1.1.164 → 1.1.166

package/dist/index.js

@@ -15,11 +15,11 @@ import { rollup } from 'rollup';
 import compileTemplate from 'lodash/template.js';
 import { createRequire } from 'node:module';
 import { pathToFileURL, fileURLToPath } from 'node:url';
-import { resolveTestRunId, TEST_RUN_ID_ENV, getTestAppName, resolveVonaLocalPaths, assertTestRunOwner, beanFullNameFromOnionName } from 'vona-core';
 import * as dotenv from '@cabloy/dotenv';
 import { getEnvFiles } from '@cabloy/dotenv';
 import { glob } from '@cabloy/module-glob';
 import os from 'node:os';
+import { resolveTestRunId, TEST_RUN_ID_ENV, getTestAppName, requiresFreshTestResources, resolveVonaLocalPaths, assertTestRunOwner, beanFullNameFromOnionName } from 'vona-core';
 import chalk from 'chalk';
 import { spawn } from 'node:child_process';
 import nodemon from 'nodemon';
@@ -178,9 +178,29 @@ function resolveTemplatePath(file) {
   return fileURLToPath(url);
 }
 
+function validateGenerationPaths(configMeta, configOptions) {
+  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;
+}
+
 // import { generateZod } from './generateZod.ts';
 
 async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
+  const strict = validateGenerationPaths(configMeta, configOptions);
   // config
   await __generateConfig();
   // modules meta
@@ -265,7 +285,8 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
     });
   }
   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);
@@ -274,14 +295,7 @@ async function generateEntryFiles(configMeta, configOptions, modulesMeta, env) {
 }
 
 async function generateVonaMeta(configMeta, configOptions) {
-  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
@@ -833,7 +847,11 @@ class CliBinDev extends BeanCliBase {
       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 = {
       appDir: projectPath,
       runtimeDir: paths.generatedDir,
@@ -841,10 +859,11 @@ class CliBinDev extends BeanCliBase {
     };
     try {
       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);
       }
@@ -852,11 +871,21 @@ class CliBinDev extends BeanCliBase {
       if (!paths.runId) await rimraf(paths.generatedRoot);
     }
   }
-  async _runTest(projectPath) {
+  async _runTest(projectPath, resolvedEnv) {
+    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, [getImportEsm(generatedDir), `${generatedDir}/bootstrap.ts`], {
       cwd: projectPath,
-      stdio: 'inherit'
+      stdio: 'inherit',
+      ...(strict ? {
+        env: {
+          ...process.env,
+          ...resolvedEnv
+        }
+      } : {})
     });
     const forwardSignal = signal => child.kill(signal);
     const onInterrupt = () => forwardSignal('SIGINT');

package/dist/lib/bean/cli.bin.dev.d.ts

@@ -13,6 +13,6 @@ declare module '@cabloy/cli' {
 export declare class CliBinDev extends BeanCliBase {
     execute(): Promise<void>;
     _dev(projectPath: string): Promise<void>;
-    _runTest(projectPath: string): Promise<void>;
+    _runTest(projectPath: string, resolvedEnv?: NodeJS.ProcessEnv): Promise<void>;
     _run(projectPath: string, _modulesMeta: Awaited<ReturnType<typeof glob>>): Promise<unknown>;
 }

package/dist/lib/bean/toolsBin/validateGenerationPaths.d.ts

@@ -0,0 +1,3 @@
+import type { VonaConfigMeta } from '@cabloy/module-info';
+import type { VonaBinConfigOptions } from './types.ts';
+export declare function validateGenerationPaths(configMeta: VonaConfigMeta, configOptions: VonaBinConfigOptions): boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.164",
-  "gitHead": "d658b653ccdc3a1856d71a932ff7a2c005005293",
+  "version": "1.1.166",
+  "gitHead": "c703cb481fdf9d50a4f3eb3971e7b7c20a79619d",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -45,7 +45,7 @@
     "@babel/plugin-proposal-decorators": "^7.29.0",
     "@babel/plugin-transform-class-properties": "^7.28.6",
     "@babel/plugin-transform-typescript": "^7.28.6",
-    "@cabloy/cli": "^3.1.29",
+    "@cabloy/cli": "^3.1.30",
     "@cabloy/dotenv": "^1.2.9",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/module-glob": "^5.3.18",
@@ -77,7 +77,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
-    "vona-core": "^5.1.48",
+    "vona-core": "^5.1.50",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   }