vona-module-a-orm 5.0.51 → 5.0.53

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

@@ -168,6 +168,29 @@ declare module 'vona-module-a-event' {
     }
 }
 /** event: end */
+/** queue: begin */
+export * from '../bean/queue.doubleDelete.ts';
+import { type IDecoratorQueueOptions } from 'vona-module-a-queue';
+declare module 'vona-module-a-queue' {
+    interface IQueueRecord {
+        'a-orm:doubleDelete': IDecoratorQueueOptions;
+    }
+}
+declare module 'vona-module-a-orm' {
+    interface QueueDoubleDelete {
+    }
+    interface QueueDoubleDelete {
+        get $beanFullName(): 'a-orm.queue.doubleDelete';
+        get $onionName(): 'a-orm:doubleDelete';
+    }
+}
+/** queue: end */
+/** queue: begin */
+import type { QueueDoubleDelete } from '../bean/queue.doubleDelete.ts';
+export interface IModuleQueue {
+    'doubleDelete': QueueDoubleDelete;
+}
+/** queue: end */
 /** schedule: begin */
 export * from '../bean/schedule.softDeletionPrune.ts';
 import { type IDecoratorScheduleOptions } from 'vona-module-a-schedule';
@@ -226,6 +249,7 @@ export interface ScopeModuleAOrm {
     service: IModuleService;
     broadcast: IModuleBroadcast;
     event: IModuleEvent;
+    queue: IModuleQueue;
 }
 import 'vona';
 declare module 'vona' {

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

@@ -10,7 +10,7 @@ export declare class BeanDatabaseDialectBase extends BeanBase {
     createDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<void>;
     dropDatabase(_schemaBuilder: Knex.SchemaBuilder, _databaseName: string): Promise<void>;
     fetchIndexes(_schemaBuilder: Knex.SchemaBuilder, _tableName: string): Promise<IFetchIndexesResultItem[]>;
-    insert(_builder: Knex.QueryBuilder): Promise<TableIdentity[]>;
+    insert(_builder: Knex.QueryBuilder, _datas: any[]): Promise<TableIdentity[]>;
     query(_result: any): void;
     viewDependents(_builder: Knex.QueryBuilder, _viewName: string): Promise<string[]>;
     coerceColumn(column: Knex.ColumnInfo): ITableColumn;

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

@@ -44,8 +44,12 @@ export declare class BeanModelCache<TRecord extends {} = {}> extends BeanModelCr
     private __filterMGetColumns;
     private __filterGetColumns;
     cacheEntityDel(id: TableIdentity | TableIdentity[], table?: keyof ITableRecord): Promise<void>;
+    cacheEntityDelInner(id: TableIdentity | TableIdentity[], table?: keyof ITableRecord): Promise<void>;
     cacheEntityClear(table?: keyof ITableRecord): Promise<void>;
+    cacheEntityClearInner(table?: keyof ITableRecord): Promise<void>;
     cacheQueryClear(table?: keyof ITableRecord): Promise<void>;
+    cacheQueryClearInner(table?: keyof ITableRecord): Promise<void>;
+    private _shardingCacheDoubleDelete;
     private _cacheQueryClearModelsClear;
     private _getModelsClear;
     private _getModelsClearAll;

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

@@ -0,0 +1,15 @@
+import type { IQueueExecute, IQueuePushOptions } from 'vona-module-a-queue';
+import type { IDatabaseClientRecord } from '../types/database.ts';
+import type { ITableRecord } from '../types/onion/table.ts';
+import { BeanQueueBase } from 'vona-module-a-queue';
+export interface TypeQueueDoubleDeleteJobData {
+    beanFullName: string;
+    clientName: keyof IDatabaseClientRecord;
+    table: keyof ITableRecord;
+    method: 'cacheEntityDelInner' | 'cacheEntityClearInner' | 'cacheQueryClearInner';
+    args: any[];
+}
+export type TypeQueueDoubleDeleteJobResult = void;
+export declare class QueueDoubleDelete extends BeanQueueBase<TypeQueueDoubleDeleteJobData, TypeQueueDoubleDeleteJobResult> implements IQueueExecute<TypeQueueDoubleDeleteJobData, TypeQueueDoubleDeleteJobResult> {
+    execute(data: TypeQueueDoubleDeleteJobData, _options?: IQueuePushOptions): Promise<TypeQueueDoubleDeleteJobResult>;
+}

package/dist/config/config.d.ts

@@ -5,12 +5,20 @@ import type { TSummerCachePreset } from 'vona-module-a-summer';
 import type { IDatabaseClientDialectRecord } from '../types/database.ts';
 export type TypeDataBaseConfigDialects = Record<keyof IDatabaseClientDialectRecord, TypeBeanRecordGeneralSelectorKeys<'databaseDialect'>>;
 export declare function config(_app: VonaApplication): {
+    sharding: {
+        cache: {
+            doubleDelete: boolean;
+        };
+    };
     rest: {
         query: {
             pageSize: {
                 default: number;
                 max: number;
             };
+            orders: {
+                default: string;
+            };
         };
     };
     table: {

package/dist/index.js

@@ -1,37 +1,37 @@
 import BigNumber$1, { BigNumber } from 'bignumber.js';
-import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, Virtual, appResource, beanFullNameFromOnionName, cast, appMetadata, useApp, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
+import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, Virtual, appResource, beanFullNameFromOnionName, cast, useApp, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
 import { AopMethod, Aspect } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { AsyncLocalStorage, AsyncResource } from 'node:async_hooks';
 import knex from 'knex';
 import { isNil, safeBoolean, isClass, ensureArray, hashkey } from '@cabloy/utils';
 import { swapDeps } from '@cabloy/deps';
-import { prepareClassType, getTargetDecoratorRules, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapi';
-import { ZodMetadata } from '@cabloy/zod-query';
-import { SymbolDecoratorRuleColumn } from 'vona-module-a-openapiutils';
+import { prepareClassType, getTargetDecoratorRules, getTargetDecoratorRuleColumnsMap, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapi';
+import { ZodMetadata } from '@cabloy/zod-openapi';
 import z from 'zod';
 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 { configAllWithIgnoreNull, configAll, configRedisWithIgnoreNull, 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$w, _dec2$w, _class$w;
-let AopMethodTransaction = (_dec$w = AopMethod(), _dec2$w = BeanInfo({
+var _dec$x, _dec2$x, _class$x;
+let AopMethodTransaction = (_dec$x = AopMethod(), _dec2$x = BeanInfo({
   module: "a-orm"
-}), _dec$w(_class$w = _dec2$w(_class$w = class AopMethodTransaction extends BeanAopMethodBase {
+}), _dec$x(_class$x = _dec2$x(_class$x = class AopMethodTransaction extends BeanAopMethodBase {
   execute(options, _args, next, _receiver, _prop) {
     return this.bean.database.current.transaction.begin(() => {
       return next();
     }, options);
   }
-}) || _class$w) || _class$w);
+}) || _class$x) || _class$x);
 
-var _dec$v, _dec2$v, _class$v;
-let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
+var _dec$w, _dec2$w, _class$w;
+let ServiceDatabaseAsyncLocalStorage = (_dec$w = Service(), _dec2$w = BeanInfo({
   module: "a-orm"
-}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
+}), _dec$w(_class$w = _dec2$w(_class$w = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.dbStorage = void 0;
@@ -50,14 +50,14 @@ let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
       return fn();
     });
   }
-}) || _class$v) || _class$v);
+}) || _class$w) || _class$w);
 
-var _dec$u, _dec2$u, _class$u;
+var _dec$v, _dec2$v, _class$v;
 const SymbolColumnsCache = Symbol('SymbolColumnsCache');
 const SymbolColumnsDefaultCache = Symbol('SymbolColumnsDefaultCache');
-let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
+let ServiceColumnsCache = (_dec$v = Service(), _dec2$v = BeanInfo({
   module: "a-orm"
-}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumnsCache extends BeanBase {
+}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceColumnsCache extends BeanBase {
   constructor(...args) {
     super(...args);
     this.clientName = void 0;
@@ -112,12 +112,12 @@ let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
       return exists;
     }
   }
-}) || _class$u) || _class$u);
+}) || _class$v) || _class$v);
 
-var _dec$t, _dec2$t, _class$t;
-let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
+var _dec$u, _dec2$u, _class$u;
+let ServiceColumns = (_dec$u = Service(), _dec2$u = BeanInfo({
   module: "a-orm"
-}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceColumns extends BeanBase {
+}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumns extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -168,7 +168,7 @@ let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
   columnsClear(tableName) {
     return this.scope.service.database.columnsClear(this.db.clientName, tableName);
   }
-}) || _class$t) || _class$t);
+}) || _class$u) || _class$u);
 
 const TransactionIsolationLevelsMap = {
   DEFAULT: undefined,
@@ -181,10 +181,10 @@ const TransactionIsolationLevelsMap = {
 
 // export type TransactionPropagation=''
 
-var _dec$s, _dec2$s, _class$s;
-let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
+var _dec$t, _dec2$t, _class$t;
+let ServiceDatabase = (_dec$t = Service(), _dec2$t = BeanInfo({
   module: "a-orm"
-}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceDatabase extends BeanBase {
+}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceDatabase extends BeanBase {
   getDialect(client) {
     if (!client) throw new Error('database dialect not specified');
     const beanFullName = this.scope.config.dialects[client];
@@ -270,12 +270,12 @@ let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
     });
     this.__columnsClearRaw(clientName);
   }
-}) || _class$s) || _class$s);
+}) || _class$t) || _class$t);
 
-var _dec$r, _dec2$r, _class$r;
-let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
+var _dec$s, _dec2$s, _class$s;
+let ServiceTransactionConsistency‌ = (_dec$s = Service(), _dec2$s = BeanInfo({
   module: "a-orm"
-}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionConsistency‌ extends BeanBase {
+}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceTransactionConsistency‌ extends BeanBase {
   constructor(...args) {
     super(...args);
     this._commitCallbacks = [];
@@ -287,7 +287,7 @@ let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
   compensate(cb) {
     this._compensateCallbacks.unshift(AsyncResource.bind(cb));
   }
-  async commitDone() {
+  async commitsDone() {
     while (true) {
       const cb = this._commitCallbacks.shift();
       if (!cb) break;
@@ -295,7 +295,7 @@ let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
     }
     this._compensateCallbacks = [];
   }
-  async compensateDone() {
+  async compensatesDone() {
     while (true) {
       const cb = this._compensateCallbacks.shift();
       if (!cb) break;
@@ -303,12 +303,12 @@ let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
     }
     this._commitCallbacks = [];
   }
-}) || _class$r) || _class$r);
+}) || _class$s) || _class$s);
 
-var _dec$q, _dec2$q, _class$q;
-let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
+var _dec$r, _dec2$r, _class$r;
+let ServiceTransactionFiber = (_dec$r = Service(), _dec2$r = BeanInfo({
   module: "a-orm"
-}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionFiber extends BeanBase {
+}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionFiber extends BeanBase {
   constructor(...args) {
     super(...args);
     this._connection = void 0;
@@ -329,20 +329,20 @@ let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
   }
   async doCommit() {
     await this._connection.commit();
-    await this._transactionConsistency.commitDone();
+    await this._transactionConsistency.commitsDone();
     this._connection = undefined;
   }
   async doRollback() {
     await this._connection.rollback();
-    await this._transactionConsistency.compensateDone();
+    await this._transactionConsistency.compensatesDone();
     this._connection = undefined;
   }
-}) || _class$q) || _class$q);
+}) || _class$r) || _class$r);
 
-var _dec$p, _dec2$p, _class$p;
-let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
+var _dec$q, _dec2$q, _class$q;
+let ServiceTransactionState = (_dec$q = Service(), _dec2$q = BeanInfo({
   module: "a-orm"
-}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionState extends BeanBase {
+}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionState extends BeanBase {
   constructor(...args) {
     super(...args);
     this._fibers = {};
@@ -364,12 +364,12 @@ let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
     const selector = this.serviceDatabase.prepareClientNameSelector(dbInfo);
     delete this._fibers[selector];
   }
-}) || _class$p) || _class$p);
+}) || _class$q) || _class$q);
 
-var _dec$o, _dec2$o, _class$o;
-let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInfo({
+var _dec$p, _dec2$p, _class$p;
+let ServiceTransactionAsyncLocalStorage = (_dec$p = Service(), _dec2$p = BeanInfo({
   module: "a-orm"
-}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionAsyncLocalStorage extends BeanBase {
+}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.transactionStorage = void 0;
@@ -390,12 +390,12 @@ let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInf
       return fn();
     });
   }
-}) || _class$o) || _class$o);
+}) || _class$p) || _class$p);
 
-var _dec$n, _dec2$n, _class$n;
-let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
+var _dec$o, _dec2$o, _class$o;
+let ServiceTransaction = (_dec$o = Service(), _dec2$o = BeanInfo({
   module: "a-orm"
-}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransaction extends BeanBase {
+}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransaction extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -516,7 +516,7 @@ let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
     }
     return res;
   }
-}) || _class$n) || _class$n);
+}) || _class$o) || _class$o);
 function _translateTransactionOptions(options) {
   if (!options) return undefined;
   return {
@@ -525,10 +525,10 @@ function _translateTransactionOptions(options) {
   };
 }
 
-var _dec$m, _dec2$m, _class$m;
-let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
+var _dec$n, _dec2$n, _class$n;
+let ServiceDb = (_dec$n = Service(), _dec2$n = BeanInfo({
   module: "a-orm"
-}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDb extends BeanBase {
+}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceDb extends BeanBase {
   constructor(...args) {
     super(...args);
     this._client = void 0;
@@ -583,12 +583,12 @@ let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
   compensate(cb) {
     return this.transaction.compensate(cb);
   }
-}) || _class$m) || _class$m);
+}) || _class$n) || _class$n);
 
-var _dec$l, _dec2$l, _class$l;
-let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
+var _dec$m, _dec2$m, _class$m;
+let ServiceDatabaseClient = (_dec$m = Service(), _dec2$m = BeanInfo({
   module: "a-orm"
-}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceDatabaseClient extends BeanBase {
+}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDatabaseClient extends BeanBase {
   constructor(...args) {
     super(...args);
     this.level = void 0;
@@ -694,12 +694,12 @@ let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
     // reload
     await this.reload(config);
   }
-}) || _class$l) || _class$l);
+}) || _class$m) || _class$m);
 
-var _dec$k, _dec2$k, _class$k;
-let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
+var _dec$l, _dec2$l, _class$l;
+let BeanDatabase = (_dec$l = Bean(), _dec2$l = BeanInfo({
   module: "a-orm"
-}), _dec$k(_class$k = _dec2$k(_class$k = class BeanDatabase extends BeanBase {
+}), _dec$l(_class$l = _dec2$l(_class$l = class BeanDatabase extends BeanBase {
   get current() {
     return this.bean._getBean(ServiceDatabaseAsyncLocalStorage).current;
   }
@@ -729,12 +729,12 @@ let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
-}) || _class$k) || _class$k);
+}) || _class$l) || _class$l);
 
-var _dec$j, _dec2$j, _dec3$7, _class$j;
-let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = BeanInfo({
+var _dec$k, _dec2$k, _dec3$7, _class$k;
+let BeanDatabaseDialectBase = (_dec$k = Bean(), _dec2$k = Virtual(), _dec3$7 = BeanInfo({
   module: "a-orm"
-}), _dec$j(_class$j = _dec2$j(_class$j = _dec3$7(_class$j = class BeanDatabaseDialectBase extends BeanBase {
+}), _dec$k(_class$k = _dec2$k(_class$k = _dec3$7(_class$k = class BeanDatabaseDialectBase extends BeanBase {
   getConfigBase() {
     return undefined;
   }
@@ -750,7 +750,7 @@ let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = B
   async fetchIndexes(_schemaBuilder, _tableName) {
     throw new Error('Not Implemented');
   }
-  async insert(_builder) {
+  async insert(_builder, _datas) {
     throw new Error('Not Implemented');
   }
   query(_result) {
@@ -794,7 +794,7 @@ let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = B
   _columnTypePrefixes(type, prefixes) {
     return prefixes.some(prefix => type.includes(prefix));
   }
-}) || _class$j) || _class$j) || _class$j);
+}) || _class$k) || _class$k) || _class$k);
 
 const OpAggrs = ['count', 'sum', 'avg', 'max', 'min'];
 const OpJoint = {
@@ -807,6 +807,8 @@ const OpJoint = {
 const OpNormal = {
   eq: '_eq_',
   notEq: '_notEq_',
+  eqI: '_eqI_',
+  notEqI: '_notEqI_',
   gt: '_gt_',
   gte: '_gte_',
   lt: '_lt_',
@@ -1018,10 +1020,23 @@ function _buildWhereColumn(having, knex, builder, column, value, op) {
 }
 function _buildWhereColumnOpNormal(having, knex, builder, column, value, op) {
   column = _checkHavingColumn(knex, column);
+  if (_shouldPatchLike(knex)) {
+    if (op === Op.startsWith) op = Op.startsWithI;
+    if (op === Op.endsWith) op = Op.endsWithI;
+    if (op === Op.includes) op = Op.includesI;
+    if (op === Op.eqI) op = Op.eq;
+    if (op === Op.notEqI) op = Op.notEq;
+  }
   if (op === Op.eq) {
     builder[having ? 'having' : 'where'](column, '=', value);
   } else if (op === Op.notEq) {
     builder[having ? 'having' : 'where'](column, '<>', value);
+  } else if (op === Op.eqI) {
+    builder[having ? 'havingILike' : 'whereILike'](column, value);
+  } else if (op === Op.notEqI) {
+    builder[having ? 'havingNot' : 'whereNot'](builder => {
+      builder[having ? 'havingILike' : 'whereILike'](column, value);
+    });
   } else if (op === Op.gt) {
     builder[having ? 'having' : 'where'](column, '>', value);
   } else if (op === Op.gte) {
@@ -1058,6 +1073,13 @@ function _buildWhereColumnOpNormal(having, knex, builder, column, value, op) {
     builder[having ? 'having' : 'where'](column, '=', knex.ref(value));
   }
 }
+function _shouldPatchLike(knex) {
+  const dialectName = _getDialectName(knex);
+  return dialectName === 'mysql' || dialectName === 'mysql2';
+}
+function _getDialectName(knex) {
+  return knex.client.config.client;
+}
 function _checkHavingColumn(knex, column) {
   let [aggr, name] = cast(column).split('_');
   if (!OpAggrs.includes(aggr) || !name) return column;
@@ -1092,7 +1114,7 @@ function $columns(key) {
 }
 function $columnsAll(classEntity, withTableName, withMeta) {
   const classEntity2 = _prepareClassEntity(classEntity);
-  let columns = appMetadata.getMetadata(SymbolDecoratorRuleColumn, classEntity2.prototype);
+  let columns = getTargetDecoratorRuleColumnsMap(classEntity2.prototype);
   if (withTableName) {
     const tableName = $tableName(classEntity2);
     columns = {
@@ -1131,7 +1153,8 @@ function $tableComments(classEntity) {
   const comments = {};
   for (const key in rules) {
     const rule = rules[key];
-    const comment = rule._def.openapi?.metadata?.description || rule._def.openapi?.metadata?.title;
+    const metadata = ZodMetadata.getOpenapiMetadata(rule);
+    const comment = metadata?.description || metadata?.title;
     comments[key] = comment ? app.meta.text(comment) : '';
   }
   // table comment
@@ -1177,66 +1200,69 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$i, _dec2$i, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _class$i, _descriptor$4, _descriptor2$2, _descriptor3$1;
-let DtoQueryBase = (_dec$i = Api.field(v.optional(), v.array(String, {
+var _dec$j, _dec2$j, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _dec7$1, _class$j, _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$j = Api.field(v.optional(), v.array(String, {
   separator: ','
-})), _dec2$i = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.object({}).passthrough()), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Reflect.metadata("design:type", Object), _class$i = class DtoQueryBase {
+})), _dec2$j = 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 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec7$1 = Reflect.metadata("design:type", Object), _class$j = 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$i.prototype, "columns", [_dec$i, _dec2$i], {
+}, _descriptor$4 = _applyDecoratedDescriptor(_class$j.prototype, "columns", [_dec$j, _dec2$j], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$2 = _applyDecoratedDescriptor(_class$i.prototype, "where", [_dec3$6, _dec4$4], {
+}), _descriptor2$2 = _applyDecoratedDescriptor(_class$j.prototype, "where", [_dec3$6, _dec4$4], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$1 = _applyDecoratedDescriptor(_class$i.prototype, "orders", [_dec5$1, _dec6$1], {
+}), _descriptor3$1 = _applyDecoratedDescriptor(_class$j.prototype, "orders", [_dec5$1, _dec6$1, _dec7$1], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$i);
+}), _class$j);
 
-var _dec$h, _dec2$h, _dec3$5, _dec4$3, _class$h, _descriptor$3, _descriptor2$1;
+var _dec$i, _dec2$i, _dec3$5, _dec4$3, _class$i, _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$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 {
+let DtoQueryPageBase = (_dec$i = Api.field(z.number().min(1).default(1)), _dec2$i = 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$i = class DtoQueryPageBase extends DtoQueryBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "pageNo", _descriptor$3, this);
     _initializerDefineProperty(this, "pageSize", _descriptor2$1, this);
   }
-}, _descriptor$3 = _applyDecoratedDescriptor(_class$h.prototype, "pageNo", [_dec$h, _dec2$h], {
+}, _descriptor$3 = _applyDecoratedDescriptor(_class$i.prototype, "pageNo", [_dec$i, _dec2$i], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$1 = _applyDecoratedDescriptor(_class$h.prototype, "pageSize", [_dec3$5, _dec4$3], {
+}), _descriptor2$1 = _applyDecoratedDescriptor(_class$i.prototype, "pageSize", [_dec3$5, _dec4$3], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$h);
+}), _class$i);
 
 const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 
 class EntityBaseEmpty {}
 
-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({
+var _dec$h, _dec2$h, _dec3$4, _dec4$2, _dec5, _dec6, _dec7, _dec8, _class$h, _descriptor$2, _descriptor2, _descriptor3, _descriptor4;
+let EntityBaseInner = (_dec$h = Api.field(v.openapi({
   title: $locale('CreatedAt'),
   rest: {
     order: OrderMaxBase - 2
   }
-})), _dec2$g = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
+})), _dec2$h = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec3$4 = Api.field(v.openapi({
   title: $locale('UpdatedAt'),
   rest: {
     order: OrderMaxBase - 1
@@ -1251,7 +1277,7 @@ let EntityBaseInner = (_dec$g = Api.field(v.openapi({
   rest: {
     visible: false
   }
-}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$g = class EntityBaseInner extends EntityBaseEmpty {
+}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$h = class EntityBaseInner extends EntityBaseEmpty {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "createdAt", _descriptor$2, this);
@@ -1259,63 +1285,63 @@ let EntityBaseInner = (_dec$g = Api.field(v.openapi({
     _initializerDefineProperty(this, "deleted", _descriptor3, this);
     _initializerDefineProperty(this, "iid", _descriptor4, this);
   }
-}, _descriptor$2 = _applyDecoratedDescriptor(_class$g.prototype, "createdAt", [_dec$g, _dec2$g], {
+}, _descriptor$2 = _applyDecoratedDescriptor(_class$h.prototype, "createdAt", [_dec$h, _dec2$h], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class$g.prototype, "updatedAt", [_dec3$4, _dec4$2], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class$h.prototype, "updatedAt", [_dec3$4, _dec4$2], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class$g.prototype, "deleted", [_dec5, _dec6], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class$h.prototype, "deleted", [_dec5, _dec6], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class$g.prototype, "iid", [_dec7, _dec8], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class$h.prototype, "iid", [_dec7, _dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$g);
+}), _class$h);
 
-var _dec$f, _dec2$f, _class$f, _descriptor$1;
-let EntityBase = (_dec$f = Api.field(v.openapi({
+var _dec$g, _dec2$g, _class$g, _descriptor$1;
+let EntityBase = (_dec$g = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-}), v.tableIdentity()), _dec2$f = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$f = class EntityBase extends EntityBaseInner {
+}), v.tableIdentity()), _dec2$g = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _class$g = class EntityBase extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor$1, this);
   }
-}, _descriptor$1 = _applyDecoratedDescriptor(_class$f.prototype, "id", [_dec$f, _dec2$f], {
+}, _descriptor$1 = _applyDecoratedDescriptor(_class$g.prototype, "id", [_dec$g, _dec2$g], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$f);
+}), _class$g);
 
-var _dec$e, _dec2$e, _class$e, _descriptor;
-let EntityBaseSimple = (_dec$e = Api.field(v.openapi({
+var _dec$f, _dec2$f, _class$f, _descriptor;
+let EntityBaseSimple = (_dec$f = Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-})), _dec2$e = Reflect.metadata("design:type", Number), _class$e = class EntityBaseSimple extends EntityBaseInner {
+})), _dec2$f = Reflect.metadata("design:type", Number), _class$f = class EntityBaseSimple extends EntityBaseInner {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "id", _descriptor, this);
   }
-}, _descriptor = _applyDecoratedDescriptor(_class$e.prototype, "id", [_dec$e, _dec2$e], {
+}, _descriptor = _applyDecoratedDescriptor(_class$f.prototype, "id", [_dec$f, _dec2$f], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _class$e);
+}), _class$f);
 
 const SymbolKeyEntity = Symbol('$entity');
 const SymbolKeyEntityMeta = Symbol('$entityMeta');
@@ -2003,12 +2029,10 @@ class BeanModelCrudInner extends BeanModelView {
     }
     // builder
     const builder = this.builder(table);
-    // insert
-    builder.insert(datas);
-    // debug
-    this.$loggerChild('model').debug('model.insert: %s', builder.toQuery());
+    // // debug
+    // this.$loggerChild('model').debug('model.insert: %s', builder.toQuery());
     // dialect insert
-    const ids = await this.dialect.insert(builder);
+    const ids = await this.dialect.insert(builder, datas);
     // combine
     const result = [];
     const dataDefault = await this.defaultData(table);
@@ -2109,10 +2133,10 @@ class BeanModelCrudTable extends BeanModelCrudInner {
   }
 }
 
-var _dec$d, _dec2$d, _dec3$3, _class$d;
-let BeanModel = (_dec$d = Bean(), _dec2$d = Virtual(), _dec3$3 = BeanInfo({
+var _dec$e, _dec2$e, _dec3$3, _class$e;
+let BeanModel = (_dec$e = Bean(), _dec2$e = Virtual(), _dec3$3 = BeanInfo({
   module: "a-orm"
-}), _dec$d(_class$d = _dec2$d(_class$d = _dec3$3(_class$d = class BeanModel extends BeanModelCrudTable {}) || _class$d) || _class$d) || _class$d);
+}), _dec$e(_class$e = _dec2$e(_class$e = _dec3$3(_class$e = class BeanModel extends BeanModelCrudTable {}) || _class$e) || _class$e) || _class$e);
 
 const SymbolCacheOptions = Symbol('SymbolCacheOptions');
 const SymbolCacheEnabled = Symbol('SymbolCacheEnabled');
@@ -2187,10 +2211,10 @@ class ModelCacheBase extends BeanBase {
   }
 }
 
-var _dec$c, _dec2$c, _class$c;
-let ServiceCacheEntity = (_dec$c = Service(), _dec2$c = BeanInfo({
+var _dec$d, _dec2$d, _class$d;
+let ServiceCacheEntity = (_dec$d = Service(), _dec2$d = BeanInfo({
   module: "a-orm"
-}), _dec$c(_class$c = _dec2$c(_class$c = class ServiceCacheEntity extends ModelCacheBase {
+}), _dec$d(_class$d = _dec2$d(_class$d = class ServiceCacheEntity extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'entity');
   }
@@ -2213,12 +2237,12 @@ let ServiceCacheEntity = (_dec$c = Service(), _dec2$c = BeanInfo({
   get keysAux() {
     return this._model.options.cache?.keysAux;
   }
-}) || _class$c) || _class$c);
+}) || _class$d) || _class$d);
 
-var _dec$b, _dec2$b, _class$b;
-let ServiceCacheQuery = (_dec$b = Service(), _dec2$b = BeanInfo({
+var _dec$c, _dec2$c, _class$c;
+let ServiceCacheQuery = (_dec$c = Service(), _dec2$c = BeanInfo({
   module: "a-orm"
-}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceCacheQuery extends ModelCacheBase {
+}), _dec$c(_class$c = _dec2$c(_class$c = class ServiceCacheQuery extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'query');
   }
@@ -2228,12 +2252,12 @@ let ServiceCacheQuery = (_dec$b = Service(), _dec2$b = BeanInfo({
     const cache = this.getInstance(table);
     await cache.clear();
   }
-}) || _class$b) || _class$b);
+}) || _class$c) || _class$c);
 
-var _dec$a, _dec2$a, _class$a;
-let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
+var _dec$b, _dec2$b, _class$b;
+let ServiceRelations = (_dec$b = Service(), _dec2$b = BeanInfo({
   module: "a-orm"
-}), _dec$a(_class$a = _dec2$a(_class$a = class ServiceRelations extends BeanBase {
+}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceRelations extends BeanBase {
   constructor(...args) {
     super(...args);
     this._model = void 0;
@@ -2729,7 +2753,7 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
     if (!columns) return [columns, true];
     columns = Array.isArray(columns) ? columns : [columns];
     if (columns.includes('*') || columns.includes(key)) return [columns, true];
-    columns.push(key);
+    columns = columns.concat(key);
     return [columns, false];
   }
   __getModelTarget(modelClassTarget, meta) {
@@ -2774,7 +2798,7 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
     }
     return relations;
   }
-}) || _class$a) || _class$a);
+}) || _class$b) || _class$b);
 
 class BeanModelCrud extends BeanModelCrudInner {
   async mget(ids, options) {
@@ -3244,17 +3268,73 @@ class BeanModelCache extends BeanModelCrud {
     return data2;
   }
   async cacheEntityDel(id, table) {
+    await this.cacheEntityDelInner(id, table);
+    if (this.db.inTransaction) {
+      this.db.commit(async () => {
+        await this.cacheEntityDelInner(id, table);
+      });
+    }
+    this._shardingCacheDoubleDelete({
+      beanFullName: this.$beanFullName,
+      clientName: this.db.clientName,
+      table: this.getTable(),
+      method: 'cacheEntityDelInner',
+      args: [id, table]
+    });
+  }
+  async cacheEntityDelInner(id, table) {
     await this.cacheEntity.del(id, table);
-    await this.cacheQueryClear(table);
+    await this.cacheQueryClearInner(table);
   }
   async cacheEntityClear(table) {
+    await this.cacheEntityClearInner(table);
+    if (this.db.inTransaction) {
+      this.db.commit(async () => {
+        await this.cacheEntityClearInner(table);
+      });
+    }
+    this._shardingCacheDoubleDelete({
+      beanFullName: this.$beanFullName,
+      clientName: this.db.clientName,
+      table: this.getTable(),
+      method: 'cacheEntityClearInner',
+      args: [table]
+    });
+  }
+  async cacheEntityClearInner(table) {
     await this.cacheEntity.clear(table);
-    await this.cacheQueryClear(table);
+    await this.cacheQueryClearInner(table);
   }
   async cacheQueryClear(table) {
+    await this.cacheQueryClearInner(table);
+    if (this.db.inTransaction) {
+      this.db.commit(async () => {
+        await this.cacheQueryClearInner(table);
+      });
+    }
+    this._shardingCacheDoubleDelete({
+      beanFullName: this.$beanFullName,
+      clientName: this.db.clientName,
+      table: this.getTable(),
+      method: 'cacheQueryClearInner',
+      args: [table]
+    });
+  }
+  async cacheQueryClearInner(table) {
     await this.cacheQuery.clear(table);
     await this._cacheQueryClearModelsClear();
   }
+  _shardingCacheDoubleDelete(jobData) {
+    const doubleDelete = this.scopeOrm.config.sharding.cache.doubleDelete;
+    if (!doubleDelete) return;
+    if (this.db.inTransaction) {
+      this.db.commit(() => {
+        this.scopeOrm.queue.doubleDelete.push(jobData);
+      });
+    } else {
+      this.scopeOrm.queue.doubleDelete.push(jobData);
+    }
+  }
   async _cacheQueryClearModelsClear() {
     const modelsClear = this._getModelsClear();
     if (!modelsClear || modelsClear.length === 0) return;
@@ -3264,7 +3344,7 @@ class BeanModelCache extends BeanModelCrud {
       if (modelsClearedByFn) {
         await modelsClearedByFn(this.ctx, modelTarget, this);
       } else {
-        await modelTarget.cacheQueryClear();
+        await modelTarget.cacheQueryClearInner();
       }
     }
   }
@@ -3340,16 +3420,16 @@ class BeanModelCache extends BeanModelCrud {
   }
 }
 
-var _dec$9, _dec2$9, _dec3$2, _class$9;
-let BeanModelBase = (_dec$9 = Bean(), _dec2$9 = Virtual(), _dec3$2 = BeanInfo({
+var _dec$a, _dec2$a, _dec3$2, _class$a;
+let BeanModelBase = (_dec$a = Bean(), _dec2$a = Virtual(), _dec3$2 = BeanInfo({
   module: "a-orm"
-}), _dec$9(_class$9 = _dec2$9(_class$9 = _dec3$2(_class$9 = class BeanModelBase extends BeanModelCache {}) || _class$9) || _class$9) || _class$9);
+}), _dec$a(_class$a = _dec2$a(_class$a = _dec3$2(_class$a = class BeanModelBase extends BeanModelCache {}) || _class$a) || _class$a) || _class$a);
 
-var _dec$8, _dec2$8, _dec3$1, _dec4$1, _class$8;
+var _dec$9, _dec2$9, _dec3$1, _dec4$1, _class$9;
 const SymbolModuleScope$1 = Symbol('SymbolModuleScope');
-let ServiceEntityResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
+let ServiceEntityResolver = (_dec$9 = Service(), _dec2$9 = BeanInfo({
   module: "a-orm"
-}), _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 {
+}), _dec3$1 = Reflect.metadata("design:type", Function), _dec4$1 = Reflect.metadata("design:paramtypes", [String]), _dec$9(_class$9 = _dec2$9(_class$9 = _dec3$1(_class$9 = _dec4$1(_class$9 = class ServiceEntityResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope$1] = void 0;
@@ -3364,13 +3444,13 @@ let ServiceEntityResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
     }
     return this.__instances[prop];
   }
-}) || _class$8) || _class$8) || _class$8) || _class$8);
+}) || _class$9) || _class$9) || _class$9) || _class$9);
 
-var _dec$7, _dec2$7, _dec3, _dec4, _class$7;
+var _dec$8, _dec2$8, _dec3, _dec4, _class$8;
 const SymbolModuleScope = Symbol('SymbolModuleScope');
-let ServiceModelResolver = (_dec$7 = Service(), _dec2$7 = BeanInfo({
+let ServiceModelResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
   module: "a-orm"
-}), _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 {
+}), _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [String]), _dec$8(_class$8 = _dec2$8(_class$8 = _dec3(_class$8 = _dec4(_class$8 = class ServiceModelResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope] = void 0;
@@ -3380,12 +3460,12 @@ let ServiceModelResolver = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     const beanFullName = `${this[SymbolModuleScope]}.model.${prop}`;
     return this.bean._getBean(beanFullName);
   }
-}) || _class$7) || _class$7) || _class$7) || _class$7);
+}) || _class$8) || _class$8) || _class$8) || _class$8);
 
-var _dec$6, _dec2$6, _class$6;
-let BroadcastColumnsClear = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
+var _dec$7, _dec2$7, _class$7;
+let BroadcastColumnsClear = (_dec$7 = Broadcast(), _dec2$7 = BeanInfo({
   module: "a-orm"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class BroadcastColumnsClear extends BeanBroadcastBase {
+}), _dec$7(_class$7 = _dec2$7(_class$7 = class BroadcastColumnsClear extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3395,12 +3475,12 @@ let BroadcastColumnsClear = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
       await cast(this.scope.service.database).__columnsClearRaw(clientName, tableName);
     }
   }
-}) || _class$6) || _class$6);
+}) || _class$7) || _class$7);
 
-var _dec$5, _dec2$5, _class$5;
-let BroadcastDatabaseClientReload = (_dec$5 = Broadcast(), _dec2$5 = BeanInfo({
+var _dec$6, _dec2$6, _class$6;
+let BroadcastDatabaseClientReload = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
   module: "a-orm"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class BroadcastDatabaseClientReload extends BeanBroadcastBase {
+}), _dec$6(_class$6 = _dec2$6(_class$6 = class BroadcastDatabaseClientReload extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3411,22 +3491,38 @@ let BroadcastDatabaseClientReload = (_dec$5 = Broadcast(), _dec2$5 = BeanInfo({
       await cast(this.scope.service.database).__reloadAllClientsRaw(clientName, clientConfig, extraData);
     }
   }
-}) || _class$5) || _class$5);
+}) || _class$6) || _class$6);
+
+var _dec$5, _dec2$5, _class$5;
+let EventClientNameReal = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+  module: "a-orm"
+}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventClientNameReal extends BeanEventBase {}) || _class$5) || _class$5);
 
 var _dec$4, _dec2$4, _class$4;
-let EventClientNameReal = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+let EventColumnsClear = (_dec$4 = Event(), _dec2$4 = BeanInfo({
   module: "a-orm"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventClientNameReal extends BeanEventBase {}) || _class$4) || _class$4);
+}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventColumnsClear extends BeanEventBase {}) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
-let EventColumnsClear = (_dec$3 = Event(), _dec2$3 = BeanInfo({
+let EventDatabaseClientReload = (_dec$3 = Event(), _dec2$3 = BeanInfo({
   module: "a-orm"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class EventColumnsClear extends BeanEventBase {}) || _class$3) || _class$3);
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class EventDatabaseClientReload extends BeanEventBase {}) || _class$3) || _class$3);
 
 var _dec$2, _dec2$2, _class$2;
-let EventDatabaseClientReload = (_dec$2 = Event(), _dec2$2 = BeanInfo({
+let QueueDoubleDelete = (_dec$2 = Queue({
+  options: {
+    job: {
+      delay: 3 * 1000
+    }
+  }
+}), _dec2$2 = BeanInfo({
   module: "a-orm"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class EventDatabaseClientReload extends BeanEventBase {}) || _class$2) || _class$2);
+}), _dec$2(_class$2 = _dec2$2(_class$2 = 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);
 
 var _dec$1, _dec2$1, _class$1;
 let ScheduleSoftDeletionPrune = (_dec$1 = Schedule({
@@ -3470,11 +3566,19 @@ let ScheduleSoftDeletionPrune = (_dec$1 = Schedule({
 
 function config(_app) {
   return {
+    sharding: {
+      cache: {
+        doubleDelete: false
+      }
+    },
     rest: {
       query: {
         pageSize: {
           default: 20,
           max: 100
+        },
+        orders: {
+          default: 'createdAt,desc'
         }
       }
     },
@@ -3647,11 +3751,11 @@ class Main extends BeanSimple {
         };
       }
     });
-    Object.defineProperty(this.app.context, 'commitDone', {
+    Object.defineProperty(this.app.context, 'commitsDone', {
       enumerable: false,
       get() {
         return function () {
-          cast(this).transactionConsistency.commitDone();
+          return cast(this).transactionConsistency.commitsDone();
         };
       }
     });
@@ -4241,4 +4345,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, DtoQueryBase, DtoQueryPageBase, 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 };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, 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, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/service/transactionConsistency/342/200/214_.d.ts

@@ -5,6 +5,6 @@ export declare class ServiceTransactionConsistency‌ extends BeanBase {
     private _compensateCallbacks;
     commit(cb: FunctionAny): void;
     compensate(cb: FunctionAny): void;
-    commitDone(): Promise<void>;
-    compensateDone(): Promise<void>;
+    commitsDone(): Promise<void>;
+    compensatesDone(): Promise<void>;
 }

package/dist/types/database.d.ts

@@ -29,7 +29,7 @@ declare module 'vona' {
     interface VonaContext {
         get db(): ServiceDb;
         commit(cb: FunctionAny): void;
-        commitDone(): Promise<void>;
+        commitsDone(): Promise<void>;
     }
     interface VonaConfigEnv {
         DATABASE_DEFAULT_CLIENT: string | undefined;

package/dist/types/modelWhere.d.ts

@@ -10,6 +10,8 @@ export declare const OpJoint: {
 export declare const OpNormal: {
     readonly eq: "_eq_";
     readonly notEq: "_notEq_";
+    readonly eqI: "_eqI_";
+    readonly notEqI: "_notEqI_";
     readonly gt: "_gt_";
     readonly gte: "_gte_";
     readonly lt: "_lt_";
@@ -31,6 +33,8 @@ export declare const OpNormal: {
 export declare const Op: {
     readonly eq: "_eq_";
     readonly notEq: "_notEq_";
+    readonly eqI: "_eqI_";
+    readonly notEqI: "_notEqI_";
     readonly gt: "_gt_";
     readonly gte: "_gte_";
     readonly lt: "_lt_";
@@ -56,8 +60,8 @@ export declare const Op: {
     readonly skip: "_skip_";
 };
 export declare const OpJointValues: ("_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_")[];
-export declare const OpNormalValues: ("_eq_" | "_notEq_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_")[];
-export declare const OpValues: ("_eq_" | "_notEq_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_" | "_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_" | "_skip_")[];
+export declare const OpNormalValues: ("_eq_" | "_notEq_" | "_eqI_" | "_notEqI_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_")[];
+export declare const OpValues: ("_and_" | "_or_" | "_not_" | "_exists_" | "_notExists_" | "_skip_" | "_eq_" | "_notEq_" | "_eqI_" | "_notEqI_" | "_gt_" | "_gte_" | "_lt_" | "_lte_" | "_in_" | "_notIn_" | "_is_" | "_isNot_" | "_between_" | "_notBetween_" | "_startsWith_" | "_endsWith_" | "_includes_" | "_startsWithI_" | "_endsWithI_" | "_includesI_" | "_ref_")[];
 export type TypeOpsJointPostfix<Op> = {
     [KEY in keyof Op]: Op[KEY] | (KEY extends string ? `_${KEY}_${number}` : never);
 };

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

@@ -5,7 +5,7 @@ export interface IDecoratorDatabaseDialectOptions {
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {
-        databaseDialect: ServiceOnion<IDecoratorDatabaseDialectOptions, keyof IDatabaseDialectRecord>;
+        databaseDialect: ServiceOnion<IDatabaseDialectRecord>;
     }
 }
 declare module 'vona' {

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

@@ -1,6 +1,7 @@
 import type { OmitNever } from 'vona';
 import type { ServiceOnion } from 'vona-module-a-onion';
 import type { TypeOpenapiMetadata } from 'vona-module-a-openapi';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
 import type { SymbolKeyFieldsMore } from '../entity.ts';
 import type { ITableRecord } from './table.ts';
 export interface IEntityRecord {
@@ -10,10 +11,11 @@ export interface IDecoratorEntityOptions<FieldsMore = never> {
     table?: keyof ITableRecord;
     independent?: boolean;
     openapi?: TypeOpenapiMetadata;
+    pipes?: SchemaLike | SchemaLike[];
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {
-        entity: ServiceOnion<IDecoratorEntityOptions, keyof IEntityRecord>;
+        entity: ServiceOnion<IEntityRecord>;
     }
 }
 declare module 'vona' {

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

@@ -42,7 +42,7 @@ export interface IDecoratorModelOptions<TRecord extends EntityBaseEmpty = any> {
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {
-        model: ServiceOnion<IDecoratorModelOptions, keyof IModelRecord>;
+        model: ServiceOnion<IModelRecord>;
     }
 }
 declare module 'vona' {

package/package.json

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