cabloy 5.1.111 → 5.1.112

package/vona/src/suite-vendor/a-vona/modules/a-jwt/src/.metadata/index.ts

@@ -19,7 +19,7 @@ declare module 'vona-module-a-jwt' {
 /** bean: end */
 /** bean: begin */
 import type { BeanJwt } from '../bean/bean.jwt.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'jwt': BeanJwt;

package/vona/src/suite-vendor/a-vona/modules/a-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-logger",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-logger/src/.metadata/index.ts

@@ -69,7 +69,7 @@ declare module 'vona-module-a-logger' {
 /** bean: end */
 /** bean: begin */
 import type { BeanLogger } from '../bean/bean.logger.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'logger': BeanLogger;

package/vona/src/suite-vendor/a-vona/modules/a-mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-mail",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-mail/src/.metadata/index.ts

@@ -90,6 +90,8 @@ declare module 'vona-module-a-mail' {
       [SymbolKeyEntityMeta]: EntityMailMeta;
       [SymbolKeyModelOptions]: IModelOptionsMail;
       get<T extends IModelGetOptions<EntityMail,ModelMail>>(where: TypeModelWhere<EntityMail>, options?: T): Promise<TypeModelRelationResult<EntityMail, ModelMail, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<EntityMail,ModelMail>>(where: TypeModelWhere<EntityMail>, options?: T): Promise<TypeModelRelationResult<EntityMail, ModelMail, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<EntityMail,ModelMail>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityMail, ModelMail, T> | undefined>;
       mget<T extends IModelGetOptions<EntityMail,ModelMail>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityMail, ModelMail, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityMail,ModelMail,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityMail, ModelMail, T>>;
       select<T extends IModelSelectParams<EntityMail,ModelMail,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityMail, ModelMail, T>[]>;
@@ -135,7 +137,7 @@ declare module 'vona-module-a-mail' {
 /** bean: end */
 /** bean: begin */
 import type { BeanMail } from '../bean/bean.mail.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'mail': BeanMail;

package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-mailconfirm",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-mailconfirm/src/.metadata/index.ts

@@ -18,7 +18,7 @@ declare module 'vona-module-a-mailconfirm' {
 /** bean: end */
 /** bean: begin */
 import type { BeanMailConfirm } from '../bean/bean.mailConfirm.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'mailConfirm': BeanMailConfirm;

package/vona/src/suite-vendor/a-vona/modules/a-onion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-onion",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-onion/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-onion' {
 /** bean: end */
 /** bean: begin */
 import type { BeanOnion } from '../bean/bean.onion.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'onion': BeanOnion;

package/vona/src/suite-vendor/a-vona/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-openapi",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-openapi/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-openapi' {
 /** bean: end */
 /** bean: begin */
 import type { BeanOpenapi } from '../bean/bean.openapi.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'openapi': BeanOpenapi;

package/vona/src/suite-vendor/a-vona/modules/a-orm/cli/model/metadata/generate.ts

@@ -32,6 +32,8 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
       [SymbolKeyEntityMeta]: ${entityMetaName};
       [SymbolKeyModelOptions]: ${opionsName};
       get<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<${entityName},${className}>>(where: TypeModelWhere<${entityName}>, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<${entityName},${className}>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T> | undefined>;
       mget<T extends IModelGetOptions<${entityName},${className}>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
       selectAndCount<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<${entityName}, ${className}, T>>;
       select<T extends IModelSelectParams<${entityName},${className},ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<${entityName}, ${className}, T>[]>;
@@ -245,18 +247,10 @@ function __parseRelation_options(node: t.Node) {
     aggrs = options?.aggrs;
   }
   // columns
-  if (!options?.columns) {
-    if (options?.groups) {
-      columns = 'undefined';
-    } else {
-      columns = 'undefined'; // '\'*\'';
-    }
+  if (!options?.columns || options.columns.includes('*')) {
+    columns = "'*'";
   } else {
-    if (options?.columns.includes('*')) {
-      columns = "'*'";
-    } else {
-      columns = __joinColumnsType(options?.columns, false);
-    }
+    columns = __joinColumnsType(options.columns, false);
   }
   return { autoload, columns, groups, aggrs };
 }

package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.24",
+  "version": "5.1.25",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/bean.model/bean.model_cache.ts

@@ -465,6 +465,58 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
     return item;
   }
 
+  async getForUpdate<T extends IModelGetOptions<TRecord>>(
+    where: TypeModelWhere<TRecord>,
+    options?: T,
+  ): Promise<any | undefined> {
+    if (!this.db.inTransaction) {
+      throw new Error('model error: getForUpdate requires an active transaction');
+    }
+    const optionsLock = Object.assign({}, options, {
+      disableCacheEntity: true,
+      disableCacheQuery: true,
+    });
+    const relations = this.relations.handleRelationsCollection(optionsLock);
+    const [options2, refKeys] = this.relations.prepareColumnsByRelations(relations, optionsLock);
+    let item = await this.__getForUpdate_raw(undefined, where, options2);
+    if (!item) return item;
+    item = await this.relations.handleRelationsOne(
+      relations,
+      item,
+      optionsLock as any,
+      optionsLock,
+    );
+    if (refKeys) {
+      for (const refKey of refKeys) {
+        delete item![refKey];
+      }
+    }
+    return item;
+  }
+
+  async getByIdForUpdate<T extends IModelGetOptions<TRecord>>(
+    id: TableIdentity,
+    options?: T,
+  ): Promise<any | undefined> {
+    return await this.getForUpdate({ id } as TypeModelWhere<TRecord>, options);
+  }
+
+  private async __getForUpdate_raw(
+    table: keyof ITableRecord | undefined,
+    where: TypeModelWhere<TRecord>,
+    options?: IModelGetOptions<TRecord>,
+  ): Promise<TRecord | undefined> {
+    table = table || this.getTable(where);
+    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    const params: IModelSelectParams<TRecord> = { where, limit: 1 };
+    if (options?.columns) {
+      params.columns = options.columns as any;
+    }
+    const builder = this._select_buildParams(table, params as any, options).forUpdate();
+    const items = await super._select(table, params, options, builder);
+    return items[0];
+  }
+
   private async __get_raw(
     table: keyof ITableRecord | undefined,
     where: TypeModelWhere<TRecord>,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/lib/dto/dtoGet.ts

@@ -38,18 +38,12 @@ export function DtoGet<
     : ModelLike,
   params?: T,
 ): Constructable<TypeDtoGetResult<ModelLike, T>> {
-  return _DtoGet_raw(modelLike, params);
+  return _DtoGet_raw(modelLike as any, params as any) as Constructable<
+    TypeDtoGetResult<ModelLike, T>
+  >;
 }
 
-function _DtoGet_raw<
-  ModelLike extends BeanModelMeta | keyof IModelClassRecord,
-  T extends IDtoGetParams<ModelLike> | undefined = undefined,
->(
-  modelLike: ModelLike extends BeanModelMeta
-    ? (() => Constructable<ModelLike>) | Constructable<ModelLike>
-    : ModelLike,
-  params?: T,
-): Constructable<TypeDtoGetResult<ModelLike, T>> {
+function _DtoGet_raw(modelLike: any, params?: any): Constructable<any> {
   // model
   const modelClass = prepareClassModel(modelLike);
   // entity

package/vona/src/suite-vendor/a-vona/modules/a-redis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-redis",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-redis/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-redis' {
 /** bean: end */
 /** bean: begin */
 import type { BeanRedis } from '../bean/bean.redis.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'redis': BeanRedis;

package/vona/src/suite-vendor/a-vona/modules/a-security/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-security",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-security/src/.metadata/index.ts

@@ -57,7 +57,7 @@ declare module 'vona-module-a-security' {
 /** bean: end */
 /** bean: begin */
 import type { BeanSecurity } from '../bean/bean.security.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'security': BeanSecurity;

package/vona/src/suite-vendor/a-vona/modules/a-serialization/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-serialization",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-serialization/src/.metadata/index.ts

@@ -43,7 +43,7 @@ declare module 'vona-module-a-serialization' {
 /** bean: end */
 /** bean: begin */
 import type { BeanSerializer } from '../bean/bean.serializer.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'serializer': BeanSerializer;

package/vona/src/suite-vendor/a-vona/modules/a-summer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-summer",
-  "version": "5.1.13",
+  "version": "5.1.14",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Layered Cache",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-summer/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-summer' {
 /** bean: end */
 /** bean: begin */
 import type { BeanSummer } from '../bean/bean.summer.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'summer': BeanSummer;

package/vona/src/suite-vendor/a-vona/modules/a-user/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-user",
-  "version": "5.1.20",
+  "version": "5.1.21",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-user/src/.metadata/index.ts

@@ -39,8 +39,7 @@ declare module 'vona-module-a-user' {
             get $beanFullName(): 'a-user.guard.roleName';
             get $onionName(): 'a-user:roleName';
             get $onionOptions(): IGuardOptionsRoleName;
-          }
-
+          } 
 }
 /** guard: end */
 /** bean: begin */
@@ -75,12 +74,12 @@ declare module 'vona-module-a-user' {
 import type { BeanPassport } from '../bean/bean.passport.ts';
 import type { BeanRole } from '../bean/bean.role.ts';
 import type { BeanUser } from '../bean/bean.user.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'passport': BeanPassport;
-'role': BeanRole;
-'user': BeanUser;
+    'role': BeanRole;
+    'user': BeanUser;
   }
 }
 /** bean: end */

package/vona/src/suite-vendor/a-vona/modules/a-validation/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-validation",
-  "version": "5.1.11",
+  "version": "5.1.12",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-validation/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-validation' {
 /** bean: end */
 /** bean: begin */
 import type { BeanValidator } from '../bean/bean.validator.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'validator': BeanValidator;

package/vona/src/suite-vendor/a-vona/modules/a-version/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-version",
-  "version": "5.1.13",
+  "version": "5.1.14",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona-module-a-version",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-version/src/.metadata/index.ts

@@ -148,6 +148,8 @@ declare module 'vona-module-a-version' {
       [SymbolKeyEntityMeta]: EntityVersionMeta;
       [SymbolKeyModelOptions]: IModelOptionsVersion;
       get<T extends IModelGetOptions<EntityVersion,ModelVersion>>(where: TypeModelWhere<EntityVersion>, options?: T): Promise<TypeModelRelationResult<EntityVersion, ModelVersion, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<EntityVersion,ModelVersion>>(where: TypeModelWhere<EntityVersion>, options?: T): Promise<TypeModelRelationResult<EntityVersion, ModelVersion, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<EntityVersion,ModelVersion>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityVersion, ModelVersion, T> | undefined>;
       mget<T extends IModelGetOptions<EntityVersion,ModelVersion>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityVersion, ModelVersion, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityVersion,ModelVersion,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityVersion, ModelVersion, T>>;
       select<T extends IModelSelectParams<EntityVersion,ModelVersion,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityVersion, ModelVersion, T>[]>;
@@ -173,6 +175,8 @@ export interface ModelVersionInit {
       [SymbolKeyEntityMeta]: EntityVersionInitMeta;
       [SymbolKeyModelOptions]: IModelOptionsVersionInit;
       get<T extends IModelGetOptions<EntityVersionInit,ModelVersionInit>>(where: TypeModelWhere<EntityVersionInit>, options?: T): Promise<TypeModelRelationResult<EntityVersionInit, ModelVersionInit, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<EntityVersionInit,ModelVersionInit>>(where: TypeModelWhere<EntityVersionInit>, options?: T): Promise<TypeModelRelationResult<EntityVersionInit, ModelVersionInit, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<EntityVersionInit,ModelVersionInit>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityVersionInit, ModelVersionInit, T> | undefined>;
       mget<T extends IModelGetOptions<EntityVersionInit,ModelVersionInit>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityVersionInit, ModelVersionInit, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityVersionInit,ModelVersionInit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityVersionInit, ModelVersionInit, T>>;
       select<T extends IModelSelectParams<EntityVersionInit,ModelVersionInit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityVersionInit, ModelVersionInit, T>[]>;
@@ -198,6 +202,8 @@ export interface ModelViewRecord {
       [SymbolKeyEntityMeta]: EntityViewRecordMeta;
       [SymbolKeyModelOptions]: IModelOptionsViewRecord;
       get<T extends IModelGetOptions<EntityViewRecord,ModelViewRecord>>(where: TypeModelWhere<EntityViewRecord>, options?: T): Promise<TypeModelRelationResult<EntityViewRecord, ModelViewRecord, T> | undefined>;
+      getForUpdate<T extends IModelGetOptions<EntityViewRecord,ModelViewRecord>>(where: TypeModelWhere<EntityViewRecord>, options?: T): Promise<TypeModelRelationResult<EntityViewRecord, ModelViewRecord, T> | undefined>;
+      getByIdForUpdate<T extends IModelGetOptions<EntityViewRecord,ModelViewRecord>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityViewRecord, ModelViewRecord, T> | undefined>;
       mget<T extends IModelGetOptions<EntityViewRecord,ModelViewRecord>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityViewRecord, ModelViewRecord, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityViewRecord,ModelViewRecord,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityViewRecord, ModelViewRecord, T>>;
       select<T extends IModelSelectParams<EntityViewRecord,ModelViewRecord,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelRelationResult<EntityViewRecord, ModelViewRecord, T>[]>;

package/vona/src/suite-vendor/a-vona/modules/a-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-web",
-  "version": "5.1.19",
+  "version": "5.1.20",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-web/src/.metadata/index.ts

@@ -57,7 +57,7 @@ declare module 'vona-module-a-web' {
 /** bean: end */
 /** bean: begin */
 import type { BeanRouter } from '../bean/bean.router.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'router': BeanRouter;

package/vona/src/suite-vendor/a-vona/modules/a-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-worker",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-worker/src/.metadata/index.ts

@@ -17,7 +17,7 @@ declare module 'vona-module-a-worker' {
 /** bean: end */
 /** bean: begin */
 import type { BeanWorker } from '../bean/bean.worker.ts';
-import 'vona';  
+import 'vona';
 declare module 'vona' {
   export interface IBeanRecordGlobal {
     'worker': BeanWorker;

package/vona/src/suite-vendor/a-vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.69",
+  "version": "5.1.70",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/zova/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli",
-  "version": "1.2.98",
+  "version": "1.2.99",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli",
   "keywords": [
@@ -44,7 +44,7 @@
     "@cabloy/process-helper": "^3.1.8",
     "fs-extra": "^11.3.5",
     "semver": "^7.6.2",
-    "zova-cli-set-front": "^1.2.96"
+    "zova-cli-set-front": "^1.2.97"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-cli/cli-set-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-cli-set-front",
-  "version": "1.2.96",
+  "version": "1.2.97",
   "gitHead": "6f675a8cc46d596142c591c28a40cc4d82fcc6cc",
   "description": "zova cli-set-front",
   "keywords": [

package/zova/packages-cli/cli-set-front/src/lib/bean/toolsMetadata/generateScope.ts

@@ -87,7 +87,7 @@ ${
   return \`${moduleName}::\${key}\`;
 }`
     : ''
-}  
+}
 /** scope: end */
 `;
   return content;

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.138",
+  "version": "5.1.139",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "zova-core": "^5.1.78",
-    "zova-suite-a-zova": "^5.1.137"
+    "zova-suite-a-zova": "^5.1.138"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/pnpm-lock.yaml

@@ -76,8 +76,8 @@ importers:
         specifier: ^10.4.27
         version: 10.5.2(postcss@8.5.15)
       axios:
-        specifier: ^1.16.1
-        version: 1.18.1(supports-color@10.2.2)
+        specifier: ^1.18.1
+        version: 1.18.1
       compression:
         specifier: ^1.8.1
         version: 1.8.1
@@ -1104,8 +1104,8 @@ importers:
   src/suite-vendor/a-zova/modules/a-fetch:
     dependencies:
       axios:
-        specifier: ^1.16.1
-        version: 1.18.1(supports-color@10.2.2)
+        specifier: ^1.18.1
+        version: 1.18.1
     devDependencies:
       clean-package:
         specifier: ^2.2.0
@@ -10420,7 +10420,7 @@ snapshots:
 
   acorn@8.17.0: {}
 
-  agent-base@6.0.2(supports-color@10.2.2):
+  agent-base@6.0.2:
     dependencies:
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
@@ -10532,11 +10532,11 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axios@1.18.1(supports-color@10.2.2):
+  axios@1.18.1:
     dependencies:
       follow-redirects: 1.16.0
       form-data: 4.0.6
-      https-proxy-agent: 5.0.1(supports-color@10.2.2)
+      https-proxy-agent: 5.0.1
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
       - debug
@@ -11958,9 +11958,9 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  https-proxy-agent@5.0.1(supports-color@10.2.2):
+  https-proxy-agent@5.0.1:
     dependencies:
-      agent-base: 6.0.2(supports-color@10.2.2)
+      agent-base: 6.0.2
       debug: 4.4.3(supports-color@10.2.2)
     transitivePeerDependencies:
       - supports-color

package/zova/src/front/config/config/config.cabloyCommerce.ts

@@ -8,7 +8,11 @@ export default function (_sys: ZovaSys) {
       '/home/indexadmin/dashboard': undefined,
     },
     name: {
-      'home-indexweb:home': { alias: '/:locale(zh-cn)?' },
+      'commerce-catalog:catalogue': { alias: '/:locale(zh-cn)?' },
+      'commerce-catalog:product': { alias: '/:locale(zh-cn)?/product/:id' },
+      'commerce-member:address': { alias: '/:locale(zh-cn)?/address' },
+      'commerce-trade:cart': { alias: '/:locale(zh-cn)?/cart' },
+      'home-indexweb:home': undefined,
     },
   };
 

package/zova/src/front/config/config/config.cabloyCommerceAdmin.ts

@@ -5,7 +5,8 @@ export default function (_sys: ZovaSys) {
 
   config.routes = {
     path: {
-      '/home/indexadmin/dashboard': { alias: '/' },
+      '/commerce/siteadmin/dashboard': { alias: '/' },
+      '/home/indexadmin/dashboard': undefined,
     },
   };
 

package/zova/src/suite/a-commerce/modules/commerce-catalog/cli/openapi.config.ts

@@ -0,0 +1,9 @@
+import type { ZovaOpenapiConfigModule } from 'zova-openapi';
+
+export default function (): ZovaOpenapiConfigModule {
+  return {
+    operations: {
+      match: [/^CommerceCatalogProduct_(selectPublic|viewPublic)$/],
+    },
+  };
+}

package/zova/src/suite/a-commerce/modules/commerce-catalog/package.json

@@ -11,7 +11,8 @@
     "dist",
     "src",
     "icons",
-    "assets"
+    "assets",
+    "cli"
   ],
   "type": "module",
   "exports": {