cabloy 5.1.49 → 5.1.51

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/database.ts

@@ -1,6 +1,5 @@
 import type { FunctionAny } from 'vona';
 
-import type { BeanModel } from '../bean/bean.model.ts';
 import type { ServiceDb } from '../service/db_.ts';
 import type { ConfigDatabase } from './config.ts';
 
@@ -28,10 +27,6 @@ export interface IDatabaseSwitchOptions {
 }
 
 declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    model: BeanModel;
-  }
-
   export interface VonaConfig {
     database: ConfigDatabase;
   }

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

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumns } from '../modelWhere.ts';
 import type { IModelClassRecord } from '../onion/model.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/dto/dtoMutate.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { OmitNever, TypeOmitStringUnion } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumnsStrict } from '../modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/dto/dtoSelectAndCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../onion/model.ts';
 import type { TypeDtoGetResult } from './dtoGet.ts';
 

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/model.ts

@@ -1,7 +1,7 @@
 import type { Knex } from 'knex';
 import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   TypeModelColumn,
   TypeModelColumns,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelAggr.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumns, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumn, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelGeneral.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
   IModelSelectParamsJoin,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelGroup.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/modelIncrement.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relations.ts

@@ -1,6 +1,6 @@
 import type { Constructable, OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { TypeDepthPrev, TypeDepthPrevMax } from './depth.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from './onion/model.ts';
 import type {

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsColumns.ts

@@ -1,6 +1,6 @@
 import type { TypeConfirmArray, TypeRecordValues } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeModelOfModelLike,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsDef.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { ServiceDb } from '../service/db_.ts';
 import type { IDatabaseClientRecord } from './database.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsDefDynamic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
   IModelSelectParamsJoin,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsDefMutate.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from './model.ts';
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
 

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsMutate.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeUtilGetModelOptions,

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/types/relationsTables.ts

@@ -1,6 +1,6 @@
 import type { TypeConfirmArray, TypeRecordValues } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeModelOfModelLike,

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ormdialect",
-  "version": "5.1.8",
+  "version": "5.1.9",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.betterSqlite3.ts

@@ -12,12 +12,12 @@ import type {
 import { ensureDir, remove } from 'fs-extra';
 import { globby } from 'globby';
 import path from 'node:path';
-import { BeanDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
+import { ServiceDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
 
 export interface IDatabaseDialectOptionsBetterSqlite3 extends IDecoratorDatabaseDialectOptions {}
 
 @DatabaseDialect<IDatabaseDialectOptionsBetterSqlite3>()
-export class DatabaseDialectBetterSqlite3 extends BeanDatabaseDialectBase {
+export class DatabaseDialectBetterSqlite3 extends ServiceDatabaseDialectBase {
   protected _capabilities: IDatabaseDialectCapabilities = {
     like: true,
     ilike: false,

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.mysql.ts

@@ -9,12 +9,12 @@ import type {
 } from 'vona-module-a-orm';
 
 import { promisify } from 'node:util';
-import { BeanDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
+import { ServiceDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
 
 export interface IDatabaseDialectOptionsMysql extends IDecoratorDatabaseDialectOptions {}
 
 @DatabaseDialect<IDatabaseDialectOptionsMysql>()
-export class DatabaseDialectMysql extends BeanDatabaseDialectBase {
+export class DatabaseDialectMysql extends ServiceDatabaseDialectBase {
   protected _capabilities: IDatabaseDialectCapabilities = {
     like: false,
     ilike: true,

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.pg.ts

@@ -8,12 +8,12 @@ import type {
   IFetchIndexesResultItem,
 } from 'vona-module-a-orm';
 
-import { BeanDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
+import { ServiceDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
 
 export interface IDatabaseDialectOptionsPg extends IDecoratorDatabaseDialectOptions {}
 
 @DatabaseDialect<IDatabaseDialectOptionsPg>()
-export class DatabaseDialectPg extends BeanDatabaseDialectBase {
+export class DatabaseDialectPg extends ServiceDatabaseDialectBase {
   protected _capabilities: IDatabaseDialectCapabilities = {
     like: true,
     ilike: true,

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/bean.permission.ts

@@ -4,87 +4,156 @@ import type {
   IOpenapiPermissions,
   IResourceRecord,
 } from 'vona-module-a-openapi';
-import type {
-  ContextRoute,
-  ContextRouteBase,
-  ContextRouteMetadata,
-  IRecordResourceNameToRoutePathItem,
-} from 'vona-module-a-web';
+import type { IGuardOptionsPassport, IGuardOptionsRoleName } from 'vona-module-a-user';
+import type { ContextRouteMetadata, IRecordResourceNameToRoutePathItem } from 'vona-module-a-web';
 
-import { catchError } from '@cabloy/utils';
 import { appMetadata, appResource, BeanBase, beanFullNameFromOnionName } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 import { Caching } from 'vona-module-a-caching';
 import { SymbolUseOnionOptionsRouteReal } from 'vona-module-a-onion';
-import { composeGuards, recordResourceNameToRoutePath } from 'vona-module-a-web';
+import { recordResourceNameToRoutePath } from 'vona-module-a-web';
+
+const BeanFullNameGuardPassport = beanFullNameFromOnionName('a-user:passport', 'guard');
+const BeanFullNameGuardRoleName = beanFullNameFromOnionName('a-user:roleName', 'guard');
+const BeanFullNameGuardUserName = beanFullNameFromOnionName('a-user:userName', 'guard');
+const BeanFullNamesGuardSupported = new Set<string>([
+  BeanFullNameGuardPassport,
+  BeanFullNameGuardRoleName,
+  BeanFullNameGuardUserName,
+]);
+const GuardOptionsPassportDefault: IGuardOptionsPassport = {
+  public: false,
+  activated: true,
+  checkAuthToken: true,
+};
+
+type TGuardMeta = Record<string, unknown>;
 
 @Bean()
 export class BeanPermission extends BeanBase {
-  public async clearAllCaches() {
-    const cacheOpenapiSchema = this.bean.summer.cache(
+  public async clearAllCaches(): Promise<void> {
+    const cachePermission = this.bean.summer.cache(
       beanFullNameFromOnionName('a-permission:permission', 'summerCache'),
     );
-    await cacheOpenapiSchema.clear();
+    await cachePermission.clear();
   }
 
-  protected retrievePermissionsCacheKey(info: ICachingActionKeyInfo) {
+  protected retrievePermissionsCacheKey(info: ICachingActionKeyInfo): string {
     const resource = info.args[0];
     const userId = this.ctx.passport.user?.id;
-    return `${resource}_${userId}`;
+    return `user:${resource}_${userId}`;
+  }
+
+  protected retrievePermissionsDefaultCacheKey(info: ICachingActionKeyInfo): string {
+    return `default:${this._buildPermissionProfileKey(info.args[0])}`;
   }
 
   @Caching.get({ cacheName: 'a-permission:permission', cacheKeyFn: 'retrievePermissionsCacheKey' })
   async retrievePermissions(resource: keyof IResourceRecord): Promise<IOpenapiPermissions> {
     return await this.scope.event.retrievePermissions.emit({ resource }, async () => {
-      return await this.getPermissionsDefault(resource);
+      return await this.retrievePermissionsDefault(resource);
     });
   }
 
+  @Caching.get({
+    cacheName: 'a-permission:permission',
+    cacheKeyFn: 'retrievePermissionsDefaultCacheKey',
+  })
+  protected async retrievePermissionsDefault(
+    resource: keyof IResourceRecord,
+  ): Promise<IOpenapiPermissions> {
+    return await this.getPermissionsDefault(resource);
+  }
+
   async getPermissionsDefault(resource: keyof IResourceRecord): Promise<IOpenapiPermissions> {
     const routePathInfo: IRecordResourceNameToRoutePathItem =
       recordResourceNameToRoutePath[resource];
     if (!routePathInfo) throw new Error(`not found routePath of resource: ${resource}`);
-    // controller options
     const controller = routePathInfo.controller;
-    // controller options
-    const beanOptions = appResource.getBean(controller);
-    if (!beanOptions) throw new Error('invalid controller');
-    const controllerBeanFullName = beanOptions.beanFullName;
-    // descs
+    if (!appResource.getBean(controller)) throw new Error('invalid controller');
     const descs = Object.getOwnPropertyDescriptors(controller.prototype);
     const actionsIgnore = this.scope.config.permission.actionsIgnore;
     const actionKeys = Object.keys(descs).filter(
-      actionKey => !['constructor'].includes(actionKey) && !actionsIgnore.includes(actionKey),
+      actionKey => actionKey !== 'constructor' && !actionsIgnore.includes(actionKey),
     );
-    // actions
     const permissionsActions: IOpenapiPermissionModeActionActions = {};
     for (const actionKey of actionKeys) {
       const desc = descs[actionKey];
       if (!desc.value || typeof desc.value !== 'function') continue;
-      const routeReal: ContextRouteMetadata = appMetadata.getMetadata(
+      const routeReal: ContextRouteMetadata | undefined = appMetadata.getMetadata(
         SymbolUseOnionOptionsRouteReal,
         controller.prototype,
         actionKey,
-      )!;
-      const route: Partial<ContextRoute> = {
-        controller,
-        controllerBeanFullName,
-        action: actionKey,
-        route: routeReal,
-      };
-      permissionsActions[actionKey] = await this._getPermissionOfAction(route);
+      );
+      permissionsActions[actionKey] = this._getPermissionOfActionByMetadata(routeReal);
     }
     return { actions: permissionsActions };
   }
 
-  private async _getPermissionOfAction(route: Partial<ContextRoute>) {
-    const routePrev = this.ctx.route;
-    this.ctx.route = route as ContextRoute;
-    const composer = composeGuards(this.app, route as ContextRouteBase);
-    const [_, error] = await catchError(() => {
-      return composer(this.ctx);
-    });
-    this.ctx.route = routePrev;
-    return !error;
+  private _buildPermissionProfileKey(resource: keyof IResourceRecord): string {
+    if (!this.bean.passport.isAuthenticated) return `${resource}__anon`;
+    const activated = this.bean.passport.isActivated ? 1 : 0;
+    const roleNames = this._extractCurrentRoleNames();
+    return `${resource}__auth__act:${activated}__roles:${roleNames.join(',')}`;
+  }
+
+  private _extractCurrentRoleNames(): string[] {
+    const roleNames = this.bean.passport.currentRoles?.map(item => item.name) ?? [];
+    return Array.from(new Set(roleNames)).sort();
+  }
+
+  private _getPermissionOfActionByMetadata(routeReal: ContextRouteMetadata | undefined): boolean {
+    if (!routeReal?.meta) return false;
+    return this._evaluatePassportGuardsStatically(routeReal.meta);
+  }
+
+  private _evaluatePassportGuardsStatically(meta: TGuardMeta): boolean {
+    if (this._hasUnknownGuard(meta)) return false;
+    if (this._hasDynamicUserNameGuard(meta)) return false;
+    const passportOptions = this._getPassportOptions(meta);
+    if (!this._matchPassportOptions(passportOptions)) return false;
+    const roleNameOptions = meta[BeanFullNameGuardRoleName] as
+      | Partial<IGuardOptionsRoleName>
+      | undefined;
+    if (!this._matchRoleNameOptions(roleNameOptions)) return false;
+    return true;
+  }
+
+  private _hasUnknownGuard(meta: TGuardMeta): boolean {
+    return Object.keys(meta).some(
+      key => key.includes('.guard.') && !BeanFullNamesGuardSupported.has(key),
+    );
+  }
+
+  private _hasDynamicUserNameGuard(meta: TGuardMeta): boolean {
+    return BeanFullNameGuardUserName in meta;
+  }
+
+  private _getPassportOptions(meta: TGuardMeta): IGuardOptionsPassport {
+    return {
+      ...GuardOptionsPassportDefault,
+      ...(meta[BeanFullNameGuardPassport] as Partial<IGuardOptionsPassport> | undefined),
+    };
+  }
+
+  private _matchPassportOptions(
+    options: Pick<IGuardOptionsPassport, 'public' | 'activated'>,
+  ): boolean {
+    const isAuthenticated = this.bean.passport.isAuthenticated;
+    if (!options.public && !isAuthenticated) return false;
+    if (!isAuthenticated) return true;
+    if (options.activated === true && !this.bean.passport.isActivated) return false;
+    if (options.activated === false && this.bean.passport.isActivated) return false;
+    return true;
+  }
+
+  private _matchRoleNameOptions(options: Partial<IGuardOptionsRoleName> | undefined): boolean {
+    if (!options) return true;
+    if (!options.name) return false;
+    if (options.passWhenMatched === false) return false;
+    if (options.rejectWhenDismatched === false) return false;
+    const roleNamesCurrent = this._extractCurrentRoleNames();
+    const roleNamesRequired = Array.isArray(options.name) ? options.name : [options.name];
+    return roleNamesCurrent.some(roleName => roleNamesRequired.includes(roleName as any));
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-permission/src/bean/summerCache.permission.ts

@@ -1,13 +1,13 @@
 import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCachePermissionKey = any;
 export type TSummerCachePermissionData = any;
 
 @SummerCache({ preset: 'mem' })
 export class SummerCachePermission
-  extends BeanSummerCacheBase<TSummerCachePermissionKey, TSummerCachePermissionData>
+  extends ServiceSummerCacheBase<TSummerCachePermissionKey, TSummerCachePermissionData>
   implements ISummerCacheGet<TSummerCachePermissionKey, TSummerCachePermissionData>
 {
   async getNative(

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-startup",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-startup/src/bean/cacheRedis.startupDebounce.ts

@@ -1,4 +1,4 @@
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
+import { ServiceCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
 
 export type TCacheRedisStartupDebounceKey = `startupDebounce:${string}`;
 export type TCacheRedisStartupDebounceData = boolean;
@@ -8,7 +8,7 @@ export type TCacheRedisStartupDebounceData = boolean;
   disableTransactionCompensate: true,
   client: 'worker',
 })
-export class CacheRedisStartupDebounce extends BeanCacheRedisBase<
+export class CacheRedisStartupDebounce extends ServiceCacheRedisBase<
   TCacheRedisStartupDebounceKey,
   TCacheRedisStartupDebounceData
 > {}

package/vona/src/suite-vendor/a-vona/modules/a-summer/cli/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -1,12 +1,12 @@
 import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCache<%=argv.beanNameCapitalize%>Key = any;
 export type TSummerCache<%=argv.beanNameCapitalize%>Data = any;
 
 @SummerCache()
 export class SummerCache<%=argv.beanNameCapitalize%>
-  extends BeanSummerCacheBase<TSummerCache<%=argv.beanNameCapitalize%>Key, TSummerCache<%=argv.beanNameCapitalize%>Data>
+  extends ServiceSummerCacheBase<TSummerCache<%=argv.beanNameCapitalize%>Key, TSummerCache<%=argv.beanNameCapitalize%>Data>
   implements ISummerCacheGet<TSummerCache<%=argv.beanNameCapitalize%>Key, TSummerCache<%=argv.beanNameCapitalize%>Data> {
   async getNative(
     _key?: TSummerCache<%=argv.beanNameCapitalize%>Key,

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

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

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

@@ -1,7 +1,6 @@
 // eslint-disable
 /** bean: begin */
 export * from '../bean/bean.summer.ts';
-export * from '../bean/bean.summerCacheBase.ts';
 
 import 'vona';
 declare module 'vona' {
@@ -29,6 +28,7 @@ declare module 'vona' {
 export * from '../service/localFetch_.ts';
 export * from '../service/localMem_.ts';
 export * from '../service/localRedis_.ts';
+export * from '../service/summerCacheBase_.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {

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

@@ -3,17 +3,17 @@ import { Bean } from 'vona-module-a-bean';
 
 import type { IDecoratorSummerCacheOptions } from '../types/summerCache.ts';
 
-import { BeanSummerCacheBase } from './bean.summerCacheBase.ts';
+import { ServiceSummerCacheBase } from '../service/summerCacheBase_.ts';
 
 @Bean()
 export class BeanSummer extends BeanBase {
   cache<KEY, DATA>(
     cacheName: string,
     cacheOptions?: IDecoratorSummerCacheOptions,
-  ): BeanSummerCacheBase<KEY, DATA> {
+  ): ServiceSummerCacheBase<KEY, DATA> {
     if (cacheName.includes('.summerCache.')) {
       return this.app.bean._getBeanSelector(cacheName as any, undefined, cacheOptions);
     }
-    return this.app.bean._getBeanSelector(BeanSummerCacheBase, cacheName, cacheOptions);
+    return this.app.bean._getBeanSelector(ServiceSummerCacheBase, cacheName, cacheOptions);
   }
 }

package/vona/src/suite-vendor/a-vona/modules/a-summer/src/service/localMem_.ts

@@ -1,4 +1,4 @@
-import type { BeanCacheMemBase } from 'vona-module-a-cache';
+import type { ServiceCacheMemBase } from 'vona-module-a-cache';
 
 import { Service } from 'vona-module-a-bean';
 
@@ -12,7 +12,7 @@ export class ServiceLocalMem<KEY = any, DATA = any>
   extends CacheBase<KEY, DATA>
   implements ICacheLayeredBase<KEY, DATA>
 {
-  private _cacheMemInstance: BeanCacheMemBase<KEY, DATA> | undefined;
+  private _cacheMemInstance: ServiceCacheMemBase<KEY, DATA> | undefined;
 
   protected async __dispose__() {
     if (this._cacheMemInstance) {
@@ -21,7 +21,7 @@ export class ServiceLocalMem<KEY = any, DATA = any>
     }
   }
 
-  get cacheMem(): BeanCacheMemBase<KEY, DATA> {
+  get cacheMem(): ServiceCacheMemBase<KEY, DATA> {
     if (!this._cacheMemInstance) {
       this._cacheMemInstance = this.app.bean.cache.mem(this._cacheName, this._cacheOptions.mem);
     }

package/vona/src/suite-vendor/a-vona/modules/a-summer/src/service/localRedis_.ts

@@ -1,4 +1,4 @@
-import type { BeanCacheRedisBase } from 'vona-module-a-cache';
+import type { ServiceCacheRedisBase } from 'vona-module-a-cache';
 
 import { Service } from 'vona-module-a-bean';
 
@@ -12,7 +12,7 @@ export class ServiceLocalRedis<KEY = any, DATA = any>
   extends CacheBase<KEY, DATA>
   implements ICacheLayeredBase<KEY, DATA>
 {
-  private _cacheRedisInstance: BeanCacheRedisBase<KEY, DATA> | undefined;
+  private _cacheRedisInstance: ServiceCacheRedisBase<KEY, DATA> | undefined;
 
   protected async __dispose__() {
     if (this._cacheRedisInstance) {
@@ -21,7 +21,7 @@ export class ServiceLocalRedis<KEY = any, DATA = any>
     }
   }
 
-  get cacheRedis(): BeanCacheRedisBase<KEY, DATA> {
+  get cacheRedis(): ServiceCacheRedisBase<KEY, DATA> {
     if (!this._cacheRedisInstance) {
       this._cacheRedisInstance = this.app.bean.cache.redis(
         this._cacheName,

package/vona/src/suite-vendor/a-vona/modules/a-summer/src/{bean/bean.summerCacheBase.ts → service/summerCacheBase_.ts}

@@ -1,5 +1,5 @@
 import { deepExtend, Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type {
   IDecoratorSummerCacheOptions,
@@ -8,9 +8,9 @@ import type {
 
 import { CacheBase } from '../common/cacheBase.ts';
 
-@Bean()
+@Service()
 @Virtual()
-export class BeanSummerCacheBase<KEY = any, DATA = any> extends CacheBase<KEY, DATA> {
+export class ServiceSummerCacheBase<KEY = any, DATA = any> extends CacheBase<KEY, DATA> {
   protected __init__(cacheName?: string, cacheOptions?: IDecoratorSummerCacheOptions) {
     let _cacheName: string;
     let _cacheOptions: IDecoratorSummerCacheOptions;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-swagger",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-swagger/src/bean/summerCache.rapidoc.ts

@@ -1,13 +1,13 @@
 import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCacheRapidocKey = any;
 export type TSummerCacheRapidocData = any;
 
 @SummerCache({ preset: 'mem' })
 export class SummerCacheRapidoc
-  extends BeanSummerCacheBase<TSummerCacheRapidocKey, TSummerCacheRapidocData>
+  extends ServiceSummerCacheBase<TSummerCacheRapidocKey, TSummerCacheRapidocData>
   implements ISummerCacheGet<TSummerCacheRapidocKey, TSummerCacheRapidocData>
 {
   async getNative(

package/vona/src/suite-vendor/a-vona/modules/a-swagger/src/bean/summerCache.swagger.ts

@@ -1,13 +1,13 @@
 import type { ISummerCacheGet, TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import { BeanSummerCacheBase, SummerCache } from 'vona-module-a-summer';
+import { ServiceSummerCacheBase, SummerCache } from 'vona-module-a-summer';
 
 export type TSummerCacheSwaggerKey = any;
 export type TSummerCacheSwaggerData = any;
 
 @SummerCache({ preset: 'mem' })
 export class SummerCacheSwagger
-  extends BeanSummerCacheBase<TSummerCacheSwaggerKey, TSummerCacheSwaggerData>
+  extends ServiceSummerCacheBase<TSummerCacheSwaggerKey, TSummerCacheSwaggerData>
   implements ISummerCacheGet<TSummerCacheSwaggerKey, TSummerCacheSwaggerData>
 {
   async getNative(