vona-cli-set-api 1.1.51 → 1.1.57

package/cli/templates/create/project/cabloy-basic/boilerplate/.vscode/extensions.json

@@ -1,4 +1,4 @@
 {
   "recommendations": ["cabloy.vona-vscode", "oxc.oxc-vscode"],
-  "unwantedRecommendations": [],
+  "unwantedRecommendations": []
 }

package/cli/templates/create/project/cabloy-basic/boilerplate/.vscode/settings.json

@@ -19,13 +19,13 @@
   "editor.formatOnSave": true,
   // oxlint
   "editor.codeActionsOnSave": {
-    "source.fixAll.oxc": "always",
+    "source.fixAll.oxc": "always"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "oxc.oxc-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "oxc.oxc-vscode",
+    "editor.defaultFormatter": "oxc.oxc-vscode"
   },
   // associations
   "files.associations": {
@@ -33,7 +33,7 @@
     "*.css.ejs": "css",
     "*.less.ejs": "less",
     "*.code-snippets": "text",
-    "docker-compose-dockerfile-app": "dockerfile",
+    "docker-compose-dockerfile-app": "dockerfile"
   },
   // search
   "search.exclude": {
@@ -44,8 +44,8 @@
     "/src/backend/app/**": true,
     "/src/backend/logs/**": true,
     "/src/backend/run/**": true,
-    "**/node_modules": true,
+    "**/node_modules": true
   },
   "search.useIgnoreFiles": false,
-  "hide-my-secrets.hideSecrets": false,
+  "hide-my-secrets.hideSecrets": false
 }

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

@@ -26,10 +26,10 @@ miniprogram_npm
 .app
 .zova-rest
 
-# mine .env files
-env/.env*.mine
-/src/backend/config/config/config*.mine.ts
-/src/backend/config/config/config*.mine.tsx
+# local .env files
+env/.env*.local
+/src/backend/config/config/config*.local.ts
+/src/backend/config/config/config*.local.tsx
 /src/backend/typing/modules.d.ts
 **/.metadata/modules.d.ts
 src/backend/typing/mine.d.ts

package/cli/templates/create/project/cabloy-basic/boilerplate/docker-compose.yml

@@ -16,7 +16,16 @@ services:
       - ./docker-compose/output/dist/docker:/opt/node/app/dist/docker
       - ./docker-compose/output/app/vona:/root/vona
       - ./docker-compose/logs/app:/root/logs
-    command: [./scripts/wait-for-it.sh, 'pg:5432', 'mysql:3306', 'redis:6379', -s, --, ./scripts/app-init.sh]
+    command:
+      [
+        ./scripts/wait-for-it.sh,
+        'pg:5432',
+        'mysql:3306',
+        'redis:6379',
+        -s,
+        --,
+        ./scripts/app-init.sh,
+      ]
 
   nginx:
     image: nginx:latest

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

@@ -39,7 +39,7 @@
     "lint:fix": "oxlint --fix"
   },
   "dependencies": {
-    "vona": "^5.1.18"
+    "vona": "^5.1.21"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.1.7",

package/cli/templates/create/project/cabloy-basic/boilerplate/pnpm-workspace.yaml

@@ -37,4 +37,4 @@ onlyBuiltDependencies:
 
 overrides:
   '@types/mime': '3.0.4'
-  '@types/react': 'npm:@cabloy/types-react@^19.2.15'
+  '@types/react': 'npm:@cabloy/types-react@^19.2.16'

package/cli/templates/create/project/cabloy-basic/boilerplate/src/backend/config/config/config.dev.ts

@@ -8,7 +8,13 @@ export default async function (_app: VonaApplication) {
     instances: {
       '': { password: '', title: '' },
       'shareTest': { password: '', title: '' },
-      'isolateTest': { password: '', title: '', id: 1000, isolate: true, isolateClient: 'isolateTest' },
+      'isolateTest': {
+        password: '',
+        title: '',
+        id: 1000,
+        isolate: true,
+        isolateClient: 'isolateTest',
+      },
     },
   };
 

package/cli/templates/create/project/cabloy-basic/boilerplate/src/backend/config/config/config.test.ts

@@ -13,7 +13,13 @@ export default async function (_app: VonaApplication) {
     instances: {
       '': { password: '', title: '', config: {} },
       'shareTest': { password: '', title: '' },
-      'isolateTest': { password: '', title: '', id: 1000, isolate: true, isolateClient: 'isolateTest' },
+      'isolateTest': {
+        password: '',
+        title: '',
+        id: 1000,
+        isolate: true,
+        isolateClient: 'isolateTest',
+      },
     },
   };
 

package/cli/templates/create/project/cabloy-basic/boilerplate/src/backend/config/config/config.ts

@@ -3,7 +3,13 @@ import type { IMailClientRecord, TypeMailTransportService } from 'vona-module-a-
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
 
 import { replaceTemplate } from '@cabloy/utils';
-import { $customKey, getLoggerPathPhysicalRoot, getPublicPathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding } from 'vona';
+import {
+  $protocolKey,
+  getLoggerPathPhysicalRoot,
+  getPublicPathPhysicalRoot,
+  getSqlite3DatabaseNameDefault,
+  getSqlite3NativeBinding,
+} from 'vona';
 
 declare module 'vona' {
   export interface IInstanceRecord {
@@ -37,8 +43,8 @@ export default async function (app: VonaApplication) {
   // instance
   config.instance = {
     getInstanceName: undefined,
-    queryField: $customKey('x-vona-instance-name'),
-    headerField: $customKey('x-vona-instance-name'),
+    queryField: $protocolKey('x-vona-instance-name'),
+    headerField: $protocolKey('x-vona-instance-name'),
     instances: {},
   };
 
@@ -184,7 +190,9 @@ export default async function (app: VonaApplication) {
         transport: {
           service: (env.MAIL_SYSTEM_TRANSPORT_SERVICE as TypeMailTransportService) || undefined,
           host: env.MAIL_SYSTEM_TRANSPORT_HOST || undefined,
-          port: env.MAIL_SYSTEM_TRANSPORT_PORT ? Number.parseInt(env.MAIL_SYSTEM_TRANSPORT_PORT) : undefined,
+          port: env.MAIL_SYSTEM_TRANSPORT_PORT
+            ? Number.parseInt(env.MAIL_SYSTEM_TRANSPORT_PORT)
+            : undefined,
           secure: env.MAIL_SYSTEM_TRANSPORT_SECURE === 'true',
           auth: {
             user: env.MAIL_SYSTEM_TRANSPORT_AUTH_USER || undefined,

package/cli/templates/create/project/cabloy-basic/boilerplate/src/backend/config/locales.ts

@@ -2,8 +2,14 @@ import type { TypeLocaleBase, VonaLocaleOptionalMap } from 'vona';
 
 import { $makeLocaleMagic } from 'vona';
 
-import { localeDefault as localeDefault_en_us, localeModules as localeModules_en_us } from './locale/en-us.ts';
-import { localeDefault as localeDefault_zh_cn, localeModules as localeModules_zh_cn } from './locale/zh-cn.ts';
+import {
+  localeDefault as localeDefault_en_us,
+  localeModules as localeModules_en_us,
+} from './locale/en-us.ts';
+import {
+  localeDefault as localeDefault_zh_cn,
+  localeModules as localeModules_zh_cn,
+} from './locale/zh-cn.ts';
 
 export const localesDefault = {
   'en-us': localeDefault_en_us,
@@ -15,6 +21,9 @@ export const localesModules: VonaLocaleOptionalMap = {
   'zh-cn': localeModules_zh_cn,
 };
 
-export function $localeDefault<K extends keyof (typeof localesDefault)[TypeLocaleBase]>(key: K, ...args: any[]): any {
+export function $localeDefault<K extends keyof (typeof localesDefault)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
   return $makeLocaleMagic(`::${key}`, ...args);
 }

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/modules/home-base/package.json

@@ -1,6 +1,7 @@
 {
   "name": "vona-module-home-base",
-  "version": "5.1.4",
+  "version": "5.1.5",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -47,6 +48,5 @@
     "dependencies": {
       "a-vona": "5.0.0"
     }
-  },
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d"
+  }
 }

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/modules/home-base/src/controller/permission.ts

@@ -13,7 +13,9 @@ export interface IControllerOptionsPermission extends IDecoratorControllerOption
 export class ControllerPermission extends BeanBase {
   @Web.get(':resource')
   @Api.body(v.object(DtoPermissions))
-  async retrievePermissions(@Arg.param('resource', z.string()) resource: keyof IResourceRecord): Promise<IOpenapiPermissions> {
+  async retrievePermissions(
+    @Arg.param('resource', z.string()) resource: keyof IResourceRecord,
+  ): Promise<IOpenapiPermissions> {
     return await this.scope.service.permission.retrievePermissions(resource);
   }
 }

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

@@ -10,7 +10,10 @@ export class Main extends BeanSimple implements IModuleMain {
       'en-us': en,
       'zh-cn': zhCN,
     };
-    this.app.util.setLocaleErrors(localeErrors, this.app.scope('a-locale').config.locale.defaultLocale);
+    this.app.util.setLocaleErrors(
+      localeErrors,
+      this.app.scope('a-locale').config.locale.defaultLocale,
+    );
   }
 
   async configLoaded(_config: any) {}

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/modules/home-base/src/service/menu.ts

@@ -13,7 +13,9 @@ export class ServiceMenu extends BeanBase {
 
   private _getMenusDefault(): IMenus {
     return {
-      menus: [{ name: 'home', title: this.$scope.homeIndex.locale.Home(), icon: '::home', link: '/' }],
+      menus: [
+        { name: 'home', title: this.$scope.homeIndex.locale.Home(), icon: '::home', link: '/' },
+      ],
     };
   }
 }

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

@@ -1,6 +1,7 @@
 {
   "name": "vona-module-home-index",
-  "version": "5.1.4",
+  "version": "5.1.5",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -47,6 +48,5 @@
     "dependencies": {
       "a-vona": "5.0.0"
     }
-  },
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d"
+  }
 }

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

@@ -1,5 +1,7 @@
 import type { TypeLocaleBase } from 'vona';
+
 import { $makeLocaleMagic } from 'vona';
+
 import locale_en_us from '../config/locale/en-us.ts';
 import locale_zh_cn from '../config/locale/zh-cn.ts';
 
@@ -8,6 +10,9 @@ export const locales = {
   'zh-cn': locale_zh_cn,
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): any {
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
   return $makeLocaleMagic(`home-index::${key}`, ...args);
 }

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

@@ -1,6 +1,7 @@
 {
   "name": "vona-module-home-user",
-  "version": "5.1.4",
+  "version": "5.1.6",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -48,6 +49,5 @@
     "dependencies": {
       "a-vona": "5.0.0"
     }
-  },
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d"
+  }
 }

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

@@ -1,5 +1,7 @@
 import type { TypeLocaleBase } from 'vona';
+
 import { $makeLocaleMagic } from 'vona';
+
 import locale_en_us from '../config/locale/en-us.ts';
 import locale_zh_cn from '../config/locale/zh-cn.ts';
 
@@ -8,6 +10,9 @@ export const locales = {
   'zh-cn': locale_zh_cn,
 };
 
-export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): any {
+export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
+  key: K,
+  ...args: any[]
+): any {
   return $makeLocaleMagic(`home-user::${key}`, ...args);
 }

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

@@ -8,8 +8,14 @@ type TypeEventData = TypeEventActivateData;
 type TypeEventResult = TypeEventActivateResult;
 
 @EventListener({ match: 'a-user:activate' })
-export class EventListenerActivate extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
-  async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<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' && !this.scope.config.disableRoleAdmin) {
       // role: admin

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

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

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

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

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

@@ -8,8 +8,14 @@ type TypeEventData = TypeEventRegisterData;
 type TypeEventResult = TypeEventRegisterResult;
 
 @EventListener({ match: 'a-user:register' })
-export class EventListenerRegister extends BeanBase implements IEventExecute<TypeEventData, TypeEventResult> {
-  async execute(data: TypeEventData, next: NextEvent<TypeEventData, TypeEventResult>): Promise<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;
     // mail: activate

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

@@ -1,4 +1,9 @@
-import type { IMetaVersionInit, IMetaVersionInitOptions, IMetaVersionUpdate, IMetaVersionUpdateOptions } from 'vona-module-a-version';
+import type {
+  IMetaVersionInit,
+  IMetaVersionInitOptions,
+  IMetaVersionUpdate,
+  IMetaVersionUpdateOptions,
+} from 'vona-module-a-version';
 
 import { BeanBase } from 'vona';
 import { Meta } from 'vona-module-a-meta';
@@ -23,7 +28,10 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate, IMetaVe
         table.string(entityUser.avatar, 255).comment(entityUser.$comment.avatar);
         table.string(entityUser.email, 255).comment(entityUser.$comment.email);
         table.string(entityUser.mobile, 255).comment(entityUser.$comment.mobile);
-        table.boolean(entityUser.activated).defaultTo(entityUser.$default.activated).comment(entityUser.$comment.activated);
+        table
+          .boolean(entityUser.activated)
+          .defaultTo(entityUser.$default.activated)
+          .comment(entityUser.$comment.activated);
         table.string(entityUser.locale, 255).comment(entityUser.$comment.locale);
         table.string(entityUser.tz, 255).comment(entityUser.$comment.tz);
       });

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

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -8,8 +12,15 @@ export type TypeZodRefineEmailUniqueData = string;
 export interface IZodRefineOptionsEmailUnique extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsEmailUnique>()
-export class ZodRefineEmailUnique extends BeanBase implements IZodRefineExecute<TypeZodRefineEmailUniqueData> {
-  async execute(value: TypeZodRefineEmailUniqueData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsEmailUnique) {
+export class ZodRefineEmailUnique
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefineEmailUniqueData>
+{
+  async execute(
+    value: TypeZodRefineEmailUniqueData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsEmailUnique,
+  ) {
     const user = await this.scope.model.user.getByEmailEqI(value);
     if (user) {
       refinementCtx.addIssue({

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

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -11,8 +15,15 @@ export interface TypeZodRefinePasswordConfirmData {
 export interface IZodRefineOptionsPasswordConfirm extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsPasswordConfirm>()
-export class ZodRefinePasswordConfirm extends BeanBase implements IZodRefineExecute<TypeZodRefinePasswordConfirmData> {
-  async execute(value: TypeZodRefinePasswordConfirmData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsPasswordConfirm) {
+export class ZodRefinePasswordConfirm
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefinePasswordConfirmData>
+{
+  async execute(
+    value: TypeZodRefinePasswordConfirmData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsPasswordConfirm,
+  ) {
     if (value.password !== value.passwordConfirm) {
       refinementCtx.addIssue({
         code: 'custom',

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

@@ -1,4 +1,8 @@
-import type { IDecoratorZodRefineOptions, IZodRefineExecute, TypeRefinementCtx } from 'vona-module-a-zod';
+import type {
+  IDecoratorZodRefineOptions,
+  IZodRefineExecute,
+  TypeRefinementCtx,
+} from 'vona-module-a-zod';
 
 import { BeanBase } from 'vona';
 import { ZodRefine } from 'vona-module-a-zod';
@@ -8,8 +12,15 @@ export type TypeZodRefineUsernameUniqueData = string;
 export interface IZodRefineOptionsUsernameUnique extends IDecoratorZodRefineOptions {}
 
 @ZodRefine<IZodRefineOptionsUsernameUnique>()
-export class ZodRefineUsernameUnique extends BeanBase implements IZodRefineExecute<TypeZodRefineUsernameUniqueData> {
-  async execute(value: TypeZodRefineUsernameUniqueData, refinementCtx: TypeRefinementCtx, _options: IZodRefineOptionsUsernameUnique) {
+export class ZodRefineUsernameUnique
+  extends BeanBase
+  implements IZodRefineExecute<TypeZodRefineUsernameUniqueData>
+{
+  async execute(
+    value: TypeZodRefineUsernameUniqueData,
+    refinementCtx: TypeRefinementCtx,
+    _options: IZodRefineOptionsUsernameUnique,
+  ) {
     const user = await this.bean.user.findOneByName(value);
     if (user) {
       refinementCtx.addIssue({

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

@@ -57,7 +57,9 @@ export class ControllerPassport extends BeanBase {
   async loginOauth<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ) {
     // only support oauth, so not return jwt to client
@@ -72,7 +74,9 @@ export class ControllerPassport extends BeanBase {
   async associate<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ): Promise<DtoPassportJwt> {
     const jwt = await this.bean.auth.authenticate(`${module}:${providerName}` as T, {
@@ -87,7 +91,9 @@ export class ControllerPassport extends BeanBase {
   async migrate<T extends keyof IAuthProviderRecord>(
     @Arg.param('module') module: string,
     @Arg.param('providerName') providerName: string,
-    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<IAuthProviderRecord[T]>['clientName'],
+    @Arg.param('clientName', z.string().optional()) clientName?: IAuthenticateOptions<
+      IAuthProviderRecord[T]
+    >['clientName'],
     @Arg.query('redirect', v.optional()) redirect?: string,
   ): Promise<DtoPassportJwt> {
     const jwt = await this.bean.auth.authenticate(`${module}:${providerName}` as T, {

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

@@ -3,6 +3,7 @@ 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';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 export interface IDtoOptionsLogin extends IDecoratorDtoOptions {}
 
@@ -14,6 +15,10 @@ export class DtoLogin {
   @Api.field(v.required(), v.min(6))
   password: string;
 
-  @Api.field(v.required(), v.rest({ iconPrefix: ':editor:code-block' }), v.component('captcha'))
+  @Api.field(
+    v.required(),
+    ZovaRender.layout({ iconPrefix: ':editor:code-block' }),
+    ZovaRender.field('basic-captcha:formFieldCaptcha'),
+  )
   captcha: DtoCaptchaVerify;
 }

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

@@ -3,17 +3,18 @@ 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';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 export interface IDtoOptionsRegister extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsRegister>({
-  pipes: v.refine('home-user:passwordConfirm'),
+  pipes: v.zodRefine('home-user:passwordConfirm'),
 })
 export class DtoRegister {
-  @Api.field(v.refine('home-user:usernameUnique'), v.min(3), v.trim())
+  @Api.field(v.zodRefine('home-user:usernameUnique'), v.min(3), v.trim())
   username: string;
 
-  @Api.field(v.refine('home-user:emailUnique'), v.email(), v.trim())
+  @Api.field(v.zodRefine('home-user:emailUnique'), v.email(), v.trim())
   email: string;
 
   @Api.field(v.min(6), v.max(20))
@@ -22,6 +23,6 @@ export class DtoRegister {
   @Api.field(v.min(6), v.max(20))
   passwordConfirm: string;
 
-  @Api.field(v.component('captcha'))
+  @Api.field(ZovaRender.field('basic-captcha:formFieldCaptcha'))
   captcha: DtoCaptchaVerify;
 }

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/a-home/package.json

@@ -1,6 +1,7 @@
 {
   "name": "vona-suite-a-home",
-  "version": "5.1.4",
+  "version": "5.1.6",
+  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "zhennann",
   "files": [],
@@ -13,6 +14,5 @@
     "vona-module-home-index": "workspace:^",
     "vona-module-home-user": "workspace:^"
   },
-  "title": "a-home",
-  "gitHead": "a79189b882c17af5911573896a781bbb0046d37d"
+  "title": "a-home"
 }

package/cli/templates/create/project/cabloy-basic/boilerplate/src/suite/cabloy-basic/modules/basic-siteadmin/assets/site/ssr-cabloyBasicAdmin-5.0.0/client/assets/{a-api-Bs5aJ34_.js → a-api-CdExh-XW.js}

@@ -1 +1 @@
-import{n as a}from"./rolldown-runtime-DSSfW_98.js";import{m as e,p as o}from"./fecha-Dq97t_u9.js";import{F as s,O as t,S as i,U as n,h as r,j as p,k as l,q as u}from"./zova-nU8xy_z7.js";import{t as d}from"./zova-p980XH-V.js";import{m as c,o as f,t as m}from"./a-bean-C05pmgBU.js";var h,A,v,_,y,b,g,S,M,j,P,$,x=a(()=>{d(),m(),h=c(),A=i(),v=l({module:"a-api"}),y=h(_=A(_=v(_=class BeanApiBase extends p{$pathTranslate(a,e){return this.sys.util.apiActionPathTranslate(a,e)}$configPrepare(a,e,o){return this.sys.util.apiActionConfigPrepare(a,e,o)}$formData(a){const e=new FormData;for(const o in a){const s=a[o];if(Array.isArray(s))for(const a of s)e.append(o,a);else e.append(o,s)}return e}})||_)||_)||_}),B=a(()=>{b=a=>({defaultModuleApi:"home-api"})}),k=a(()=>{z(),g="a-api"}),w=a(()=>{d(),k(),e(),S=class extends n{constructor(a){super(),this._moduleSelf=void 0,this._defaultModuleApi=void 0,this._moduleSelf=a}moduleLoading(a){return o(function*(){})()}moduleLoaded(a){var e=this;return o(function*(){const o=[];o.push(e._loadApis(a,"api")),o.push(e._loadApis(a,"apiSchema")),yield Promise.all(o),e._moduleSelf===a&&(e._defaultModuleApi=(yield e.bean.getScope(g)).config.defaultModuleApi,yield e.app.meta.module.use(e._defaultModuleApi))})()}beanInit(a,e){var s=this;return o(function*(){const o=s;for(const s of["api","apiSchema"])a.defineProperty(e,`$${s}`,{enumerable:!1,configurable:!0,get:()=>u(o.app.bean.scope(o._defaultModuleApi))[s]})})()}_loadApis(a,e){var t=this;return o(function*(){var o;const i=null===(o=s.scenes[e])||void 0===o?void 0:o[a.info.relativeName];if(!i)return;const n=t.bean.scope(a.info.relativeName),r=Object.keys(i),p=[];for(const a of r)p.push(t.bean._getBean(a,!0));const l=yield Promise.all(p);for(let a=0;a<r.length;a++){const o=i[r[a]];n[e][o.name]=l[a]}})()}}}),z=a(()=>{d(),x(),B(),w(),m(),M=f(),j=l({module:"a-api"}),$=M(P=j(P=class ScopeModuleAApi extends r{})||P)||P});function D(){return t("api","app")}function F(){return t("apiMeta","app")}function L(){return t("apiSchema","app")}var N=a(()=>{d()}),O=a(()=>{N()}),T=a(()=>{}),q=a(()=>{d()}),C=a(()=>{d()}),I=a(()=>{T(),q(),C()}),U=a(()=>{z(),O(),I()});export{$ as a,y as c,L as i,D as n,S as o,F as r,b as s,U as t};
+import{n as a}from"./rolldown-runtime-DSSfW_98.js";import{m as e,p as o}from"./fecha-BQnQQpNY.js";import{F as s,K as t,O as i,S as n,U as r,j as p,k as l,m as u}from"./zova-Dxk4Lwim.js";import{t as d}from"./zova-BLZKBFDw.js";import{m as c,o as f,t as m}from"./a-bean-in5SzpIT.js";var h,A,v,_,y,b,g,S,M,j,P,$,x=a(()=>{d(),m(),h=c(),A=n(),v=l({module:"a-api"}),y=h(_=A(_=v(_=class BeanApiBase extends p{$pathTranslate(a,e){return this.sys.util.apiActionPathTranslate(a,e)}$configPrepare(a,e,o){return this.sys.util.apiActionConfigPrepare(a,e,o)}$formData(a){const e=new FormData;for(const o in a){const s=a[o];if(Array.isArray(s))for(const a of s)e.append(o,a);else e.append(o,s)}return e}})||_)||_)||_}),B=a(()=>{b=a=>({defaultModuleApi:"home-api"})}),k=a(()=>{z(),g="a-api"}),w=a(()=>{d(),k(),e(),S=class extends r{constructor(a){super(),this._moduleSelf=void 0,this._defaultModuleApi=void 0,this._moduleSelf=a}moduleLoading(a){return o(function*(){})()}moduleLoaded(a){var e=this;return o(function*(){const o=[];o.push(e._loadApis(a,"api")),o.push(e._loadApis(a,"apiSchema")),yield Promise.all(o),e._moduleSelf===a&&(e._defaultModuleApi=(yield e.bean.getScope(g)).config.defaultModuleApi,yield e.app.meta.module.use(e._defaultModuleApi))})()}beanInit(a,e){var s=this;return o(function*(){const o=s;for(const s of["api","apiSchema"])a.defineProperty(e,`$${s}`,{enumerable:!1,configurable:!0,get:()=>t(o.app.bean.scope(o._defaultModuleApi))[s]})})()}_loadApis(a,e){var t=this;return o(function*(){var o;const i=null===(o=s.scenes[e])||void 0===o?void 0:o[a.info.relativeName];if(!i)return;const n=t.bean.scope(a.info.relativeName),r=Object.keys(i),p=[];for(const a of r)p.push(t.bean._getBean(a,!0));const l=yield Promise.all(p);for(let a=0;a<r.length;a++){const o=i[r[a]];n[e][o.name]=l[a]}})()}}}),z=a(()=>{d(),x(),B(),w(),m(),M=f(),j=l({module:"a-api"}),$=M(P=j(P=class ScopeModuleAApi extends u{})||P)||P});function D(){return i("api","app")}function F(){return i("apiMeta","app")}function L(){return i("apiSchema","app")}var N=a(()=>{d()}),O=a(()=>{N()}),T=a(()=>{}),C=a(()=>{d()}),I=a(()=>{d()}),K=a(()=>{T(),C(),I()}),U=a(()=>{z(),O(),K()});export{$ as a,y as c,L as i,D as n,S as o,F as r,b as s,U as t};