vona-cli-set-api 1.0.335 → 1.0.341

package/cli/templates/create/module/boilerplate/_package.json

@@ -22,7 +22,7 @@
   "description": "<%=argv.description%>",
   "keywords": ["Vona Module"],
   "author": "<%=argv.author%>",
-  "files": ["dist", "static"],
+  "files": ["dist", "assets"],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
     "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",

package/cli/templates/create/project/basic/boilerplate/env/.env

@@ -9,7 +9,6 @@ APP_VERSION = 5.0.0
 SERVER_KEYS = <%=argv.SERVER_KEYS%>
 SERVER_GLOBALPREFIX = /api
 SERVER_PUBLICDIR =
-SERVER_LOGGERDIR =
 SERVER_SUBDOMAINOFFSET = 1
 SERVER_WORKERS =
 SERVER_LISTEN_HOSTNAME = 0.0.0.0
@@ -23,6 +22,7 @@ PROJECT_DISABLED_SUITES =
 
 # logger
 
+LOGGER_DIR =
 LOGGER_CLIENT_DEFAULT = 
 LOGGER_DUMMY =
 LOGGER_ROTATE_ENABLE = true

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.195"
+    "vona": "^5.0.198"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/backend/config/config/config.ts

@@ -28,14 +28,12 @@ export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
 
   // server
   const publicDir = env.SERVER_PUBLICDIR || getPublicPathPhysicalRoot(appInfo);
-  const loggerDir = env.SERVER_LOGGERDIR || getLoggerPathPhysicalRoot(appInfo);
   const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '1');
   const workers = Number.parseInt(env.SERVER_WORKERS!);
   config.server = {
     keys: (env.SERVER_KEYS || '').split(','),
     globalPrefix: env.SERVER_GLOBALPREFIX || '/api',
     publicDir,
-    loggerDir,
     subdomainOffset,
     workers,
     listen: {
@@ -57,7 +55,9 @@ export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
   };
 
   // logger
+  const loggerDir = env.LOGGER_DIR || getLoggerPathPhysicalRoot(appInfo);
   config.logger = {
+    baseDir: loggerDir,
     rotate: {
       enable: env.LOGGER_ROTATE_ENABLE === 'true',
       options(filename: string) {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-base",
   "type": "module",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "title": "home-base",
   "vonaModule": {
     "dependencies": {
@@ -25,8 +25,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "static"
+    "assets",
+    "dist"
   ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-index/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-index",
   "type": "module",
-  "version": "5.0.8",
+  "version": "5.0.9",
   "title": "home-index",
   "vonaModule": {
     "dependencies": {
@@ -25,8 +25,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "static"
+    "assets",
+    "dist"
   ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-home-user",
   "type": "module",
-  "version": "5.0.16",
+  "version": "5.0.17",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,
@@ -26,8 +26,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist",
-    "static"
+    "assets",
+    "dist"
   ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-suite-a-home",
   "type": "module",
-  "version": "5.0.18",
+  "version": "5.0.19",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

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

@@ -8,6 +8,7 @@ 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";
@@ -71,16 +72,12 @@ export class CliBinBuild extends BeanCliBase {
         const assetsPath = path.join(outDir, 'assets');
         for (const relativeName in modulesMeta.modules) {
             const module = modulesMeta.modules[relativeName];
-            if (!module.package.files)
-                continue;
-            for (const scene of module.package.files) {
-                if (['src', 'dist', 'cli', 'test'].includes(scene))
-                    continue;
-                const scenePath = path.join(module.root, scene);
-                if (fse.existsSync(scenePath)) {
-                    const destPath = path.join(assetsPath, scene, relativeName);
-                    await fse.copy(scenePath, destPath);
-                }
+            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);
             }
         }
     }

package/dist/lib/bean/cli.init.asset.d.ts

@@ -0,0 +1,12 @@
+import type { IModuleInfo } from '@cabloy/module-info';
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+        moduleInfo: IModuleInfo;
+        scene: string;
+    }
+}
+export declare class CliInitAsset extends BeanCliBase {
+    execute(): Promise<void>;
+}

package/dist/lib/bean/cli.init.asset.js

@@ -0,0 +1,28 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+export class CliInitAsset extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv.module;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        // scene
+        const scene = argv.scene;
+        // directory
+        const assetDir = path.join(targetDir, 'assets', scene);
+        if (fse.existsSync(assetDir)) {
+            throw new Error(`asset exists: ${moduleName}/assets/${scene}`);
+        }
+        await this.helper.ensureDir(assetDir);
+    }
+}

package/dist/lib/bean/cli.init.static.js

@@ -19,7 +19,7 @@ export class CliInitStatic extends BeanCliBase {
         }
         // target dir
         const targetDir = await this.helper.ensureDir(_module.root);
-        const staticDir = path.join(targetDir, 'static');
+        const staticDir = path.join(targetDir, 'assets/static');
         if (fse.existsSync(staticDir)) {
             throw new Error(`static exists: ${moduleName}`);
         }

package/dist/lib/beans.d.ts

@@ -12,6 +12,7 @@ import { CliCreateSuite } from './bean/cli.create.suite.ts';
 import { CliCreateTest } from './bean/cli.create.test.ts';
 import { CliDefaultList } from './bean/cli.default.list.ts';
 import { CliInitAppMonkey } from './bean/cli.init.appMonkey.ts';
+import { CliInitAsset } from './bean/cli.init.asset.ts';
 import { CliInitConfig } from './bean/cli.init.config.ts';
 import { CliInitConstant } from './bean/cli.init.constant.ts';
 import { CliInitError } from './bean/cli.init.error.ts';
@@ -45,6 +46,7 @@ export declare const beans: {
     'init.monkey': typeof CliInitMonkey;
     'init.main': typeof CliInitMain;
     'init.static': typeof CliInitStatic;
+    'init.asset': typeof CliInitAsset;
     'init.lib': typeof CliInitLib;
     'init.types': typeof CliInitTypes;
     'init.appMonkey': typeof CliInitAppMonkey;

package/dist/lib/beans.js

@@ -12,6 +12,7 @@ import { CliCreateSuite } from "./bean/cli.create.suite.js";
 import { CliCreateTest } from "./bean/cli.create.test.js";
 import { CliDefaultList } from "./bean/cli.default.list.js";
 import { CliInitAppMonkey } from "./bean/cli.init.appMonkey.js";
+import { CliInitAsset } from "./bean/cli.init.asset.js";
 import { CliInitConfig } from "./bean/cli.init.config.js";
 import { CliInitConstant } from "./bean/cli.init.constant.js";
 import { CliInitError } from "./bean/cli.init.error.js";
@@ -45,6 +46,7 @@ export const beans = {
     'init.monkey': CliInitMonkey,
     'init.main': CliInitMain,
     'init.static': CliInitStatic,
+    'init.asset': CliInitAsset,
     'init.lib': CliInitLib,
     'init.types': CliInitTypes,
     'init.appMonkey': CliInitAppMonkey,

package/dist/lib/command/init.asset.d.ts

@@ -0,0 +1,34 @@
+declare const _default: {
+    bean: string;
+    info: {
+        version: string;
+        title: string;
+        usage: string;
+    };
+    options: {
+        module: {
+            description: string;
+            type: string;
+        };
+    };
+    groups: {
+        default: {
+            questions: {
+                scene: {
+                    type: string;
+                    message: string;
+                    initial: {
+                        expression: string;
+                    };
+                    required: boolean;
+                };
+                module: {
+                    type: string;
+                    message: string;
+                    required: boolean;
+                };
+            };
+        };
+    };
+};
+export default _default;

package/dist/lib/command/init.asset.js

@@ -0,0 +1,33 @@
+export default {
+    bean: 'init.asset',
+    info: {
+        version: '5.0.0',
+        title: 'Cli: Init: Asset Resources',
+        usage: 'vona :init:asset scene [--module=]',
+    },
+    options: {
+        module: {
+            description: 'module name',
+            type: 'string',
+        },
+    },
+    groups: {
+        default: {
+            questions: {
+                scene: {
+                    type: 'input',
+                    message: 'scene',
+                    initial: {
+                        expression: 'context.argv._[0]',
+                    },
+                    required: true,
+                },
+                module: {
+                    type: 'input',
+                    message: 'module name',
+                    required: true,
+                },
+            },
+        },
+    },
+};

package/dist/lib/commands.d.ts

@@ -399,6 +399,39 @@ export declare const commands: {
                 usage: string;
             };
         };
+        asset: {
+            bean: string;
+            info: {
+                version: string;
+                title: string;
+                usage: string;
+            };
+            options: {
+                module: {
+                    description: string;
+                    type: string;
+                };
+            };
+            groups: {
+                default: {
+                    questions: {
+                        scene: {
+                            type: string;
+                            message: string;
+                            initial: {
+                                expression: string;
+                            };
+                            required: boolean;
+                        };
+                        module: {
+                            type: string;
+                            message: string;
+                            required: boolean;
+                        };
+                    };
+                };
+            };
+        };
         lib: {
             bean: string;
             info: {

package/dist/lib/commands.js

@@ -12,6 +12,7 @@ import createSuite from "./command/create.suite.js";
 import createTest from "./command/create.test.js";
 import defaultList from "./command/default.list.js";
 import initAppMonkey from "./command/init.appMonkey.js";
+import initAsset from "./command/init.asset.js";
 import initConfig from "./command/init.config.js";
 import initConstant from "./command/init.constant.js";
 import initError from "./command/init.error.js";
@@ -52,6 +53,7 @@ export const commands = {
         monkey: initMonkey,
         main: initMain,
         static: initStatic,
+        asset: initAsset,
         lib: initLib,
         types: initTypes,
         appMonkey: initAppMonkey,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.335",
+  "version": "1.0.341",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -61,7 +61,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.90",
+    "vona-core": "^5.0.93",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },