vona-cli-set-api 1.0.339 → 1.0.342

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

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

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

@@ -9,5 +9,4 @@ declare module '@cabloy/cli' {
 }
 export declare class CliInitAsset extends BeanCliBase {
     execute(): Promise<void>;
-    _setPackageInfo(modulePath: string, scene: string): Promise<void>;
 }

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

@@ -19,28 +19,10 @@ export class CliInitAsset extends BeanCliBase {
         // scene
         const scene = argv.scene;
         // directory
-        const assetDir = path.join(targetDir, scene);
+        const assetDir = path.join(targetDir, 'assets', scene);
         if (fse.existsSync(assetDir)) {
-            throw new Error(`asset exists: ${moduleName}/${scene}`);
+            throw new Error(`asset exists: ${moduleName}/assets/${scene}`);
         }
         await this.helper.ensureDir(assetDir);
-        // package.json
-        await this._setPackageInfo(targetDir, scene);
-    }
-    async _setPackageInfo(modulePath, scene) {
-        const pkgFile = path.join(modulePath, 'package.json');
-        const pkg = await this.helper.loadJSONFile(pkgFile);
-        if (!pkg.files)
-            pkg.files = [];
-        let changed;
-        // files
-        if (!pkg.files.includes(scene)) {
-            pkg.files.push(scene);
-            changed = true;
-        }
-        // save
-        if (changed) {
-            await this.helper.saveJSONFile(pkgFile, pkg);
-        }
     }
 }

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/bean/cli.tools.metadata.d.ts

@@ -11,4 +11,5 @@ export declare class CliToolsMetadata extends BeanCliBase {
     _generatePatch_resources(content: string, packageName: string, resources: string[], type: boolean): string;
     _generateThis(moduleName: string, relativeNameCapitalize: string, modulePath: string): Promise<void>;
     _generateIndex(modulePath: string): Promise<void>;
+    _generatePackage(modulePath: string): Promise<void>;
 }

package/dist/lib/bean/cli.tools.metadata.js

@@ -3,6 +3,7 @@ import { BeanCliBase } from '@cabloy/cli';
 import { getOnionMetasMeta, getOnionScenesMeta } from '@cabloy/module-info';
 import { toUpperCaseFirstChar } from '@cabloy/word-utils';
 import fse from 'fs-extra';
+import { loadJSONFile, saveJSONFile } from "../utils.js";
 import { generateBeanGenerals } from "./toolsMetadata/generateBeanGenerals.js";
 import { generateConfig, generateConstant, generateError, generateLocale } from "./toolsMetadata/generateConfig.js";
 import { generateMetadataCustom } from "./toolsMetadata/generateMetadataCustom.js";
@@ -130,6 +131,8 @@ export class CliToolsMetadata extends BeanCliBase {
         await this._generateThis(moduleName, relativeNameCapitalize, modulePath);
         // index
         await this._generateIndex(modulePath);
+        // package
+        await this._generatePackage(modulePath);
     }
     _generatePatch(content) {
         if (!content)
@@ -198,4 +201,31 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
         await fse.writeFile(jsFile, jsContent);
         await this.helper.formatFile({ fileName: jsFile, logPrefix: 'format: ' });
     }
+    async _generatePackage(modulePath) {
+        let pkgFile;
+        let pkg;
+        let changed;
+        async function _loadPkg() {
+            if (!pkg) {
+                pkgFile = path.join(modulePath, 'package.json');
+                pkg = await loadJSONFile(pkgFile);
+            }
+            return pkg;
+        }
+        // cli
+        const cli = path.join(modulePath, 'cli');
+        if (fse.existsSync(cli)) {
+            pkg = await _loadPkg();
+            const index = pkg.files.indexOf('cli');
+            if (index === -1) {
+                changed = true;
+                pkg.files.push('cli');
+            }
+        }
+        // save
+        if (changed) {
+            await saveJSONFile(pkgFile, pkg);
+            await this.helper.formatFile({ fileName: pkgFile });
+        }
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.339",
+  "version": "1.0.342",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
     "@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.55",
+    "@cabloy/cli": "^3.0.56",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
     "@cabloy/module-glob": "^5.2.32",
@@ -61,7 +61,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.92",
+    "vona-core": "^5.0.93",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },