vona-module-a-orm 5.0.45 → 5.0.47

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

@@ -30,7 +30,7 @@ export declare class BeanModelMeta<TRecord extends {} = {}> extends BeanBase {
     protected _prepareDisableDeletedByOptions(table: keyof ITableRecord, data: any, options?: IModelMethodOptionsGeneral, useRaw?: boolean): any;
     protected _prepareDisableDeletedByOptionsSimple(options?: IModelMethodOptionsGeneral): boolean | undefined;
     protected _checkIfEntityValidByDeleted(entity: any, options?: IModelMethodOptionsGeneral): boolean;
-    protected _checkDisableInstanceByOptions(options?: IModelMethodOptionsGeneral): boolean;
+    protected _checkDisableInstanceByOptions(_options?: IModelMethodOptionsGeneral): boolean;
     protected _checkDisableDeletedByOptions(options?: IModelMethodOptionsGeneral): boolean;
     protected _checkDisableCreateTimeByOptions(options?: IModelUpdateOptionsGeneral<TRecord>): boolean;
     protected _checkDisableUpdateTimeByOptions(options?: IModelUpdateOptionsGeneral<TRecord>): boolean;

package/dist/common/utils.d.ts

@@ -3,6 +3,7 @@ import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns } from '../types/modelWhere.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 export declare function isRaw(raw: any): boolean;
+export declare function isRef(ref: any): boolean;
 export declare function getTableOrTableAlias(table: string): string;
 export declare function getTargetColumnName(column: string): string;
 export declare function prepareColumns<TRecord>(columns?: TypeModelColumns<TRecord>): Array<TypeModelColumn<TRecord>> | undefined;

package/dist/config/config.d.ts

@@ -35,11 +35,13 @@ export declare function config(_app: VonaApplication): {
                     updateAgeOnGet?: boolean;
                     updateAgeOnHas?: boolean;
                     broadcastOnSet?: import("vona-module-a-cache").TypeBroadcastOnSet;
+                    disableInstance?: boolean;
                 };
                 redis?: {
-                    ttl: number;
+                    ttl?: number;
                     updateAgeOnGet?: boolean;
                     client?: keyof import("vona-module-a-redis").IRedisClientRecord;
+                    disableInstance?: boolean;
                 };
                 enable?: boolean;
                 meta?: Omit<IOnionOptionsMeta, never> | undefined;
@@ -55,11 +57,13 @@ export declare function config(_app: VonaApplication): {
                     updateAgeOnGet?: boolean;
                     updateAgeOnHas?: boolean;
                     broadcastOnSet?: import("vona-module-a-cache").TypeBroadcastOnSet;
+                    disableInstance?: boolean;
                 };
                 redis?: {
-                    ttl: number;
+                    ttl?: number;
                     updateAgeOnGet?: boolean;
                     client?: keyof import("vona-module-a-redis").IRedisClientRecord;
+                    disableInstance?: boolean;
                 };
                 enable?: boolean;
                 meta?: Omit<IOnionOptionsMeta, never> | undefined;

package/dist/index.js

@@ -846,6 +846,9 @@ const OpValues = Object.values(Op);
 function isRaw(raw) {
   return typeof raw?.constructor === 'function' && raw?.constructor?.name === 'Raw';
 }
+function isRef(ref) {
+  return typeof ref?.constructor === 'function' && ref?.constructor?.name === 'Ref';
+}
 function getTableOrTableAlias(table) {
   const _table = table.toString();
   return _table.includes(' as ') ? _table.split(' as ')[1].trim() : _table;
@@ -985,7 +988,7 @@ function _buildWhereColumn(having, knex, builder, column, value, op) {
     return;
   }
   // raw
-  if (isRaw(value)) {
+  if (isRaw(value) || isRef(value)) {
     _buildWhereColumnOpNormal(having, knex, builder, column, value, op ?? Op.eq);
     return;
   }
@@ -1359,14 +1362,10 @@ class BeanModelMeta extends BeanBase {
       delete data[columnNameInstance];
     } else {
       delete data.iid;
-      if (!isNil(options?.iid)) {
-        data[columnNameInstance] = options?.iid;
-      } else {
-        if (!this.ctx.instance) {
-          throw new Error('ctx.instance not exists');
-        }
-        data[columnNameInstance] = this.ctx.instance.id;
+      if (!this.ctx.instance) {
+        throw new Error('ctx.instance not exists');
       }
+      data[columnNameInstance] = this.ctx.instance.id;
     }
     return data;
   }
@@ -1395,8 +1394,8 @@ class BeanModelMeta extends BeanBase {
     const deleted = this._prepareDisableDeletedByOptionsSimple(options);
     return isNil(deleted) || Boolean(entity.deleted) === Boolean(deleted);
   }
-  _checkDisableInstanceByOptions(options) {
-    return options?.disableInstance ?? this.disableInstance;
+  _checkDisableInstanceByOptions(_options) {
+    return this.disableInstance;
   }
   _checkDisableDeletedByOptions(options) {
     if (this.disableDeleted) return true;
@@ -2089,7 +2088,7 @@ class ModelCacheBase extends BeanBase {
   }
   getName(table) {
     const clientNameReal = this.$scope.orm.service.database.prepareClientNameReal(this._model.db.clientName);
-    return `${this.$beanFullName}:${clientNameReal}:${table}:${this._cacheType}`;
+    return `${this._model.$beanFullName}:${clientNameReal}:${table}:${this._cacheType}`;
   }
   get options() {
     if (this[SymbolCacheOptions] === undefined) {
@@ -2125,7 +2124,11 @@ class ModelCacheBase extends BeanBase {
     _cacheOptions = deepExtend({
       enable: this.scopeOrm.config.summer.enable,
       meta: this.scopeOrm.config.summer.meta,
+      mem: {
+        disableInstance: this._model.disableInstance
+      },
       redis: {
+        disableInstance: this._model.disableInstance,
         client: this.scopeOrm.config.summer.redis.client
       }
     }, configPreset, _cacheOptions, {
@@ -3124,7 +3127,6 @@ class BeanModelCache extends BeanModelCrud {
     const item = await cache.get(id, {
       get: async () => {
         // where: maybe contain aux key
-        // disableInstance: use the model options, not use options by outer
         return await super._get(table, where, {
           disableDeleted: true
         });
@@ -4125,4 +4127,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, 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, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, locales, prepareClassModel, prepareColumns };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, 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, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/types/config.d.ts

@@ -1,7 +1,7 @@
 import type { Knex } from 'knex';
 import type { VonaContext } from 'vona';
 import type { IDatabaseClientDialectRecord, IDatabaseClientRecord } from './database.ts';
-export type TypeDefaultClientNameFn = (ctx: VonaContext) => keyof IDatabaseClientRecord;
+export type TypeDefaultClientNameFn = (ctx?: VonaContext) => keyof IDatabaseClientRecord;
 export type TypeDefaultClientName = TypeDefaultClientNameFn | keyof IDatabaseClientRecord;
 export interface ConfigDatabaseClient extends Omit<Knex.Config, 'client'> {
     client: keyof IDatabaseClientDialectRecord;

package/dist/types/model.d.ts

@@ -37,20 +37,18 @@ export interface IBuildModelCountParams<TRecord, _Model extends BeanModelMeta |
     joins?: IModelSelectParamsJoin<TRecord, TableNames, ColumnNames>[];
 }
 export type IModelCountParams<TRecord, Model extends BeanModelMeta = BeanModelMeta, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined> = IBuildModelCountParams<TRecord, Model, TypeEntityTableNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnNamesOfGeneral<ModelJoins, Model>, TypeEntityTableColumnsOfGeneral<ModelJoins, Model>>;
-export type IModelMethodOptions = Omit<IModelMethodOptionsGeneral, 'disableInstance'>;
-export type IModelInsertOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = Omit<IModelInsertOptionsGeneral<TRecord, Model>, 'disableInstance'>;
-export type IModelUpdateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = Omit<IModelUpdateOptionsGeneral<TRecord, Model>, 'disableInstance'>;
-export type IModelDeleteOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = Omit<IModelDeleteOptionsGeneral<TRecord, Model>, 'disableInstance'>;
-export type IModelGetOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = Omit<IModelGetOptionsGeneral<TRecord, Model>, 'disableInstance'>;
-export type IModelMutateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = Omit<IModelMutateOptionsGeneral<TRecord, Model>, 'disableInstance'>;
+export type IModelMethodOptions = IModelMethodOptionsGeneral;
+export type IModelInsertOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelInsertOptionsGeneral<TRecord, Model>;
+export type IModelUpdateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelUpdateOptionsGeneral<TRecord, Model>;
+export type IModelDeleteOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelDeleteOptionsGeneral<TRecord, Model>;
+export type IModelGetOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelGetOptionsGeneral<TRecord, Model>;
+export type IModelMutateOptions<TRecord, Model extends BeanModelMeta | undefined = undefined> = IModelMutateOptionsGeneral<TRecord, Model>;
 export interface IModelMethodOptionsGeneral {
     disableDeleted?: boolean;
-    disableInstance?: boolean;
     disableCreateTime?: boolean;
     disableUpdateTime?: boolean;
     disableCacheQuery?: boolean;
     disableCacheEntity?: boolean;
-    iid?: number;
     deleted?: boolean;
 }
 export interface IModelInsertOptionsGeneral<_TRecord, Model extends BeanModelMeta | undefined = undefined> extends IModelMethodOptionsGeneral, IModelMutateRelationIncludeWrapper<Model> {

package/package.json

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