vona-module-test-vona 5.0.81 → 5.0.83

package/dist/service/post.d.ts

@@ -9,7 +9,7 @@ export declare class ServicePost extends BeanBase {
         };
         with?: Record<string, unknown>;
         distinct?: boolean | keyof import("vona-module-test-vona").EntityPost | (keyof import("vona-module-test-vona").EntityPost)[] | undefined;
-        columns?: "title" | "id" | "iid" | "createdAt" | "updatedAt" | "deleted" | "*" | "userId" | "stars" | ("title" | "id" | "iid" | "createdAt" | "updatedAt" | "deleted" | "*" | "userId" | "stars")[] | undefined;
+        columns?: "title" | "id" | "userId" | "*" | "iid" | "deleted" | "createdAt" | "updatedAt" | "stars" | ("title" | "id" | "userId" | "*" | "iid" | "deleted" | "createdAt" | "updatedAt" | "stars")[] | undefined;
         where?: import("vona-module-a-orm").TypeModelWhereInner<{
             "testVonaUser.name": string;
             "testVonaUser.age"?: number | undefined;
@@ -50,12 +50,12 @@ export declare class ServicePost extends BeanBase {
             postContent: "testVonaPostContent";
             user: "testVonaUser";
         }>, import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelPost> | import("vona").TypeRecordValues<{
-            postContent: "testVonaPostContent.content" | "testVonaPostContent.id" | "testVonaPostContent.iid" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.deleted" | "testVonaPostContent.postId";
-            user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.iid" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.age" | "testVonaUser.scores";
+            postContent: "testVonaPostContent.content" | "testVonaPostContent.id" | "testVonaPostContent.iid" | "testVonaPostContent.deleted" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.postId";
+            user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.age" | "testVonaUser.iid" | "testVonaUser.deleted" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.scores";
         }>>[] | undefined;
         orders?: import("vona-module-a-orm").IModelSelectParamsOrder<import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelPost> | import("vona").TypeRecordValues<{
-            postContent: "testVonaPostContent.content" | "testVonaPostContent.id" | "testVonaPostContent.iid" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.deleted" | "testVonaPostContent.postId";
-            user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.iid" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.age" | "testVonaUser.scores";
+            postContent: "testVonaPostContent.content" | "testVonaPostContent.id" | "testVonaPostContent.iid" | "testVonaPostContent.deleted" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.postId";
+            user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.age" | "testVonaUser.iid" | "testVonaUser.deleted" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.scores";
         }>>[] | undefined;
         limit?: number;
         offset?: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-test-vona",
   "type": "module",
-  "version": "5.0.81",
+  "version": "5.0.83",
   "title": "test-vona",
   "vonaModule": {
     "fileVersion": 1,

package/src/controller/bean.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase, cast } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 import { __ThisModule__ } from '../.metadata/this.ts';

package/src/controller/cacheMem.ts

@@ -2,7 +2,7 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { sleep } from '@cabloy/utils';
 import { BeanBase, retry } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 

package/src/controller/cacheRedis.ts

@@ -2,7 +2,7 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { sleep } from '@cabloy/utils';
 import { BeanBase, retry } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 

package/src/controller/dtoTest.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoCategoryTree } from '../dto/categoryTree.ts';

package/src/controller/onion.ts

@@ -2,7 +2,7 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { Aspect } from 'vona-module-a-aspect';
 import { Core } from 'vona-module-a-core';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';

package/src/controller/order.ts

@@ -1,10 +1,9 @@
 import type { TableIdentity } from 'table-identity';
-import type { VonaContext } from 'vona';
 import type { IQueryParams } from 'vona-module-a-orm';
-import type { IDecoratorControllerOptions, IPipeOptionsQueryTransformInfo } from 'vona-module-a-web';
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import type { ModelOrder } from '../model/order.ts';
 import { BeanBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoOrderCreate } from '../dto/orderCreate.ts';
 import { DtoOrderQuery } from '../dto/orderQuery.ts';
@@ -15,14 +14,6 @@ import { DtoOrderUpdate } from '../dto/orderUpdate.ts';
 
 export interface IControllerOptionsOrder extends IDecoratorControllerOptions {}
 
-function myCustomQueryTransform(_ctx: VonaContext, info: IPipeOptionsQueryTransformInfo): boolean | undefined {
-  if (info.key === 'userName') {
-    info.params.where[info.fullName] = info.value;
-    return true;
-  }
-  return undefined;
-}
-
 @Controller<IControllerOptionsOrder>('order')
 export class ControllerOrder extends BeanBase {
   @Web.post('create')
@@ -39,7 +30,7 @@ export class ControllerOrder extends BeanBase {
   @Web.get('findAll')
   @Api.body(v.array(DtoOrderResult))
   async findAll(
-    @Arg.queryPro(DtoOrderQuery, myCustomQueryTransform) params: IQueryParams<ModelOrder>,
+    @Arg.filter(DtoOrderQuery) params: IQueryParams<ModelOrder>,
   ): Promise<DtoOrderResult[]> {
     return this.scope.model.order.select({
       ...params,
@@ -52,7 +43,7 @@ export class ControllerOrder extends BeanBase {
   @Web.get('findMany')
   @Api.body(DtoOrderResultPage)
   async findMany(
-    @Arg.queryPro(DtoOrderQueryPage) params: IQueryParams<ModelOrder>,
+    @Arg.filter(DtoOrderQueryPage) params: IQueryParams<ModelOrder>,
   ) {
     return this.scope.model.order.selectAndCount({
       ...params,

package/src/controller/passport.ts

@@ -4,7 +4,7 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase } from 'vona';
 import { DtoJwtToken } from 'vona-module-a-jwt';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 

package/src/controller/performAction.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 

package/src/controller/post.ts

@@ -1,8 +1,8 @@
 import type { IQueryParams } from 'vona-module-a-orm';
-import type { IDecoratorControllerOptions, IPipeOptionsQueryTransformInfo } from 'vona-module-a-web';
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import type { ModelPost } from '../model/post.ts';
 import { BeanBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoPostAggregate } from '../dto/postAggregate.ts';
@@ -43,18 +43,14 @@ export class ControllerPost extends BeanBase {
   @Web.get('findManyEcho')
   @Api.body(DtoPostQueryRes)
   @Passport.public()
-  findManyEcho(@Arg.queryPro(DtoPostQuery) params: IQueryParams<ModelPost>) {
+  findManyEcho(@Arg.filter(DtoPostQuery) params: IQueryParams<ModelPost>) {
     return params;
   }
 
-  findManyQueryTransform(_info: IPipeOptionsQueryTransformInfo): boolean | undefined {
-    return undefined;
-  }
-
   @Web.get('findMany')
   @Api.body(DtoPostQueryRes)
   @Passport.public()
-  async findMany(@Arg.queryPro(DtoPostQuery) params: IQueryParams<ModelPost>) {
+  async findMany(@Arg.filter(DtoPostQuery) params: IQueryParams<ModelPost>) {
     return await this.scope.service.post.findMany(params);
   }
 }

package/src/controller/queue.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 

package/src/controller/serializer.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Serializer } from 'vona-module-a-serialization';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';

package/src/controller/summer.ts

@@ -3,7 +3,7 @@ import type { SummerCacheTest, TSummerCacheTestData } from '../bean/summerCache.
 import assert from 'node:assert';
 import { sleep } from '@cabloy/utils';
 import { BeanBase, retry } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 import { __ThisModule__ } from '../.metadata/this.ts';

package/src/controller/tail.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase, cast } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Controller, Web } from 'vona-module-a-web';
 

package/src/controller/transaction.ts

@@ -1,7 +1,7 @@
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 

package/src/controller/upload.ts

@@ -3,7 +3,7 @@ import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import assert from 'node:assert';
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { SymbolUploadValue } from 'vona-module-a-upload';
 import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';

package/src/dto/orderQuery.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto, $tableName } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { EntityOrder } from '../entity/order.ts';
@@ -8,21 +8,18 @@ import { EntityUser } from '../entity/user.ts';
 export interface IDtoOptionsOrderQuery extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsOrderQuery>({
-  openapi: {
-    query: {
-      table: $tableName(EntityOrder),
-    },
-  },
+  openapi: { filter: { table: $tableName(EntityOrder) } },
 })
 export class DtoOrderQuery
   extends $Dto.query(EntityOrder, ['orderNo', 'remark']) {
-  @Api.field(v.optional(), v.openapi({
-    query: {
+  @Api.field(
+    v.filter({
       table: $tableName(EntityUser),
       joinType: 'innerJoin',
       joinOn: ['userId', 'testVonaUser.id'],
       originalName: 'name',
-    },
-  }))
+    }),
+    v.optional(),
+  )
   userName?: string;
 }

package/src/dto/orderQueryPage.ts

@@ -1,6 +1,6 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $Class } from 'vona';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';

package/src/dto/postQuery.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto, $tableName } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { EntityPost } from '../entity/post.ts';
@@ -7,16 +7,23 @@ import { EntityPost } from '../entity/post.ts';
 export interface IDtoOptionsPostQuery extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsPostQuery>({
-  openapi: { query: { table: $tableName(EntityPost) } },
+  openapi: { filter: { table: $tableName(EntityPost) } },
 })
 export class DtoPostQuery extends $Dto.queryPage(EntityPost, ['title']) {
-  @Api.field(v.optional(), v.openapi({
-    query: {
+  @Api.field(v.optional())
+  title?: string;
+
+  @Api.field(
+    v.filter({
       table: 'testVonaUser',
       joinOn: ['userId', 'testVonaUser.id'],
       originalName: 'name',
       op: '_eqI_',
-    },
-  }))
+    }),
+    v.optional(),
+  )
   userName?: string;
+
+  @Api.field(v.filterDateRange({ separator: ' - ' }), v.optional())
+  createdAt: string;
 }

package/src/dto/profile.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 
 export interface IDtoOptionsProfile extends IDecoratorDtoOptions {}

package/src/dto/roleLazy.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { DtoUserLazy } from './userLazy.ts';
 

package/src/dto/serializerArray.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { DtoSerializerSimple } from './serializerSimple.ts';
 

package/src/dto/serializerLazy.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { DtoSerializerSimple } from './serializerSimple.ts';
 

package/src/dto/serializerSimple.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Serializer } from 'vona-module-a-serialization';
 import { Dto } from 'vona-module-a-web';
 import { SensitiveEmail } from '../lib/serializer.ts';

package/src/dto/signin.ts

@@ -1,6 +1,6 @@
 import type { DtoCaptchaVerify } from 'vona-module-a-captcha';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 
 export interface IDtoOptionsSignin extends IDecoratorDtoOptions {}

package/src/dto/user.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { $locale } from '../.metadata/index.ts';
 

package/src/dto/userLazy.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import { DtoRoleLazy } from './roleLazy.ts';
 

package/src/entity/category.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsCategory extends IDecoratorEntityOptions {}

package/src/entity/order.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { $locale } from '../.metadata/index.ts';
 

package/src/entity/post.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsPost extends IDecoratorEntityOptions {}

package/src/entity/postContent.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsPostContent extends IDecoratorEntityOptions {}

package/src/entity/product.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { $locale } from '../.metadata/index.ts';
 

package/src/entity/role.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api } from 'vona-module-a-openapi';
+import { Api } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsRole extends IDecoratorEntityOptions {}

package/src/entity/roleUser.ts

@@ -1,6 +1,6 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsRoleUser extends IDecoratorEntityOptions {}

package/src/entity/test.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import { $locale } from '../.metadata/index.ts';
 

package/src/entity/user.ts

@@ -1,5 +1,5 @@
 import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 
 export interface IEntityOptionsUser extends IDecoratorEntityOptions {}

package/src/model/testDynamicTable.ts

@@ -1,6 +1,6 @@
 import type { VonaContext } from 'vona';
 import type { IDecoratorModelOptions, ITableRecord } from 'vona-module-a-orm';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { BeanModelBase, Model } from 'vona-module-a-orm';
 import { EntityTest } from '../entity/test.ts';
 
@@ -10,7 +10,7 @@ export interface IModelOptionsTestDynamicTable extends IDecoratorModelOptions<En
   entity: EntityTest,
   table(ctx: VonaContext, _where: EntityTest | undefined, defaultTable: keyof ITableRecord) {
     if (ctx.instanceName !== '') return defaultTable;
-    return `${defaultTable}_${moment().format('YYYYMMDD')}`;
+    return `${defaultTable}_${DateTime.now().toFormat('yyyyMMdd')}`;
   },
   softDeletionPrune: {
     handler: async (_ctx, _modelInstance: ModelTestDynamicTable) => {

package/src/service/caching.ts

@@ -1,29 +1,24 @@
-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';
 import { Service } from 'vona-module-a-bean';
-import { getKeyHash } from 'vona-module-a-cache';
 import { Caching } from 'vona-module-a-caching';
 
-function cacheKeyFn(this: ServiceCaching, args: [], prop: string, options: TypeCachingActionOptions): any {
-  return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+function cacheKeyFn(this: ServiceCaching, info: ICachingActionKeyInfo, _options: TypeCachingActionOptions): any {
+  return info.args[0];
 }
 
 @Service()
 export class ServiceCaching extends BeanBase {
-  cacheKey(args: any[], prop: string, options: TypeCachingActionOptions) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args)}`;
+  cacheKey(info: ICachingActionKeyInfo, _options: TypeCachingActionOptions) {
+    return info.args[0];
   }
 
-  cacheKeySet(args: any[], prop: string, options: TypeCachingActionOptions) {
-    return `${this.$beanFullName}_${options.cacheProp ?? prop}_${getKeyHash(args.slice(0, -1))}`;
+  cacheValue(info: ICachingActionValueInfo, _options: TypeCachingActionOptions) {
+    return info.args[1];
   }
 
-  cacheValueSet(_value: any, args: any[], _prop: string, _options: TypeCachingActionOptions) {
-    return args[args.length - 1];
-  }
-
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKey' })
+  @Caching.get({ cacheName: 'test-vona:test', cacheKeyFn: 'cacheKey' })
   async get(id: number): Promise<TSummerCacheTestData> {
     return {
       id,
@@ -31,39 +26,39 @@ export class ServiceCaching extends BeanBase {
     };
   }
 
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn })
+  @Caching.get({ cacheName: 'test-vona:test', cacheKeyFn })
   async get2(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey(args)],"_")' })
+  @Caching.get({ cacheName: 'test-vona:test', cacheKey: 'cel://args[0]' })
   async get3(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
   // default cacheKey
-  @Caching.get({ cacheName: 'test-vona:test', cacheProp: 'test' })
+  @Caching.get({ cacheName: 'test-vona:test' })
   async get4(_id: number): Promise<TSummerCacheTestData> {
     return undefined as any;
   }
 
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKeySet', cacheValueFn: 'cacheValueSet' })
+  @Caching.set({ cacheName: 'test-vona:test', cacheKeyFn: 'cacheKey', cacheValueFn: 'cacheValue' })
   async set(_id: number, _value: TSummerCacheTestData): Promise<void> {
     // do nothing
   }
 
   //
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKey: 'cel://join([get(self,"$beanFullName"),options.cacheProp,hashkey([args[0]])],"_")', cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}' })
+  @Caching.set({ cacheName: 'test-vona:test', cacheKey: 'cel://args[0]', cacheValue: 'cel://{"id": args[1].id, "name": args[1].name}' })
   async set2(_id: number, _value: TSummerCacheTestData): Promise<void> {
     // do nothing
   }
 
-  @Caching.set({ cacheName: 'test-vona:test', cacheProp: 'test', cacheKeyFn: 'cacheKeySet' })
+  @Caching.set({ cacheName: 'test-vona:test', cacheKeyFn: 'cacheKey' })
   async set3(_id: number, value: TSummerCacheTestData): Promise<TSummerCacheTestData> {
     return value;
   }
 
-  @Caching.del({ cacheName: 'test-vona:test', cacheProp: 'test' })
+  @Caching.del({ cacheName: 'test-vona:test' })
   async del(_id: number): Promise<void> {
     // do nothing
   }

package/test/database/database.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { catchError } from '@cabloy/utils';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { app } from 'vona-mock';
 
 describe('database.test.ts', () => {
@@ -100,7 +100,7 @@ describe('database.test.ts', () => {
       const entityTest = scopeTest.entity.test;
       const modelTest = scopeTest.model.testDynamicTable;
       // tableName
-      const tableName = `${entityTest.$table}_${moment().format('YYYYMMDD')}`;
+      const tableName = `${entityTest.$table}_${DateTime.now().toFormat('yyyyMMdd')}`;
       // create table
       await app.bean.model.createTable(tableName, table => {
         table.basicFields();

package/test/database/dtoAggregate.test.ts

@@ -3,7 +3,7 @@ import type z from 'zod';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
-import { getTargetDecoratorRules } from 'vona-module-a-openapi';
+import { getTargetDecoratorRules } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { ModelUserStats } from 'vona-module-test-vona';