vona-cli-set-api 1.0.496 → 1.1.3

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

@@ -1,18 +1,17 @@
 {
   "name": "vona-module-home-index",
-  "type": "module",
-  "version": "5.0.17",
-  "title": "home-index",
-  "vonaModule": {
-    "dependencies": {
-      "a-vona": "5.0.0"
-    }
-  },
+  "version": "5.1.1",
   "description": "",
-  "author": "",
   "keywords": [
     "Vona Module"
   ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -24,18 +23,18 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "assets",
-    "dist"
-  ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
     "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "clean-package": {
     "indent": 2,
     "remove": [
@@ -43,8 +42,10 @@
       "exports.\\..import"
     ]
   },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.0.1"
+  "title": "home-index",
+  "vonaModule": {
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
   }
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/src/.metadata/index.ts

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// eslint-disable
 import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** meta: begin */
 export * from '../bean/meta.printTip.ts';
@@ -67,6 +67,7 @@ declare module 'vona-module-a-web' {
     }
 
 }
+
 /** controller: end */
 /** locale: begin */
 import { locales } from './locales.ts';

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/src/bean/meta.printTip.ts

@@ -1,4 +1,5 @@
 import type { IMetaPrintTipExecute, TypeMetaPrintTipResult } from 'vona-module-a-printtip';
+
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/src/controller/home.ts

@@ -1,8 +1,10 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
 import { BeanBase } from 'vona';
 import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
+
 import { $locale } from '../.metadata/locales.ts';
 
 export interface IControllerOptionsHome extends IDecoratorControllerOptions {}

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

@@ -0,0 +1,15 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+
+describe('home.test.ts', () => {
+  it('action:home', async () => {
+    await app.bean.executor.mockCtx(
+      async () => {
+        const res = await app.bean.executor.performAction('get', '//');
+        assert.equal(res, 'Hello Vona!');
+      },
+      { locale: 'en-us' },
+    );
+  });
+});

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-index/tsconfig.build.json

@@ -3,12 +3,9 @@
   "compilerOptions": {
     "rootDir": "src",
     "declaration": true,
+    "declarationMap": true,
     "emitDeclarationOnly": true,
     "outDir": "dist"
   },
-  "include": [
-    "src",
-    "src/.metadata/*.ts",
-    "src/**/*.json"
-  ]
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
 }

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

@@ -1,19 +1,17 @@
 {
   "name": "vona-module-home-user",
-  "type": "module",
-  "version": "5.0.26",
-  "title": "home-user",
-  "vonaModule": {
-    "fileVersion": 1,
-    "dependencies": {
-      "a-vona": "5.0.0"
-    }
-  },
+  "version": "5.1.1",
   "description": "",
-  "author": "",
   "keywords": [
     "Vona Module"
   ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
   "exports": {
     ".": {
       "types": [
@@ -25,18 +23,18 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "assets",
-    "dist"
-  ],
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json",
+    "tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
     "prepublishOnly": "npm run tsc:publish",
     "prepack": "clean-package",
     "postpack": "clean-package restore && npm run clean",
     "version": "node ../../../../../scripts/version-home.ts"
   },
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.0.1"
+  },
   "clean-package": {
     "indent": 2,
     "remove": [
@@ -44,8 +42,11 @@
       "exports.\\..import"
     ]
   },
-  "devDependencies": {
-    "clean-package": "^2.2.0",
-    "rimraf": "^6.0.1"
+  "title": "home-user",
+  "vonaModule": {
+    "fileVersion": 1,
+    "dependencies": {
+      "a-vona": "5.0.0"
+    }
   }
 }

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

@@ -1,4 +1,4 @@
-/* eslint-disable */
+// eslint-disable
 import type { TypeEntityMeta,TypeModelsClassLikeGeneral,TypeSymbolKeyFieldsMore,IModelRelationBelongsToMany } from 'vona-module-a-orm';
 import type { TypeEntityOptionsFields,TypeControllerOptionsActions } from 'vona-module-a-openapi';
 import type { TableIdentity } from 'table-identity';
@@ -139,7 +139,7 @@ declare module 'vona' {
 }
 /** model: end */
 /** model: begin */
-import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
+import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelIncrementParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-home-user' {
   export interface IModelOptionsUser {
@@ -164,6 +164,8 @@ declare module 'vona-module-home-user' {
       mutate<T extends IModelMutateOptions<EntityRole,ModelRole>>(data?: TypeModelMutateRelationData<EntityRole,ModelRole, T>, options?: T): Promise<TypeModelMutateRelationData<EntityRole,ModelRole, T>>;
       mutateBulk<T extends IModelMutateOptions<EntityRole,ModelRole>>(items: TypeModelMutateRelationData<EntityRole,ModelRole, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityRole,ModelRole, T>[]>;
       count<T extends IModelSelectCountParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
       aggregate<T extends IModelSelectAggrParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
       group<T extends IModelSelectGroupParams<EntityRole,ModelRole,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityRole, T>[]>;
       getById<T extends IModelGetOptions<EntityRole,ModelRole>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityRole, ModelRole, T> | undefined>;
@@ -191,6 +193,8 @@ export interface ModelRoleUser {
       mutate<T extends IModelMutateOptions<EntityRoleUser,ModelRoleUser>>(data?: TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>, options?: T): Promise<TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>>;
       mutateBulk<T extends IModelMutateOptions<EntityRoleUser,ModelRoleUser>>(items: TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityRoleUser,ModelRoleUser, T>[]>;
       count<T extends IModelSelectCountParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
       aggregate<T extends IModelSelectAggrParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
       group<T extends IModelSelectGroupParams<EntityRoleUser,ModelRoleUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityRoleUser, T>[]>;
       getById<T extends IModelGetOptions<EntityRoleUser,ModelRoleUser>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityRoleUser, ModelRoleUser, T> | undefined>;
@@ -214,6 +218,8 @@ export interface ModelUser {
       mutate<T extends IModelMutateOptions<EntityUser,ModelUser>>(data?: TypeModelMutateRelationData<EntityUser,ModelUser, T>, options?: T): Promise<TypeModelMutateRelationData<EntityUser,ModelUser, T>>;
       mutateBulk<T extends IModelMutateOptions<EntityUser,ModelUser>>(items: TypeModelMutateRelationData<EntityUser,ModelUser, T>[], options?: T): Promise<TypeModelMutateRelationData<EntityUser,ModelUser, T>[]>;
       count<T extends IModelSelectCountParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<string | undefined>;
+      increment<T extends IModelIncrementParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
+      decrement<T extends IModelIncrementParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<number>;
       aggregate<T extends IModelSelectAggrParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelAggrRelationResult<T>>;
       group<T extends IModelSelectGroupParams<EntityUser,ModelUser,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelGroupRelationResult<EntityUser, T>[]>;
       getById<T extends IModelGetOptions<EntityUser,ModelUser>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityUser, ModelUser, T> | undefined>;
@@ -439,7 +445,7 @@ declare module 'vona-module-home-user' {
 import type { DtoLogin } from '../dto/login.ts';
 import type { DtoPassport } from '../dto/passport.ts';
 import type { DtoPassportJwt } from '../dto/passportJwt.ts';
-import type { DtoRegister } from '../dto/register.ts'; 
+import type { DtoRegister } from '../dto/register.ts';
 declare module 'vona-module-home-user' {
   
     export interface IDtoOptionsLogin {
@@ -511,6 +517,7 @@ export interface IApiPathPostRecord{
     }
 
 }
+
 /** controller: end */
 /** zodRefine: begin */
 export * from '../bean/zodRefine.emailUnique.ts';

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.activate.ts

@@ -1,5 +1,6 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
 import type { IUser, TypeEventActivateData, TypeEventActivateResult } from 'vona-module-a-user';
+
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -7,19 +8,13 @@ type TypeEventData = TypeEventActivateData;
 type TypeEventResult = TypeEventActivateResult;
 
 @EventListener({ match: 'a-user:activate' })
-export class EventListenerActivate
-  extends BeanBase
-  implements IEventExecute<TypeEventData, TypeEventResult> {
+export class EventListenerActivate extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
     const user = data as IUser;
-    if (user.name === 'admin') {
+    if (user.name === 'admin' && !this.scope.config.disableRoleAdmin) {
       // role: admin
       const roleAdmin = await this.scope.model.role.get({ name: 'admin' });
-      // userRole: admin
-      await this.scope.model.roleUser.insert({
-        userId: user.id,
-        roleId: roleAdmin!.id,
-      });
+      await this.bean.role.addUserId(roleAdmin!.id, user.id);
     }
     // next
     return next();

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.emailConfirmCallback.ts

@@ -1,5 +1,6 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
 import type { TypeEventEmailConfirmCallbackData, TypeEventEmailConfirmCallbackResult } from 'vona-module-a-mailconfirm';
+
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -7,9 +8,7 @@ type TypeEventData = TypeEventEmailConfirmCallbackData;
 type TypeEventResult = TypeEventEmailConfirmCallbackResult;
 
 @EventListener({ match: 'a-mailconfirm:emailConfirmCallback' })
-export class EventListenerEmailConfirmCallback
-  extends BeanBase
-  implements IEventExecute<TypeEventData, TypeEventResult> {
+export class EventListenerEmailConfirmCallback extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, _next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
     // check cache
     if (!data) {

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.passwordResetCallback.ts

@@ -1,5 +1,6 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
 import type { TypeEventPasswordResetCallbackData, TypeEventPasswordResetCallbackResult } from 'vona-module-a-mailconfirm';
+
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -7,9 +8,7 @@ type TypeEventData = TypeEventPasswordResetCallbackData;
 type TypeEventResult = TypeEventPasswordResetCallbackResult;
 
 @EventListener({ match: 'a-mailconfirm:passwordResetCallback' })
-export class EventListenerPasswordResetCallback
-  extends BeanBase
-  implements IEventExecute<TypeEventData, TypeEventResult> {
+export class EventListenerPasswordResetCallback extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, _next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
     // check cache
     if (!data) {

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/eventListener.register.ts

@@ -1,5 +1,6 @@
 import type { IEventExecute, NextEvent } from 'vona-module-a-event';
 import type { IUser, TypeEventRegisterData, TypeEventRegisterResult } from 'vona-module-a-user';
+
 import { BeanBase } from 'vona';
 import { EventListener } from 'vona-module-a-event';
 
@@ -7,12 +8,10 @@ type TypeEventData = TypeEventRegisterData;
 type TypeEventResult = TypeEventRegisterResult;
 
 @EventListener({ match: 'a-user:register' })
-export class EventListenerRegister
-  extends BeanBase
-  implements IEventExecute<TypeEventData, TypeEventResult> {
+export class EventListenerRegister extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
   async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<TypeEventResult> {
     // next: registered
-    const user = await next() as IUser;
+    const user = (await next()) as IUser;
     // mail: activate
     if (!data.autoActivate && user.email) {
       await this.bean.mailConfirm.emailConfirm(user);

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/meta.index.ts

@@ -1,4 +1,5 @@
 import type { IMetaOptionsIndex } from 'vona-module-a-index';
+
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
 import { $tableColumns } from 'vona-module-a-ormutils';

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

@@ -1,4 +1,5 @@
 import type { IMetaVersionInit, IMetaVersionInitOptions, IMetaVersionUpdate, IMetaVersionUpdateOptions } from 'vona-module-a-version';
+
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
 
@@ -39,16 +40,24 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
   async init(options: IMetaVersionInitOptions) {
     if (options.version === 1) {
       // role: admin
-      await this.scope.model.role.insert({
-        name: 'admin',
-      });
+      if (!this.scope.config.disableRoleAdmin) {
+        await this.scope.model.role.insert({
+          name: 'admin',
+        });
+      }
       // user: admin
-      await this.bean.authSimple.authenticate({
-        username: 'admin',
-        password: options.password || this.scope.config.passwordDefault.admin,
-        avatar: ':emoji:flower',
-        confirmed: true,
-      }, 'register', 'default');
+      if (!this.scope.config.disableUserAdmin) {
+        await this.bean.authSimple.authenticate(
+          {
+            username: 'admin',
+            password: options.password || this.scope.config.passwordDefault.admin,
+            avatar: ':emoji:flower',
+            confirmed: true,
+          },
+          'register',
+          'default',
+        );
+      }
     }
   }
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.emailUnique.ts

@@ -1,4 +1,5 @@
 import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.passwordConfirm.ts

@@ -1,8 +1,12 @@
 import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
 
-export interface TypeZodRefinePasswordConfirmData { password: string; passwordConfirm: string }
+export interface TypeZodRefinePasswordConfirmData {
+  password: string;
+  passwordConfirm: string;
+}
 
 export interface IZodRefineOptionsPasswordConfirm extends IDecoratorZodRefineOptions {}
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/bean/zodRefine.usernameUnique.ts

@@ -1,4 +1,5 @@
 import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/config/config.ts

@@ -5,5 +5,7 @@ export function config(_app: VonaApplication) {
     passwordDefault: {
       admin: '123456',
     },
+    disableRoleAdmin: false,
+    disableUserAdmin: false,
   };
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -1,8 +1,7 @@
 import type { DtoAuth, IAuthenticateOptions, IAuthProviderRecord } from 'vona-module-a-auth';
 import type { IJwtToken } from 'vona-module-a-jwt';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
-import type { EntityRole } from '../entity/role.ts';
-import type { EntityUser } from '../entity/user.ts';
+
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
 import { DtoJwtToken } from 'vona-module-a-jwt';
@@ -10,6 +9,10 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
+
+import type { EntityRole } from '../entity/role.ts';
+import type { EntityUser } from '../entity/user.ts';
+
 import { DtoLogin } from '../dto/login.ts';
 import { DtoPassport } from '../dto/passport.ts';
 import { DtoPassportJwt } from '../dto/passportJwt.ts';
@@ -33,7 +36,7 @@ export class ControllerPassport extends BeanBase {
 
   @Web.post('register')
   @Passport.public()
-  @Core.captchaVerify({ scene: 'a-captchasimple:simple' })
+  @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async register(@Arg.body() data: DtoRegister) {
     const jwt = await this.bean.authSimple.authenticate(data, 'register', 'default');
@@ -42,7 +45,7 @@ export class ControllerPassport extends BeanBase {
 
   @Web.post('login')
   @Passport.public()
-  @Core.captchaVerify({ scene: 'a-captchasimple:simple' })
+  @Core.captchaVerify({ scene: 'captcha-simple:simple' })
   @Api.body(v.object(DtoPassportJwt))
   async login(@Arg.body() data: DtoLogin): Promise<DtoPassportJwt> {
     const jwt = await this.bean.authSimple.authenticate(data, 'login', 'default');

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/dto/login.ts

@@ -1,4 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { DtoCaptchaVerify } from 'vona-module-a-captcha';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
@@ -7,12 +8,12 @@ export interface IDtoOptionsLogin extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsLogin>()
 export class DtoLogin {
-  @Api.field(v.min(3), v.trim())
+  @Api.field(v.required(), v.min(3), v.trim())
   username: string;
 
-  @Api.field(v.min(6))
+  @Api.field(v.required(), v.min(6))
   password: string;
 
-  @Api.field(v.captcha({ scene: 'a-captchasimple:simple' }))
+  @Api.field(v.required(), v.rest({ iconPrefix: ':editor:code-block' }), v.component('captcha'))
   captcha: DtoCaptchaVerify;
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/dto/passport.ts

@@ -1,8 +1,10 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { DtoAuth } from 'vona-module-a-auth';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { EntityRole } from 'vona-module-home-user';
+
 import { EntityUser } from '../entity/user.ts';
 
 export interface IDtoOptionsPassport extends IDecoratorDtoOptions {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/dto/passportJwt.ts

@@ -1,7 +1,9 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { DtoJwtToken } from 'vona-module-a-jwt';
 import { Api } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
+
 import { DtoPassport } from './passport.ts';
 
 export interface IDtoOptionsPassportJwt extends IDecoratorDtoOptions {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/dto/register.ts

@@ -1,4 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
 import { DtoCaptchaVerify } from 'vona-module-a-captcha';
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
@@ -21,6 +22,6 @@ export class DtoRegister {
   @Api.field(v.min(6), v.max(20))
   passwordConfirm: string;
 
-  @Api.field(v.captcha({ scene: 'a-captchasimple:simple' }))
+  @Api.field(v.component('captcha'))
   captcha: DtoCaptchaVerify;
 }

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/entity/role.ts

@@ -1,7 +1,9 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import type { IRole } from 'vona-module-a-user';
+
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
+
 import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsRole extends IDecoratorEntityOptions {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/entity/roleUser.ts

@@ -1,5 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/entity/user.ts

@@ -1,9 +1,11 @@
 import type { ILocaleRecord } from 'vona';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
 import type { IUser } from 'vona-module-a-user';
+
 import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { z } from 'zod';
+
 import { $locale } from '../.metadata/locales.ts';
 
 export interface IEntityOptionsUser extends IDecoratorEntityOptions {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/model/role.ts

@@ -1,5 +1,7 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
 import { BeanModelBase, Model } from 'vona-module-a-orm';
+
 import { EntityRole } from '../entity/role.ts';
 
 export interface IModelOptionsRole extends IDecoratorModelOptions<EntityRole> {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/model/roleUser.ts

@@ -1,5 +1,7 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
 import { BeanModelBase, Model } from 'vona-module-a-orm';
+
 import { EntityRoleUser } from '../entity/roleUser.ts';
 
 export interface IModelOptionsRoleUser extends IDecoratorModelOptions<EntityRoleUser> {}

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/model/user.ts

@@ -1,5 +1,7 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
 import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
+
 import { EntityUser } from '../entity/user.ts';
 import { ModelRole } from './role.ts';
 import { ModelRoleUser } from './roleUser.ts';
@@ -9,7 +11,12 @@ export interface IModelOptionsUser extends IDecoratorModelOptions<EntityUser> {}
 @Model<IModelOptionsUser>({
   entity: EntityUser,
   relations: {
-    roles: $relation.belongsToMany(() => ModelRoleUser, () => ModelRole, 'userId', 'roleId'),
+    roles: $relation.belongsToMany(
+      () => ModelRoleUser,
+      () => ModelRole,
+      'userId',
+      'roleId',
+    ),
   },
 })
 export class ModelUser extends BeanModelBase<EntityUser> {

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/service/passportAdapter.ts

@@ -1,8 +1,10 @@
 import type { IPassport, IPassportAdapter } from 'vona-module-a-user';
-import type { IPayloadDataOfPassport } from '../types/jwt.ts';
+
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
+import type { IPayloadDataOfPassport } from '../types/jwt.ts';
+
 @Service()
 export class ServicePassportAdapter extends BeanBase implements IPassportAdapter {
   async isAdmin(passport: IPassport | undefined): Promise<boolean> {

package/cli/templates/create/project/{basic → cabloy-basic}/boilerplate/src/suite/a-home/modules/home-user/src/service/roleAdapter.ts

@@ -1,5 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IRole, IRoleAdapter } from 'vona-module-a-user';
+
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
@@ -17,4 +18,12 @@ export class ServiceRoleAdapter extends BeanBase implements IRoleAdapter {
     const user = await this.scope.model.user.get({ id: userId }, { include: { roles: true } });
     return user?.roles;
   }
+
+  async addUserId(id: TableIdentity, userId: TableIdentity): Promise<TableIdentity> {
+    const res = await this.scope.model.roleUser.insert({
+      userId,
+      roleId: id,
+    });
+    return res.id;
+  }
 }