vona-cli-set-api 1.0.415 → 1.0.419

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

@@ -31,7 +31,7 @@
     "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore"
+    "postpack": "clean-package restore && npm run clean"
   },
   "clean-package": {
     "indent": 2,

package/cli/templates/create/project/basic/boilerplate/_.gitignore

@@ -3,6 +3,8 @@ miniprogram_npm
 /typings/core
 /coverage
 **/dist/
+**/dist-toolsIsolate/
+**/dist-cli/
 /dist-releases
 /docs-api
 /run

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

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.235"
+    "vona": "^5.0.237"
   },
   "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.13",
+  "version": "5.0.14",
   "title": "home-base",
   "vonaModule": {
     "dependencies": {
@@ -33,7 +33,7 @@
     "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore",
+    "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
   "clean-package": {

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.13",
+  "version": "5.0.14",
   "title": "home-index",
   "vonaModule": {
     "dependencies": {
@@ -33,7 +33,7 @@
     "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore",
+    "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
   "clean-package": {

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.21",
+  "version": "5.0.22",
   "title": "home-user",
   "vonaModule": {
     "fileVersion": 1,
@@ -34,7 +34,7 @@
     "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
-    "postpack": "clean-package restore",
+    "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
   "clean-package": {

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.25",
+  "version": "5.0.26",
   "title": "a-home",
   "description": "",
   "author": "zhennann",

package/dist/index.js

@@ -1068,12 +1068,13 @@ class CliCreateBean extends BeanCliBase {
     const boilerplates = this._getBoilerplatesOrSnippets('boilerplate', argv.boilerplate);
     const snippetsName = snippets[`${sceneName}:${argv.beanName}`] || snippets[sceneName];
     const boilerplateName = boilerplates[`${sceneName}:${argv.beanName}`] || boilerplates[sceneName];
+    const boilerplatePath = `cli/${boilerplateName}`;
     // render
     await this.template.renderBoilerplateAndSnippets({
       targetDir: beanDir,
       setName: __ThisSetName__,
       snippetsPath: snippetsName,
-      boilerplatePath: boilerplateName
+      boilerplatePath
     });
     // tools.metadata
     if (!argv.nometadata) {
@@ -2205,7 +2206,10 @@ async function generateMetadataCustom(cli, sceneName, sceneMeta, moduleName, mod
   const globFiles = await globBeanFiles(sceneName, sceneMeta, moduleName, modulePath);
   if (globFiles.length === 0) return '';
   // custom
-  const jsFile = path.join(sceneMeta.module.root, sceneMeta.metadataCustom);
+  let jsFile = path.join(sceneMeta.module.root, 'dist-cli', sceneMeta.metadataCustom.replace('.ts', '.js'));
+  if (!fse.existsSync(jsFile)) {
+    jsFile = path.join(sceneMeta.module.root, 'cli', sceneMeta.metadataCustom);
+  }
   return await cli.helper.importDynamic(jsFile, async instance => {
     const options = {
       cli,
@@ -2691,6 +2695,13 @@ export { ScopeModule${relativeNameCapitalize} as ScopeModule } from './index.ts'
         changed = true;
         pkg.files.push('cli');
       }
+      if (pkg.scripts['tsc:publish'].includes('tsconfig.cli.json')) {
+        const index = pkg.files.indexOf('dist-cli');
+        if (index === -1) {
+          changed = true;
+          pkg.files.push('dist-cli');
+        }
+      }
     }
     // save
     if (changed) {

package/dist-cli/templates/create/module/snippets/package.json.d.ts

@@ -0,0 +1,7 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        name: string;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"json">;
+export default _default;

package/dist-cli/templates/create/module/snippets/package.json.js

@@ -0,0 +1,10 @@
+import { metadataCustomSnippet } from '@cabloy/cli';
+export default metadataCustomSnippet({
+    file: 'package.json',
+    language: 'json',
+    async transform({ /* cli, */ ast, argv }) {
+        ast.dependencies[`vona-module-${argv.name}`] = '^5.0.0';
+        // ok
+        return ast;
+    },
+});

package/dist-cli/templates/create/module/snippets/tsconfig.json.d.ts

@@ -0,0 +1,7 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        name: string;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"json">;
+export default _default;

package/dist-cli/templates/create/module/snippets/tsconfig.json.js

@@ -0,0 +1,12 @@
+import { metadataCustomSnippet } from '@cabloy/cli';
+export default metadataCustomSnippet({
+    file: 'tsconfig.json',
+    language: 'json',
+    async transform({ /* cli, */ ast, argv }) {
+        ast.references.push({
+            path: `modules/${argv.name}/tsconfig.build.json`,
+        });
+        // ok
+        return ast;
+    },
+});

package/dist-cli/templates/tools/crud/snippets/1-package.json.d.ts

@@ -0,0 +1,7 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        fileVersion: number;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"json">;
+export default _default;

package/dist-cli/templates/tools/crud/snippets/1-package.json.js

@@ -0,0 +1,9 @@
+import { metadataCustomSnippet } from '@cabloy/cli';
+export default metadataCustomSnippet({
+    file: 'package.json',
+    language: 'json',
+    async transform({ ast, argv }) {
+        argv.fileVersion = ast.vonaModule.fileVersion = 1 + (ast.vonaModule.fileVersion ?? 0);
+        return ast;
+    },
+});

package/dist-cli/templates/tools/crud/snippets/2-meta.index.d.ts

@@ -0,0 +1,7 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"plain">;
+export default _default;

package/dist-cli/templates/tools/crud/snippets/2-meta.index.js

@@ -0,0 +1,44 @@
+import fs from 'node:fs';
+import { metadataCustomSnippet } from '@cabloy/cli';
+import { catchError } from '@cabloy/utils';
+const __snippet_import1 = 'import { $tableColumns } from \'vona-module-a-orm\';';
+const __snippet_import2 = 'import { Entity<%=argv.resourceNameCapitalize%> } from \'../entity/<%=argv.resourceName%>.ts\';';
+const __snippet_update = '...$tableColumns(() => Entity<%=argv.resourceNameCapitalize%>, \'name\'),';
+export default metadataCustomSnippet({
+    file: 'src/bean/meta.index.ts',
+    language: 'plain',
+    format: true,
+    init: async ({ cli, argv, targetFile }) => {
+        await catchError(() => {
+            return cli.helper.invokeCli([
+                ':create:bean',
+                'meta',
+                'index',
+                `--module=${argv.module}`,
+                '--nometadata',
+                '--noformat',
+            ], { cwd: argv.projectPath });
+        });
+        return fs.readFileSync(targetFile).toString('utf8');
+    },
+    async transform({ cli, ast }) {
+        // import1
+        if (!ast.includes(__snippet_import1)) {
+            const code = await cli.template.renderContent({ content: __snippet_import1 });
+            ast = ast.replace('import { Meta } from \'vona-module-a-meta\';', `import { Meta } from 'vona-module-a-meta';\n${code}`);
+        }
+        // import2
+        let code = await cli.template.renderContent({ content: __snippet_import2 });
+        ast = ast.replace('import { $tableColumns } from \'vona-module-a-orm\';', `import { $tableColumns } from 'vona-module-a-orm';\n${code}`);
+        // update
+        code = await cli.template.renderContent({ content: __snippet_update });
+        if (ast.includes('indexes: {}')) {
+            ast = ast.replace('indexes: {', `indexes: {\n    ${code}\n  `);
+        }
+        else {
+            ast = ast.replace('indexes: {', `indexes: {\n    ${code}`);
+        }
+        // ok
+        return ast;
+    },
+});

package/dist-cli/templates/tools/crud/snippets/2-meta.version.d.ts

@@ -0,0 +1,7 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"gogo">;
+export default _default;

package/dist-cli/templates/tools/crud/snippets/2-meta.version.js

@@ -0,0 +1,39 @@
+import fs from 'node:fs';
+import { metadataCustomSnippet } from '@cabloy/cli';
+import { catchError } from '@cabloy/utils';
+const __snippet_update = `if (options.version === <%=argv.fileVersion%>) {
+    const entity<%=argv.resourceNameCapitalize%> = this.scope.entity.<%=argv.resourceName%>;
+    await this.bean.model.createTable(entity<%=argv.resourceNameCapitalize%>.$table, table => {
+      table.comment(entity<%=argv.resourceNameCapitalize%>.$comment.$table);
+      table.basicFields();
+      table.string(entity<%=argv.resourceNameCapitalize%>.name, 50).defaultTo(entity<%=argv.resourceNameCapitalize%>.$default.name).comment(entity<%=argv.resourceNameCapitalize%>.$comment.name);
+      table.string(entity<%=argv.resourceNameCapitalize%>.description, 255).comment(entity<%=argv.resourceNameCapitalize%>.$comment.description);
+    });
+  }
+`;
+export default metadataCustomSnippet({
+    file: 'src/bean/meta.version.ts',
+    language: 'gogo',
+    format: true,
+    init: async ({ cli, argv, targetFile }) => {
+        await catchError(() => {
+            return cli.helper.invokeCli([
+                ':create:bean',
+                'meta',
+                'version',
+                `--module=${argv.module}`,
+                '--nometadata',
+                '--noformat',
+            ], { cwd: argv.projectPath });
+        });
+        return fs.readFileSync(targetFile).toString('utf8');
+    },
+    async transform({ cli, ast }) {
+        // update
+        ast.replace('async update(_options: IMetaVersionUpdateOptions) {$$$1}', 'async update(options: IMetaVersionUpdateOptions) {$$$1}');
+        const code = await cli.template.renderContent({ content: __snippet_update });
+        ast.replace('async update($$$0) {$$$1}', `async update($$$0) {\n  $$$1\n  ${code}}`);
+        // ok
+        return ast;
+    },
+});

package/dist-cli/templates/tools/crud/snippets/3-en-us.d.ts

@@ -0,0 +1,8 @@
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+        resourceNameCapitalize: string;
+    }
+}
+declare const _default: import("@cabloy/cli").ISnippet<"plain">;
+export default _default;

package/dist-cli/templates/tools/crud/snippets/3-en-us.js

@@ -0,0 +1,25 @@
+import fs from 'node:fs';
+import { metadataCustomSnippet } from '@cabloy/cli';
+import { catchError } from '@cabloy/utils';
+import { locale_transform } from "../utils.js";
+const __resources = { Name: 'Name', Description: 'Description' };
+export default metadataCustomSnippet({
+    file: 'src/config/locale/en-us.ts',
+    language: 'plain',
+    init: async ({ cli, argv, targetFile }) => {
+        await catchError(() => {
+            return cli.helper.invokeCli([
+                ':init:locale',
+                argv.module,
+                '--nometadata',
+                '--noformat',
+            ], {
+                cwd: argv.projectPath,
+            });
+        });
+        return fs.readFileSync(targetFile).toString('utf8');
+    },
+    async transform({ ast, argv }) {
+        return locale_transform({ ast, argv, resources: __resources });
+    },
+});

package/dist-cli/templates/tools/crud/snippets/4-zh-cn.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("@cabloy/cli").ISnippet<"plain">;
+export default _default;

package/dist-cli/templates/tools/crud/snippets/4-zh-cn.js

@@ -0,0 +1,10 @@
+import { metadataCustomSnippet } from '@cabloy/cli';
+import { locale_transform } from "../utils.js";
+const __resources = { Name: '名称', Description: '描述' };
+export default metadataCustomSnippet({
+    file: 'src/config/locale/zh-cn.ts',
+    language: 'plain',
+    async transform({ ast, argv }) {
+        return locale_transform({ ast, argv, resources: __resources });
+    },
+});

package/dist-cli/templates/tools/crud/utils.d.ts

@@ -0,0 +1,5 @@
+export declare function locale_transform({ ast, argv, resources }: {
+    ast: string;
+    argv: any;
+    resources: any;
+}): Promise<string>;

package/dist-cli/templates/tools/crud/utils.js

@@ -0,0 +1,13 @@
+import { evaluateSimple } from '@cabloy/utils';
+export async function locale_transform({ ast, argv, resources }) {
+    const values = evaluateSimple(ast.replace('export default', '').replace(';', ''));
+    resources = Object.assign({}, resources, { [argv.resourceNameCapitalize]: argv.resourceNameCapitalize }, values);
+    const keys = Object.keys(resources).sort();
+    let content = '';
+    for (const key of keys) {
+        content += `  ${key}: '${resources[key].replaceAll('\'', '\\\'')}',\n`;
+    }
+    ast = `export default {\n${content}};\n`;
+    // ok
+    return ast;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.415",
+  "version": "1.0.419",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -25,6 +25,7 @@
   "files": [
     "cli",
     "dist",
+    "dist-cli",
     "dist-toolsIsolate",
     "templates"
   ],
@@ -32,7 +33,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.71",
+    "@cabloy/cli": "^3.0.73",
     "@cabloy/dotenv": "^1.1.12",
     "@cabloy/extend": "^3.1.11",
     "@cabloy/module-glob": "^5.2.35",
@@ -69,7 +70,7 @@
   },
   "gitHead": "0eab9dc4a5622caffe89e7b1b3f02c08ccbc4c4b",
   "scripts": {
-    "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"
+    "clean": "rimraf dist dist-cli dist-toolsIsolate tsconfig.build.tsbuildinfo tsconfig.cli.tsbuildinfo tsconfig.isolate.tsbuildinfo",
+    "tsc:publish": "npm run clean && vona :bin:buildGeneral && tsc -p tsconfig.build.json && tsc -p tsconfig.cli.json && tsc -p tsconfig.isolate.json"
   }
 }