vona-cli-set-api 1.1.155 → 1.1.158

package/dist/index.js

@@ -15,18 +15,19 @@ 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 chalk from 'chalk';
+import { spawn } from 'node:child_process';
 import nodemon from 'nodemon';
 import { catchError, combineApiPathControllerAndActionRaw, replaceTemplate } from '@cabloy/utils';
 import { getOnionScenesMeta, getOnionMetasMeta, relativeNameToCapitalize } from '@cabloy/module-info';
 import { toUpperCaseFirstChar, stringToCapitalize, replaceTemplate as replaceTemplate$1 } from '@cabloy/word-utils';
 import fs from 'node:fs';
 import gogocode from 'gogocode';
-import { beanFullNameFromOnionName } from 'vona-core';
 
 function getEnvMeta(configMeta) {
   return {
@@ -97,9 +98,8 @@ function copyTemplateIfNeed(fileSrc, fileDest) {
     fse.copyFileSync(fileSrc, fileDest);
   }
 }
-function getImportEsm() {
-  // return '--loader=ts-node/esm';
-  return '--import=./.vona/register.js';
+function getImportEsm(runtimeDir = '.vona') {
+  return `--import=./${runtimeDir}/register.js`;
 }
 
 function createConfigUtils(configMeta, configOptions) {
@@ -114,6 +114,10 @@ function createConfigUtils(configMeta, configOptions) {
   function __loadEnvs() {
     const meta = getEnvMeta(configMeta);
     const envDir = path.join(configOptions.appDir, 'env');
+    const runId = resolveTestRunId(meta.mode, process.env[TEST_RUN_ID_ENV]);
+    if (runId && process.env.VONA_DB_RESET !== undefined) {
+      throw new Error('Isolated test cannot run a development database reset');
+    }
     const envs = dotenv.loadEnvs(meta, envDir, '.env');
     const res = Object.assign({
       NODE_ENV: getNodeEnv(meta.mode)
@@ -121,6 +125,20 @@ function createConfigUtils(configMeta, configOptions) {
       META_FLAVOR: meta.flavor,
       META_MODE: meta.mode
     });
+    if (runId) {
+      res[TEST_RUN_ID_ENV] = runId;
+      res.APP_NAME = getTestAppName(runId);
+      const port = Number(process.env.SERVER_LISTEN_PORT);
+      if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+        throw new Error('Isolated test requires an assigned SERVER_LISTEN_PORT');
+      }
+      res.SERVER_LISTEN_PORT = String(port);
+      res.SERVER_LISTEN_HOSTNAME = '127.0.0.1';
+      if (process.env.VONA_TEST_SERVER_ORIGIN === 'true') {
+        res.SERVER_SERVE_PROTOCOL = 'http';
+        res.SERVER_SERVE_HOST = `127.0.0.1:${port}`;
+      }
+    }
     if (configOptions.workers !== undefined) {
       res.SERVER_WORKERS = configOptions.workers.toString();
     }
@@ -132,8 +150,8 @@ function createConfigUtils(configMeta, configOptions) {
         res.SERVER_WORKERS = '1';
       }
     }
-    for (const key of ['NODE_ENV', 'SERVER_WORKERS', 'META_FLAVOR', 'META_MODE']) {
-      if (res[key] !== false) {
+    for (const key of ['NODE_ENV', 'SERVER_WORKERS', 'META_FLAVOR', 'META_MODE', TEST_RUN_ID_ENV]) {
+      if (res[key] !== undefined && res[key] !== false) {
         process.env[key] = res[key];
       }
     }
@@ -256,6 +274,14 @@ 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);
+  }
   // config utils
   const configUtils = createConfigUtils(configMeta, configOptions);
   // env
@@ -724,29 +750,33 @@ class CliBinDbReset extends BeanCliBase {
     // super
     await super.execute();
     const projectPath = argv.projectPath;
-    // test
+    // recreate the development database
     await this._dbReset(projectPath);
   }
   async _dbReset(projectPath) {
     const {
       argv
     } = this.context;
-    const mode = 'test';
+    const mode = 'dev';
     const flavor = argv.flavor || 'normal';
     const configMeta = {
       flavor,
       mode
     };
+    const paths = resolveVonaLocalPaths(projectPath, mode);
     const configOptions = {
       appDir: projectPath,
-      runtimeDir: '.vona',
+      runtimeDir: paths.generatedDir,
       workers: 1
     };
-    const {
-      modulesMeta
-    } = await generateVonaMeta(configMeta, configOptions);
-    await this._run(projectPath, modulesMeta);
-    await rimraf(path.join(projectPath, '.vona'));
+    try {
+      const {
+        modulesMeta
+      } = await generateVonaMeta(configMeta, configOptions);
+      await this._run(projectPath, modulesMeta);
+    } finally {
+      await rimraf(paths.generatedRoot);
+    }
   }
   async _run(projectPath, _modulesMeta) {
     // testFile
@@ -756,7 +786,7 @@ class CliBinDbReset extends BeanCliBase {
     }
     // run
     let args = [];
-    args = args.concat([getImportEsm(), testFile, projectPath]);
+    args = args.concat([getImportEsm(resolveVonaLocalPaths(projectPath, 'dev').generatedDir), testFile, projectPath]);
     // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath]);
     await this.helper.spawnExe({
       cmd: 'node',
@@ -768,6 +798,16 @@ class CliBinDbReset extends BeanCliBase {
   }
 }
 
+function resolveDevMode(mode) {
+  if (mode === undefined || mode === 'dev') return 'dev';
+  if (mode === 'test') return 'test';
+  throw new Error('Invalid --mode: expected dev or test');
+}
+function resolveTestWorkers(mode, workers) {
+  if (mode !== 'test') return workers;
+  if (workers === undefined || workers === 1) return 1;
+  throw new Error('--mode=test requires --workers=1');
+}
 class CliBinDev extends BeanCliBase {
   async execute() {
     const {
@@ -783,22 +823,54 @@ class CliBinDev extends BeanCliBase {
     const {
       argv
     } = this.context;
-    const mode = 'dev';
+    const mode = resolveDevMode(argv.mode);
+    const workers = resolveTestWorkers(mode, argv.workers);
     const flavor = argv.flavor || 'normal';
     const configMeta = {
       flavor,
       mode
     };
+    const paths = resolveVonaLocalPaths(projectPath, mode);
     const configOptions = {
       appDir: projectPath,
-      runtimeDir: '.vona',
-      workers: argv.workers
+      runtimeDir: paths.generatedDir,
+      workers
     };
-    const {
-      modulesMeta
-    } = await generateVonaMeta(configMeta, configOptions);
-    await this._run(projectPath, modulesMeta);
-    await rimraf(path.join(projectPath, '.vona'));
+    try {
+      const {
+        modulesMeta
+      } = await generateVonaMeta(configMeta, configOptions);
+      if (mode === 'test') {
+        await this._runTest(projectPath);
+      } else {
+        await this._run(projectPath, modulesMeta);
+      }
+    } finally {
+      if (!paths.runId) await rimraf(paths.generatedRoot);
+    }
+  }
+  async _runTest(projectPath) {
+    const generatedDir = resolveVonaLocalPaths(projectPath, 'test').generatedDir;
+    const child = spawn(process.execPath, [getImportEsm(generatedDir), `${generatedDir}/bootstrap.ts`], {
+      cwd: projectPath,
+      stdio: 'inherit'
+    });
+    const forwardSignal = signal => child.kill(signal);
+    const onInterrupt = () => forwardSignal('SIGINT');
+    const onTerminate = () => forwardSignal('SIGTERM');
+    process.on('SIGINT', onInterrupt);
+    process.on('SIGTERM', onTerminate);
+    try {
+      await new Promise((resolve, reject) => {
+        child.once('error', reject);
+        child.once('exit', (code, signal) => {
+          if (code === 0) resolve();else reject(new Error(`Test-mode dev server exited: ${signal ?? code}`));
+        });
+      });
+    } finally {
+      process.off('SIGINT', onInterrupt);
+      process.off('SIGTERM', onTerminate);
+    }
   }
   async _run(projectPath, _modulesMeta) {
     let closed = false;
@@ -872,7 +944,7 @@ class CliBinPlay extends BeanCliBase {
     }
   }
   async _runAttach(projectPath) {
-    const runtimeFile = path.join(projectPath, '.app/runtime/-.json');
+    const runtimeFile = path.join(resolveVonaLocalPaths(projectPath, process.env.META_MODE ?? 'dev').runtimeRoot, '-.json');
     if (!fse.existsSync(runtimeFile)) throw new Error('dev server not running');
     // args
     let args = [];
@@ -952,19 +1024,23 @@ class CliBinTest extends BeanCliBase {
       flavor,
       mode
     };
+    const paths = resolveVonaLocalPaths(projectPath, mode);
     const configOptions = {
       appDir: projectPath,
-      runtimeDir: '.vona',
+      runtimeDir: paths.generatedDir,
       workers: 1
     };
-    const {
-      modulesMeta
-    } = await generateVonaMeta(configMeta, configOptions);
-    await this._run(projectPath, modulesMeta);
-    if (argv.coverage && !argv.ci) {
-      await this._outputCoverageReportViewer(projectPath);
+    try {
+      const {
+        modulesMeta
+      } = await generateVonaMeta(configMeta, configOptions);
+      await this._run(projectPath, modulesMeta);
+      if (argv.coverage && !argv.ci) {
+        await this._outputCoverageReportViewer(projectPath);
+      }
+    } finally {
+      if (!paths.runId) await rimraf(paths.generatedRoot);
     }
-    await rimraf(path.join(projectPath, '.vona'));
   }
   async _run(projectPath, modulesMeta) {
     const {
@@ -990,7 +1066,7 @@ class CliBinTest extends BeanCliBase {
     if (process.env.TEST_WHYISNODERUNNING === 'true') {
       args.push('--import=why-is-node-running/include');
     }
-    args = args.concat([getImportEsm(), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
+    args = args.concat([getImportEsm(resolveVonaLocalPaths(projectPath, 'test').generatedDir), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
     // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
     await this.helper.spawnExe({
       cmd: 'node',
@@ -3471,7 +3547,7 @@ var binDev = {
   info: {
     version: '5.0.0',
     title: 'Cli: Bin: Dev',
-    usage: 'npm run vona :bin:dev -- [--workers=] [--flavor=]'
+    usage: 'npm run vona :bin:dev -- [--workers=] [--flavor=] [--mode=dev|test]'
   },
   options: {
     workers: {
@@ -3481,6 +3557,11 @@ var binDev = {
     flavor: {
       description: 'flavor',
       type: 'string'
+    },
+    mode: {
+      description: 'dev or test',
+      type: 'string',
+      choices: ['dev', 'test']
     }
   }
 };

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

@@ -1,14 +1,18 @@
 import type { glob } from '@cabloy/module-glob';
-import type { VonaMetaFlavor } from '@cabloy/module-info';
+import type { VonaMetaFlavor, VonaMetaMode } from '@cabloy/module-info';
 import { BeanCliBase } from '@cabloy/cli';
+export declare function resolveDevMode(mode: unknown): 'dev' | 'test';
+export declare function resolveTestWorkers(mode: 'dev' | 'test', workers: unknown): number | undefined;
 declare module '@cabloy/cli' {
     interface ICommandArgv {
         workers?: number;
         flavor?: VonaMetaFlavor;
+        mode?: VonaMetaMode;
     }
 }
 export declare class CliBinDev extends BeanCliBase {
     execute(): Promise<void>;
     _dev(projectPath: string): Promise<void>;
+    _runTest(projectPath: string): Promise<void>;
     _run(projectPath: string, _modulesMeta: Awaited<ReturnType<typeof glob>>): Promise<unknown>;
 }

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

@@ -0,0 +1,15 @@
+import type { TestClaimManifest } from 'vona-core';
+import { VonaApplication } from 'vona-core';
+export interface TestCleanupResolvedConfig {
+    databaseOptions: Map<string, Record<string, any>>;
+    redisOptions: Map<string, Record<string, any>>;
+}
+export interface TestCleanupConfigDependencies {
+    loadEnvs(): NodeJS.ProcessEnv;
+    files: string[];
+    loadConfig(file: string): Promise<{
+        default: (app: VonaApplication) => unknown;
+    }>;
+    createApp(env: NodeJS.ProcessEnv): VonaApplication;
+}
+export declare function resolveTestCleanupConfig(claim: TestClaimManifest, injected?: TestCleanupConfigDependencies): Promise<TestCleanupResolvedConfig>;

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

@@ -0,0 +1,17 @@
+export interface CleanupSqlConnection {
+    raw(sql: string): Promise<unknown>;
+    destroy(): Promise<unknown>;
+}
+export interface CleanupRedisConnection {
+    scan(cursor: string, match: 'MATCH', pattern: string, count: 'COUNT', size: number): Promise<[string, string[]]>;
+    unlink(...keys: string[]): Promise<unknown>;
+    del(...keys: string[]): Promise<unknown>;
+    disconnect(): unknown;
+}
+export declare function quoteCleanupDatabase(name: string, dialect: string): string;
+export declare function dropExactCleanupDatabase(connection: CleanupSqlConnection, dialect: string, name: string, validate: (name: string) => void): Promise<void>;
+export declare function escapeRedisCleanupPattern(prefix: string): string;
+export declare function clearExactRedisPrefix(connection: CleanupRedisConnection, prefix: string, validate: (prefix: string) => void, options?: {
+    batchSize?: number;
+    maxScans?: number;
+}): Promise<void>;

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

@@ -0,0 +1 @@
+export {};

package/dist/lib/command/bin.dev.d.ts

@@ -14,6 +14,11 @@ declare const _default: {
             description: string;
             type: string;
         };
+        mode: {
+            description: string;
+            type: string;
+            choices: string[];
+        };
     };
 };
 export default _default;

package/dist/lib/commands.d.ts

@@ -104,6 +104,11 @@ export declare const commands: {
                     description: string;
                     type: string;
                 };
+                mode: {
+                    description: string;
+                    type: string;
+                    choices: string[];
+                };
             };
         };
         play: {

package/dist/lib/utils.d.ts

@@ -15,4 +15,4 @@ export declare function pathToHref(fileName: string): string;
 export declare function getOutDir(): string;
 export declare function getOutReleasesDir(): string;
 export declare function copyTemplateIfNeed(fileSrc: string, fileDest: string): void;
-export declare function getImportEsm(): string;
+export declare function getImportEsm(runtimeDir?: string): string;

package/dist-toolsIsolate/dbReset.js

@@ -3,6 +3,23 @@ const argv = process.argv.slice(2);
 const projectPath = argv[0];
 await dbResetRun(projectPath);
 async function dbResetRun(projectPath) {
-    await createGeneralApp(projectPath);
-    await closeApp();
+    if (process.env.META_MODE !== 'dev') {
+        throw new Error('db:reset requires dev mode');
+    }
+    const previousReset = process.env.VONA_DB_RESET;
+    process.env.VONA_DB_RESET = 'true';
+    try {
+        await createGeneralApp(projectPath);
+    }
+    finally {
+        try {
+            await closeApp();
+        }
+        finally {
+            if (previousReset === undefined)
+                delete process.env.VONA_DB_RESET;
+            else
+                process.env.VONA_DB_RESET = previousReset;
+        }
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.155",
-  "gitHead": "8d575dd958be6aa16daa249bdbdb024d20d0789d",
+  "version": "1.1.158",
+  "gitHead": "bc3034e45e4f728199560c682b3432d47381ceb4",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -62,7 +62,7 @@
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.3.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
-    "babel-plugin-vona-bean-module": "^1.1.7",
+    "babel-plugin-vona-bean-module": "^1.1.9",
     "chalk": "^3.0.0",
     "cli-table3": "^0.6.5",
     "compressing": "^1.10.4",
@@ -77,7 +77,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
-    "vona-core": "^5.1.42",
+    "vona-core": "^5.1.44",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   }

package/templates/config/_tsconfig_project.json

@@ -5,6 +5,7 @@
   },
   "include": [
     ".vona/**/*.ts",
+    ".vona-test-*/**/*.ts",
     "src/backend/package.json",
     "src/backend/config",
     "src/backend/play",

package/templates/config/_tsconfig_source.json

@@ -5,6 +5,7 @@
   },
   "include": [
     ".vona/**/*.ts",
+    ".vona-test-*/**/*.ts",
     "src/backend/package.json",
     "src/backend/config",
     "src/backend/play",