vona-cli-set-api 1.1.137 → 1.1.139

package/README.md

@@ -46,4 +46,4 @@ Representative example:
 
 For the compact top-level overview shared across Vona and Zova, see:
 
-- `../../../cabloy-docs/reference/cli-reference.md`
+- `../../../repo-docs/reference/cli-reference.md`

package/cli/templates/tools/crudStart/boilerplate/src/controller/{{resourceName}}.ts_

@@ -10,6 +10,7 @@ import { Arg, Controller, Web } from 'vona-module-a-web';
 
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 
+import { $locale } from '../.metadata/locales.ts';
 import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>SelectReq } from '../dto/<%=argv.resourceName%>SelectReq.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
@@ -18,40 +19,42 @@ import { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resource
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 
-@Controller<IControllerOptions<%=argv.resourceNameCapitalize%>>('<%=argv.resourceName%>')
+@Controller<IControllerOptions<%=argv.resourceNameCapitalize%>>('<%=argv.resourceName%>', {
+  summary: $locale('<%=argv.resourceNameCapitalize%>Controller'),
+})
 @Resource()
 export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
-  @Web.post()
+  @Web.post({ summary: $locale('<%=argv.resourceNameCapitalize%>Create') })
   @Api.body(v.tableIdentity())
-  @Passport.systemAdmin()
+  @Passport.rbac()
   async create(@Arg.body() <%=argv.resourceName%>: Dto<%=argv.resourceNameCapitalize%>Create): Promise<TableIdentity> {
     return (await this.scope.service.<%=argv.resourceName%>.create(<%=argv.resourceName%>)).id;
   }
 
-  @Web.get()
+  @Web.get({ summary: $locale('<%=argv.resourceNameCapitalize%>Select') })
   @Api.body(Dto<%=argv.resourceNameCapitalize%>SelectRes)
-  @Passport.systemAdmin()
+  @Passport.rbac()
   async select(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>SelectRes> {
     return await this.scope.service.<%=argv.resourceName%>.select(params);
   }
 
-  @Web.get(':id')
+  @Web.get(':id', { summary: $locale('<%=argv.resourceNameCapitalize%>View') })
   @Api.body(v.optional(), v.object(Dto<%=argv.resourceNameCapitalize%>View))
-  @Passport.systemAdmin()
+  @Passport.rbac()
   async view(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<Dto<%=argv.resourceNameCapitalize%>View | undefined> {
     return await this.scope.service.<%=argv.resourceName%>.view(id);
   }
 
-  @Web.patch(':id')
+  @Web.patch(':id', { summary: $locale('<%=argv.resourceNameCapitalize%>Update') })
   @Api.body(z.null())
-  @Passport.systemAdmin()
+  @Passport.rbac()
   async update(@Arg.param('id', v.tableIdentity()) id: TableIdentity, @Arg.body() <%=argv.resourceName%>: Dto<%=argv.resourceNameCapitalize%>Update): Promise<void> {
     await this.scope.service.<%=argv.resourceName%>.update(id, <%=argv.resourceName%>);
   }
 
-  @Web.delete(':id')
+  @Web.delete(':id', { summary: $locale('<%=argv.resourceNameCapitalize%>Delete') })
   @Api.body(z.null())
-  @Passport.systemAdmin()
+  @Passport.rbac()
   async delete(@Arg.param('id', v.tableIdentity()) id: TableIdentity): Promise<void> {
     await this.scope.service.<%=argv.resourceName%>.delete(id);
   }

package/cli/templates/tools/crudStart/snippets/3-en-us.ts

@@ -30,6 +30,16 @@ export default metadataCustomSnippet({
     return fs.readFileSync(targetFile).toString('utf8');
   },
   async transform({ ast, argv }) {
-    return locale_transform({ ast, argv, resources: __resources });
+    const resource = argv.resourceNameCapitalize;
+    const resources = {
+      ...__resources,
+      [`${resource}Controller`]: `${resource} Management`,
+      [`${resource}Create`]: `Create ${resource}`,
+      [`${resource}Select`]: `Query ${resource} List`,
+      [`${resource}View`]: `View ${resource}`,
+      [`${resource}Update`]: `Update ${resource}`,
+      [`${resource}Delete`]: `Delete ${resource}`,
+    };
+    return locale_transform({ ast, argv, resources });
   },
 });

package/cli/templates/tools/crudStart/snippets/4-zh-cn.ts

@@ -13,6 +13,16 @@ export default metadataCustomSnippet({
   file: 'src/config/locale/zh-cn.ts',
   language: 'plain',
   async transform({ ast, argv }) {
-    return locale_transform({ ast, argv, resources: __resources });
+    const resource = argv.resourceNameCapitalize;
+    const resources = {
+      ...__resources,
+      [`${resource}Controller`]: `${resource}管理`,
+      [`${resource}Create`]: `创建${resource}`,
+      [`${resource}Select`]: `查询${resource}列表`,
+      [`${resource}View`]: `查看${resource}`,
+      [`${resource}Update`]: `更新${resource}`,
+      [`${resource}Delete`]: `删除${resource}`,
+    };
+    return locale_transform({ ast, argv, resources });
   },
 });

package/dist/index.js

@@ -2851,12 +2851,11 @@ async function generateOnions(sceneName, sceneMeta, moduleName, modulePath) {
           get scope(): ${scopeModuleName};
         }`);
       if (!isBeanGlobal) {
-        const contentOnionOptions = onionOptions ? `get $onionOptions(): ${onionOptions};` : '';
+        const contentOnionOptions = onionOptions ? `\n            get $onionOptions(): ${onionOptions};` : '';
         contentScopes.push(`
           export interface ${className} {
             get $beanFullName(): '${beanFullNameFromOnionName(beanNameFull, sceneName)}';
-            get $onionName(): '${beanNameFull}';
-            ${contentOnionOptions}
+            get $onionName(): '${beanNameFull}';${contentOnionOptions}
           }`);
       }
     }
@@ -3124,6 +3123,7 @@ class CliToolsMetadata extends BeanCliBase {
       content = `// eslint-disable\n${content}`;
     }
     // save
+    content = content.replace(/[^\S\r\n]+$/gm, '');
     await fse.writeFile(metaIndexFile, content);
     // await this.helper.formatFile({ fileName: metaIndexFile, logPrefix: 'format: ' });
     // locales

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

@@ -20,6 +20,16 @@ export default metadataCustomSnippet({
         return fs.readFileSync(targetFile).toString('utf8');
     },
     async transform({ ast, argv }) {
-        return locale_transform({ ast, argv, resources: __resources });
+        const resource = argv.resourceNameCapitalize;
+        const resources = {
+            ...__resources,
+            [`${resource}Controller`]: `${resource} Management`,
+            [`${resource}Create`]: `Create ${resource}`,
+            [`${resource}Select`]: `Query ${resource} List`,
+            [`${resource}View`]: `View ${resource}`,
+            [`${resource}Update`]: `Update ${resource}`,
+            [`${resource}Delete`]: `Delete ${resource}`,
+        };
+        return locale_transform({ ast, argv, resources });
     },
 });

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

@@ -10,6 +10,16 @@ export default metadataCustomSnippet({
     file: 'src/config/locale/zh-cn.ts',
     language: 'plain',
     async transform({ ast, argv }) {
-        return locale_transform({ ast, argv, resources: __resources });
+        const resource = argv.resourceNameCapitalize;
+        const resources = {
+            ...__resources,
+            [`${resource}Controller`]: `${resource}管理`,
+            [`${resource}Create`]: `创建${resource}`,
+            [`${resource}Select`]: `查询${resource}列表`,
+            [`${resource}View`]: `查看${resource}`,
+            [`${resource}Update`]: `更新${resource}`,
+            [`${resource}Delete`]: `删除${resource}`,
+        };
+        return locale_transform({ ast, argv, resources });
     },
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.137",
-  "gitHead": "75a09e6a22891e958802ee649ed454db38f90c16",
+  "version": "1.1.139",
+  "gitHead": "3f5bcf6c117853bc013e9195e3ab781de585740f",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",