vona-module-test-vona 5.0.81 → 5.0.83

package/dist/index.js

@@ -1,15 +1,15 @@
 import { BeanInfo, BeanAopBase, BeanAopMethodBase, BeanBase, $Class, cast, retry, BeanScopeBase } from 'vona';
 import { Aop, AopMethod, Aspect } from 'vona-module-a-aspect';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase, Model, $relation, BeanModelBase, $relationDynamic, $Dto, $tableName } from 'vona-module-a-orm';
 import { ModelCategoryChain as ModelCategoryChain$1, ModelOrder as ModelOrder$1 } from 'vona-module-test-vona';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
-import { getKeyHash, CacheMem, BeanCacheMemBase, CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Caching } from 'vona-module-a-caching';
 import assert from 'node:assert';
 import { Core } from 'vona-module-a-core';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
+import { CacheMem, BeanCacheMemBase, CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
 import { Event, BeanEventBase, EventListener } from 'vona-module-a-event';
 import { Meta } from 'vona-module-a-meta';
 import { BeanAssetBase, BeanStaticBase } from 'vona-module-a-static';
@@ -178,28 +178,28 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$1p, _dec2$1p, _dec3$E, _dec4$E, _dec5$A, _dec6$z, _class$1p, _class2$E, _descriptor$j, _descriptor2$f;
+var _dec$1p, _dec2$1p, _dec3$E, _dec4$E, _dec5$B, _dec6$A, _class$1p, _class2$E, _descriptor$j, _descriptor2$g;
 let EntityCategory = (_dec$1p = Entity('testVonaCategory'), _dec2$1p = BeanInfo({
   module: "test-vona"
-}), _dec3$E = Api.field(), _dec4$E = Reflect.metadata("design:type", String), _dec5$A = Api.field(v.optional(), v.tableIdentity()), _dec6$z = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1p(_class$1p = _dec2$1p(_class$1p = (_class2$E = class EntityCategory extends EntityBase {
+}), _dec3$E = Api.field(), _dec4$E = Reflect.metadata("design:type", String), _dec5$B = Api.field(v.optional(), v.tableIdentity()), _dec6$A = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1p(_class$1p = _dec2$1p(_class$1p = (_class2$E = class EntityCategory extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "name", _descriptor$j, this);
-    _initializerDefineProperty(this, "categoryIdParent", _descriptor2$f, this);
+    _initializerDefineProperty(this, "categoryIdParent", _descriptor2$g, this);
   }
 }, _descriptor$j = _applyDecoratedDescriptor(_class2$E.prototype, "name", [_dec3$E, _dec4$E], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$f = _applyDecoratedDescriptor(_class2$E.prototype, "categoryIdParent", [_dec5$A, _dec6$z], {
+}), _descriptor2$g = _applyDecoratedDescriptor(_class2$E.prototype, "categoryIdParent", [_dec5$B, _dec6$A], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$E)) || _class$1p) || _class$1p);
 
-var _dec$1o, _dec2$1o, _dec3$D, _dec4$D, _dec5$z, _dec6$y, _dec7$s, _dec8$o, _class$1o, _class2$D, _descriptor$i, _descriptor2$e, _descriptor3$8;
+var _dec$1o, _dec2$1o, _dec3$D, _dec4$D, _dec5$A, _dec6$z, _dec7$t, _dec8$p, _class$1o, _class2$D, _descriptor$i, _descriptor2$f, _descriptor3$9;
 let EntityOrder = (_dec$1o = Entity('testVonaOrder', {
   openapi: {
     title: $locale('Order')
@@ -208,91 +208,91 @@ let EntityOrder = (_dec$1o = Entity('testVonaOrder', {
   module: "test-vona"
 }), _dec3$D = Api.field(v.openapi({
   title: $locale('OrderNo')
-}), v.default(''), v.min(3)), _dec4$D = Reflect.metadata("design:type", String), _dec5$z = Api.field(v.openapi({
+}), v.default(''), v.min(3)), _dec4$D = Reflect.metadata("design:type", String), _dec5$A = Api.field(v.openapi({
   title: $locale('Remark')
-}), v.optional()), _dec6$y = Reflect.metadata("design:type", String), _dec7$s = Api.field(v.tableIdentity()), _dec8$o = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1o(_class$1o = _dec2$1o(_class$1o = (_class2$D = class EntityOrder extends EntityBase {
+}), v.optional()), _dec6$z = Reflect.metadata("design:type", String), _dec7$t = Api.field(v.tableIdentity()), _dec8$p = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1o(_class$1o = _dec2$1o(_class$1o = (_class2$D = class EntityOrder extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "orderNo", _descriptor$i, this);
-    _initializerDefineProperty(this, "remark", _descriptor2$e, this);
-    _initializerDefineProperty(this, "userId", _descriptor3$8, this);
+    _initializerDefineProperty(this, "remark", _descriptor2$f, this);
+    _initializerDefineProperty(this, "userId", _descriptor3$9, this);
   }
 }, _descriptor$i = _applyDecoratedDescriptor(_class2$D.prototype, "orderNo", [_dec3$D, _dec4$D], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$e = _applyDecoratedDescriptor(_class2$D.prototype, "remark", [_dec5$z, _dec6$y], {
+}), _descriptor2$f = _applyDecoratedDescriptor(_class2$D.prototype, "remark", [_dec5$A, _dec6$z], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$8 = _applyDecoratedDescriptor(_class2$D.prototype, "userId", [_dec7$s, _dec8$o], {
+}), _descriptor3$9 = _applyDecoratedDescriptor(_class2$D.prototype, "userId", [_dec7$t, _dec8$p], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$D)) || _class$1o) || _class$1o);
 
-var _dec$1n, _dec2$1n, _dec3$C, _dec4$C, _dec5$y, _dec6$x, _dec7$r, _dec8$n, _class$1n, _class2$C, _descriptor$h, _descriptor2$d, _descriptor3$7;
+var _dec$1n, _dec2$1n, _dec3$C, _dec4$C, _dec5$z, _dec6$y, _dec7$s, _dec8$o, _class$1n, _class2$C, _descriptor$h, _descriptor2$e, _descriptor3$8;
 let EntityPost = (_dec$1n = Entity('testVonaPost'), _dec2$1n = BeanInfo({
   module: "test-vona"
-}), _dec3$C = Api.field(), _dec4$C = Reflect.metadata("design:type", String), _dec5$y = Api.field(v.tableIdentity()), _dec6$x = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec7$r = Api.field(v.optional()), _dec8$n = Reflect.metadata("design:type", Number), _dec$1n(_class$1n = _dec2$1n(_class$1n = (_class2$C = class EntityPost extends EntityBase {
+}), _dec3$C = Api.field(), _dec4$C = Reflect.metadata("design:type", String), _dec5$z = Api.field(v.tableIdentity()), _dec6$y = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec7$s = Api.field(v.optional()), _dec8$o = Reflect.metadata("design:type", Number), _dec$1n(_class$1n = _dec2$1n(_class$1n = (_class2$C = class EntityPost extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "title", _descriptor$h, this);
-    _initializerDefineProperty(this, "userId", _descriptor2$d, this);
-    _initializerDefineProperty(this, "stars", _descriptor3$7, this);
+    _initializerDefineProperty(this, "userId", _descriptor2$e, this);
+    _initializerDefineProperty(this, "stars", _descriptor3$8, this);
   }
 }, _descriptor$h = _applyDecoratedDescriptor(_class2$C.prototype, "title", [_dec3$C, _dec4$C], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$d = _applyDecoratedDescriptor(_class2$C.prototype, "userId", [_dec5$y, _dec6$x], {
+}), _descriptor2$e = _applyDecoratedDescriptor(_class2$C.prototype, "userId", [_dec5$z, _dec6$y], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$7 = _applyDecoratedDescriptor(_class2$C.prototype, "stars", [_dec7$r, _dec8$n], {
+}), _descriptor3$8 = _applyDecoratedDescriptor(_class2$C.prototype, "stars", [_dec7$s, _dec8$o], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$C)) || _class$1n) || _class$1n);
 
-var _dec$1m, _dec2$1m, _dec3$B, _dec4$B, _dec5$x, _dec6$w, _class$1m, _class2$B, _descriptor$g, _descriptor2$c;
+var _dec$1m, _dec2$1m, _dec3$B, _dec4$B, _dec5$y, _dec6$x, _class$1m, _class2$B, _descriptor$g, _descriptor2$d;
 let EntityPostContent = (_dec$1m = Entity('testVonaPostContent'), _dec2$1m = BeanInfo({
   module: "test-vona"
-}), _dec3$B = Api.field(), _dec4$B = Reflect.metadata("design:type", String), _dec5$x = Api.field(v.tableIdentity()), _dec6$w = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1m(_class$1m = _dec2$1m(_class$1m = (_class2$B = class EntityPostContent extends EntityBase {
+}), _dec3$B = Api.field(), _dec4$B = Reflect.metadata("design:type", String), _dec5$y = Api.field(v.tableIdentity()), _dec6$x = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1m(_class$1m = _dec2$1m(_class$1m = (_class2$B = class EntityPostContent extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "content", _descriptor$g, this);
-    _initializerDefineProperty(this, "postId", _descriptor2$c, this);
+    _initializerDefineProperty(this, "postId", _descriptor2$d, this);
   }
 }, _descriptor$g = _applyDecoratedDescriptor(_class2$B.prototype, "content", [_dec3$B, _dec4$B], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$c = _applyDecoratedDescriptor(_class2$B.prototype, "postId", [_dec5$x, _dec6$w], {
+}), _descriptor2$d = _applyDecoratedDescriptor(_class2$B.prototype, "postId", [_dec5$y, _dec6$x], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$B)) || _class$1m) || _class$1m);
 
-var _dec$1l, _dec2$1l, _dec3$A, _dec4$A, _dec5$w, _dec6$v, _dec7$q, _dec8$m, _dec9$e, _dec0$e, _dec1$e, _dec10$c, _class$1l, _class2$A, _descriptor$f, _descriptor2$b, _descriptor3$6, _descriptor4$1, _descriptor5$1;
+var _dec$1l, _dec2$1l, _dec3$A, _dec4$A, _dec5$x, _dec6$w, _dec7$r, _dec8$n, _dec9$e, _dec0$e, _dec1$e, _dec10$c, _class$1l, _class2$A, _descriptor$f, _descriptor2$c, _descriptor3$7, _descriptor4$1, _descriptor5$1;
 let EntityProduct = (_dec$1l = Entity('testVonaProduct', {
   independent: true
 }), _dec2$1l = BeanInfo({
   module: "test-vona"
-}), _dec3$A = Api.field(v.title($locale('Name'))), _dec4$A = Reflect.metadata("design:type", String), _dec5$w = Api.field(v.title($locale('Price'))), _dec6$v = Reflect.metadata("design:type", Number), _dec7$q = Api.field(v.title($locale('Quantity'))), _dec8$m = Reflect.metadata("design:type", Number), _dec9$e = Api.field(v.title($locale('Amount'))), _dec0$e = Reflect.metadata("design:type", Number), _dec1$e = Api.field(v.tableIdentity()), _dec10$c = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1l(_class$1l = _dec2$1l(_class$1l = (_class2$A = class EntityProduct extends EntityBase {
+}), _dec3$A = Api.field(v.title($locale('Name'))), _dec4$A = Reflect.metadata("design:type", String), _dec5$x = Api.field(v.title($locale('Price'))), _dec6$w = Reflect.metadata("design:type", Number), _dec7$r = Api.field(v.title($locale('Quantity'))), _dec8$n = Reflect.metadata("design:type", Number), _dec9$e = Api.field(v.title($locale('Amount'))), _dec0$e = Reflect.metadata("design:type", Number), _dec1$e = Api.field(v.tableIdentity()), _dec10$c = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1l(_class$1l = _dec2$1l(_class$1l = (_class2$A = class EntityProduct extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "name", _descriptor$f, this);
-    _initializerDefineProperty(this, "price", _descriptor2$b, this);
-    _initializerDefineProperty(this, "quantity", _descriptor3$6, this);
+    _initializerDefineProperty(this, "price", _descriptor2$c, this);
+    _initializerDefineProperty(this, "quantity", _descriptor3$7, this);
     _initializerDefineProperty(this, "amount", _descriptor4$1, this);
     _initializerDefineProperty(this, "orderId", _descriptor5$1, this);
   }
@@ -301,12 +301,12 @@ let EntityProduct = (_dec$1l = Entity('testVonaProduct', {
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$b = _applyDecoratedDescriptor(_class2$A.prototype, "price", [_dec5$w, _dec6$v], {
+}), _descriptor2$c = _applyDecoratedDescriptor(_class2$A.prototype, "price", [_dec5$x, _dec6$w], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$6 = _applyDecoratedDescriptor(_class2$A.prototype, "quantity", [_dec7$q, _dec8$m], {
+}), _descriptor3$7 = _applyDecoratedDescriptor(_class2$A.prototype, "quantity", [_dec7$r, _dec8$n], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -338,81 +338,81 @@ let EntityRole = (_dec$1k = Entity('testVonaRole'), _dec2$1k = BeanInfo({
   initializer: null
 }), _class2$z)) || _class$1k) || _class$1k);
 
-var _dec$1j, _dec2$1j, _dec3$y, _dec4$y, _dec5$v, _dec6$u, _class$1j, _class2$y, _descriptor$d, _descriptor2$a;
+var _dec$1j, _dec2$1j, _dec3$y, _dec4$y, _dec5$w, _dec6$v, _class$1j, _class2$y, _descriptor$d, _descriptor2$b;
 let EntityRoleUser = (_dec$1j = Entity('testVonaRoleUser'), _dec2$1j = BeanInfo({
   module: "test-vona"
-}), _dec3$y = Api.field(v.tableIdentity()), _dec4$y = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec5$v = Api.field(v.tableIdentity()), _dec6$u = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1j(_class$1j = _dec2$1j(_class$1j = (_class2$y = class EntityRoleUser extends EntityBase {
+}), _dec3$y = Api.field(v.tableIdentity()), _dec4$y = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec5$w = Api.field(v.tableIdentity()), _dec6$v = Reflect.metadata("design:type", typeof TableIdentity === "undefined" ? Object : TableIdentity), _dec$1j(_class$1j = _dec2$1j(_class$1j = (_class2$y = class EntityRoleUser extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "userId", _descriptor$d, this);
-    _initializerDefineProperty(this, "roleId", _descriptor2$a, this);
+    _initializerDefineProperty(this, "roleId", _descriptor2$b, this);
   }
 }, _descriptor$d = _applyDecoratedDescriptor(_class2$y.prototype, "userId", [_dec3$y, _dec4$y], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$a = _applyDecoratedDescriptor(_class2$y.prototype, "roleId", [_dec5$v, _dec6$u], {
+}), _descriptor2$b = _applyDecoratedDescriptor(_class2$y.prototype, "roleId", [_dec5$w, _dec6$v], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$y)) || _class$1j) || _class$1j);
 
-var _dec$1i, _dec2$1i, _dec3$x, _dec4$x, _dec5$u, _dec6$t, _dec7$p, _dec8$l, _class$1i, _class2$x, _descriptor$c, _descriptor2$9, _descriptor3$5;
+var _dec$1i, _dec2$1i, _dec3$x, _dec4$x, _dec5$v, _dec6$u, _dec7$q, _dec8$m, _class$1i, _class2$x, _descriptor$c, _descriptor2$a, _descriptor3$6;
 let EntityTest = (_dec$1i = Entity('testVonaTest', {
   openapi: {
     title: $locale('Test')
   }
 }), _dec2$1i = BeanInfo({
   module: "test-vona"
-}), _dec3$x = Api.field(v.title($locale('Test'))), _dec4$x = Reflect.metadata("design:type", String), _dec5$u = Api.field(), _dec6$t = Reflect.metadata("design:type", String), _dec7$p = Api.field(v.default(() => {
+}), _dec3$x = Api.field(v.title($locale('Test'))), _dec4$x = Reflect.metadata("design:type", String), _dec5$v = Api.field(), _dec6$u = Reflect.metadata("design:type", String), _dec7$q = Api.field(v.default(() => {
   return new Date();
-})), _dec8$l = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec$1i(_class$1i = _dec2$1i(_class$1i = (_class2$x = class EntityTest extends EntityBase {
+})), _dec8$m = Reflect.metadata("design:type", typeof Date === "undefined" ? Object : Date), _dec$1i(_class$1i = _dec2$1i(_class$1i = (_class2$x = class EntityTest extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "title", _descriptor$c, this);
-    _initializerDefineProperty(this, "description", _descriptor2$9, this);
-    _initializerDefineProperty(this, "testDate", _descriptor3$5, this);
+    _initializerDefineProperty(this, "description", _descriptor2$a, this);
+    _initializerDefineProperty(this, "testDate", _descriptor3$6, this);
   }
 }, _descriptor$c = _applyDecoratedDescriptor(_class2$x.prototype, "title", [_dec3$x, _dec4$x], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$9 = _applyDecoratedDescriptor(_class2$x.prototype, "description", [_dec5$u, _dec6$t], {
+}), _descriptor2$a = _applyDecoratedDescriptor(_class2$x.prototype, "description", [_dec5$v, _dec6$u], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$5 = _applyDecoratedDescriptor(_class2$x.prototype, "testDate", [_dec7$p, _dec8$l], {
+}), _descriptor3$6 = _applyDecoratedDescriptor(_class2$x.prototype, "testDate", [_dec7$q, _dec8$m], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
 }), _class2$x)) || _class$1i) || _class$1i);
 
-var _dec$1h, _dec2$1h, _dec3$w, _dec4$w, _dec5$t, _dec6$s, _dec7$o, _dec8$k, _class$1h, _class2$w, _descriptor$b, _descriptor2$8, _descriptor3$4;
+var _dec$1h, _dec2$1h, _dec3$w, _dec4$w, _dec5$u, _dec6$t, _dec7$p, _dec8$l, _class$1h, _class2$w, _descriptor$b, _descriptor2$9, _descriptor3$5;
 let EntityUser = (_dec$1h = Entity('testVonaUser'), _dec2$1h = BeanInfo({
   module: "test-vona"
-}), _dec3$w = Api.field(), _dec4$w = Reflect.metadata("design:type", String), _dec5$t = Api.field(v.optional()), _dec6$s = Reflect.metadata("design:type", Number), _dec7$o = Api.field(v.optional()), _dec8$k = Reflect.metadata("design:type", Number), _dec$1h(_class$1h = _dec2$1h(_class$1h = (_class2$w = class EntityUser extends EntityBase {
+}), _dec3$w = Api.field(), _dec4$w = Reflect.metadata("design:type", String), _dec5$u = Api.field(v.optional()), _dec6$t = Reflect.metadata("design:type", Number), _dec7$p = Api.field(v.optional()), _dec8$l = Reflect.metadata("design:type", Number), _dec$1h(_class$1h = _dec2$1h(_class$1h = (_class2$w = class EntityUser extends EntityBase {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "name", _descriptor$b, this);
-    _initializerDefineProperty(this, "age", _descriptor2$8, this);
-    _initializerDefineProperty(this, "scores", _descriptor3$4, this);
+    _initializerDefineProperty(this, "age", _descriptor2$9, this);
+    _initializerDefineProperty(this, "scores", _descriptor3$5, this);
   }
 }, _descriptor$b = _applyDecoratedDescriptor(_class2$w.prototype, "name", [_dec3$w, _dec4$w], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor2$8 = _applyDecoratedDescriptor(_class2$w.prototype, "age", [_dec5$t, _dec6$s], {
+}), _descriptor2$9 = _applyDecoratedDescriptor(_class2$w.prototype, "age", [_dec5$u, _dec6$t], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$4 = _applyDecoratedDescriptor(_class2$w.prototype, "scores", [_dec7$o, _dec8$k], {
+}), _descriptor3$5 = _applyDecoratedDescriptor(_class2$w.prototype, "scores", [_dec7$p, _dec8$l], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -624,7 +624,7 @@ let ModelTestDynamicTable = (_dec$13 = Model({
   entity: EntityTest,
   table(ctx, _where, defaultTable) {
     if (ctx.instanceName !== '') return defaultTable;
-    return `${defaultTable}_${moment().format('YYYYMMDD')}`;
+    return `${defaultTable}_${DateTime.now().toFormat('yyyyMMdd')}`;
   },
   softDeletionPrune: {
     handler: async (_ctx, _modelInstance) => {
@@ -704,7 +704,7 @@ let BeanTestCtx = (_dec$12 = Bean(), _dec2$12 = BeanInfo({
   module: "test-vona"
 }), _dec$12(_class$12 = _dec2$12(_class$12 = class BeanTestCtx extends TestCtx1 {}) || _class$12) || _class$12);
 
-var _dec$11, _dec2$11, _dec3$v, _dec4$v, _class$11, _dec5$s, _dec6$r, _dec7$n, _dec8$j, _dec9$d, _dec0$d, _dec1$d, _dec10$b, _dec11$b, _dec12$b, _dec13$b, _dec14$a, _dec15$a, _dec16$a, _class2$v, _class3;
+var _dec$11, _dec2$11, _dec3$v, _dec4$v, _class$11, _dec5$t, _dec6$s, _dec7$o, _dec8$k, _dec9$d, _dec0$d, _dec1$d, _dec10$b, _dec11$b, _dec12$b, _dec13$b, _dec14$a, _dec15$a, _dec16$a, _class2$v, _class3;
 let ServiceAopMethodBase = (_dec$11 = Aspect.aopMethod('test-vona:test', {
   wrapper: '+'
 }), _dec2$11 = Aspect.aopMethod('test-vona:test', {
@@ -714,11 +714,11 @@ let ServiceAopMethodBase = (_dec$11 = Aspect.aopMethod('test-vona:test', {
     return 'hello';
   }
 }, _applyDecoratedDescriptor(_class$11.prototype, "testSyncBase", [_dec$11, _dec2$11, _dec3$v, _dec4$v], Object.getOwnPropertyDescriptor(_class$11.prototype, "testSyncBase"), _class$11.prototype), _class$11);
-let ServiceAopMethod = (_dec5$s = Service(), _dec6$r = BeanInfo({
+let ServiceAopMethod = (_dec5$t = Service(), _dec6$s = BeanInfo({
   module: "test-vona"
-}), _dec7$n = Aspect.aopMethod('test-vona:test', {
+}), _dec7$o = Aspect.aopMethod('test-vona:test', {
   wrapper: '+'
-}), _dec8$j = Aspect.aopMethod('test-vona:test', {
+}), _dec8$k = Aspect.aopMethod('test-vona:test', {
   wrapper: '-'
 }), _dec9$d = Reflect.metadata("design:type", Function), _dec0$d = Reflect.metadata("design:paramtypes", []), _dec1$d = Aspect.aopMethod('test-vona:test', {
   wrapper: '+'
@@ -728,7 +728,7 @@ let ServiceAopMethod = (_dec5$s = Service(), _dec6$r = BeanInfo({
   wrapper: '+'
 }), _dec14$a = Aspect.aopMethod('test-vona:test', {
   wrapper: '-'
-}), _dec15$a = Reflect.metadata("design:type", Function), _dec16$a = Reflect.metadata("design:paramtypes", []), _dec5$s(_class2$v = _dec6$r(_class2$v = (_class3 = class ServiceAopMethod extends ServiceAopMethodBase {
+}), _dec15$a = Reflect.metadata("design:type", Function), _dec16$a = Reflect.metadata("design:paramtypes", []), _dec5$t(_class2$v = _dec6$s(_class2$v = (_class3 = class ServiceAopMethod extends ServiceAopMethodBase {
   constructor(...args) {
     super(...args);
     this._name = '';
@@ -745,57 +745,46 @@ let ServiceAopMethod = (_dec5$s = Service(), _dec6$r = BeanInfo({
   set name(value) {
     this._name = value;
   }
-}, _applyDecoratedDescriptor(_class3.prototype, "testSync", [_dec7$n, _dec8$j, _dec9$d, _dec0$d], Object.getOwnPropertyDescriptor(_class3.prototype, "testSync"), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, "testAsync", [_dec1$d, _dec10$b, _dec11$b, _dec12$b], Object.getOwnPropertyDescriptor(_class3.prototype, "testAsync"), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, "name", [_dec13$b, _dec14$a, _dec15$a, _dec16$a], Object.getOwnPropertyDescriptor(_class3.prototype, "name"), _class3.prototype), _class3)) || _class2$v) || _class2$v);
+}, _applyDecoratedDescriptor(_class3.prototype, "testSync", [_dec7$o, _dec8$k, _dec9$d, _dec0$d], Object.getOwnPropertyDescriptor(_class3.prototype, "testSync"), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, "testAsync", [_dec1$d, _dec10$b, _dec11$b, _dec12$b], Object.getOwnPropertyDescriptor(_class3.prototype, "testAsync"), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, "name", [_dec13$b, _dec14$a, _dec15$a, _dec16$a], Object.getOwnPropertyDescriptor(_class3.prototype, "name"), _class3.prototype), _class3)) || _class2$v) || _class2$v);
 
-var _dec$10, _dec2$10, _dec3$u, _dec4$u, _dec5$r, _dec6$q, _dec7$m, _dec8$i, _dec9$c, _dec0$c, _dec1$c, _dec10$a, _dec11$a, _dec12$a, _dec13$a, _dec14$9, _dec15$9, _dec16$9, _dec17$8, _dec18$8, _dec19$8, _dec20$8, _dec21$6, _dec22$5, _dec23$5, _dec24$5, _dec25$5, _dec26$4, _dec27$4, _class$10, _class2$u;
-function cacheKeyFn(args, prop, options) {
-  return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+var _dec$10, _dec2$10, _dec3$u, _dec4$u, _dec5$s, _dec6$r, _dec7$n, _dec8$j, _dec9$c, _dec0$c, _dec1$c, _dec10$a, _dec11$a, _dec12$a, _dec13$a, _dec14$9, _dec15$9, _dec16$9, _dec17$8, _dec18$8, _dec19$8, _dec20$8, _dec21$6, _dec22$5, _dec23$5, _dec24$5, _dec25$5, _dec26$4, _dec27$4, _class$10, _class2$u;
+function cacheKeyFn(info, _options) {
+  return info.args[0];
 }
 let ServiceCaching = (_dec$10 = Service(), _dec2$10 = BeanInfo({
   module: "test-vona"
 }), _dec3$u = Caching.get({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
   cacheKeyFn: 'cacheKey'
-}), _dec4$u = Reflect.metadata("design:type", Function), _dec5$r = Reflect.metadata("design:paramtypes", [Number]), _dec6$q = Caching.get({
+}), _dec4$u = Reflect.metadata("design:type", Function), _dec5$s = Reflect.metadata("design:paramtypes", [Number]), _dec6$r = Caching.get({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
   cacheKeyFn
-}), _dec7$m = Reflect.metadata("design:type", Function), _dec8$i = Reflect.metadata("design:paramtypes", [Number]), _dec9$c = Caching.get({
+}), _dec7$n = Reflect.metadata("design:type", Function), _dec8$j = Reflect.metadata("design:paramtypes", [Number]), _dec9$c = Caching.get({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
-  cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey(args)],"_")'
+  cacheKey: 'cel://args[0]'
 }), _dec0$c = Reflect.metadata("design:type", Function), _dec1$c = Reflect.metadata("design:paramtypes", [Number]), _dec10$a = Caching.get({
-  cacheName: 'test-vona:test',
-  cacheProp: 'test'
+  cacheName: 'test-vona:test'
 }), _dec11$a = Reflect.metadata("design:type", Function), _dec12$a = Reflect.metadata("design:paramtypes", [Number]), _dec13$a = Caching.set({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
-  cacheKeyFn: 'cacheKeySet',
-  cacheValueFn: 'cacheValueSet'
+  cacheKeyFn: 'cacheKey',
+  cacheValueFn: 'cacheValue'
 }), _dec14$9 = Reflect.metadata("design:type", Function), _dec15$9 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec16$9 = Caching.set({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
-  cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey([args[0]])],"_")',
+  cacheKey: 'cel://args[0]',
   cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}'
 }), _dec17$8 = Reflect.metadata("design:type", Function), _dec18$8 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec19$8 = Caching.set({
   cacheName: 'test-vona:test',
-  cacheProp: 'test',
-  cacheKeyFn: 'cacheKeySet'
+  cacheKeyFn: 'cacheKey'
 }), _dec20$8 = Reflect.metadata("design:type", Function), _dec21$6 = Reflect.metadata("design:paramtypes", [Number, typeof TSummerCacheTestData === "undefined" ? Object : TSummerCacheTestData]), _dec22$5 = Caching.del({
-  cacheName: 'test-vona:test',
-  cacheProp: 'test'
+  cacheName: 'test-vona:test'
 }), _dec23$5 = Reflect.metadata("design:type", Function), _dec24$5 = Reflect.metadata("design:paramtypes", [Number]), _dec25$5 = Caching.clear({
   cacheName: 'test-vona:test'
 }), _dec26$4 = Reflect.metadata("design:type", Function), _dec27$4 = Reflect.metadata("design:paramtypes", []), _dec$10(_class$10 = _dec2$10(_class$10 = (_class2$u = class ServiceCaching extends BeanBase {
-  cacheKey(args, prop, options) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+  cacheKey(info, _options) {
+    return info.args[0];
   }
-  cacheKeySet(args, prop, options) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args.slice(0, -1))}`;
-  }
-  cacheValueSet(_value, args, _prop, _options) {
-    return args[args.length - 1];
+  cacheValue(info, _options) {
+    return info.args[1];
   }
   async get(id) {
     return {
@@ -831,7 +820,7 @@ let ServiceCaching = (_dec$10 = Service(), _dec2$10 = BeanInfo({
   async clear() {
     // do nothing
   }
-}, _applyDecoratedDescriptor(_class2$u.prototype, "get", [_dec3$u, _dec4$u, _dec5$r], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get2", [_dec6$q, _dec7$m, _dec8$i], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get2"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get3", [_dec9$c, _dec0$c, _dec1$c], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get3"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get4", [_dec10$a, _dec11$a, _dec12$a], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get4"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set", [_dec13$a, _dec14$9, _dec15$9], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set2", [_dec16$9, _dec17$8, _dec18$8], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set2"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set3", [_dec19$8, _dec20$8, _dec21$6], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set3"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "del", [_dec22$5, _dec23$5, _dec24$5], Object.getOwnPropertyDescriptor(_class2$u.prototype, "del"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "clear", [_dec25$5, _dec26$4, _dec27$4], Object.getOwnPropertyDescriptor(_class2$u.prototype, "clear"), _class2$u.prototype), _class2$u)) || _class$10) || _class$10);
+}, _applyDecoratedDescriptor(_class2$u.prototype, "get", [_dec3$u, _dec4$u, _dec5$s], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get2", [_dec6$r, _dec7$n, _dec8$j], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get2"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get3", [_dec9$c, _dec0$c, _dec1$c], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get3"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "get4", [_dec10$a, _dec11$a, _dec12$a], Object.getOwnPropertyDescriptor(_class2$u.prototype, "get4"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set", [_dec13$a, _dec14$9, _dec15$9], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set2", [_dec16$9, _dec17$8, _dec18$8], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set2"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "set3", [_dec19$8, _dec20$8, _dec21$6], Object.getOwnPropertyDescriptor(_class2$u.prototype, "set3"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "del", [_dec22$5, _dec23$5, _dec24$5], Object.getOwnPropertyDescriptor(_class2$u.prototype, "del"), _class2$u.prototype), _applyDecoratedDescriptor(_class2$u.prototype, "clear", [_dec25$5, _dec26$4, _dec27$4], Object.getOwnPropertyDescriptor(_class2$u.prototype, "clear"), _class2$u.prototype), _class2$u)) || _class$10) || _class$10);
 
 var _dec$$, _dec2$$, _class$$;
 let ServiceCategory = (_dec$$ = Service(), _dec2$$ = BeanInfo({
@@ -1042,10 +1031,10 @@ let ServiceOrder = (_dec$_ = Service(), _dec2$_ = BeanInfo({
   }
 }) || _class$_) || _class$_);
 
-var _dec$Z, _dec2$Z, _dec3$t, _dec4$t, _dec5$q, _class$Z, _class2$t;
+var _dec$Z, _dec2$Z, _dec3$t, _dec4$t, _dec5$r, _class$Z, _class2$t;
 let ServicePost = (_dec$Z = Service(), _dec2$Z = BeanInfo({
   module: "test-vona"
-}), _dec3$t = Core.transaction(), _dec4$t = Reflect.metadata("design:type", Function), _dec5$q = Reflect.metadata("design:paramtypes", []), _dec$Z(_class$Z = _dec2$Z(_class$Z = (_class2$t = class ServicePost extends BeanBase {
+}), _dec3$t = Core.transaction(), _dec4$t = Reflect.metadata("design:type", Function), _dec5$r = Reflect.metadata("design:paramtypes", []), _dec$Z(_class$Z = _dec2$Z(_class$Z = (_class2$t = class ServicePost extends BeanBase {
   async findMany(params) {
     return await this.scope.model.post.selectAndCount({
       ...params,
@@ -1287,7 +1276,7 @@ let ServicePost = (_dec$Z = Service(), _dec2$Z = BeanInfo({
   // async count() {
   //   return await this.scope.model.post.count();
   // }
-}, _applyDecoratedDescriptor(_class2$t.prototype, "transaction", [_dec3$t, _dec4$t, _dec5$q], Object.getOwnPropertyDescriptor(_class2$t.prototype, "transaction"), _class2$t.prototype), _class2$t)) || _class$Z) || _class$Z);
+}, _applyDecoratedDescriptor(_class2$t.prototype, "transaction", [_dec3$t, _dec4$t, _dec5$r], Object.getOwnPropertyDescriptor(_class2$t.prototype, "transaction"), _class2$t.prototype), _class2$t)) || _class$Z) || _class$Z);
 
 var _dec$Y, _dec2$Y, _class$Y;
 let ServiceProduct = (_dec$Y = Service(), _dec2$Y = BeanInfo({
@@ -1433,12 +1422,12 @@ let ServiceTestData = (_dec$U = Service(), _dec2$U = BeanInfo({
   }
 }) || _class$U) || _class$U);
 
-var _dec$T, _dec2$T, _dec3$s, _dec4$s, _dec5$p, _dec6$p, _dec7$l, _dec8$h, _class$T, _class2$s;
+var _dec$T, _dec2$T, _dec3$s, _dec4$s, _dec5$q, _dec6$q, _dec7$m, _dec8$i, _class$T, _class2$s;
 const tableNameFail$1 = '__tempTransactionFail';
 const tableNameSuccess$1 = '__tempTransactionSuccess';
 let ServiceTransaction = (_dec$T = Service(), _dec2$T = BeanInfo({
   module: "test-vona"
-}), _dec3$s = Core.transaction(), _dec4$s = Reflect.metadata("design:type", Function), _dec5$p = Reflect.metadata("design:paramtypes", [Object]), _dec6$p = Core.transaction(), _dec7$l = Reflect.metadata("design:type", Function), _dec8$h = Reflect.metadata("design:paramtypes", [Object]), _dec$T(_class$T = _dec2$T(_class$T = (_class2$s = class ServiceTransaction extends BeanBase {
+}), _dec3$s = Core.transaction(), _dec4$s = Reflect.metadata("design:type", Function), _dec5$q = Reflect.metadata("design:paramtypes", [Object]), _dec6$q = Core.transaction(), _dec7$m = Reflect.metadata("design:type", Function), _dec8$i = Reflect.metadata("design:paramtypes", [Object]), _dec$T(_class$T = _dec2$T(_class$T = (_class2$s = class ServiceTransaction extends BeanBase {
   async fail(item) {
     await this.bean.model.update(`${tableNameFail$1}`, item);
     await this.bean.model.update(`${tableNameFail$1}error`, item);
@@ -1446,7 +1435,7 @@ let ServiceTransaction = (_dec$T = Service(), _dec2$T = BeanInfo({
   async success(item) {
     await this.bean.model.update(tableNameSuccess$1, item);
   }
-}, _applyDecoratedDescriptor(_class2$s.prototype, "fail", [_dec3$s, _dec4$s, _dec5$p], Object.getOwnPropertyDescriptor(_class2$s.prototype, "fail"), _class2$s.prototype), _applyDecoratedDescriptor(_class2$s.prototype, "success", [_dec6$p, _dec7$l, _dec8$h], Object.getOwnPropertyDescriptor(_class2$s.prototype, "success"), _class2$s.prototype), _class2$s)) || _class$T) || _class$T);
+}, _applyDecoratedDescriptor(_class2$s.prototype, "fail", [_dec3$s, _dec4$s, _dec5$q], Object.getOwnPropertyDescriptor(_class2$s.prototype, "fail"), _class2$s.prototype), _applyDecoratedDescriptor(_class2$s.prototype, "success", [_dec6$q, _dec7$m, _dec8$i], Object.getOwnPropertyDescriptor(_class2$s.prototype, "success"), _class2$s.prototype), _class2$s)) || _class$T) || _class$T);
 
 var _dec$S, _dec2$S, _class$S;
 let ServiceUser = (_dec$S = Service(), _dec2$S = BeanInfo({
@@ -1783,20 +1772,18 @@ let DtoOrderCreate = (_dec$C = Dto(), _dec2$C = BeanInfo({
 var _dec$B, _dec2$B, _dec3$r, _dec4$r, _class$B, _class2$r, _descriptor$a;
 let DtoOrderQuery = (_dec$B = Dto({
   openapi: {
-    query: {
+    filter: {
       table: $tableName(EntityOrder)
     }
   }
 }), _dec2$B = BeanInfo({
   module: "test-vona"
-}), _dec3$r = Api.field(v.optional(), v.openapi({
-  query: {
-    table: $tableName(EntityUser),
-    joinType: 'innerJoin',
-    joinOn: ['userId', 'testVonaUser.id'],
-    originalName: 'name'
-  }
-})), _dec4$r = Reflect.metadata("design:type", String), _dec$B(_class$B = _dec2$B(_class$B = (_class2$r = class DtoOrderQuery extends $Dto.query(EntityOrder, ['orderNo', 'remark']) {
+}), _dec3$r = Api.field(v.filter({
+  table: $tableName(EntityUser),
+  joinType: 'innerJoin',
+  joinOn: ['userId', 'testVonaUser.id'],
+  originalName: 'name'
+}), v.optional()), _dec4$r = Reflect.metadata("design:type", String), _dec$B(_class$B = _dec2$B(_class$B = (_class2$r = class DtoOrderQuery extends $Dto.query(EntityOrder, ['orderNo', 'remark']) {
   constructor(...args) {
     super(...args);
     _initializerDefineProperty(this, "userName", _descriptor$a, this);
@@ -1870,28 +1857,40 @@ let DtoPostGroup = (_dec$u = Dto(), _dec2$u = BeanInfo({
   sum: 'stars'
 }) {}) || _class$u) || _class$u);
 
-var _dec$t, _dec2$t, _dec3$p, _dec4$p, _class$t, _class2$p, _descriptor$8;
+var _dec$t, _dec2$t, _dec3$p, _dec4$p, _dec5$p, _dec6$p, _dec7$l, _dec8$h, _class$t, _class2$p, _descriptor$8, _descriptor2$8, _descriptor3$4;
 let DtoPostQuery = (_dec$t = Dto({
   openapi: {
-    query: {
+    filter: {
       table: $tableName(EntityPost)
     }
   }
 }), _dec2$t = BeanInfo({
   module: "test-vona"
-}), _dec3$p = Api.field(v.optional(), v.openapi({
-  query: {
-    table: 'testVonaUser',
-    joinOn: ['userId', 'testVonaUser.id'],
-    originalName: 'name',
-    op: '_eqI_'
-  }
-})), _dec4$p = Reflect.metadata("design:type", String), _dec$t(_class$t = _dec2$t(_class$t = (_class2$p = class DtoPostQuery extends $Dto.queryPage(EntityPost, ['title']) {
+}), _dec3$p = Api.field(v.optional()), _dec4$p = Reflect.metadata("design:type", String), _dec5$p = Api.field(v.filter({
+  table: 'testVonaUser',
+  joinOn: ['userId', 'testVonaUser.id'],
+  originalName: 'name',
+  op: '_eqI_'
+}), v.optional()), _dec6$p = Reflect.metadata("design:type", String), _dec7$l = Api.field(v.filterDateRange({
+  separator: ' - '
+}), v.optional()), _dec8$h = Reflect.metadata("design:type", String), _dec$t(_class$t = _dec2$t(_class$t = (_class2$p = class DtoPostQuery extends $Dto.queryPage(EntityPost, ['title']) {
   constructor(...args) {
     super(...args);
-    _initializerDefineProperty(this, "userName", _descriptor$8, this);
+    _initializerDefineProperty(this, "title", _descriptor$8, this);
+    _initializerDefineProperty(this, "userName", _descriptor2$8, this);
+    _initializerDefineProperty(this, "createdAt", _descriptor3$4, this);
   }
-}, _descriptor$8 = _applyDecoratedDescriptor(_class2$p.prototype, "userName", [_dec3$p, _dec4$p], {
+}, _descriptor$8 = _applyDecoratedDescriptor(_class2$p.prototype, "title", [_dec3$p, _dec4$p], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2$8 = _applyDecoratedDescriptor(_class2$p.prototype, "userName", [_dec5$p, _dec6$p], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3$4 = _applyDecoratedDescriptor(_class2$p.prototype, "createdAt", [_dec7$l, _dec8$h], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -2660,13 +2659,6 @@ let ControllerOnion = (_dec$b = Controller({
 }, _applyDecoratedDescriptor(_class2$a.prototype, "index", [_dec3$a, _dec4$a, _dec5$a, _dec6$a, _dec7$a], Object.getOwnPropertyDescriptor(_class2$a.prototype, "index"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo", [_dec8$8, _dec9$7, _dec0$7, _dec1$7, _dec10$6, _dec11$6, _dec12$6, _dec13$6, _dec14$5, _dec15$5, _dec16$5, _dec17$5], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo2", [_dec18$5, _dec19$5, _dec20$5, _dec21$3, _dec22$2, _dec23$2, _dec24$2, _dec25$2], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo2"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo3", [_dec26$1, _dec27$1, _dec28, _dec29, _dec30, _dec31, _dec32], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo3"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo4", [_dec33, _dec34, _dec35, _dec36, _dec37, _dec38, _dec39], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo4"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo5", [_dec40, _dec41, _dec42, _dec43, _dec44], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo5"), _class2$a.prototype), _applyDecoratedDescriptor(_class2$a.prototype, "echo6", [_dec45, _dec46, _dec47, _dec48], Object.getOwnPropertyDescriptor(_class2$a.prototype, "echo6"), _class2$a.prototype), _class2$a)) || _class$b) || _class$b);
 
 var _dec$a, _dec2$a, _dec3$9, _dec4$9, _dec5$9, _dec6$9, _dec7$9, _dec8$7, _dec9$6, _dec0$6, _dec1$6, _dec10$5, _dec11$5, _dec12$5, _dec13$5, _dec14$4, _dec15$4, _dec16$4, _dec17$4, _dec18$4, _dec19$4, _dec20$4, _class$a, _class2$9;
-function myCustomQueryTransform(_ctx, info) {
-  if (info.key === 'userName') {
-    info.params.where[info.fullName] = info.value;
-    return true;
-  }
-  return undefined;
-}
 let ControllerOrder = (_dec$a = Controller('order'), _dec2$a = BeanInfo({
   module: "test-vona"
 }), _dec3$9 = Web.post('create'), _dec4$9 = Api.body(v.tableIdentity()), _dec5$9 = function (target, key) {
@@ -2676,9 +2668,9 @@ let ControllerOrder = (_dec$a = Controller('order'), _dec2$a = BeanInfo({
 }, _dec0$6 = function (target, key) {
   return Arg.body()(target, key, 1);
 }, _dec1$6 = Reflect.metadata("design:type", Function), _dec10$5 = Reflect.metadata("design:paramtypes", [typeof TableIdentity === "undefined" ? Object : TableIdentity, typeof DtoOrderUpdate === "undefined" ? Object : DtoOrderUpdate]), _dec11$5 = Web.get('findAll'), _dec12$5 = Api.body(v.array(DtoOrderResult)), _dec13$5 = function (target, key) {
-  return Arg.queryPro(DtoOrderQuery, myCustomQueryTransform)(target, key, 0);
+  return Arg.filter(DtoOrderQuery)(target, key, 0);
 }, _dec14$4 = Reflect.metadata("design:type", Function), _dec15$4 = Reflect.metadata("design:paramtypes", [typeof IQueryParams === "undefined" ? Object : IQueryParams]), _dec16$4 = Web.get('findMany'), _dec17$4 = Api.body(DtoOrderResultPage), _dec18$4 = function (target, key) {
-  return Arg.queryPro(DtoOrderQueryPage)(target, key, 0);
+  return Arg.filter(DtoOrderQueryPage)(target, key, 0);
 }, _dec19$4 = Reflect.metadata("design:type", Function), _dec20$4 = Reflect.metadata("design:paramtypes", [typeof IQueryParams === "undefined" ? Object : IQueryParams]), _dec$a(_class$a = _dec2$a(_class$a = (_class2$9 = class ControllerOrder extends BeanBase {
   async create(data) {
     return (await this.scope.model.order.insert(data)).id;
@@ -2772,9 +2764,9 @@ let ControllerPost = (_dec$7 = Controller('post', {
 }), _dec2$7 = BeanInfo({
   module: "test-vona"
 }), _dec3$6 = Web.get('group'), _dec4$6 = Api.body(v.array(DtoPostGroup)), _dec5$6 = Reflect.metadata("design:type", Function), _dec6$6 = Reflect.metadata("design:paramtypes", []), _dec7$6 = Web.get('aggregate'), _dec8$4 = Api.body(DtoPostAggregate), _dec9$4 = Reflect.metadata("design:type", Function), _dec0$4 = Reflect.metadata("design:paramtypes", []), _dec1$4 = Web.get('findManyEcho'), _dec10$3 = Api.body(DtoPostQueryRes), _dec11$3 = Passport.public(), _dec12$3 = function (target, key) {
-  return Arg.queryPro(DtoPostQuery)(target, key, 0);
+  return Arg.filter(DtoPostQuery)(target, key, 0);
 }, _dec13$3 = Reflect.metadata("design:type", Function), _dec14$2 = Reflect.metadata("design:paramtypes", [typeof IQueryParams === "undefined" ? Object : IQueryParams]), _dec15$2 = Web.get('findMany'), _dec16$2 = Api.body(DtoPostQueryRes), _dec17$2 = Passport.public(), _dec18$2 = function (target, key) {
-  return Arg.queryPro(DtoPostQuery)(target, key, 0);
+  return Arg.filter(DtoPostQuery)(target, key, 0);
 }, _dec19$2 = Reflect.metadata("design:type", Function), _dec20$2 = Reflect.metadata("design:paramtypes", [typeof IQueryParams === "undefined" ? Object : IQueryParams]), _dec$7(_class$7 = _dec2$7(_class$7 = (_class2$6 = class ControllerPost extends BeanBase {
   async group() {
     return await this.scope.model.post.group({
@@ -2799,9 +2791,6 @@ let ControllerPost = (_dec$7 = Controller('post', {
   findManyEcho(params) {
     return params;
   }
-  findManyQueryTransform(_info) {
-    return undefined;
-  }
   async findMany(params) {
     return await this.scope.service.post.findMany(params);
   }

package/dist/service/caching.d.ts

@@ -1,10 +1,9 @@
-import type { TypeCachingActionOptions } from 'vona-module-a-caching';
+import type { ICachingActionKeyInfo, ICachingActionValueInfo, TypeCachingActionOptions } from 'vona-module-a-caching';
 import type { TSummerCacheTestData } from '../bean/summerCache.test.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceCaching extends BeanBase {
-    cacheKey(args: any[], prop: string, options: TypeCachingActionOptions): string;
-    cacheKeySet(args: any[], prop: string, options: TypeCachingActionOptions): string;
-    cacheValueSet(_value: any, args: any[], _prop: string, _options: TypeCachingActionOptions): any;
+    cacheKey(info: ICachingActionKeyInfo, _options: TypeCachingActionOptions): any;
+    cacheValue(info: ICachingActionValueInfo, _options: TypeCachingActionOptions): any;
     get(id: number): Promise<TSummerCacheTestData>;
     get2(_id: number): Promise<TSummerCacheTestData>;
     get3(_id: number): Promise<TSummerCacheTestData>;