vona-module-a-orm 5.0.93 → 5.0.95

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

@@ -192,14 +192,22 @@ declare module 'vona-module-a-orm' {
 }
 /** schedule: end */
 /** hmr: begin */
+export * from '../bean/hmr.entity.ts';
 export * from '../bean/hmr.model.ts';
 import 'vona';
 declare module 'vona' {
     interface IHmrRecord {
+        'a-orm:entity': never;
         'a-orm:model': never;
     }
 }
 declare module 'vona-module-a-orm' {
+    interface HmrEntity {
+    }
+    interface HmrEntity {
+        get $beanFullName(): 'a-orm.hmr.entity';
+        get $onionName(): 'a-orm:entity';
+    }
     interface HmrModel {
     }
     interface HmrModel {

package/dist/.metadata/locales.d.ts

@@ -17,4 +17,4 @@ export declare const locales: {
         ShouldSpecifyTable: string;
     };
 };
-export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): import("vona").ILocaleMagic<`a-orm::${K}`>;
+export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): import("vona").ILocaleMagic<`a-orm::${K}`>;

package/dist/bean/hmr.entity.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 HmrEntity extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/index.js

@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, beanFullNameFromOnionName, Virtual, cast, useApp, $makeLocaleMagic, disposeInstance, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class } from 'vona';
+import { __decorate, __metadata } from 'tslib';
 import { AopMethod } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { AsyncLocalStorage, AsyncResource } from 'node:async_hooks';
@@ -20,21 +21,18 @@ 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$w, _dec2$w, _class$w;
-let AopMethodTransaction = (_dec$w = AopMethod(), _dec2$w = BeanInfo({
-  module: "a-orm"
-}), _dec$w(_class$w = _dec2$w(_class$w = class AopMethodTransaction extends BeanAopMethodBase {
+let AopMethodTransaction = class AopMethodTransaction extends BeanAopMethodBase {
   execute(options, _args, next, _receiver, _prop) {
     return this.bean.database.current.transaction.begin(() => {
       return next();
     }, options);
   }
-}) || _class$w) || _class$w);
-
-var _dec$v, _dec2$v, _class$v;
-let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
+};
+AopMethodTransaction = __decorate([AopMethod(), BeanInfo({
   module: "a-orm"
-}), _dec$v(_class$v = _dec2$v(_class$v = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
+})], AopMethodTransaction);
+
+let ServiceDatabaseAsyncLocalStorage = class ServiceDatabaseAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.dbStorage = void 0;
@@ -53,14 +51,14 @@ let ServiceDatabaseAsyncLocalStorage = (_dec$v = Service(), _dec2$v = BeanInfo({
       return fn();
     });
   }
-}) || _class$v) || _class$v);
+};
+ServiceDatabaseAsyncLocalStorage = __decorate([Service(), BeanInfo({
+  module: "a-orm"
+})], ServiceDatabaseAsyncLocalStorage);
 
-var _dec$u, _dec2$u, _class$u;
 const SymbolColumnsCache = Symbol('SymbolColumnsCache');
 const SymbolColumnsDefaultCache = Symbol('SymbolColumnsDefaultCache');
-let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
-  module: "a-orm"
-}), _dec$u(_class$u = _dec2$u(_class$u = class ServiceColumnsCache extends BeanBase {
+let ServiceColumnsCache = class ServiceColumnsCache extends BeanBase {
   constructor(...args) {
     super(...args);
     this.clientName = void 0;
@@ -115,12 +113,12 @@ let ServiceColumnsCache = (_dec$u = Service(), _dec2$u = BeanInfo({
       return exists;
     }
   }
-}) || _class$u) || _class$u);
-
-var _dec$t, _dec2$t, _class$t;
-let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
+};
+ServiceColumnsCache = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$t(_class$t = _dec2$t(_class$t = class ServiceColumns extends BeanBase {
+})], ServiceColumnsCache);
+
+let ServiceColumns = class ServiceColumns extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -171,7 +169,10 @@ let ServiceColumns = (_dec$t = Service(), _dec2$t = BeanInfo({
   columnsClear(tableName) {
     return this.scope.service.database.columnsClear(this.db.clientName, tableName);
   }
-}) || _class$t) || _class$t);
+};
+ServiceColumns = __decorate([Service(), BeanInfo({
+  module: "a-orm"
+})], ServiceColumns);
 
 const TransactionIsolationLevelsMap = {
   DEFAULT: undefined,
@@ -182,12 +183,7 @@ const TransactionIsolationLevelsMap = {
   SNAPSHOT: 'snapshot'
 };
 
-// export type TransactionPropagation=''
-
-var _dec$s, _dec2$s, _class$s;
-let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
-  module: "a-orm"
-}), _dec$s(_class$s = _dec2$s(_class$s = class ServiceDatabase extends BeanBase {
+let ServiceDatabase = class ServiceDatabase extends BeanBase {
   get configDatabase() {
     return this.app.config.database;
   }
@@ -306,12 +302,12 @@ let ServiceDatabase = (_dec$s = Service(), _dec2$s = BeanInfo({
     });
     this.columnsClear(clientName);
   }
-}) || _class$s) || _class$s);
-
-var _dec$r, _dec2$r, _class$r;
-let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
+};
+ServiceDatabase = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$r(_class$r = _dec2$r(_class$r = class ServiceTransactionConsistency‌ extends BeanBase {
+})], ServiceDatabase);
+
+let ServiceTransactionConsistency‌ = class ServiceTransactionConsistency‌ extends BeanBase {
   constructor(...args) {
     super(...args);
     this._commitCallbacks = [];
@@ -339,12 +335,12 @@ let ServiceTransactionConsistency‌ = (_dec$r = Service(), _dec2$r = BeanInfo({
     }
     this._commitCallbacks = [];
   }
-}) || _class$r) || _class$r);
-
-var _dec$q, _dec2$q, _class$q;
-let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
+};
+ServiceTransactionConsistency‌ = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$q(_class$q = _dec2$q(_class$q = class ServiceTransactionFiber extends BeanBase {
+})], ServiceTransactionConsistency‌);
+
+let ServiceTransactionFiber = class ServiceTransactionFiber extends BeanBase {
   constructor(...args) {
     super(...args);
     this._connection = void 0;
@@ -373,12 +369,12 @@ let ServiceTransactionFiber = (_dec$q = Service(), _dec2$q = BeanInfo({
     await this._transactionConsistency.compensatesDone();
     this._connection = undefined;
   }
-}) || _class$q) || _class$q);
-
-var _dec$p, _dec2$p, _class$p;
-let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
+};
+ServiceTransactionFiber = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$p(_class$p = _dec2$p(_class$p = class ServiceTransactionState extends BeanBase {
+})], ServiceTransactionFiber);
+
+let ServiceTransactionState = class ServiceTransactionState extends BeanBase {
   constructor(...args) {
     super(...args);
     this._fibers = {};
@@ -400,12 +396,12 @@ let ServiceTransactionState = (_dec$p = Service(), _dec2$p = BeanInfo({
     const selector = this.serviceDatabase.prepareClientNameSelector(db.info, db.dialect);
     delete this._fibers[selector];
   }
-}) || _class$p) || _class$p);
-
-var _dec$o, _dec2$o, _class$o;
-let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInfo({
+};
+ServiceTransactionState = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$o(_class$o = _dec2$o(_class$o = class ServiceTransactionAsyncLocalStorage extends BeanBase {
+})], ServiceTransactionState);
+
+let ServiceTransactionAsyncLocalStorage = class ServiceTransactionAsyncLocalStorage extends BeanBase {
   constructor(...args) {
     super(...args);
     this.transactionStorage = void 0;
@@ -426,12 +422,12 @@ let ServiceTransactionAsyncLocalStorage = (_dec$o = Service(), _dec2$o = BeanInf
       return fn();
     });
   }
-}) || _class$o) || _class$o);
-
-var _dec$n, _dec2$n, _class$n;
-let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
+};
+ServiceTransactionAsyncLocalStorage = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$n(_class$n = _dec2$n(_class$n = class ServiceTransaction extends BeanBase {
+})], ServiceTransactionAsyncLocalStorage);
+
+let ServiceTransaction = class ServiceTransaction extends BeanBase {
   constructor(...args) {
     super(...args);
     this._db = void 0;
@@ -550,7 +546,10 @@ let ServiceTransaction = (_dec$n = Service(), _dec2$n = BeanInfo({
     }
     return res;
   }
-}) || _class$n) || _class$n);
+};
+ServiceTransaction = __decorate([Service(), BeanInfo({
+  module: "a-orm"
+})], ServiceTransaction);
 function _translateTransactionOptions(options) {
   if (!options) return undefined;
   return {
@@ -559,10 +558,7 @@ function _translateTransactionOptions(options) {
   };
 }
 
-var _dec$m, _dec2$m, _class$m;
-let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
-  module: "a-orm"
-}), _dec$m(_class$m = _dec2$m(_class$m = class ServiceDb extends BeanBase {
+let ServiceDb = class ServiceDb extends BeanBase {
   constructor(...args) {
     super(...args);
     this._client = void 0;
@@ -617,12 +613,12 @@ let ServiceDb = (_dec$m = Service(), _dec2$m = BeanInfo({
   compensate(cb) {
     return this.transaction.compensate(cb);
   }
-}) || _class$m) || _class$m);
-
-var _dec$l, _dec2$l, _class$l;
-let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
+};
+ServiceDb = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$l(_class$l = _dec2$l(_class$l = class ServiceDatabaseClient extends BeanMutateBase {
+})], ServiceDb);
+
+let ServiceDatabaseClient = class ServiceDatabaseClient extends BeanMutateBase {
   constructor(...args) {
     super(...args);
     this.level = void 0;
@@ -709,7 +705,6 @@ let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
     }
     return result;
   }
-
   // only used by startup, so no consider that workers broadcast
   async changeConfigConnectionAndReloadWorker(databaseName) {
     // set databaseName
@@ -724,12 +719,12 @@ let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
     await this.scope.service.database.reloadClientsWorker(this.clientName, config);
     // await this.scope.service.database.reloadClients(this.clientName, config);
   }
-}) || _class$l) || _class$l);
-
-var _dec$k, _dec2$k, _class$k;
-let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
+};
+ServiceDatabaseClient = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$k(_class$k = _dec2$k(_class$k = class BeanDatabase extends BeanBase {
+})], ServiceDatabaseClient);
+
+let BeanDatabase = class BeanDatabase extends BeanBase {
   get current() {
     return this.bean._getBean(ServiceDatabaseAsyncLocalStorage).current;
   }
@@ -769,12 +764,12 @@ let BeanDatabase = (_dec$k = Bean(), _dec2$k = BeanInfo({
       return this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn);
     });
   }
-}) || _class$k) || _class$k);
-
-var _dec$j, _dec2$j, _dec3$7, _class$j;
-let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = BeanInfo({
+};
+BeanDatabase = __decorate([Bean(), BeanInfo({
   module: "a-orm"
-}), _dec$j(_class$j = _dec2$j(_class$j = _dec3$7(_class$j = class BeanDatabaseDialectBase extends BeanBase {
+})], BeanDatabase);
+
+let BeanDatabaseDialectBase = class BeanDatabaseDialectBase extends BeanBase {
   constructor(...args) {
     super(...args);
     this._capabilities = void 0;
@@ -882,7 +877,6 @@ let BeanDatabaseDialectBase = (_dec$j = Bean(), _dec2$j = Virtual(), _dec3$7 = B
     // others
     return value;
   }
-
   // pg: nextval
   _safeNumber(value) {
     const num = Number(value);
@@ -891,7 +885,10 @@ 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);
+};
+BeanDatabaseDialectBase = __decorate([Bean(), Virtual(), BeanInfo({
+  module: "a-orm"
+})], BeanDatabaseDialectBase);
 
 const OpAggrs = ['count', 'sum', 'avg', 'max', 'min'];
 const OpJoint = {
@@ -933,14 +930,6 @@ const OpJointValues = Object.values(OpJoint);
 const OpNormalValues = Object.values(OpNormal);
 const OpValues = Object.values(Op);
 
-// not use TypeOpsJointPostfix, which cause type not take affect for table.field
-// export type TypeOpsJoint = TypeRecordValues<TypeOpsJointPostfix<Pick<typeof Op, 'and' | 'or' | 'not' | 'exists' | 'notExists'>>>;
-
-// not use Knex.Raw
-
-// not use Knex.Raw
-// Columns extends {} ? TypeModelWhereInner<Columns> | Knex.Raw : TypeModelWhereInner<TRecord> | Knex.Raw;
-
 function isRaw(raw) {
   return typeof raw?.constructor === 'function' && raw?.constructor?.name === 'Raw';
 }
@@ -974,7 +963,6 @@ function getClassEntityFromClassModel(modelClass) {
   const options = beanOptions.options;
   return options.entity;
 }
-
 // export function formatValue(value) {
 //   if (typeof value !== 'object' || value instanceof Date) return value;
 //   // date
@@ -991,7 +979,6 @@ function getClassEntityFromClassModel(modelClass) {
 //   // others
 //   return value.val;
 // }
-
 // export function formatValueArray(value) {
 //   if (!value.val) return null;
 //   const arr = typeof value.val === 'string' ? value.val.split(',') : value.val;
@@ -1190,74 +1177,35 @@ function _safeColumn(column) {
   return column.replace(/[\\.#%'"`;,() ]/g, '');
 }
 
-function _applyDecoratedDescriptor(i, e, r, n, l) {
-  var a = {};
-  return Object.keys(n).forEach(function (i) {
-    a[i] = n[i];
-  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
-    return n(i, e, r) || r;
-  }, a), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
-}
-function _initializerDefineProperty(e, i, r, l) {
-  r && Object.defineProperty(e, i, {
-    enumerable: r.enumerable,
-    configurable: r.configurable,
-    writable: r.writable,
-    value: r.initializer ? r.initializer.call(l) : void 0
-  });
-}
-
-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$i = Api.field(v.optional(), v.array(String, {
-  separator: ','
-})), _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 {
+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], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2$2 = _applyDecoratedDescriptor(_class$i.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], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class$i);
+    this.columns = void 0;
+    this.where = void 0;
+    this.orders = void 0;
+  }
+}
+__decorate([Api.field(v.optional(), v.array(String, {
+  separator: ','
+})), __metadata("design:type", Array)], DtoQueryBase.prototype, "columns", void 0);
+__decorate([Api.field(v.optional(), z.looseObject({})), __metadata("design:type", Object)], DtoQueryBase.prototype, "where", void 0);
+__decorate([Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), __metadata("design:type", Object)], DtoQueryBase.prototype, "orders", void 0);
 
-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$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 {
+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], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2$1 = _applyDecoratedDescriptor(_class$h.prototype, "pageSize", [_dec3$5, _dec4$3], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class$h);
+    this.pageNo = void 0;
+    this.pageSize = void 0;
+  }
+}
+__decorate([Api.field(z.number().min(1).default(1)), __metadata("design:type", Number)], DtoQueryPageBase.prototype, "pageNo", void 0);
+__decorate([Api.field(z.number().min(1).max(pageSizeMax).default(pageSizeDefault)), __metadata("design:type", Number)], DtoQueryPageBase.prototype, "pageSize", void 0);
 
 const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 
@@ -1283,105 +1231,76 @@ const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn
 };
-function $locale(key) {
-  return $makeLocaleMagic(`a-orm::${key}`);
+function $locale(key, ...args) {
+  return $makeLocaleMagic(`a-orm::${key}`, ...args);
 }
 
 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({
+class EntityBaseInner extends EntityBaseEmpty {
+  constructor(...args) {
+    super(...args);
+    this.createdAt = void 0;
+    this.updatedAt = void 0;
+    this.deleted = void 0;
+    this.iid = void 0;
+  }
+}
+__decorate([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({
+})), __metadata("design:type", Date)], EntityBaseInner.prototype, "createdAt", void 0);
+__decorate([Api.field(v.openapi({
   title: $locale('UpdatedAt'),
   rest: {
     order: OrderMaxBase - 1
   }
-})), _dec4$2 = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec5 = Api.field(v.openapi({
+})), __metadata("design:type", Date)], EntityBaseInner.prototype, "updatedAt", void 0);
+__decorate([Api.field(v.openapi({
   title: $locale('Deleted'),
   rest: {
     visible: false
   }
-}), v.default(false)), _dec6 = Reflect.metadata("design:type", Boolean), _dec7 = Api.field(v.openapi({
+}), v.default(false)), __metadata("design:type", Boolean)], EntityBaseInner.prototype, "deleted", void 0);
+__decorate([Api.field(v.openapi({
   title: $locale('InstanceId'),
   rest: {
     visible: false
   }
-}), v.default(0)), _dec8 = Reflect.metadata("design:type", Number), _class$g = class EntityBaseInner extends EntityBaseEmpty {
+}), v.default(0)), __metadata("design:type", Number)], EntityBaseInner.prototype, "iid", void 0);
+
+class EntityBase extends EntityBaseInner {
   constructor(...args) {
     super(...args);
-    _initializerDefineProperty(this, "createdAt", _descriptor$2, this);
-    _initializerDefineProperty(this, "updatedAt", _descriptor2, this);
-    _initializerDefineProperty(this, "deleted", _descriptor3, this);
-    _initializerDefineProperty(this, "iid", _descriptor4, this);
-  }
-}, _descriptor$2 = _applyDecoratedDescriptor(_class$g.prototype, "createdAt", [_dec$g, _dec2$g], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class$g.prototype, "updatedAt", [_dec3$4, _dec4$2], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class$g.prototype, "deleted", [_dec5, _dec6], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class$g.prototype, "iid", [_dec7, _dec8], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class$g);
-
-var _dec$f, _dec2$f, _class$f, _descriptor$1;
-let EntityBase = (_dec$f = Api.field(v.openapi({
+    this.id = void 0;
+  }
+}
+__decorate([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()), __metadata("design:type", Object)], EntityBase.prototype, "id", void 0);
+
+class EntityBaseSimple extends EntityBaseInner {
   constructor(...args) {
     super(...args);
-    _initializerDefineProperty(this, "id", _descriptor$1, this);
-  }
-}, _descriptor$1 = _applyDecoratedDescriptor(_class$f.prototype, "id", [_dec$f, _dec2$f], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class$f);
-
-var _dec$e, _dec2$e, _class$e, _descriptor;
-let EntityBaseSimple = (_dec$e = Api.field(v.openapi({
+    this.id = void 0;
+  }
+}
+__decorate([Api.field(v.openapi({
   title: $locale('TableIdentity'),
   rest: {
     order: OrderCoreBase + 1
   }
-})), _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$e.prototype, "id", [_dec$e, _dec2$e], {
-  configurable: true,
-  enumerable: true,
-  writable: true,
-  initializer: null
-}), _class$e);
+})), __metadata("design:type", Number)], EntityBaseSimple.prototype, "id", void 0);
 
 const SymbolKeyEntity = Symbol('$entity');
 const SymbolKeyEntityMeta = Symbol('$entityMeta');
 const SymbolKeyModelOptions = Symbol('$modelOptions');
 
-// not use Groups extends string |string[]
-
 const SymbolModelDb = Symbol('SymbolModelDb');
 const SymbolModelTable = Symbol('SymbolModelTable');
 class BeanModelMeta extends BeanBase {
@@ -1588,11 +1507,9 @@ class BeanModelUtils extends BeanModelMeta {
     const parts = Array.isArray(name) ? name : name.split(',');
     return this.raw(parts.map(_ => '??').join(','), parts);
   }
-
   // checkWhere(where: TypeModelWhere<TRecord>) {
   //   return checkWhere(where);
   // }
-
   buildWhere(builder, wheres) {
     if (!wheres) return;
     return buildWhere(this.db, builder, wheres);
@@ -1925,7 +1842,6 @@ class BeanModelCrudInner extends BeanModelView {
     const items = await this._mget_original(table, ids, options);
     return items.filter(item => !isNil(item));
   }
-
   // with undefined
   async _mget_original(table, ids, options) {
     // table
@@ -2158,10 +2074,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({
+let BeanModel = class BeanModel extends BeanModelCrudTable {};
+BeanModel = __decorate([Bean(), Virtual(), 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);
+})], BeanModel);
 
 const SymbolCacheModelsClear = Symbol('SymbolCacheModelsClearAll');
 const SymbolCacheModelCacheInstances = Symbol('SymbolCacheModelCacheInstances');
@@ -2292,10 +2208,7 @@ class ModelCacheBase extends BeanBase {
   }
 }
 
-var _dec$c, _dec2$c, _class$c;
-let ServiceCacheEntity = (_dec$c = Service(), _dec2$c = BeanInfo({
-  module: "a-orm"
-}), _dec$c(_class$c = _dec2$c(_class$c = class ServiceCacheEntity extends ModelCacheBase {
+let ServiceCacheEntity = class ServiceCacheEntity extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'entity');
   }
@@ -2318,12 +2231,12 @@ let ServiceCacheEntity = (_dec$c = Service(), _dec2$c = BeanInfo({
   get keysAux() {
     return this._model.options.cache?.keysAux;
   }
-}) || _class$c) || _class$c);
-
-var _dec$b, _dec2$b, _class$b;
-let ServiceCacheQuery = (_dec$b = Service(), _dec2$b = BeanInfo({
+};
+ServiceCacheEntity = __decorate([Service(), BeanInfo({
   module: "a-orm"
-}), _dec$b(_class$b = _dec2$b(_class$b = class ServiceCacheQuery extends ModelCacheBase {
+})], ServiceCacheEntity);
+
+let ServiceCacheQuery = class ServiceCacheQuery extends ModelCacheBase {
   __init__(model) {
     super.__init__(model, 'query');
   }
@@ -2333,7 +2246,10 @@ let ServiceCacheQuery = (_dec$b = Service(), _dec2$b = BeanInfo({
     const cache = this.getInstance(table);
     await cache.clear();
   }
-}) || _class$b) || _class$b);
+};
+ServiceCacheQuery = __decorate([Service(), BeanInfo({
+  module: "a-orm"
+})], ServiceCacheQuery);
 
 function handleRelationsCollection(relationsStatic, includeWrapper) {
   // collect
@@ -2378,10 +2294,7 @@ function handleRelationsCollection(relationsStatic, includeWrapper) {
   return relations;
 }
 
-var _dec$a, _dec2$a, _class$a;
-let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
-  module: "a-orm"
-}), _dec$a(_class$a = _dec2$a(_class$a = class ServiceRelations extends BeanBase {
+let ServiceRelations = class ServiceRelations extends BeanBase {
   constructor(...args) {
     super(...args);
     this._model = void 0;
@@ -2916,7 +2829,10 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
   handleRelationsCollection(includeWrapper) {
     return handleRelationsCollection(this._model.options.relations, includeWrapper);
   }
-}) || _class$a) || _class$a);
+};
+ServiceRelations = __decorate([Service(), BeanInfo({
+  module: "a-orm"
+})], ServiceRelations);
 
 class BeanModelCrud extends BeanModelCrudInner {
   async mget(ids, options) {
@@ -3602,16 +3518,13 @@ function __parseMagicField(str) {
   return [fieldName, op];
 }
 
-var _dec$9, _dec2$9, _dec3$2, _class$9;
-let BeanModelBase = (_dec$9 = Bean(), _dec2$9 = Virtual(), _dec3$2 = BeanInfo({
+let BeanModelBase = class BeanModelBase extends BeanModelCache {};
+BeanModelBase = __decorate([Bean(), Virtual(), 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);
+})], BeanModelBase);
 
-var _dec$8, _dec2$8, _dec3$1, _dec4$1, _class$8;
 const SymbolModuleScope$1 = Symbol('SymbolModuleScope');
-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$8(_class$8 = _dec2$8(_class$8 = _dec3$1(_class$8 = _dec4$1(_class$8 = class ServiceEntityResolver extends BeanBase {
+let ServiceEntityResolver = class ServiceEntityResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope$1] = void 0;
@@ -3626,13 +3539,13 @@ let ServiceEntityResolver = (_dec$8 = Service(), _dec2$8 = BeanInfo({
     }
     return this.__instances[prop];
   }
-}) || _class$8) || _class$8) || _class$8) || _class$8);
+};
+ServiceEntityResolver = __decorate([Service(), __metadata("design:paramtypes", [String]), BeanInfo({
+  module: "a-orm"
+})], ServiceEntityResolver);
 
-var _dec$7, _dec2$7, _dec3, _dec4, _class$7;
 const SymbolModuleScope = Symbol('SymbolModuleScope');
-let ServiceModelResolver = (_dec$7 = Service(), _dec2$7 = 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 {
+let ServiceModelResolver = class ServiceModelResolver extends BeanBase {
   constructor(moduleScope) {
     super();
     this[SymbolModuleScope] = void 0;
@@ -3642,12 +3555,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);
-
-var _dec$6, _dec2$6, _class$6;
-let BroadcastColumnsClear = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
+};
+ServiceModelResolver = __decorate([Service(), __metadata("design:paramtypes", [String]), BeanInfo({
   module: "a-orm"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class BroadcastColumnsClear extends BeanBroadcastBase {
+})], ServiceModelResolver);
+
+let BroadcastColumnsClear = class BroadcastColumnsClear extends BeanBroadcastBase {
   async execute(data, isEmitter) {
     const {
       clientName,
@@ -3657,42 +3570,38 @@ let BroadcastColumnsClear = (_dec$6 = Broadcast(), _dec2$6 = BeanInfo({
       await cast(this.scope.service.database).columnsClearWorker(clientName, tableName);
     }
   }
-}) || _class$6) || _class$6);
+};
+BroadcastColumnsClear = __decorate([Broadcast(), BeanInfo({
+  module: "a-orm"
+})], BroadcastColumnsClear);
 
-var _dec$5, _dec2$5, _class$5;
-let EventClientNameReal = (_dec$5 = Event(), _dec2$5 = BeanInfo({
+let EventClientNameReal = class EventClientNameReal extends BeanEventBase {};
+EventClientNameReal = __decorate([Event(), BeanInfo({
   module: "a-orm"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EventClientNameReal extends BeanEventBase {}) || _class$5) || _class$5);
+})], EventClientNameReal);
 
-var _dec$4, _dec2$4, _class$4;
-let EventColumnsClear = (_dec$4 = Event(), _dec2$4 = BeanInfo({
+let EventColumnsClear = class EventColumnsClear extends BeanEventBase {};
+EventColumnsClear = __decorate([Event(), BeanInfo({
   module: "a-orm"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EventColumnsClear extends BeanEventBase {}) || _class$4) || _class$4);
+})], EventColumnsClear);
 
-var _dec$3, _dec2$3, _class$3;
-let QueueDoubleDelete = (_dec$3 = Queue({
+let QueueDoubleDelete = 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);
+  }
+};
+QueueDoubleDelete = __decorate([Queue({
   options: {
     job: {
       delay: 3 * 1000
     }
   }
-}), _dec2$3 = BeanInfo({
+}), BeanInfo({
   module: "a-orm"
-}), _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$3) || _class$3);
+})], QueueDoubleDelete);
 
-var _dec$2, _dec2$2, _class$2;
-let ScheduleSoftDeletionPrune = (_dec$2 = Schedule({
-  repeat: {
-    every: 24 * 3600 * 1000
-  }
-}), _dec2$2 = BeanInfo({
-  module: "a-orm"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class ScheduleSoftDeletionPrune extends BeanBase {
+let ScheduleSoftDeletionPrune = class ScheduleSoftDeletionPrune extends BeanBase {
   async execute() {
     const onionSlices = this.bean.onion.model.getOnionsEnabledCached();
     for (const onionSlice of onionSlices) {
@@ -3723,21 +3632,36 @@ let ScheduleSoftDeletionPrune = (_dec$2 = Schedule({
       });
     }
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-// import { clearAllCacheModelsClear, clearCacheModelCacheInstance } from '../lib/const.ts';
+};
+ScheduleSoftDeletionPrune = __decorate([Schedule({
+  repeat: {
+    every: 24 * 3600 * 1000
+  }
+}), BeanInfo({
+  module: "a-orm"
+})], ScheduleSoftDeletionPrune);
 
-let HmrModel = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+let HmrEntity = class HmrEntity extends BeanBase {
+  async reload(_beanOptions) {
+    this.app.bean.worker.reload();
+  }
+};
+HmrEntity = __decorate([Hmr(), BeanInfo({
   module: "a-orm"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrModel extends BeanBase {
+})], HmrEntity);
+
+// import { clearAllCacheModelsClear, clearCacheModelCacheInstance } from '../lib/const.ts';
+let HmrModel = 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);
+};
+HmrModel = __decorate([Hmr(), BeanInfo({
+  module: "a-orm"
+})], HmrModel);
 
 function config(_app) {
   return {
@@ -3934,11 +3858,10 @@ async function configTest(_app) {
   return {};
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAOrm = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAOrm = class ScopeModuleAOrm extends BeanScopeBase {};
+ScopeModuleAOrm = __decorate([Scope(), BeanInfo({
   module: "a-orm"
-}), _dec(_class = _dec2(_class = class ScopeModuleAOrm extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAOrm);
 /** scope: end */
 
 function DatabaseDialect(options) {
@@ -4193,7 +4116,6 @@ function DtoSelectAndCount(modelLike, params) {
 function DtoUpdate(modelLike, params) {
   return _DtoMutate_raw(modelLike, params, 'update', ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'], true, undefined);
 }
-
 // not use Partial/$Class.partial, for form render at frontend
 
 const $Dto = {
@@ -4207,8 +4129,6 @@ const $Dto = {
   selectAndCount: DtoSelectAndCount
 };
 
-// const __tableNames = new Set();
-
 function Entity(table, options) {
   if (typeof table === 'string') {
     options = Object.assign({}, options, {
@@ -4233,7 +4153,6 @@ function Model(options) {
 }
 
 function hasOne$2(classModel, key, options) {
-  // :  IModelRelationHasOne<MODEL, AUTOLOAD, COLUMNS> {
   return {
     type: 'hasOne',
     model: classModel,
@@ -4242,7 +4161,6 @@ function hasOne$2(classModel, key, options) {
   };
 }
 function belongsTo$1(_classModelSelf, classModel, key, options) {
-  // : IModelRelationBelongsTo<MODELSelf, MODEL, AUTOLOAD, COLUMNS> {
   return {
     type: 'belongsTo',
     model: classModel,
@@ -4251,7 +4169,6 @@ function belongsTo$1(_classModelSelf, classModel, key, options) {
   };
 }
 function hasMany$2(classModel, key, options, _modelJoins, _group) {
-  // : IModelRelationHasMany<MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
   return {
     type: 'hasMany',
     model: classModel,
@@ -4260,7 +4177,6 @@ function hasMany$2(classModel, key, options, _modelJoins, _group) {
   };
 }
 function belongsToMany$2(classModelMiddle, classModel, keyFrom, keyTo, options, _modelJoins, _group) {
-  // : IModelRelationBelongsToMany<MODELMiddle, MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
   return {
     type: 'belongsToMany',
     modelMiddle: classModelMiddle,
@@ -4276,7 +4192,6 @@ const $relation = {
   hasMany: hasMany$2,
   belongsToMany: belongsToMany$2
 };
-
 // function hasMany<
 //   MODEL extends BeanModelMeta | (keyof IModelClassRecord),
 //   AUTOLOAD extends boolean = boolean,
@@ -4299,7 +4214,6 @@ const $relation = {
 // ): any { // : IModelRelationHasMany<MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
 //   return { type: 'hasMany', model: classModel, key, options };
 // }
-
 // function belongsToMany<
 //   MODELMiddle extends BeanModelMeta | (keyof IModelClassRecord),
 //   MODEL extends BeanModelMeta | (keyof IModelClassRecord),
@@ -4375,7 +4289,6 @@ function hasOne(classModel, key, options) {
     options
   };
 }
-
 // function belongsTo<
 //   MODELSelf extends BeanModelMeta | (keyof IModelClassRecord),
 //   MODEL extends BeanModelMeta | (keyof IModelClassRecord),
@@ -4388,7 +4301,6 @@ function hasOne(classModel, key, options) {
 // ): IModelRelationBelongsToDynamic<MODELSelf, MODEL, OPTIONS> {
 //   return { type: 'belongsTo', model: classModel, key, options };
 // }
-
 function hasMany(classModel, key, options) {
   return {
     type: 'hasMany',
@@ -4414,4 +4326,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $locale, $relation, $relationDynamic, $relationMutate, 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 };
+export { $Dto, $locale, $relation, $relationDynamic, $relationMutate, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrEntity, 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/package.json

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