vona-module-a-orm 5.0.85 → 5.0.87

package/dist/.metadata/index.d.ts

@@ -191,6 +191,23 @@ declare module 'vona-module-a-orm' {
     }
 }
 /** schedule: end */
+/** hmr: begin */
+export * from '../bean/hmr.model.ts';
+import 'vona';
+declare module 'vona' {
+    interface IHmrRecord {
+        'a-orm:model': never;
+    }
+}
+declare module 'vona-module-a-orm' {
+    interface HmrModel {
+    }
+    interface HmrModel {
+        get $beanFullName(): 'a-orm.hmr.model';
+        get $onionName(): 'a-orm:model';
+    }
+}
+/** hmr: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

package/dist/bean/bean.database.d.ts

@@ -11,5 +11,4 @@ export declare class BeanDatabase extends BeanBase {
     getDialect(client: keyof IDatabaseClientDialectRecord): BeanDatabaseDialectBase;
     switchDbIsolate<RESULT>(fn: FunctionAsync<RESULT>, dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): Promise<RESULT>;
     switchDb<RESULT>(fn: FunctionAsync<RESULT>, dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): Promise<RESULT>;
-    private _prepareClientConfig;
 }

package/dist/bean/bean.databaseDialectBase.d.ts

@@ -6,8 +6,9 @@ import type { IDatabaseDialectCapabilities, IFetchDatabasesResultItem, IFetchInd
 import { BeanBase } from 'vona';
 export declare class BeanDatabaseDialectBase extends BeanBase {
     protected _capabilities?: IDatabaseDialectCapabilities;
+    protected _configBase?: Partial<ConfigDatabaseClient>;
     get capabilities(): IDatabaseDialectCapabilities;
-    getConfigBase(): ConfigDatabaseClient | undefined;
+    get configBase(): Partial<ConfigDatabaseClient> | undefined;
     fetchDatabases(_schemaBuilder: Knex.SchemaBuilder, _databasePrefix: string): Promise<IFetchDatabasesResultItem[]>;
     createDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<string>;
     dropDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<void>;

package/dist/bean/bean.model/bean.model_cache.d.ts

@@ -1,17 +1,16 @@
 import type { TableIdentity } from 'table-identity';
 import type { ServiceDb } from '../../service/db_.ts';
-import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelRecord, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, TypeModelAggrRelationResult, TypeModelClassLikeGeneral, TypeModelGroupRelationResult, TypeModelsClassLikeGeneral, TypeModelWhere } from '../../types/index.ts';
+import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, TypeModelAggrRelationResult, TypeModelGroupRelationResult, TypeModelsClassLikeGeneral, TypeModelWhere } from '../../types/index.ts';
 import { ServiceCacheEntity } from '../../service/cacheEntity_.ts';
 import { ServiceCacheQuery } from '../../service/cacheQuery_.ts';
 import { ServiceRelations } from '../../service/relations_.ts';
 import { BeanModelCrud } from './bean.model_crud.ts';
-declare const SymbolModelsClearAll: unique symbol;
 export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TRecord> {
     cacheQuery: ServiceCacheQuery;
     cacheEntity: ServiceCacheEntity;
     protected relations: ServiceRelations;
-    protected [SymbolModelsClearAll]: Record<keyof IModelRecord, TypeModelClassLikeGeneral[]>;
     protected __init__(clientName?: keyof IDatabaseClientRecord | ServiceDb, table?: keyof ITableRecord): void;
+    protected __dispose__(): Promise<void>;
     insert<T extends IModelInsertOptions<TRecord>>(data?: Partial<TRecord>, options?: T): Promise<TRecord>;
     insertBulk<T extends IModelInsertOptions<TRecord>>(items: Partial<TRecord>[], options?: T): Promise<TRecord[]>;
     __insertBulk_raw(table: keyof ITableRecord | undefined, items: Partial<TRecord>[], options?: IModelMutateOptions<TRecord>): Promise<TRecord[]>;
@@ -51,12 +50,9 @@ export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCr
     private _shardingCacheDoubleDelete;
     private _cacheQueryClearModelsClear;
     private _getModelsClear;
-    private _getModelsClearAll;
-    private _collectModelsClearAll;
     protected _checkDisableCacheQueryByOptions(options?: IModelMethodOptionsGeneral): boolean;
     protected _checkDisableCacheEntityByOptions(options?: IModelMethodOptionsGeneral): boolean;
     private __checkIfOnlyKey;
     private __checkCacheKeyValid;
     protected __get__(prop: string): ((fieldValue?: any, options?: any) => Promise<Partial<TRecord> | undefined>) | ((fieldValue?: any, params?: any, options?: any, modelJoins?: any) => Promise<any[]>) | ((fieldValue: any, data: any, options?: any) => Promise<Partial<TRecord>>) | ((fieldValue: any, options?: any) => Promise<void>) | undefined;
 }
-export {};

package/dist/bean/hmr.model.d.ts

@@ -0,0 +1,6 @@
+import type { IDecoratorBeanOptionsBase } from 'vona';
+import type { IHmrReload } from 'vona-module-a-hmr';
+import { BeanBase } from 'vona';
+export declare class HmrModel extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/index.js

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, beanFullNameFromOnionName, Virtual, cast, useApp, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
+import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, beanFullNameFromOnionName, Virtual, cast, useApp, disposeInstance, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
 import { AopMethod } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { AsyncLocalStorage, AsyncResource } from 'node:async_hooks';
@@ -15,25 +15,26 @@ import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Queue, BeanQueueBase } from 'vona-module-a-queue';
 import { Schedule } from 'vona-module-a-schedule';
+import { Hmr } from 'vona-module-a-hmr';
 import { configAll, configRedis } from 'vona-module-a-summer';
 import { ServiceDatabaseAsyncLocalStorage as ServiceDatabaseAsyncLocalStorage$1, ServiceTransactionConsistency‌ as ServiceTransactionConsistency_ } from 'vona-module-a-orm';
 import { mutate } from 'mutate-on-copy';
 
-var _dec$v, _dec2$v, _class$v;
-let AopMethodTransaction = (_dec$v = AopMethod(), _dec2$v = BeanInfo({
+var _dec$w, _dec2$w, _class$w;
+let AopMethodTransaction = (_dec$w = AopMethod(), _dec2$w = BeanInfo({
   module: "a-orm"
-}), _dec$v(_class$v = _dec2$v(_class$v = class AopMethodTransaction extends BeanAopMethodBase {
+}), _dec$w(_class$w = _dec2$w(_class$w = class AopMethodTransaction extends BeanAopMethodBase {
   execute(options, _args, next, _receiver, _prop) {
     return this.bean.database.current.transaction.begin(() => {
       return next();
     }, options);
   }
-}) || _class$v) || _class$v);
+}) || _class$w) || _class$w);
 
-var _dec$u, _dec2$u, _class$u;
-let ServiceDatabaseAsyncLocalStorage = (_dec$u = Service(), _dec2$u = BeanInfo({
+var _dec$v, _dec2$v, _class$v;
+let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
   module: "a-orm"
-}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
+}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.dbStorage = void 0;
@@ -52,14 +53,14 @@ let ServiceDatabaseAsyncLocalStorage = (_dec$u = Service(), _dec2$u = BeanInfo({
       return fn();
     });
   }
-}) || _class$u) || _class$u);
+}) || _class$v) || _class$v);
 
-var _dec$t, _dec2$t, _class$t;
+var _dec$u, _dec2$u, _class$u;
 const SymbolColumnsCache = Symbol('SymbolColumnsCache');
 const SymbolColumnsDefaultCache = Symbol('SymbolColumnsDefaultCache');
-let ServiceColumnsCache = (_dec$t = Service(), _dec2$t = BeanInfo({
+let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
   module: "a-orm"
-}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceColumnsCache extends BeanBase {
+}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumnsCache extends BeanBase {
   constructor(...args) {
     super(...args);
     this.clientName = void 0;
@@ -114,12 +115,12 @@ let ServiceColumnsCache = (_dec$t = Service(), _dec2$t = BeanInfo({
       return exists;
     }
   }
-}) || _class$t) || _class$t);
+}) || _class$u) || _class$u);
 
-var _dec$s, _dec2$s, _class$s;
-let ServiceColumns = (_dec$s = Service(), _dec2$s = BeanInfo({
+var _dec$t, _dec2$t, _class$t;
+let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
   module: "a-orm"
-}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceColumns extends BeanBase {
+}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceColumns extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -170,7 +171,7 @@ let ServiceColumns = (_dec$s = Service(), _dec2$s = BeanInfo({
   columnsClear(tableName) {
     return this.scope.service.database.columnsClear(this.db.clientName, tableName);
   }
-}) || _class$s) || _class$s);
+}) || _class$t) || _class$t);
 
 const TransactionIsolationLevelsMap = {
   DEFAULT: undefined,
@@ -183,27 +184,27 @@ const TransactionIsolationLevelsMap = {
 
 // export type TransactionPropagation=''
 
-var _dec$r, _dec2$r, _class$r;
-let ServiceDatabase = (_dec$r = Service(), _dec2$r = BeanInfo({
+var _dec$s, _dec2$s, _class$s;
+let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
   module: "a-orm"
-}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceDatabase extends BeanBase {
+}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceDatabase extends BeanBase {
   get configDatabase() {
     return this.app.config.database;
   }
-  getClientConfig(clientName, original = false) {
+  getClientConfig(clientName, clientConfig, original) {
     // clientConfig
-    let clientConfig = this.configDatabase.clients[clientName];
-    if (original) return clientConfig;
+    if (!clientConfig) {
+      clientConfig = this.configDatabase.clients[clientName];
+    }
     // check
     if (!clientConfig) {
       throw new Error(`database config not found: ${clientName}`);
     }
+    if (original) return clientConfig;
     // configBaseClient
     const dialect = this.bean.database.getDialect(clientConfig.client);
-    const configBaseClient = dialect.getConfigBase();
     // combine
-    const configBase = this.configDatabase.base;
-    clientConfig = deepExtend({}, configBase, configBaseClient, clientConfig);
+    clientConfig = deepExtend({}, this.configDatabase.base, dialect.configBase, clientConfig);
     // ready
     return clientConfig;
   }
@@ -300,17 +301,17 @@ let ServiceDatabase = (_dec$r = Service(), _dec2$r = BeanInfo({
   }
   async disposeClients(clientName) {
     clientName = this.prepareClientName(clientName);
-    await this.bean.mutate.disposeInstances(ServiceDatabaseClient, {
+    await this.bean.mutate.removeInstances(ServiceDatabaseClient, {
       clientName
     });
     this.columnsClear(clientName);
   }
-}) || _class$r) || _class$r);
+}) || _class$s) || _class$s);
 
-var _dec$q, _dec2$q, _class$q;
-let ServiceTransactionConsistency‌ = (_dec$q = Service(), _dec2$q = BeanInfo({
+var _dec$r, _dec2$r, _class$r;
+let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
   module: "a-orm"
-}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionConsistency‌ extends BeanBase {
+}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionConsistency‌ extends BeanBase {
   constructor(...args) {
     super(...args);
     this._commitCallbacks = [];
@@ -338,12 +339,12 @@ let ServiceTransactionConsistency‌ = (_dec$q = Service(), _dec2$q = BeanInfo({
     }
     this._commitCallbacks = [];
   }
-}) || _class$q) || _class$q);
+}) || _class$r) || _class$r);
 
-var _dec$p, _dec2$p, _class$p;
-let ServiceTransactionFiber = (_dec$p = Service(), _dec2$p = BeanInfo({
+var _dec$q, _dec2$q, _class$q;
+let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
   module: "a-orm"
-}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionFiber extends BeanBase {
+}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionFiber extends BeanBase {
   constructor(...args) {
     super(...args);
     this._connection = void 0;
@@ -372,12 +373,12 @@ let ServiceTransactionFiber = (_dec$p = Service(), _dec2$p = BeanInfo({
     await this._transactionConsistency.compensatesDone();
     this._connection = undefined;
   }
-}) || _class$p) || _class$p);
+}) || _class$q) || _class$q);
 
-var _dec$o, _dec2$o, _class$o;
-let ServiceTransactionState = (_dec$o = Service(), _dec2$o = BeanInfo({
+var _dec$p, _dec2$p, _class$p;
+let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
   module: "a-orm"
-}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionState extends BeanBase {
+}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionState extends BeanBase {
   constructor(...args) {
     super(...args);
     this._fibers = {};
@@ -399,12 +400,12 @@ let ServiceTransactionState = (_dec$o = Service(), _dec2$o = BeanInfo({
     const selector = this.serviceDatabase.prepareClientNameSelector(db.info, db.dialect);
     delete this._fibers[selector];
   }
-}) || _class$o) || _class$o);
+}) || _class$p) || _class$p);
 
-var _dec$n, _dec2$n, _class$n;
-let ServiceTransactionAsyncLocalStorage = (_dec$n = Service(), _dec2$n = BeanInfo({
+var _dec$o, _dec2$o, _class$o;
+let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInfo({
   module: "a-orm"
-}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransactionAsyncLocalStorage extends BeanBase {
+}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.transactionStorage = void 0;
@@ -425,12 +426,12 @@ let ServiceTransactionAsyncLocalStorage = (_dec$n = Service(), _dec2$n = BeanInf
       return fn();
     });
   }
-}) || _class$n) || _class$n);
+}) || _class$o) || _class$o);
 
-var _dec$m, _dec2$m, _class$m;
-let ServiceTransaction = (_dec$m = Service(), _dec2$m = BeanInfo({
+var _dec$n, _dec2$n, _class$n;
+let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
   module: "a-orm"
-}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceTransaction extends BeanBase {
+}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransaction extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -549,7 +550,7 @@ let ServiceTransaction = (_dec$m = Service(), _dec2$m = BeanInfo({
     }
     return res;
   }
-}) || _class$m) || _class$m);
+}) || _class$n) || _class$n);
 function _translateTransactionOptions(options) {
   if (!options) return undefined;
   return {
@@ -558,10 +559,10 @@ function _translateTransactionOptions(options) {
   };
 }
 
-var _dec$l, _dec2$l, _class$l;
-let ServiceDb = (_dec$l = Service(), _dec2$l = BeanInfo({
+var _dec$m, _dec2$m, _class$m;
+let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
   module: "a-orm"
-}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceDb extends BeanBase {
+}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDb extends BeanBase {
   constructor(...args) {
     super(...args);
     this._client = void 0;
@@ -616,12 +617,12 @@ let ServiceDb = (_dec$l = Service(), _dec2$l = BeanInfo({
   compensate(cb) {
     return this.transaction.compensate(cb);
   }
-}) || _class$l) || _class$l);
+}) || _class$m) || _class$m);
 
-var _dec$k, _dec2$k, _class$k;
-let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
+var _dec$l, _dec2$l, _class$l;
+let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
   module: "a-orm"
-}), _dec$k(_class$k = _dec2$k(_class$k = class ServiceDatabaseClient extends BeanMutateBase {
+}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceDatabaseClient extends BeanMutateBase {
   constructor(...args) {
     super(...args);
     this.level = void 0;
@@ -660,11 +661,11 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
       await this.reload(clientConfig);
     }
   }
-  async onDisposeInstance({
+  async onRemoveInstance({
     clientName
   }) {
     if (clientName === this.clientName) {
-      await super.onDisposeInstance({
+      await super.onRemoveInstance({
         clientName
       });
     }
@@ -689,8 +690,10 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
     }
   }
   async reload(clientConfig) {
+    const clientConfigReal = this.scope.service.database.getClientConfig(this.clientName, clientConfig);
+    this.$mutate([this.clientNameSelector, clientConfigReal]);
     await this.__close();
-    this.__load(this.clientNameSelector, clientConfig);
+    this.__load(this.clientNameSelector, clientConfigReal);
   }
   getDatabaseName() {
     const connection = this.clientConfig.connection;
@@ -713,7 +716,7 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
     const connDatabaseName = this._prepareDatabaseName(databaseName);
     // set config
     //   * should not use this.clientConfig.connection, because password is hidden
-    const config = this.scope.service.database.getClientConfig(this.clientName, true);
+    const config = this.scope.service.database.getClientConfig(this.clientName, undefined, true);
     config.connection = Object.assign({}, config.connection, connDatabaseName);
     // only used by startup, so no consider that workers broadcast
     this.configDatabase.clients[this.clientName] = config;
@@ -721,18 +724,18 @@ let ServiceDatabaseClient = (_dec$k = Service(), _dec2$k = BeanInfo({
     await this.scope.service.database.reloadClientsWorker(this.clientName, config);
     // await this.scope.service.database.reloadClients(this.clientName, config);
   }
-}) || _class$k) || _class$k);
+}) || _class$l) || _class$l);
 
-var _dec$j, _dec2$j, _class$j;
-let BeanDatabase = (_dec$j = Bean(), _dec2$j = BeanInfo({
+var _dec$k, _dec2$k, _class$k;
+let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
   module: "a-orm"
-}), _dec$j(_class$j = _dec2$j(_class$j = class BeanDatabase extends BeanBase {
+}), _dec$k(_class$k = _dec2$k(_class$k = class BeanDatabase extends BeanBase {
   get current() {
     return this.bean._getBean(ServiceDatabaseAsyncLocalStorage).current;
   }
   getClient(dbInfoOrClientName, clientConfig) {
     const dbInfo = this.scope.service.database.prepareDbInfo(dbInfoOrClientName);
-    const clientConfigReal = this._prepareClientConfig(dbInfo.clientName, clientConfig);
+    const clientConfigReal = this.scope.service.database.getClientConfig(dbInfo.clientName, clientConfig);
     const selector = this.scope.service.database.prepareClientNameSelector(dbInfo, clientConfigReal.client);
     return this.app.bean._getBeanSelector(ServiceDatabaseClient, selector, clientConfigReal);
   }
@@ -766,27 +769,23 @@ let BeanDatabase = (_dec$j = Bean(), _dec2$j = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
+}) || _class$k) || _class$k);
 
-  // only for bean.database.getClient
-  _prepareClientConfig(clientName, clientConfig) {
-    return clientConfig ? deepExtend({}, clientConfig) : this.scope.service.database.getClientConfig(clientName);
-  }
-}) || _class$j) || _class$j);
-
-var _dec$i, _dec2$i, _dec3$7, _class$i;
-let BeanDatabaseDialectBase = (_dec$i = Bean(), _dec2$i = Virtual(), _dec3$7 = BeanInfo({
+var _dec$j, _dec2$j, _dec3$7, _class$j;
+let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = BeanInfo({
   module: "a-orm"
-}), _dec$i(_class$i = _dec2$i(_class$i = _dec3$7(_class$i = class BeanDatabaseDialectBase extends BeanBase {
+}), _dec$j(_class$j = _dec2$j(_class$j = _dec3$7(_class$j = class BeanDatabaseDialectBase extends BeanBase {
   constructor(...args) {
     super(...args);
     this._capabilities = void 0;
+    this._configBase = void 0;
   }
   get capabilities() {
     if (!this._capabilities) throw new Error('Should provide dialect capabilities');
     return this._capabilities;
   }
-  getConfigBase() {
-    return undefined;
+  get configBase() {
+    return this._configBase;
   }
   async fetchDatabases(_schemaBuilder, _databasePrefix) {
     throw new Error('Not Implemented');
@@ -892,7 +891,7 @@ let BeanDatabaseDialectBase = (_dec$i = Bean(), _dec2$i = Virtual(), _dec3$7 = B
   _columnTypePrefixes(type, prefixes) {
     return prefixes.some(prefix => type.includes(prefix));
   }
-}) || _class$i) || _class$i) || _class$i);
+}) || _class$j) || _class$j) || _class$j);
 
 const OpAggrs = ['count', 'sum', 'avg', 'max', 'min'];
 const OpJoint = {
@@ -1282,69 +1281,69 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$h, _dec2$h, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _class$h, _descriptor$4, _descriptor2$2, _descriptor3$1;
+var _dec$i, _dec2$i, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _class$i, _descriptor$4, _descriptor2$2, _descriptor3$1;
 const app$1 = useApp();
 const ormConfig$1 = app$1.util.getModuleConfigRaw('a-orm');
 const ordersDefault = ormConfig$1?.rest?.query?.orders?.default ?? 'createdAt,desc';
-let DtoQueryBase = (_dec$h = Api.field(v.optional(), v.array(String, {
+let DtoQueryBase = (_dec$i = Api.field(v.optional(), v.array(String, {
   separator: ','
-})), _dec2$h = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Reflect.metadata("design:type", Object), _class$h = class DtoQueryBase {
+})), _dec2$i = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Reflect.metadata("design:type", Object), _class$i = class DtoQueryBase {
   constructor() {
     _initializerDefineProperty(this, "columns", _descriptor$4, this);
     _initializerDefineProperty(this, "where", _descriptor2$2, this);
     _initializerDefineProperty(this, "orders", _descriptor3$1, this);
   }
-}, _descriptor$4 = _applyDecoratedDescriptor(_class$h.prototype, "columns", [_dec$h, _dec2$h], {
+}, _descriptor$4 = _applyDecoratedDescriptor(_class$i.prototype, "columns", [_dec$i, _dec2$i], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$2 = _applyDecoratedDescriptor(_class$h.prototype, "where", [_dec3$6, _dec4$4], {
+}), _descriptor2$2 = _applyDecoratedDescriptor(_class$i.prototype, "where", [_dec3$6, _dec4$4], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$1 = _applyDecoratedDescriptor(_class$h.prototype, "orders", [_dec5$1, _dec6$1], {
+}), _descriptor3$1 = _applyDecoratedDescriptor(_class$i.prototype, "orders", [_dec5$1, _dec6$1], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$h);
+}), _class$i);
 
-var _dec$g, _dec2$g, _dec3$5, _dec4$3, _class$g, _descriptor$3, _descriptor2$1;
+var _dec$h, _dec2$h, _dec3$5, _dec4$3, _class$h, _descriptor$3, _descriptor2$1;
 const app = useApp();
 const ormConfig = app.util.getModuleConfigRaw('a-orm');
 const pageSizeDefault = ormConfig?.rest?.query?.pageSize?.default ?? 20;
 const pageSizeMax = ormConfig?.rest?.query?.pageSize?.max ?? 100;
-let DtoQueryPageBase = (_dec$g = Api.field(z.number().min(1).default(1)), _dec2$g = Reflect.metadata("design:type", Number), _dec3$5 = Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), _dec4$3 = Reflect.metadata("design:type", Number), _class$g = class DtoQueryPageBase extends DtoQueryBase {
+let DtoQueryPageBase = (_dec$h = Api.field(z.number().min(1).default(1)), _dec2$h = Reflect.metadata("design:type", Number), _dec3$5 = Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), _dec4$3 = Reflect.metadata("design:type", Number), _class$h = class DtoQueryPageBase extends DtoQueryBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "pageNo", _descriptor$3, this);
     _initializerDefineProperty(this, "pageSize", _descriptor2$1, this);
   }
-}, _descriptor$3 = _applyDecoratedDescriptor(_class$g.prototype, "pageNo", [_dec$g, _dec2$g], {
+}, _descriptor$3 = _applyDecoratedDescriptor(_class$h.prototype, "pageNo", [_dec$h, _dec2$h], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$1 = _applyDecoratedDescriptor(_class$g.prototype, "pageSize", [_dec3$5, _dec4$3], {
+}), _descriptor2$1 = _applyDecoratedDescriptor(_class$h.prototype, "pageSize", [_dec3$5, _dec4$3], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$g);
+}), _class$h);
 
 const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 
 class EntityBaseEmpty {}
 
-var _dec$f, _dec2$f, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$f, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
-let EntityBaseInner = (_dec$f = Api.field(v.openapi({
+var _dec$g, _dec2$g, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$g, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
+let EntityBaseInner = (_dec$g = Api.field(v.openapi({
   title: $locale('CreatedAt'),
   rest: {
     order: OrderMaxBase - 2
   }
-})), _dec2$f = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
+})), _dec2$g = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
   title: $locale('UpdatedAt'),
   rest: {
     order: OrderMaxBase - 1
@@ -1359,7 +1358,7 @@ let EntityBaseInner = (_dec$f = Api.field(v.openapi({
   rest: {
     visible: false
   }
-}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$f = class EntityBaseInner extends EntityBaseEmpty {
+}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$g = class EntityBaseInner extends EntityBaseEmpty {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "createdAt", _descriptor$2, this);
@@ -1367,63 +1366,63 @@ let EntityBaseInner = (_dec$f = Api.field(v.openapi({
     _initializerDefineProperty(this, "deleted", _descriptor3, this);
     _initializerDefineProperty(this, "iid", _descriptor4, this);
   }
-}, _descriptor$2 = _applyDecoratedDescriptor(_class$f.prototype, "createdAt", [_dec$f, _dec2$f], {
+}, _descriptor$2 = _applyDecoratedDescriptor(_class$g.prototype, "createdAt", [_dec$g, _dec2$g], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class$f.prototype, "updatedAt", [_dec3$4, _dec4$2], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class$g.prototype, "updatedAt", [_dec3$4, _dec4$2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class$f.prototype, "deleted", [_dec5, _dec6], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class$g.prototype, "deleted", [_dec5, _dec6], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class$f.prototype, "iid", [_dec7, _dec8], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class$g.prototype, "iid", [_dec7, _dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$f);
+}), _class$g);
 
-var _dec$e, _dec2$e, _class$e, _descriptor$1;
-let EntityBase = (_dec$e = Api.field(v.openapi({
+var _dec$f, _dec2$f, _class$f, _descriptor$1;
+let EntityBase = (_dec$f = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-}), v.tableIdentity()), _dec2$e = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$e = class EntityBase extends EntityBaseInner {
+}), v.tableIdentity()), _dec2$f = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$f = class EntityBase extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor$1, this);
   }
-}, _descriptor$1 = _applyDecoratedDescriptor(_class$e.prototype, "id", [_dec$e, _dec2$e], {
+}, _descriptor$1 = _applyDecoratedDescriptor(_class$f.prototype, "id", [_dec$f, _dec2$f], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$e);
+}), _class$f);
 
-var _dec$d, _dec2$d, _class$d, _descriptor;
-let EntityBaseSimple = (_dec$d = Api.field(v.openapi({
+var _dec$e, _dec2$e, _class$e, _descriptor;
+let EntityBaseSimple = (_dec$e = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-})), _dec2$d = Reflect.metadata("design:type", Number), _class$d = class EntityBaseSimple extends EntityBaseInner {
+})), _dec2$e = Reflect.metadata("design:type", Number), _class$e = class EntityBaseSimple extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor, this);
   }
-}, _descriptor = _applyDecoratedDescriptor(_class$d.prototype, "id", [_dec$d, _dec2$d], {
+}, _descriptor = _applyDecoratedDescriptor(_class$e.prototype, "id", [_dec$e, _dec2$e], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$d);
+}), _class$e);
 
 const SymbolKeyEntity = Symbol('$entity');
 const SymbolKeyEntityMeta = Symbol('$entityMeta');
@@ -2207,10 +2206,59 @@ class BeanModelCrudTable extends BeanModelCrudInner {
   }
 }
 
-var _dec$c, _dec2$c, _dec3$3, _class$c;
-let BeanModel = (_dec$c = Bean(), _dec2$c = Virtual(), _dec3$3 = BeanInfo({
+var _dec$d, _dec2$d, _dec3$3, _class$d;
+let BeanModel = (_dec$d = Bean(), _dec2$d = Virtual(), _dec3$3 = BeanInfo({
   module: "a-orm"
-}), _dec$c(_class$c = _dec2$c(_class$c = _dec3$3(_class$c = class BeanModel extends BeanModelCrudTable {}) || _class$c) || _class$c) || _class$c);
+}), _dec$d(_class$d = _dec2$d(_class$d = _dec3$3(_class$d = class BeanModel extends BeanModelCrudTable {}) || _class$d) || _class$d) || _class$d);
+
+const SymbolCacheModelsClear = Symbol('SymbolCacheModelsClearAll');
+const SymbolCacheModelCacheInstances = Symbol('SymbolCacheModelCacheInstances');
+function clearAllCacheModelsClear(app) {
+  delete app.meta[SymbolCacheModelsClear];
+}
+async function clearCacheModelCacheInstance(app, beanFullName) {
+  const cacheModelCacheInstances = getCacheModelCacheInstances(app);
+  const instances = cacheModelCacheInstances[beanFullName];
+  if (!instances) return;
+  delete cacheModelCacheInstances[beanFullName];
+  for (const cacheName in instances) {
+    await app.bean._removeBean(instances[cacheName]);
+  }
+}
+function getCacheModelCacheInstances(app) {
+  if (!app.meta[SymbolCacheModelCacheInstances]) app.meta[SymbolCacheModelCacheInstances] = {};
+  return app.meta[SymbolCacheModelCacheInstances];
+}
+function getCacheModelsClear(app) {
+  if (!app.meta[SymbolCacheModelsClear]) {
+    app.meta[SymbolCacheModelsClear] = _collectModelsClear(app);
+  }
+  return app.meta[SymbolCacheModelsClear];
+}
+function _collectModelsClear(app) {
+  const modelsClearAll = {};
+  const onionSlices = app.bean.onion.model.getOnionsEnabledCached();
+  for (const onionSlice of onionSlices) {
+    const modelName = onionSlice.name;
+    if (!modelsClearAll[modelName]) modelsClearAll[modelName] = [];
+    //
+    const modelsClear = onionSlice.beanOptions.options?.cache?.modelsClear;
+    if (modelsClear) {
+      const modelsClear2 = Array.isArray(modelsClear) ? modelsClear : [modelsClear];
+      modelsClearAll[modelName].push(...modelsClear2);
+    }
+    //
+    const modelsClearedBy = onionSlice.beanOptions.options?.cache?.modelsClearedBy;
+    if (modelsClearedBy) {
+      const modelsClearedBy2 = Array.isArray(modelsClearedBy) ? modelsClearedBy : [modelsClearedBy];
+      for (const modelName2 of modelsClearedBy2) {
+        if (!modelsClearAll[modelName2]) modelsClearAll[modelName2] = [];
+        modelsClearAll[modelName2].push(modelName);
+      }
+    }
+  }
+  return modelsClearAll;
+}
 
 const SymbolCacheOptions = Symbol('SymbolCacheOptions');
 const SymbolCacheEnabled = Symbol('SymbolCacheEnabled');
@@ -2230,7 +2278,14 @@ class ModelCacheBase extends BeanBase {
   }
   getInstance(table) {
     if (this.options === false) throw new Error('cache disabled');
-    return this.app.bean.summer.cache(this.getName(table), this.options);
+    const beanFullName = this._model.$beanFullName;
+    const cacheName = this.getName(table);
+    const cacheModelCacheInstances = getCacheModelCacheInstances(this.app);
+    if (!cacheModelCacheInstances[beanFullName]) cacheModelCacheInstances[beanFullName] = {};
+    if (!cacheModelCacheInstances[beanFullName][cacheName]) {
+      cacheModelCacheInstances[beanFullName][cacheName] = this.app.bean.summer.cache(cacheName, this.options);
+    }
+    return cacheModelCacheInstances[beanFullName][cacheName];
   }
   getName(table) {
     const clientNameReal = this.$scope.orm.service.database.prepareClientNameReal(this._model.db.clientName);
@@ -2285,10 +2340,10 @@ class ModelCacheBase extends BeanBase {
   }
 }
 
-var _dec$b, _dec2$b, _class$b;
-let ServiceCacheEntity = (_dec$b = Service(), _dec2$b = BeanInfo({
+var _dec$c, _dec2$c, _class$c;
+let ServiceCacheEntity = (_dec$c = Service(), _dec2$c = BeanInfo({
   module: "a-orm"
-}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceCacheEntity extends ModelCacheBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class ServiceCacheEntity extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'entity');
   }
@@ -2311,12 +2366,12 @@ let ServiceCacheEntity = (_dec$b = Service(), _dec2$b = BeanInfo({
   get keysAux() {
     return this._model.options.cache?.keysAux;
   }
-}) || _class$b) || _class$b);
+}) || _class$c) || _class$c);
 
-var _dec$a, _dec2$a, _class$a;
-let ServiceCacheQuery = (_dec$a = Service(), _dec2$a = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let ServiceCacheQuery = (_dec$b = Service(), _dec2$b = BeanInfo({
   module: "a-orm"
-}), _dec$a(_class$a = _dec2$a(_class$a = class ServiceCacheQuery extends ModelCacheBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceCacheQuery extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'query');
   }
@@ -2326,7 +2381,7 @@ let ServiceCacheQuery = (_dec$a = Service(), _dec2$a = BeanInfo({
     const cache = this.getInstance(table);
     await cache.clear();
   }
-}) || _class$a) || _class$a);
+}) || _class$b) || _class$b);
 
 function handleRelationsCollection(relationsStatic, includeWrapper) {
   // collect
@@ -2371,10 +2426,10 @@ function handleRelationsCollection(relationsStatic, includeWrapper) {
   return relations;
 }
 
-var _dec$9, _dec2$9, _class$9;
-let ServiceRelations = (_dec$9 = Service(), _dec2$9 = BeanInfo({
+var _dec$a, _dec2$a, _class$a;
+let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
   module: "a-orm"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = class ServiceRelations extends BeanBase {
+}), _dec$a(_class$a = _dec2$a(_class$a = class ServiceRelations extends BeanBase {
   constructor(...args) {
     super(...args);
     this._model = void 0;
@@ -2906,7 +2961,7 @@ let ServiceRelations = (_dec$9 = Service(), _dec2$9 = BeanInfo({
   handleRelationsCollection(includeWrapper) {
     return handleRelationsCollection(this._model.options.relations, includeWrapper);
   }
-}) || _class$9) || _class$9);
+}) || _class$a) || _class$a);
 
 class BeanModelCrud extends BeanModelCrudInner {
   async mget(ids, options) {
@@ -2935,14 +2990,12 @@ class BeanModelCrud extends BeanModelCrudInner {
   }
 }
 
-const SymbolModelsClearAll = Symbol('SymbolModelsClearAll');
 class BeanModelCache extends BeanModelCrud {
   constructor(...args) {
     super(...args);
     this.cacheQuery = void 0;
     this.cacheEntity = void 0;
     this.relations = void 0;
-    this[SymbolModelsClearAll] = void 0;
   }
   __init__(clientName, table) {
     super.__init__(clientName, table);
@@ -2950,6 +3003,10 @@ class BeanModelCache extends BeanModelCrud {
     this.cacheEntity = this.bean._newBean(ServiceCacheEntity, this);
     this.relations = this.bean._newBean(ServiceRelations, this);
   }
+  async __dispose__() {
+    await disposeInstance(this.cacheQuery);
+    await disposeInstance(this.cacheEntity);
+  }
   async insert(data, options) {
     if (!data) data = {};
     const items = await this.insertBulk([data], options);
@@ -3493,39 +3550,9 @@ class BeanModelCache extends BeanModelCrud {
     }
   }
   _getModelsClear(modelName) {
-    const modelsClearAll = this._getModelsClearAll();
+    const modelsClearAll = getCacheModelsClear(this.app);
     return modelsClearAll[modelName ?? this.$onionName];
   }
-  _getModelsClearAll() {
-    if (!this[SymbolModelsClearAll]) {
-      this[SymbolModelsClearAll] = this._collectModelsClearAll();
-    }
-    return this[SymbolModelsClearAll];
-  }
-  _collectModelsClearAll() {
-    const modelsClearAll = {};
-    const onionSlices = this.bean.onion.model.getOnionsEnabled();
-    for (const onionSlice of onionSlices) {
-      const modelName = onionSlice.name;
-      if (!modelsClearAll[modelName]) modelsClearAll[modelName] = [];
-      //
-      const modelsClear = onionSlice.beanOptions.options?.cache?.modelsClear;
-      if (modelsClear) {
-        const modelsClear2 = Array.isArray(modelsClear) ? modelsClear : [modelsClear];
-        modelsClearAll[modelName].push(...modelsClear2);
-      }
-      //
-      const modelsClearedBy = onionSlice.beanOptions.options?.cache?.modelsClearedBy;
-      if (modelsClearedBy) {
-        const modelsClearedBy2 = Array.isArray(modelsClearedBy) ? modelsClearedBy : [modelsClearedBy];
-        for (const modelName2 of modelsClearedBy2) {
-          if (!modelsClearAll[modelName2]) modelsClearAll[modelName2] = [];
-          modelsClearAll[modelName2].push(modelName);
-        }
-      }
-    }
-    return modelsClearAll;
-  }
   _checkDisableCacheQueryByOptions(options) {
     if (options?.disableCacheQuery === true || options?.disableCacheQuery === false) {
       return options?.disableCacheQuery;
@@ -3620,16 +3647,16 @@ function __parseMagicField(str) {
   return [fieldName, op];
 }
 
-var _dec$8, _dec2$8, _dec3$2, _class$8;
-let BeanModelBase = (_dec$8 = Bean(), _dec2$8 = Virtual(), _dec3$2 = BeanInfo({
+var _dec$9, _dec2$9, _dec3$2, _class$9;
+let BeanModelBase = (_dec$9 = Bean(), _dec2$9 = Virtual(), _dec3$2 = BeanInfo({
   module: "a-orm"
-}), _dec$8(_class$8 = _dec2$8(_class$8 = _dec3$2(_class$8 = class BeanModelBase extends BeanModelCache {}) || _class$8) || _class$8) || _class$8);
+}), _dec$9(_class$9 = _dec2$9(_class$9 = _dec3$2(_class$9 = class BeanModelBase extends BeanModelCache {}) || _class$9) || _class$9) || _class$9);
 
-var _dec$7, _dec2$7, _dec3$1, _dec4$1, _class$7;
+var _dec$8, _dec2$8, _dec3$1, _dec4$1, _class$8;
 const SymbolModuleScope$1 = Symbol('SymbolModuleScope');
-let ServiceEntityResolver = (_dec$7 = Service(), _dec2$7 = BeanInfo({
+let ServiceEntityResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   module: "a-orm"
-}), _dec3$1 = Reflect.metadata("design:type", Function), _dec4$1 = Reflect.metadata("design:paramtypes", [String]), _dec$7(_class$7 = _dec2$7(_class$7 = _dec3$1(_class$7 = _dec4$1(_class$7 = class ServiceEntityResolver extends BeanBase {
+}), _dec3$1 = Reflect.metadata("design:type", Function), _dec4$1 = Reflect.metadata("design:paramtypes", [String]), _dec$8(_class$8 = _dec2$8(_class$8 = _dec3$1(_class$8 = _dec4$1(_class$8 = class ServiceEntityResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope$1] = void 0;
@@ -3644,13 +3671,13 @@ let ServiceEntityResolver = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     }
     return this.__instances[prop];
   }
-}) || _class$7) || _class$7) || _class$7) || _class$7);
+}) || _class$8) || _class$8) || _class$8) || _class$8);
 
-var _dec$6, _dec2$6, _dec3, _dec4, _class$6;
+var _dec$7, _dec2$7, _dec3, _dec4, _class$7;
 const SymbolModuleScope = Symbol('SymbolModuleScope');
-let ServiceModelResolver = (_dec$6 = Service(), _dec2$6 = BeanInfo({
+let ServiceModelResolver = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   module: "a-orm"
-}), _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [String]), _dec$6(_class$6 = _dec2$6(_class$6 = _dec3(_class$6 = _dec4(_class$6 = class ServiceModelResolver extends BeanBase {
+}), _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [String]), _dec$7(_class$7 = _dec2$7(_class$7 = _dec3(_class$7 = _dec4(_class$7 = class ServiceModelResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope] = void 0;
@@ -3660,12 +3687,12 @@ let ServiceModelResolver = (_dec$6 = Service(), _dec2$6 = BeanInfo({
     const beanFullName = `${this[SymbolModuleScope]}.model.${prop}`;
     return this.bean._getBean(beanFullName);
   }
-}) || _class$6) || _class$6) || _class$6) || _class$6);
+}) || _class$7) || _class$7) || _class$7) || _class$7);
 
-var _dec$5, _dec2$5, _class$5;
-let BroadcastColumnsClear = (_dec$5 = Broadcast(), _dec2$5 = BeanInfo({
+var _dec$6, _dec2$6, _class$6;
+let BroadcastColumnsClear = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
   module: "a-orm"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class BroadcastColumnsClear extends BeanBroadcastBase {
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class BroadcastColumnsClear extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3675,44 +3702,44 @@ let BroadcastColumnsClear = (_dec$5 = Broadcast(), _dec2$5 = BeanInfo({
       await cast(this.scope.service.database).columnsClearWorker(clientName, tableName);
     }
   }
-}) || _class$5) || _class$5);
+}) || _class$6) || _class$6);
 
-var _dec$4, _dec2$4, _class$4;
-let EventClientNameReal = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+var _dec$5, _dec2$5, _class$5;
+let EventClientNameReal = (_dec$5 = Event(), _dec2$5 = BeanInfo({
   module: "a-orm"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventClientNameReal extends BeanEventBase {}) || _class$4) || _class$4);
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventClientNameReal extends BeanEventBase {}) || _class$5) || _class$5);
 
-var _dec$3, _dec2$3, _class$3;
-let EventColumnsClear = (_dec$3 = Event(), _dec2$3 = BeanInfo({
+var _dec$4, _dec2$4, _class$4;
+let EventColumnsClear = (_dec$4 = Event(), _dec2$4 = BeanInfo({
   module: "a-orm"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class EventColumnsClear extends BeanEventBase {}) || _class$3) || _class$3);
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventColumnsClear extends BeanEventBase {}) || _class$4) || _class$4);
 
-var _dec$2, _dec2$2, _class$2;
-let QueueDoubleDelete = (_dec$2 = Queue({
+var _dec$3, _dec2$3, _class$3;
+let QueueDoubleDelete = (_dec$3 = Queue({
   options: {
     job: {
       delay: 3 * 1000
     }
   }
-}), _dec2$2 = BeanInfo({
+}), _dec2$3 = BeanInfo({
   module: "a-orm"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class QueueDoubleDelete extends BeanQueueBase {
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class QueueDoubleDelete extends BeanQueueBase {
   async execute(data, _options) {
     const beanInstance = this.app.bean._newBean(data.beanFullName, data.clientName, data.table);
     await beanInstance[data.method](...data.args);
   }
-}) || _class$2) || _class$2);
+}) || _class$3) || _class$3);
 
-var _dec$1, _dec2$1, _class$1;
-let ScheduleSoftDeletionPrune = (_dec$1 = Schedule({
+var _dec$2, _dec2$2, _class$2;
+let ScheduleSoftDeletionPrune = (_dec$2 = Schedule({
   repeat: {
     every: 24 * 3600 * 1000
   }
-}), _dec2$1 = BeanInfo({
+}), _dec2$2 = BeanInfo({
   module: "a-orm"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class ScheduleSoftDeletionPrune extends BeanBase {
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class ScheduleSoftDeletionPrune extends BeanBase {
   async execute() {
-    const onionSlices = this.bean.onion.model.getOnionsEnabled();
+    const onionSlices = this.bean.onion.model.getOnionsEnabledCached();
     for (const onionSlice of onionSlices) {
       if (onionSlice.beanOptions.options?.disableDeleted) continue;
       let softDeletionPrune = onionSlice.beanOptions.options?.softDeletionPrune ?? this.scope.config.softDeletionPrune.enable;
@@ -3741,6 +3768,20 @@ let ScheduleSoftDeletionPrune = (_dec$1 = Schedule({
       });
     }
   }
+}) || _class$2) || _class$2);
+
+var _dec$1, _dec2$1, _class$1;
+// import { clearAllCacheModelsClear, clearCacheModelCacheInstance } from '../lib/const.ts';
+
+let HmrModel = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+  module: "a-orm"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrModel extends BeanBase {
+  async reload(_beanOptions) {
+    // more deps: dto/model
+    this.app.bean.worker.reload();
+    // clearAllCacheModelsClear(this.app);
+    // await clearCacheModelCacheInstance(this.app, beanOptions.beanFullName);
+  }
 }) || _class$1) || _class$1);
 
 function config(_app) {
@@ -4442,4 +4483,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, errors, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrModel, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolCacheModelCacheInstances, SymbolCacheModelsClear, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, clearAllCacheModelsClear, clearCacheModelCacheInstance, config, configDefault, errors, getCacheModelCacheInstances, getCacheModelsClear, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/lib/const.d.ts

@@ -0,0 +1,9 @@
+import type { VonaApplication } from 'vona';
+import type { IModelRecord } from '../types/onion/model.ts';
+import type { TypeModelClassLikeGeneral } from '../types/relations.ts';
+export declare const SymbolCacheModelsClear: unique symbol;
+export declare const SymbolCacheModelCacheInstances: unique symbol;
+export declare function clearAllCacheModelsClear(app: VonaApplication): void;
+export declare function clearCacheModelCacheInstance(app: VonaApplication, beanFullName: string): Promise<void>;
+export declare function getCacheModelCacheInstances(app: VonaApplication): any;
+export declare function getCacheModelsClear(app: VonaApplication): Record<keyof IModelRecord, TypeModelClassLikeGeneral[]>;

package/dist/lib/index.d.ts

@@ -1,4 +1,5 @@
 export * from './columns.ts';
+export * from './const.ts';
 export * from './databaseDialect.ts';
 export * from './dto/index.ts';
 export * from './entity.ts';

package/dist/lib/modelCacheBase.d.ts

@@ -1,4 +1,4 @@
-import type { IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
+import type { BeanSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
 import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
 import type { TypeModelCacheType } from '../types/model.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
@@ -10,7 +10,7 @@ export declare class ModelCacheBase extends BeanBase {
     private _cacheType;
     protected __init__(model: BeanModelCache, cacheType: TypeModelCacheType): void;
     private get scopeOrm();
-    getInstance(table: keyof ITableRecord): import("vona-module-a-summer").BeanSummerCacheBase<any, any>;
+    getInstance(table: keyof ITableRecord): BeanSummerCacheBase;
     getName(table: keyof ITableRecord): string;
     get options(): false | IDecoratorSummerCacheOptions;
     get enabled(): any;

package/dist/service/database.d.ts

@@ -4,7 +4,7 @@ import type { IDatabaseClientDialectRecord, IDatabaseClientRecord, IDbInfo } fro
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
     get configDatabase(): import("../types/config.ts").ConfigDatabase;
-    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
+    getClientConfig(clientName: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, original?: boolean): ConfigDatabaseClient;
     prepareDbInfo(dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): IDbInfo;
     prepareClientNameSelector(dbInfo: IDbInfo, dialect: BeanDatabaseDialectBase | keyof IDatabaseClientDialectRecord): string;
     parseClientNameSelector(clientNameSelector: string): IDbInfo;

package/dist/service/databaseClient_.d.ts

@@ -23,7 +23,7 @@ export declare class ServiceDatabaseClient extends BeanMutateBase {
         clientName: any;
         clientConfig: any;
     }): Promise<void>;
-    protected onDisposeInstance({ clientName }: {
+    protected onRemoveInstance({ clientName }: {
         clientName: any;
     }): Promise<void>;
     private __load;

package/dist/types/database.d.ts

@@ -36,7 +36,7 @@ declare module 'vona' {
     interface VonaConfigEnv {
         DATABASE_DEFAULT_CLIENT: string | undefined;
         DATABASE_CLIENT_SQLITE3_FILENAME: string | undefined;
-        DATABASE_CLIENT_SQLITE3_NATIVEBINDING: string | undefined;
+        DATABASE_CLIENT_SQLITE3_NATIVEBINDING: string | 'true' | 'false' | undefined;
         DATABASE_CLIENT_PG_HOST: string | undefined;
         DATABASE_CLIENT_PG_PORT: string | undefined;
         DATABASE_CLIENT_PG_USER: string | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.85",
+  "version": "5.0.87",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {
@@ -61,7 +61,7 @@
   ],
   "dependencies": {
     "knex": "^3.1.0",
-    "table-identity": "^1.0.12"
+    "table-identity": "^1.0.13"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",