vona-module-a-orm 5.0.56 → 5.0.57

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

@@ -1,5 +1,5 @@
 import type { ServiceDb } from '../../service/db_.ts';
-import type { IDatabaseClientRecord, IDecoratorModelOptions, IModelClassRecord, IModelMethodOptionsGeneral, IModelUpdateOptionsGeneral, ITableRecord, TypeEntityMeta, TypeModelClassLike, TypeModelRelationOptionsMetaClient } from '../../types/index.ts';
+import type { IDatabaseClientRecord, IDecoratorModelOptions, IModelClassRecord, IModelMethodOptionsGeneral, IModelUpdateOptionsGeneral, ITableRecord, TypeEntityMeta, TypeModelClassLike, TypeModelOptionsTable, TypeModelRelationOptionsMetaClient } from '../../types/index.ts';
 import type { BeanModel } from '../bean.model.ts';
 import { BeanBase } from 'vona';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from '../../types/index.ts';
@@ -11,7 +11,7 @@ export declare class BeanModelMeta<TRecord extends {} = {}> extends BeanBase {
     [SymbolKeyModelOptions]: IDecoratorModelOptions;
     private [SymbolModelDb]?;
     private [SymbolModelTable]?;
-    protected __init__(clientName?: keyof IDatabaseClientRecord | ServiceDb, table?: keyof ITableRecord): void;
+    protected __init__(clientName?: keyof IDatabaseClientRecord | ServiceDb, table?: TypeModelOptionsTable): void;
     protected get self(): BeanModel<any>;
     protected get connection(): import("knex").Knex<any, any[]>;
     protected get dialect(): import("vona-module-a-orm").BeanDatabaseDialectBase;
@@ -19,7 +19,7 @@ export declare class BeanModelMeta<TRecord extends {} = {}> extends BeanBase {
     get modelViewRecord(): import("vona-module-a-version").ModelViewRecord;
     get db(): ServiceDb;
     private _getDb;
-    getTable(): keyof ITableRecord;
+    getTable(where: object | undefined): keyof ITableRecord;
     private _getTable;
     get options(): IDecoratorModelOptions;
     get disableInstance(): boolean;
@@ -34,7 +34,7 @@ export declare class BeanModelMeta<TRecord extends {} = {}> extends BeanBase {
     protected _checkDisableDeletedByOptions(options?: IModelMethodOptionsGeneral): boolean;
     protected _checkDisableCreateTimeByOptions(options?: IModelUpdateOptionsGeneral<TRecord>): boolean;
     protected _checkDisableUpdateTimeByOptions(options?: IModelUpdateOptionsGeneral<TRecord>): boolean;
-    newInstance(client?: keyof IDatabaseClientRecord | ServiceDb, table?: keyof ITableRecord): this;
-    newInstanceTarget<MODEL extends BeanModelMeta | (keyof IModelClassRecord)>(modelClassTarget: TypeModelClassLike<MODEL>, client?: TypeModelRelationOptionsMetaClient, table?: keyof ITableRecord): BeanModelMeta;
+    newInstance(client?: keyof IDatabaseClientRecord | ServiceDb, table?: TypeModelOptionsTable): this;
+    newInstanceTarget<MODEL extends BeanModelMeta | (keyof IModelClassRecord)>(modelClassTarget: TypeModelClassLike<MODEL>, client?: TypeModelRelationOptionsMetaClient, table?: TypeModelOptionsTable): BeanModelMeta;
 }
 export {};

package/dist/bean/queue.doubleDelete.d.ts

@@ -5,7 +5,7 @@ import { BeanQueueBase } from 'vona-module-a-queue';
 export interface TypeQueueDoubleDeleteJobData {
     beanFullName: string;
     clientName: keyof IDatabaseClientRecord;
-    table: keyof ITableRecord;
+    table?: keyof ITableRecord;
     method: 'cacheEntityDelInner' | 'cacheEntityClearInner' | 'cacheQueryClearInner';
     args: any[];
 }

package/dist/index.js

@@ -1406,15 +1406,15 @@ class BeanModelMeta extends BeanBase {
     // db
     return this.bean.database.getDb(clientName);
   }
-  getTable() {
-    return this[SymbolModelTable] ?? this._getTable();
+  getTable(where) {
+    return this._getTable(where);
   }
-  _getTable() {
-    const table = this.options.table;
+  _getTable(where) {
+    const table = this[SymbolModelTable] ?? this.options.table;
     if (table && typeof table === 'string') return table;
     const defaultTable = this.options.entity && $tableName(this.options.entity);
     if (table && typeof table === 'function') {
-      return table(this.ctx, defaultTable, this);
+      return table(this.ctx, where, defaultTable, this);
     }
     if (defaultTable) return defaultTable;
     throw new Error(`not found table of ${this.$beanFullName}`);
@@ -1494,6 +1494,7 @@ class BeanModelMeta extends BeanBase {
     const beanOptions = appResource.getBean(modelClass2);
     const beanFullName = beanOptions.beanFullName;
     const options = beanOptions?.options;
+    // client
     if (isNil(client) || client === '_auto_') {
       client = options?.client ? '_initial_' : '_inherit_';
     }
@@ -1513,7 +1514,7 @@ class BeanModelUtils extends BeanModelMeta {
       table = undefined;
     }
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(item);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // item
     if (!item) return [{}, {}];
@@ -1539,11 +1540,11 @@ class BeanModelUtils extends BeanModelMeta {
     if (this.options.entity) {
       return $tableDefaults(this.options.entity);
     }
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     return await this.db.columns.defaultData(table);
   }
   async columns(table) {
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     return await this.db.columns.columns(table);
   }
   isRaw(raw) {
@@ -1658,7 +1659,7 @@ class BeanModelUtils extends BeanModelMeta {
   }
   prepareWhere(builder, table, where, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(where);
     if (!table) throw new Error('should specify the table name');
     // disableInstance/disableDeleted
     where = Object.assign({}, where);
@@ -1738,7 +1739,7 @@ class BeanModelKnex extends BeanModelUtils {
   }
   builder(table) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     if (table) {
       return this.connection(table);
     }
@@ -1750,7 +1751,7 @@ class BeanModelKnex extends BeanModelUtils {
       table = undefined;
     }
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // builder
     const builder = this.builder(table);
@@ -1911,7 +1912,7 @@ class BeanModelCrudInner extends BeanModelView {
   // with undefined
   async _mget_original(table, ids, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // ids maybe empty
     if (!ids || ids.length === 0) return [];
@@ -1940,7 +1941,7 @@ class BeanModelCrudInner extends BeanModelView {
   }
   async _select(table, params, options, builder) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // builder
     builder = builder ?? this._select_buildParams(table, params, options);
@@ -1976,7 +1977,7 @@ class BeanModelCrudInner extends BeanModelView {
   }
   async _get(table, where, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // params
     const params = {
@@ -1994,7 +1995,7 @@ class BeanModelCrudInner extends BeanModelView {
   }
   async _count(table, params, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // params
     params = params || {};
@@ -2012,12 +2013,12 @@ class BeanModelCrudInner extends BeanModelView {
     return this.extractFirstNumber(res);
   }
   async _insertBulk(table, data, options) {
-    // table
-    table = table || this.getTable();
-    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // data
     data = data || {};
     const datasTemp = Array.isArray(data) ? data : [data];
+    // table
+    table = table || this.getTable(datasTemp[0]);
+    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // options
     const datas = [];
     const datasOriginal = [];
@@ -2052,7 +2053,7 @@ class BeanModelCrudInner extends BeanModelView {
   }
   async _update(table, data, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(data);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // data
     [data] = await this.prepareData(table, data);
@@ -2085,7 +2086,7 @@ class BeanModelCrudInner extends BeanModelView {
   }
   async _delete(table, where, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // disableDeleted
     if (!this._checkDisableDeletedByOptions(options)) {
@@ -2225,13 +2226,13 @@ let ServiceCacheEntity = (_dec$d = Service(), _dec2$d = BeanInfo({
   }
   async clear(table) {
     if (!this.enabled) return;
-    table = table || this._model.getTable();
+    table = table || this._model.getTable(undefined);
     const cache = this.getInstance(table);
     await cache.clear();
   }
   async del(id, table) {
     if (!this.enabled) return;
-    table = table || this._model.getTable();
+    table = table || this._model.getTable(undefined);
     const cache = this.getInstance(table);
     if (Array.isArray(id)) {
       await cache.mdel(id);
@@ -2253,7 +2254,7 @@ let ServiceCacheQuery = (_dec$c = Service(), _dec2$c = BeanInfo({
   }
   async clear(table) {
     if (!this.enabled) return;
-    table = table || this._model.getTable();
+    table = table || this._model.getTable(undefined);
     const cache = this.getInstance(table);
     await cache.clear();
   }
@@ -2368,7 +2369,6 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
       options
     } = relationReal;
     const modelTarget = this.__getModelTarget(model, options?.meta);
-    const tableNameTarget = modelTarget.getTable();
     const optionsReal = Object.assign({}, options, {
       include: includeReal,
       with: withReal
@@ -2406,21 +2406,21 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
         if (optionsReal.groups) {
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.${key}`]: idFrom
+              [key]: idFrom
             }
           });
           entity[relationName] = await modelTarget.group(options2, methodOptionsReal);
         } else if (optionsReal.aggrs) {
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.${key}`]: idFrom
+              [key]: idFrom
             }
           });
           entity[relationName] = await modelTarget.aggregate(options2, methodOptionsReal);
         } else {
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.${key}`]: idFrom
+              [key]: idFrom
             }
           });
           entity[relationName] = await modelTarget.select(options2, methodOptionsReal);
@@ -2441,14 +2441,14 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
         if (optionsReal.groups) {
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.id`]: idsTo
+              id: idsTo
             }
           });
           entity[relationName] = await modelTarget.group(options2, methodOptionsReal);
         } else if (optionsReal.aggrs) {
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.id`]: idsTo
+              id: idsTo
             }
           });
           entity[relationName] = await modelTarget.aggregate(options2, methodOptionsReal);
@@ -2471,7 +2471,6 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
       options
     } = relationReal;
     const modelTarget = this.__getModelTarget(model, options?.meta);
-    const tableNameTarget = modelTarget.getTable();
     const optionsReal = Object.assign({}, options, {
       include: includeReal,
       with: withReal
@@ -2513,11 +2512,11 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
     } else if (type === 'hasMany') {
       const idsFrom = entities.map(item => cast(item).id).filter(id => !isNil(id));
       if (optionsReal.groups) {
-        const groups = [`${tableNameTarget}.${key}`].concat(optionsReal.groups);
+        const groups = [key].concat(optionsReal.groups);
         const options2 = deepExtend({}, optionsReal, {
           groups,
           where: {
-            [`${tableNameTarget}.${key}`]: idsFrom
+            [key]: idsFrom
           }
         });
         const items = await modelTarget.group(options2, methodOptionsReal);
@@ -2532,9 +2531,9 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
         }
       } else if (optionsReal.aggrs) {
         const options2 = deepExtend({}, optionsReal, {
-          groups: `${tableNameTarget}.${key}`,
+          groups: key,
           where: {
-            [`${tableNameTarget}.${key}`]: idsFrom
+            [key]: idsFrom
           }
         });
         const items = await modelTarget.group(options2, methodOptionsReal);
@@ -2550,7 +2549,7 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
         const options2 = deepExtend({}, optionsReal, {
           columns,
           where: {
-            [`${tableNameTarget}.${key}`]: idsFrom
+            [key]: idsFrom
           }
         });
         const items = await modelTarget.select(options2, methodOptionsReal);
@@ -2583,7 +2582,7 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
           const options2 = deepExtend({}, optionsReal, {
             groups: optionsReal.groups,
             where: {
-              [`${tableNameTarget}.id`]: idsTo
+              id: idsTo
             }
           });
           entity[relationName] = await modelTarget.group(options2, methodOptionsReal);
@@ -2593,7 +2592,7 @@ let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
           const idsTo = itemsMiddle.filter(item => item[keyFrom] === cast(entity).id).map(item => item[keyTo]);
           const options2 = deepExtend({}, optionsReal, {
             where: {
-              [`${tableNameTarget}.id`]: idsTo
+              id: idsTo
             }
           });
           entity[relationName] = await modelTarget.aggregate(options2, methodOptionsReal);
@@ -2900,7 +2899,7 @@ class BeanModelCache extends BeanModelCrud {
   async __insertBulk_raw(table, items, options) {
     if (items.length === 0) return [];
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(items[0]);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // insert
     const res = await this._insertBulk(table, items, options);
@@ -2918,7 +2917,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __mutateBulk_raw(table, items, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(items[0]);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check
     const indexesInsert = [];
@@ -2980,7 +2979,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __mget_raw(table, ids, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(undefined);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
@@ -3021,7 +3020,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __aggregate_raw(table, params, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     const items = await this.__select_cache(table, params, options);
     return this.convertItemsToBigNumber(items);
@@ -3031,7 +3030,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __group_raw(table, params, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     const items = await this.__select_cache(table, params, options);
     return this.convertItemsToBigNumber(items);
@@ -3076,7 +3075,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __select_raw(table, params, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(params?.where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
@@ -3144,7 +3143,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __get_raw(table, where, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
@@ -3199,7 +3198,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __update_raw(table, data, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(data);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
@@ -3277,7 +3276,7 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __delete_raw(table, where, options) {
     // table
-    table = table || this.getTable();
+    table = table || this.getTable(where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
@@ -3361,7 +3360,7 @@ class BeanModelCache extends BeanModelCrud {
     this._shardingCacheDoubleDelete({
       beanFullName: this.$beanFullName,
       clientName: this.db.clientName,
-      table: this.getTable(),
+      table,
       method: 'cacheEntityDelInner',
       args: [id, table]
     });
@@ -3380,7 +3379,7 @@ class BeanModelCache extends BeanModelCrud {
     this._shardingCacheDoubleDelete({
       beanFullName: this.$beanFullName,
       clientName: this.db.clientName,
-      table: this.getTable(),
+      table,
       method: 'cacheEntityClearInner',
       args: [table]
     });
@@ -3399,7 +3398,7 @@ class BeanModelCache extends BeanModelCrud {
     this._shardingCacheDoubleDelete({
       beanFullName: this.$beanFullName,
       clientName: this.db.clientName,
-      table: this.getTable(),
+      table,
       method: 'cacheQueryClearInner',
       args: [table]
     });

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.57",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {