vona-cli-set-api 1.0.78 → 1.0.81

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

@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.41"
+    "vona": "^5.0.42"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

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

@@ -1,4 +1,5 @@
 import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
+import type { TypeMetaEntity } from 'vona-module-a-database';
 import type { IDecoratorModelOptions } from 'vona-module-a-database';
 import type { IMetaOptionsIndex } from 'vona-module-a-index';
 import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
@@ -75,9 +76,9 @@ declare module 'vona-module-home-user' {
 
 }
 export interface IModuleEntity {
-  role: EntityRole;
-  user: EntityUser;
-  userRole: EntityUserRole;
+  role: TypeMetaEntity<EntityRole>;
+  user: TypeMetaEntity<EntityUser>;
+  userRole: TypeMetaEntity<EntityUserRole>;
 }
 /** entity: end */
 /** entity: begin */
@@ -85,20 +86,14 @@ declare module 'vona-module-home-user' {
 
   export interface EntityRole {
     get $table(): 'homeRole';
-    $column: <K extends keyof Omit<EntityRole, '$column' | '$columns' | '$table'>>(column: K) => K;
-    $columns: <K extends keyof Omit<EntityRole, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
   }
 
   export interface EntityUser {
     get $table(): 'homeUser';
-    $column: <K extends keyof Omit<EntityUser, '$column' | '$columns' | '$table'>>(column: K) => K;
-    $columns: <K extends keyof Omit<EntityUser, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
   }
 
   export interface EntityUserRole {
     get $table(): 'homeUserRole';
-    $column: <K extends keyof Omit<EntityUserRole, '$column' | '$columns' | '$table'>>(column: K) => K;
-    $columns: <K extends keyof Omit<EntityUserRole, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
   }
 
   export interface IEntityOptionsRole {

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.version.ts

@@ -10,15 +10,15 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
       const entityRole = this.scope.entity.role;
       await this.bean.model.createTable(entityRole.$table, table => {
         table.basicFields();
-        table.string(entityRole.$column('name'), 255);
+        table.string(entityRole.name, 255);
       });
       // homeUser
       const entityUser = this.scope.entity.user;
       await this.bean.model.createTable(entityUser.$table, table => {
         table.basicFields();
-        table.string(entityUser.$column('name'), 255);
-        table.string(entityUser.$column('avatar'), 255);
-        table.string(entityUser.$column('locale'), 255);
+        table.string(entityUser.name, 255);
+        table.string(entityUser.avatar, 255);
+        table.string(entityUser.locale, 255);
       });
       // homeUserRole
       const entityUserRole = this.scope.entity.userRole;

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

@@ -1,10 +1,10 @@
 import type { TableIdentity } from 'vona-module-a-database';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
-import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
 import { BeanBase } from 'vona';
 import { Api, Arg, v } from 'vona-module-a-openapi';
 import { Controller, Web } from 'vona-module-a-web';
 import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
+import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}

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

@@ -12,8 +12,8 @@ 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.basicFields();
-    table.string(entity<%=argv.resourceNameCapitalize%>.$column('name'), 50);
-    table.string(entity<%=argv.resourceNameCapitalize%>.$column('description'), 255);
+    table.string(entity<%=argv.resourceNameCapitalize%>.name, 50);
+    table.string(entity<%=argv.resourceNameCapitalize%>.description, 255);
   });
 }`;
 

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

@@ -140,6 +140,9 @@ export class CliToolsMetadata extends BeanCliBase {
         if (content.includes('TypeControllerOptionsActions')) {
             content = `import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';\n${content}`;
         }
+        if (content.includes('TypeMetaEntity')) {
+            content = `import type { TypeMetaEntity } from 'vona-module-a-database';\n${content}`;
+        }
         return content;
     }
     async _generateThis(moduleName, relativeNameCapitalize, modulePath) {

package/dist/lib/bean/toolsMetadata/generateScopeResources.js

@@ -1,4 +1,4 @@
-import { toUpperCaseFirstChar } from '@cabloy/word-utils';
+import { replaceTemplate, toUpperCaseFirstChar } from '@cabloy/word-utils';
 import { globBeanFiles } from "./utils.js";
 export async function generateScopeResources(sceneName, sceneMeta, moduleName, modulePath) {
     const sceneNameCapitalize = toUpperCaseFirstChar(sceneName);
@@ -13,7 +13,11 @@ export async function generateScopeResources(sceneName, sceneMeta, moduleName, m
         if (isIgnore)
             continue;
         contentImports.push(`import type { ${className} } from '${fileNameJSRelative}';`);
-        contentRecords.push(`'${beanName}': ${className};`);
+        let typeClassName = className;
+        if (sceneMeta.scopeResourceTypeTemplate) {
+            typeClassName = replaceTemplate(sceneMeta.scopeResourceTypeTemplate, { className });
+        }
+        contentRecords.push(`'${beanName}': ${typeClassName};`);
     }
     if (contentImports.length === 0)
         return '';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.78",
+  "version": "1.0.81",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -31,11 +31,11 @@
     "@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.31",
+    "@cabloy/cli": "^3.0.32",
     "@cabloy/dotenv": "^1.1.10",
     "@cabloy/extend": "^3.1.10",
-    "@cabloy/module-glob": "^5.2.14",
-    "@cabloy/module-info": "^1.3.21",
+    "@cabloy/module-glob": "^5.2.15",
+    "@cabloy/module-info": "^1.3.22",
     "@cabloy/word-utils": "^2.0.1",
     "@lcov-viewer/cli": "^1.3.0",
     "@rollup/plugin-alias": "^5.1.1",
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.24",
+    "vona-core": "^5.0.25",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },