vona-cli-set-api 1.0.405 → 1.0.407

package/dist/index.js

@@ -12,7 +12,7 @@ import { globby } from 'globby';
 import { rimraf } from 'rimraf';
 import { rollup } from 'rollup';
 import { createRequire } from 'node:module';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import compileTemplate from 'lodash/template.js';
 import os from 'node:os';
 import * as dotenv from '@cabloy/dotenv';
@@ -40,10 +40,6 @@ function getEnvMeta(configMeta) {
 function getNodeEnv(mode) {
   return mode === 'test' ? 'test' : mode === 'dev' ? 'development' : 'production';
 }
-function resolveTemplatePath(file) {
-  const url = new URL(path.join('../../templates', file), import.meta.url);
-  return fileURLToPath(url);
-}
 function generateConfigDefine(env, translates) {
   const acc = {};
   for (const key in env) {
@@ -161,6 +157,11 @@ function createConfigUtils(configMeta, configOptions) {
   }
 }
 
+function resolveTemplatePath(file) {
+  const url = new URL(path.join('../templates', file), import.meta.url);
+  return fileURLToPath(url);
+}
+
 const __ImportZodCore = 'zod/v4/core';
 async function generateZod(configOptions) {
   await __generateZodCoreUtil(configOptions);
@@ -689,9 +690,9 @@ class CliBinDbReset extends BeanCliBase {
   }
   async _run(projectPath, _modulesMeta) {
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsBin/dbReset.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/dbReset.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsBin/dbReset.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/dbReset.js');
     }
     // run
     let args = [];
@@ -847,9 +848,9 @@ class CliBinPlay extends BeanCliBase {
   }
   async _runIsolate(projectPath) {
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsBin/play.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/play.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsBin/play.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/play.js');
     }
     // run
     let args = [];
@@ -911,9 +912,9 @@ class CliBinTest extends BeanCliBase {
     // globs
     const patterns = this._combineTestPatterns(projectPath, modulesMeta);
     // testFile
-    let testFile = path.join(import.meta.dirname, './toolsBin/test.ts');
+    let testFile = path.join(import.meta.dirname, '../../../toolsIsolate/test.ts');
     if (!fse.existsSync(testFile)) {
-      testFile = path.join(import.meta.dirname, './toolsBin/test.js');
+      testFile = path.join(import.meta.dirname, '../dist-toolsIsolate/test.js');
     }
     // run
     let args = [];
@@ -3310,4 +3311,4 @@ const commands = {
   }
 };
 
-export { beans, commands, copyTemplateFile, copyTemplateIfNeed, generateConfigDefine, getAbsolutePathOfModule, getEnvMeta, getImportEsm, getNodeEnv, getOutDir, getOutReleasesDir, loadJSONFile, pathToHref, requireModule, resolveTemplatePath, saveJSONFile };
+export { beans, commands, copyTemplateFile, copyTemplateIfNeed, generateConfigDefine, getAbsolutePathOfModule, getEnvMeta, getImportEsm, getNodeEnv, getOutDir, getOutReleasesDir, loadJSONFile, pathToHref, requireModule, saveJSONFile };

package/dist/lib/utils.d.ts

@@ -5,7 +5,6 @@ export declare function getEnvMeta(configMeta: VonaConfigMeta): {
     mine: string;
 };
 export declare function getNodeEnv(mode: VonaMetaMode): "test" | "development" | "production";
-export declare function resolveTemplatePath(file: string): string;
 export declare function generateConfigDefine(env: any, translates?: string[]): {};
 export declare function getAbsolutePathOfModule(id: string, postfix?: string): string;
 export declare function requireModule(id: string): any;

package/dist/utils.d.ts

@@ -0,0 +1 @@
+export declare function resolveTemplatePath(file: string): string;

package/dist-toolsIsolate/dbReset.js

@@ -0,0 +1,8 @@
+import { closeApp, createGeneralApp } from 'vona-core';
+const argv = process.argv.slice(2);
+const projectPath = argv[0];
+await dbResetRun(projectPath);
+async function dbResetRun(projectPath) {
+    await createGeneralApp(projectPath);
+    await closeApp();
+}

package/dist-toolsIsolate/play.js

@@ -0,0 +1,59 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
+import path from 'node:path';
+import { sleep } from '@cabloy/utils';
+import fse from 'fs-extra';
+import { createGeneralApp, pathToHref } from 'vona-core';
+import whyIsNodeRunning from 'why-is-node-running';
+import parser from 'yargs-parser';
+const __template = `import type { IArgv, VonaApplication } from 'vona';
+
+export async function main(app: VonaApplication, _argv: IArgv) {
+  console.log(import.meta.filename);
+  console.log(app.config.meta);
+  return 'Hello VonaJS';
+}
+`;
+const projectPath = process.argv[2];
+const argv = parser(process.argv.slice(3));
+let mainFile;
+if (argv._[0]?.endsWith('.ts')) {
+    mainFile = argv._[0];
+    argv._ = argv._.slice(1);
+}
+else {
+    mainFile = 'index.ts';
+}
+await playRun(projectPath);
+async function playRun(projectPath) {
+    // create
+    const app = await createGeneralApp(projectPath);
+    // play
+    const playFile = path.join(projectPath, `src/backend/play/${mainFile}`);
+    if (!fse.existsSync(playFile)) {
+        await fse.outputFile(playFile, __template);
+    }
+    // run
+    const playInstance = await import(__rewriteRelativeImportExtension(pathToHref(playFile)));
+    const res = await playInstance.main(app, argv);
+    if (res !== undefined) {
+        // eslint-disable-next-line no-console
+        console.log(res);
+    }
+    // close
+    await app.close();
+    // handles
+    if (process.env.TEST_WHYISNODERUNNING === 'true') {
+        await sleep(2000);
+        const handles = process._getActiveHandles();
+        if (handles.length > 3) {
+            whyIsNodeRunning();
+        }
+    }
+}

package/dist-toolsIsolate/test.js

@@ -0,0 +1,141 @@
+import { createWriteStream } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { run } from 'node:test';
+import { lcov, spec } from 'node:test/reporters';
+import { fileURLToPath } from 'node:url';
+import { catchError, sleep } from '@cabloy/utils';
+import TableClass from 'cli-table3';
+import fse from 'fs-extra';
+import { globby } from 'globby';
+import { cast, createGeneralApp } from 'vona-core';
+import whyIsNodeRunning from 'why-is-node-running';
+const argv = process.argv.slice(2);
+const projectPath = argv[0];
+const coverage = argv[1] === 'true';
+const patterns = (argv[2] || '').split(',');
+await testRun(projectPath, coverage, patterns);
+async function testRun(projectPath, coverage, patterns) {
+    // patterns ignore
+    const patternsIgnore = (!coverage && process.env.TEST_PATTERNS_IGNORE) ? process.env.TEST_PATTERNS_IGNORE.split(',') : undefined;
+    // files
+    const files = await globby(patterns, {
+        cwd: projectPath,
+        ignore: patternsIgnore,
+    });
+    if (process.env.TEST_ONLY === 'true') {
+        files.push(resolveTemplatePath('test/done-only.test.js'));
+    }
+    else {
+        files.push(resolveTemplatePath('test/done.test.js'));
+    }
+    // coverage
+    let coverageIncludeGlobs = [];
+    if (coverage) {
+        if (fse.existsSync(path.join(projectPath, 'packages-vona/vona-core'))) {
+            coverageIncludeGlobs = coverageIncludeGlobs.concat(['packages-vona/vona-core/**/*.ts', 'src/suite-vendor/a-vona/**/*.ts']);
+        }
+        else {
+            coverageIncludeGlobs = coverageIncludeGlobs.concat(['src/module/**/*.ts', 'src/suite/**/*.ts']);
+        }
+    }
+    const coverageExcludeGlobs = [
+        'src/module/*/cli/**/*.ts',
+        'src/module/*/templates/**/*.ts',
+        'src/suite/*/modules/*/cli/**/*.ts',
+        'src/suite/*/modules/*/templates/**/*.ts',
+        'src/module-vendor/*/cli/**/*.ts',
+        'src/module-vendor/*/templates/**/*.ts',
+        'src/suite-vendor/*/modules/*/cli/**/*.ts',
+        'src/suite-vendor/*/modules/*/templates/**/*.ts',
+    ];
+    // app
+    const app = await createGeneralApp(projectPath);
+    // concurrency
+    const concurrency = await prepareConcurrency(app);
+    return new Promise(resolve => {
+        const testStream = run({
+            isolation: 'none',
+            concurrency,
+            only: process.env.TEST_ONLY === 'true',
+            coverage,
+            coverageIncludeGlobs,
+            coverageExcludeGlobs,
+            cwd: projectPath,
+            files,
+            setup: async () => { },
+        })
+            .on('test:coverage', data => {
+            outputCoverageReport(data.summary.totals);
+        })
+            .on('test:summary', async () => {
+            resolve(undefined);
+        })
+            .on('test:pass', async (t) => {
+            if (t.name === '---done---') {
+                const [_, err] = await catchError(() => {
+                    return app.close();
+                });
+                if (err) {
+                    console.error(err);
+                }
+                // handles
+                if (process.env.TEST_WHYISNODERUNNING === 'true') {
+                    await sleep(2000);
+                    const handles = process._getActiveHandles();
+                    if (handles.length > 3) {
+                        whyIsNodeRunning();
+                    }
+                }
+            }
+        });
+        if (coverage) {
+            const reporterDir = path.join(projectPath, 'coverage');
+            fse.ensureDirSync(reporterDir);
+            const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
+            testStream.compose(lcov)
+                .pipe(reporterLcov);
+        }
+        else {
+            testStream.compose(spec)
+                .pipe(process.stdout);
+        }
+    });
+}
+async function prepareConcurrency(app) {
+    // check
+    let concurrency = 1;
+    if (process.env.TEST_CONCURRENCY === 'true') {
+        concurrency = os.cpus().length;
+    }
+    else if (process.env.TEST_CONCURRENCY === 'false') {
+        concurrency = 1;
+    }
+    else {
+        concurrency = Number.parseInt(process.env.TEST_CONCURRENCY);
+    }
+    if (concurrency === 1)
+        return concurrency;
+    // check again
+    return await cast(app.bean).executor.mockCtx(async () => {
+        const db = cast(app.bean).database.getDb();
+        return db.dialect.capabilities.level ? concurrency : 1;
+    });
+}
+function outputCoverageReport(totals) {
+    // table
+    const table = new TableClass({
+        head: ['', 'Total', 'Covered', 'Percent'],
+        colWidths: [15, 15, 15, 25],
+    });
+    table.push(['Lines', totals.totalLineCount, totals.coveredLineCount, totals.coveredLinePercent]);
+    table.push(['Branches', totals.totalBranchCount, totals.coveredBranchCount, totals.coveredBranchPercent]);
+    table.push(['Functions', totals.totalFunctionCount, totals.coveredFunctionCount, totals.coveredFunctionPercent]);
+    // eslint-disable-next-line
+    console.log(table.toString());
+}
+;
+function resolveTemplatePath(file) {
+    const url = (new URL(path.join('../templates', file), import.meta.url));
+    return fileURLToPath(url);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.405",
+  "version": "1.0.407",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -25,6 +25,7 @@
   "files": [
     "cli",
     "dist",
+    "dist-toolsIsolate",
     "templates"
   ],
   "dependencies": {
@@ -68,7 +69,7 @@
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc"
+    "clean": "rimraf dist dist-toolsIsolate tsconfig.build.tsbuildinfo tsconfig.isolate.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc -p tsconfig.build.json && tsc -p tsconfig.isolate.json"
   }
 }