vona-cli-set-api 1.0.402 → 1.0.406

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

@@ -0,0 +1,12 @@
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        minify: boolean;
+        sourcemap: boolean;
+    }
+}
+export declare class CliBinBuildGeneral extends BeanCliBase {
+    execute(): Promise<void>;
+    _build(projectPath: string): Promise<void>;
+    _rollup(projectPath: string): Promise<void>;
+}

package/dist/lib/beans.d.ts

@@ -1,4 +1,5 @@
 import { CliBinBuild } from './bean/cli.bin.build.ts';
+import { CliBinBuildGeneral } from './bean/cli.bin.buildGeneral.ts';
 import { CliBinBuildModule } from './bean/cli.bin.buildModule.ts';
 import { CliBinDbReset } from './bean/cli.bin.dbReset.ts';
 import { CliBinDev } from './bean/cli.bin.dev.ts';
@@ -29,6 +30,7 @@ export declare const beans: {
     'default.list': typeof CliDefaultList;
     'bin.build': typeof CliBinBuild;
     'bin.buildModule': typeof CliBinBuildModule;
+    'bin.buildGeneral': typeof CliBinBuildGeneral;
     'bin.dbReset': typeof CliBinDbReset;
     'bin.play': typeof CliBinPlay;
     'bin.dev': typeof CliBinDev;

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

@@ -0,0 +1,19 @@
+declare const _default: {
+    bean: string;
+    info: {
+        version: string;
+        title: string;
+        usage: string;
+    };
+    options: {
+        minify: {
+            description: string;
+            type: string;
+        };
+        sourcemap: {
+            description: string;
+            type: string;
+        };
+    };
+};
+export default _default;

package/dist/lib/commands.d.ts

@@ -56,6 +56,24 @@ export declare const commands: {
                 };
             };
         };
+        buildGeneral: {
+            bean: string;
+            info: {
+                version: string;
+                title: string;
+                usage: string;
+            };
+            options: {
+                minify: {
+                    description: string;
+                    type: string;
+                };
+                sourcemap: {
+                    description: string;
+                    type: string;
+                };
+            };
+        };
         dbReset: {
             bean: string;
             info: {

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.402",
+  "version": "1.0.406",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,11 +31,12 @@
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-class-properties": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@cabloy/cli": "^3.0.67",
-    "@cabloy/dotenv": "^1.1.11",
-    "@cabloy/extend": "^3.1.10",
-    "@cabloy/module-glob": "^5.2.34",
-    "@cabloy/module-info": "^1.3.31",
+    "@cabloy/cli": "^3.0.68",
+    "@cabloy/dotenv": "^1.1.12",
+    "@cabloy/extend": "^3.1.11",
+    "@cabloy/module-glob": "^5.2.35",
+    "@cabloy/module-info": "^1.3.32",
+    "@cabloy/utils": "^1.0.49",
     "@cabloy/word-utils": "^2.0.1",
     "@lcov-viewer/cli": "^1.3.0",
     "@rollup/plugin-alias": "^5.1.1",
@@ -61,14 +62,13 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.104",
+    "vona-core": "^5.0.105",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "lint": "eslint .",
     "clean": "rimraf dist tsconfig.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc"
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc && tsc -p tsconfig.isolate.json"
   }
 }

package/dist/lib/bean/cli.bin.build.js

@@ -1,185 +0,0 @@
-import path from 'node:path';
-import { BeanCliBase } from '@cabloy/cli';
-import aliasImport from '@rollup/plugin-alias';
-import babelImport from '@rollup/plugin-babel';
-import commonjsImport from '@rollup/plugin-commonjs';
-import jsonImport from '@rollup/plugin-json';
-import resolveImport from '@rollup/plugin-node-resolve';
-import replaceImport from '@rollup/plugin-replace';
-import terserImport from '@rollup/plugin-terser';
-import fse from 'fs-extra';
-import { globby } from 'globby';
-import { rimraf } from 'rimraf';
-import { rollup } from 'rollup';
-import { generateConfigDefine, getAbsolutePathOfModule, getOutDir, getOutReleasesDir } from "../utils.js";
-import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
-const commonjs = commonjsImport;
-const resolve = resolveImport;
-// const swc = swcImport as any as typeof swcImport.default;
-const json = jsonImport;
-const babel = babelImport;
-const terser = terserImport;
-const alias = aliasImport;
-const replace = replaceImport;
-const __dialectDriversAll = ['pg', 'mysql2', 'better-sqlite3', 'mysql', 'oracledb', 'pg-native', 'pg-query-stream', 'sqlite3', 'tedious', 'cloudflare:sockets'];
-export class CliBinBuild extends BeanCliBase {
-    async execute() {
-        const { argv } = this.context;
-        // super
-        await super.execute();
-        const projectPath = argv.projectPath;
-        await this._build(projectPath);
-    }
-    async _build(projectPath) {
-        const { argv } = this.context;
-        const mode = 'prod';
-        const flavor = argv.flavor || 'normal';
-        const configMeta = { flavor, mode };
-        const configOptions = {
-            appDir: projectPath,
-            runtimeDir: '.vona',
-            workers: argv.workers,
-        };
-        const { env, modulesMeta } = await generateVonaMeta(configMeta, configOptions);
-        const outDir = path.join(projectPath, getOutDir());
-        await rimraf(outDir);
-        await this._rollup(projectPath, env, outDir);
-        await this._assets(projectPath, modulesMeta, outDir);
-        // custom
-        await this._custom(projectPath, env, outDir);
-        // remove .vona
-        await rimraf(path.join(projectPath, '.vona'));
-        // copy
-        const outReleasesDir = path.join(projectPath, getOutReleasesDir());
-        await rimraf(outReleasesDir);
-        fse.copySync(outDir, outReleasesDir);
-        // copy
-        if (process.env.BUILD_COPY_DIST) {
-            const envDist = path.isAbsolute(process.env.BUILD_COPY_DIST)
-                ? process.env.BUILD_COPY_DIST
-                : path.join(projectPath, process.env.BUILD_COPY_DIST);
-            const outDirCopy = path.join(envDist, path.basename(outDir));
-            fse.removeSync(outDirCopy);
-            fse.copySync(outDir, outDirCopy);
-        }
-        if (process.env.BUILD_COPY_RELEASE) {
-            const envRelease = path.isAbsolute(process.env.BUILD_COPY_RELEASE)
-                ? process.env.BUILD_COPY_RELEASE
-                : path.join(projectPath, process.env.BUILD_COPY_RELEASE);
-            const outReleasesDirCopy = path.join(envRelease, path.basename(outReleasesDir));
-            fse.removeSync(outReleasesDirCopy);
-            fse.copySync(outDir, outReleasesDirCopy);
-        }
-    }
-    async _custom(projectPath, env, outDir) {
-        // custom
-        const jsFile = path.join(projectPath, 'src/backend/cli.ts');
-        if (!fse.existsSync(jsFile))
-            return;
-        return await this.helper.importDynamic(jsFile, async (instance) => {
-            const options = {
-                cli: this,
-                env,
-                outDir,
-                projectPath,
-            };
-            return await instance.afterBuild(options);
-        });
-    }
-    async _assets(_projectPath, modulesMeta, outDir) {
-        const assetsPath = path.join(outDir, 'assets');
-        for (const relativeName in modulesMeta.modules) {
-            const module = modulesMeta.modules[relativeName];
-            const scenes = await globby('assets/*', { cwd: module.root, onlyDirectories: true });
-            for (const scene2 of scenes) {
-                const scene = scene2.substring('assets/'.length);
-                const scenePath = path.join(module.root, scene2);
-                const destPath = path.join(assetsPath, scene, relativeName);
-                await fse.copy(scenePath, destPath);
-            }
-        }
-    }
-    async _rollup(projectPath, env, outDir) {
-        const aliasEntries = [];
-        const dialectDrivers = (process.env.BUILD_DIALECT_DRIVERS || '').split(',');
-        for (const name of __dialectDriversAll) {
-            if (dialectDrivers.includes(name))
-                continue;
-            aliasEntries.push({ find: name, replacement: 'vona-shared' });
-        }
-        const replaceValues = generateConfigDefine(env, ['NODE_ENV', 'META_MODE', 'META_FLAVOR']);
-        const babelPluginZovaBeanModule = getAbsolutePathOfModule('babel-plugin-zova-bean-module', '');
-        const babelPluginTransformTypescriptMetadata = getAbsolutePathOfModule('babel-plugin-transform-typescript-metadata', '');
-        const babelPluginProposalDecorators = getAbsolutePathOfModule('@babel/plugin-proposal-decorators', '');
-        const babelPluginTransformClassProperties = getAbsolutePathOfModule('@babel/plugin-transform-class-properties', '');
-        const babelPluginTransformTypescript = getAbsolutePathOfModule('@babel/plugin-transform-typescript', '');
-        const plugins = [
-            alias({
-                entries: aliasEntries,
-            }),
-            resolve({
-                preferBuiltins: true,
-            }),
-            replace({
-                values: replaceValues,
-                preventAssignment: false,
-            }),
-            json(),
-            commonjs(),
-            babel({
-                include: '**/*.ts',
-                extensions: ['.ts', '.tsx'],
-                babelHelpers: 'bundled',
-                skipPreflightCheck: true,
-                babelrc: false,
-                configFile: false,
-                plugins: [
-                    [babelPluginZovaBeanModule, { brandName: 'vona' }],
-                    [babelPluginTransformTypescriptMetadata],
-                    [babelPluginProposalDecorators, { version: 'legacy' }],
-                    [babelPluginTransformClassProperties, { loose: true }],
-                    [babelPluginTransformTypescript],
-                ],
-            }),
-        ];
-        if (process.env.BUILD_MINIFY === 'true') {
-            plugins.push(terser({
-                keep_classnames: true,
-            }));
-        }
-        const inputOptions = {
-            input: path.join(projectPath, '.vona/bootstrap.ts'),
-            plugins,
-            onLog: (level, log, defaultHandler) => {
-                if (log.code === 'CIRCULAR_DEPENDENCY' && process.env.BUILD_LOG_CIRCULAR_DEPENDENCY === 'false')
-                    return;
-                if (log.code === 'THIS_IS_UNDEFINED' && (log.message.includes('ramda/es/partialObject.js') || log.message.includes("The 'this' keyword is equivalent to 'undefined' at the top level of an ES module")))
-                    return;
-                if (log.code === 'EVAL' && log.message.includes('depd/index.js'))
-                    return;
-                if (log.code === 'EVAL' && log.message.includes('bluebird/js/release/util.js'))
-                    return;
-                defaultHandler(level, log);
-            },
-        };
-        const outputOption = {
-            dir: outDir,
-            // file: path.join(projectPath, 'dist/index.js'),
-            format: 'esm',
-            sourcemap: process.env.BUILD_SOURCEMAP === 'true',
-            // https://github.com/rollup/rollup/issues/4166
-            inlineDynamicImports: false, // should not true
-        };
-        let bundle;
-        try {
-            bundle = await rollup(inputOptions);
-            await bundle.write(outputOption);
-        }
-        finally {
-            if (bundle) {
-                // closes the bundle
-                await bundle.close();
-            }
-        }
-    }
-}

package/dist/lib/bean/cli.bin.buildModule.js

@@ -1,106 +0,0 @@
-import path from 'node:path';
-import { BeanCliBase } from '@cabloy/cli';
-import aliasImport from '@rollup/plugin-alias';
-import babelImport from '@rollup/plugin-babel';
-import commonjsImport from '@rollup/plugin-commonjs';
-import jsonImport from '@rollup/plugin-json';
-import resolveImport from '@rollup/plugin-node-resolve';
-import terserImport from '@rollup/plugin-terser';
-import { rimraf } from 'rimraf';
-import { rollup } from 'rollup';
-const commonjs = commonjsImport;
-const resolve = resolveImport;
-// const swc = swcImport as any as typeof swcImport.default;
-const json = jsonImport;
-const babel = babelImport;
-const terser = terserImport;
-const alias = aliasImport;
-export class CliBinBuildModule extends BeanCliBase {
-    async execute() {
-        const { argv } = this.context;
-        // super
-        await super.execute();
-        const projectPath = argv.projectPath;
-        await this._build(projectPath);
-    }
-    async _build(projectPath) {
-        await rimraf(path.join(projectPath, 'dist'));
-        await this._rollup(projectPath);
-    }
-    async _rollup(projectPath) {
-        const { argv } = this.context;
-        const aliasEntries = [];
-        for (const name of ['better-sqlite3', 'mysql', 'oracledb', 'pg-native', 'pg-query-stream', 'sqlite3', 'tedious', 'cloudflare:sockets']) {
-            aliasEntries.push({ find: name, replacement: 'vona-shared' });
-        }
-        const plugins = [
-            alias({
-                entries: aliasEntries,
-            }),
-            resolve({
-                preferBuiltins: true,
-            }),
-            json(),
-            commonjs(),
-            babel({
-                include: '**/*.ts',
-                extensions: ['.ts', '.tsx'],
-                babelHelpers: 'bundled',
-                skipPreflightCheck: true,
-                babelrc: false,
-                configFile: false,
-                plugins: [
-                    ['babel-plugin-zova-bean-module', { brandName: 'vona' }],
-                    ['babel-plugin-transform-typescript-metadata'],
-                    ['@babel/plugin-proposal-decorators', { version: 'legacy' }],
-                    ['@babel/plugin-transform-class-properties', { loose: true }],
-                    ['@babel/plugin-transform-typescript'],
-                ],
-            }),
-        ];
-        if (argv.minify) {
-            plugins.push(terser({
-                keep_classnames: true,
-            }));
-        }
-        const inputOptions = {
-            input: path.join(projectPath, 'src/index.ts'),
-            plugins,
-            onLog: (level, log, defaultHandler) => {
-                if (log.code === 'CIRCULAR_DEPENDENCY')
-                    return;
-                if (log.code === 'THIS_IS_UNDEFINED' && (log.message.includes('ramda/es/partialObject.js') || log.message.includes("The 'this' keyword is equivalent to 'undefined' at the top level of an ES module")))
-                    return;
-                if (log.code === 'EVAL' && log.message.includes('depd/index.js'))
-                    return;
-                if (log.code === 'EVAL' && log.message.includes('bluebird/js/release/util.js'))
-                    return;
-                defaultHandler(level, log);
-            },
-            external(source, _importer, _isResolved) {
-                if (source.includes('/src/') || source.startsWith('.'))
-                    return false;
-                return true;
-            },
-        };
-        const outputOption = {
-            dir: path.join(projectPath, 'dist'),
-            // file: path.join(projectPath, 'dist/index.js'),
-            format: 'esm',
-            sourcemap: argv.sourcemap,
-            // https://github.com/rollup/rollup/issues/4166
-            inlineDynamicImports: true,
-        };
-        let bundle;
-        try {
-            bundle = await rollup(inputOptions);
-            await bundle.write(outputOption);
-        }
-        finally {
-            if (bundle) {
-                // closes the bundle
-                await bundle.close();
-            }
-        }
-    }
-}

package/dist/lib/bean/cli.bin.dbReset.js

@@ -1,48 +0,0 @@
-import path from 'node:path';
-import { BeanCliBase } from '@cabloy/cli';
-import fse from 'fs-extra';
-import { rimraf } from 'rimraf';
-import { getImportEsm } from "../utils.js";
-import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
-export class CliBinDbReset extends BeanCliBase {
-    async execute() {
-        const { argv } = this.context;
-        // super
-        await super.execute();
-        const projectPath = argv.projectPath;
-        // test
-        await this._dbReset(projectPath);
-    }
-    async _dbReset(projectPath) {
-        const { argv } = this.context;
-        const mode = 'test';
-        const flavor = argv.flavor || 'normal';
-        const configMeta = { flavor, mode };
-        const configOptions = {
-            appDir: projectPath,
-            runtimeDir: '.vona',
-            workers: 1,
-        };
-        const { modulesMeta } = await generateVonaMeta(configMeta, configOptions);
-        await this._run(projectPath, modulesMeta);
-        await rimraf(path.join(projectPath, '.vona'));
-    }
-    async _run(projectPath, _modulesMeta) {
-        // testFile
-        let testFile = path.join(import.meta.dirname, './toolsBin/dbReset.ts');
-        if (!fse.existsSync(testFile)) {
-            testFile = path.join(import.meta.dirname, './toolsBin/dbReset.js');
-        }
-        // run
-        let args = [];
-        args = args.concat([getImportEsm(), testFile, projectPath]);
-        // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath]);
-        await this.helper.spawnExe({
-            cmd: 'node',
-            args,
-            options: {
-                cwd: projectPath,
-            },
-        });
-    }
-}

package/dist/lib/bean/cli.bin.dev.js

@@ -1,66 +0,0 @@
-import path from 'node:path';
-import { BeanCliBase } from '@cabloy/cli';
-import nodemon from 'nodemon';
-import { rimraf } from 'rimraf';
-import { getImportEsm } from "../utils.js";
-import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
-export class CliBinDev extends BeanCliBase {
-    async execute() {
-        const { argv } = this.context;
-        // super
-        await super.execute();
-        const projectPath = argv.projectPath;
-        // run
-        await this._dev(projectPath);
-    }
-    async _dev(projectPath) {
-        const { argv } = this.context;
-        const mode = 'dev';
-        const flavor = argv.flavor || 'normal';
-        const configMeta = { flavor, mode };
-        const configOptions = {
-            appDir: projectPath,
-            runtimeDir: '.vona',
-            workers: argv.workers,
-        };
-        const { modulesMeta } = await generateVonaMeta(configMeta, configOptions);
-        await this._run(projectPath, modulesMeta);
-        await rimraf(path.join(projectPath, '.vona'));
-    }
-    async _run(projectPath, _modulesMeta) {
-        return new Promise((resolve, _reject) => {
-            nodemon({
-                script: '.vona/bootstrap.ts',
-                cwd: projectPath,
-                exec: 'node',
-                execArgs: [getImportEsm()],
-                // execArgs: ['--experimental-transform-types', getImportEsm(), '--trace-deprecation'],
-                // signal: 'SIGHUP',
-                watch: [
-                    'packages-utils',
-                    'packages-vona',
-                    './src',
-                ],
-                ignore: [
-                    '**/dist/**',
-                    '**/test/**/*.test.ts',
-                    'src/backend/play/**',
-                    'src/backend/typing/**',
-                ],
-            });
-            nodemon.on('quit', () => {
-                resolve(undefined);
-            }).on('restart', files => {
-                // eslint-disable-next-line
-                console.log('App restarted due to: ', files);
-            });
-        });
-        // await this.helper.spawnExe({
-        //   cmd: 'node',
-        //   args: ['--experimental-transform-types', '--loader=ts-node/esm', '.vona/bootstrap.ts'],
-        //   options: {
-        //     cwd: projectPath,
-        //   },
-        // });
-    }
-}

package/dist/lib/bean/cli.bin.play.js

@@ -1,92 +0,0 @@
-import path from 'node:path';
-import { BeanCliBase } from '@cabloy/cli';
-import fse from 'fs-extra';
-import { getImportEsm, loadJSONFile } from "../utils.js";
-import { generateVonaMeta } from "./toolsBin/generateVonaMeta.js";
-export class CliBinPlay extends BeanCliBase {
-    async execute() {
-        const { argv } = this.context;
-        // super
-        await super.execute();
-        const projectPath = argv.projectPath;
-        // test
-        await this._play(projectPath);
-    }
-    async _play(projectPath) {
-        const { argv } = this.context;
-        const mode = argv.mode || 'dev';
-        const flavor = argv.flavor || 'play';
-        const configMeta = { flavor, mode };
-        if (!argv.retainRuntime || !fse.existsSync(path.join(projectPath, '.vona'))) {
-            const configOptions = {
-                appDir: projectPath,
-                runtimeDir: '.vona',
-                workers: 1,
-            };
-            await generateVonaMeta(configMeta, configOptions);
-        }
-        if (argv.attach) {
-            await this._runAttach(projectPath);
-        }
-        else {
-            await this._runIsolate(projectPath);
-        }
-    }
-    async _runAttach(projectPath) {
-        const runtimeFile = path.join(projectPath, '.app/runtime/-.json');
-        if (!fse.existsSync(runtimeFile))
-            throw new Error('dev server not running');
-        // args
-        let args = [];
-        const pos = process.argv.indexOf(':bin:play');
-        if (pos > -1) {
-            args = args.concat(process.argv.slice(pos + 1));
-        }
-        const body = { args, projectPath };
-        //
-        const runtime = await loadJSONFile(runtimeFile);
-        const runtimeCore = runtime['a-core'];
-        const runtimeUser = runtime['a-user'];
-        const result = await fetch(`${runtimeCore?.protocol}://${runtimeCore?.host}/api/play`, {
-            method: 'post',
-            headers: {
-                'content-type': 'application/json',
-                'authorization': `Bearer ${runtimeUser?.accessToken}`,
-            },
-            body: JSON.stringify(body),
-        });
-        if (result.status !== 200) {
-            const message = `error: ${result.status}, ${result.statusText}`;
-            throw new Error(message);
-        }
-        const res = await result.json();
-        if (res.code !== 0)
-            throw new Error(res.message);
-        if (res.data !== undefined) {
-            // eslint-disable-next-line no-console
-            console.log(res.data);
-        }
-    }
-    async _runIsolate(projectPath) {
-        // testFile
-        let testFile = path.join(import.meta.dirname, './toolsBin/play.ts');
-        if (!fse.existsSync(testFile)) {
-            testFile = path.join(import.meta.dirname, './toolsBin/play.js');
-        }
-        // run
-        let args = [];
-        args = args.concat([getImportEsm(), testFile, projectPath]);
-        // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath]);
-        const pos = process.argv.indexOf(':bin:play');
-        if (pos > -1) {
-            args = args.concat(process.argv.slice(pos + 1));
-        }
-        await this.helper.spawnExe({
-            cmd: 'node',
-            args,
-            options: {
-                cwd: projectPath,
-            },
-        });
-    }
-}