vona-module-a-orm 5.0.56 → 5.0.58

package/dist/service/database.d.ts

@@ -3,7 +3,9 @@ import type { ConfigDatabaseClient } from '../types/config.ts';
 import type { IDatabaseClientDialectRecord, IDatabaseClientRecord, IDbInfo } from '../types/database.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
+    get configDatabase(): import("../types/config.ts").ConfigDatabase;
     getDialect(client: keyof IDatabaseClientDialectRecord): BeanDatabaseDialectBase;
+    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
     prepareDbInfo(dbInfoOrClientName?: Partial<IDbInfo> | keyof IDatabaseClientRecord): IDbInfo;
     prepareClientNameSelector(dbInfo: IDbInfo): string;
     parseClientNameSelector(clientNameSelector: string): IDbInfo;
@@ -13,5 +15,7 @@ export declare class ServiceDatabase extends BeanBase {
     columnsClear(clientName?: keyof IDatabaseClientRecord, tableName?: string): void;
     private __columnsClearRaw;
     reloadClients(clientName?: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, extraData?: any): Promise<void>;
-    private __reloadAllClientsRaw;
+    reloadClientsRaw(clientName?: keyof IDatabaseClientRecord, clientConfig?: ConfigDatabaseClient, extraData?: any): Promise<void>;
+    disposeClients(clientName?: keyof IDatabaseClientRecord): Promise<void>;
+    disposeClientsRaw(clientName?: keyof IDatabaseClientRecord): Promise<void>;
 }

package/dist/service/databaseClient_.d.ts

@@ -15,6 +15,7 @@ export declare class ServiceDatabaseClient extends BeanBase {
     private _knex;
     private _db;
     private _onDatabaseClientReloadCancel?;
+    private _onDatabaseClientDisposeCancel?;
     get configDatabase(): import("../types/config.ts").ConfigDatabase;
     get connection(): Knex;
     get db(): ServiceDb;
@@ -23,8 +24,7 @@ export declare class ServiceDatabaseClient extends BeanBase {
     private __load;
     private __close;
     reload(clientConfig?: ConfigDatabaseClient): Promise<void>;
-    getClientConfig(clientName: keyof IDatabaseClientRecord, original?: boolean): ConfigDatabaseClient;
     getDatabaseName(): string;
     private _prepareDatabaseName;
-    changeConfigAndReload(databaseName: string): Promise<void>;
+    changeConfigConnectionAndReload(databaseName: string): Promise<void>;
 }

package/dist/types/onion/model.d.ts

@@ -10,7 +10,7 @@ export interface IModelRecord {
 }
 export interface IModelClassRecord {
 }
-export type TypeDynamicTableName = (ctx: VonaContext, defaultTable: keyof ITableRecord, modelInstance: any) => string;
+export type TypeDynamicTableName = (ctx: VonaContext, where: any | undefined, defaultTable: keyof ITableRecord, modelInstance: any) => string;
 export type TypeDynamicClientName = (ctx: VonaContext, modelInstance: any) => keyof IDatabaseClientRecord;
 export type TypeModelsClearedByFn = (ctx: VonaContext, modelTarget: any, modelSource: any) => Promise<void>;
 export type TypeSoftDeletionPruneHandler = (ctx: VonaContext, modelInstance: any, options: ISoftDeletionPruneHandlerOptions) => Promise<void>;
@@ -21,9 +21,10 @@ export interface ISoftDeletionPrune {
     handler?: TypeSoftDeletionPruneHandler;
     expired?: number;
 }
+export type TypeModelOptionsTable = TypeDynamicTableName | keyof ITableRecord;
 export interface IDecoratorModelOptions<TRecord extends EntityBaseEmpty = any> {
     entity?: Constructable<TRecord>;
-    table?: TypeDynamicTableName | keyof ITableRecord;
+    table?: TypeModelOptionsTable;
     disableDeleted?: boolean;
     disableInstance?: boolean;
     disableCreateTime?: boolean;

package/dist/types/relationsDef.d.ts

@@ -4,8 +4,7 @@ import type { IDatabaseClientRecord } from './database.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { IBuildModelSelectGeneralParamsBasic } from './modelGeneral.ts';
 import type { TypeModelColumn, TypeModelColumnsPatch, TypeModelColumnsStrict } from './modelWhere.ts';
-import type { IModelClassRecord } from './onion/model.ts';
-import type { ITableRecord } from './onion/table.ts';
+import type { IModelClassRecord, TypeModelOptionsTable } from './onion/model.ts';
 import type { TypeModelClassLike, TypeModelOfModelLike, TypeModelsClassLikeGeneral, TypeSymbolKeyEntity } from './relations.ts';
 import type { TypeEntityTableColumnNamesOfGeneral, TypeEntityTableColumnsOfGeneral } from './relationsColumns.ts';
 import type { TypeEntityTableNamesOfGeneral } from './relationsTables.ts';
@@ -48,7 +47,7 @@ export interface IBuildModelRelationOptionsMany<TRecord, AUTOLOAD extends boolea
 }
 export interface IModelRelationOptionsMetaBasic {
     client?: TypeModelRelationOptionsMetaClient;
-    table?: keyof ITableRecord;
+    table?: TypeModelOptionsTable;
 }
 export interface IModelRelationOptionsMeta extends IModelRelationOptionsMetaBasic {
     middle?: IModelRelationOptionsMetaBasic;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.56",
+  "version": "5.0.58",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {