vona-module-test-vona 5.0.51 → 5.0.53

package/package.json

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

package/src/.metadata/index.ts

@@ -451,7 +451,7 @@ import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'von
 declare module 'vona-module-test-vona' {
   export interface IModelOptionsCategory {
         relations: {
-          children: IModelRelationHasMany<ModelCategory, true, 'id'|'name',undefined,undefined,undefined>;
+          children: IModelRelationHasMany<ModelCategory, 'categoryIdParent', true, 'id'|'name', undefined, undefined, undefined>;
         };
       }
 export interface IModelOptionsCategoryChain {
@@ -462,24 +462,24 @@ export interface IModelOptionsCategoryChain {
 export interface IModelOptionsOrder {
         relations: {
           user: IModelRelationBelongsTo<ModelOrder, ModelUser, true, 'id'|'name'>;
-products: IModelRelationHasMany<ModelProduct, true, 'id'|'name'|'price'|'quantity'|'amount',undefined,undefined,undefined>;
+products: IModelRelationHasMany<ModelProduct, 'orderId', true, 'id'|'name'|'price'|'quantity'|'amount', undefined, undefined, undefined>;
         };
       }
 export interface IModelOptionsOrderStats {
         relations: {
-          productStats: IModelRelationHasMany<ModelProduct, true, '*',undefined,{ count?: '*' | Array<'*'>;sum?: 'amount' | Array<'amount'> },undefined>;
-productsGroups: IModelRelationHasMany<ModelProduct, false, undefined,undefined,{ count?: '*' | Array<'*'>;sum?: 'amount' | Array<'amount'> },'id' | Array<'id'>>;
+          productStats: IModelRelationHasMany<ModelProduct, 'orderId', true, undefined, undefined, { count?: '*' | Array<'*'>;sum?: 'amount' | Array<'amount'> }, undefined>;
+productsGroups: IModelRelationHasMany<ModelProduct, 'orderId', false, undefined, undefined, { count?: '*' | Array<'*'>;sum?: 'amount' | Array<'amount'> }, 'id' | Array<'id'>>;
         };
       }
 export interface IModelOptionsPost {
         relations: {
-          postContent: IModelRelationHasOne<ModelPostContent, false, 'id'|'content'>;
+          postContent: IModelRelationHasOne<ModelPostContent, 'postId', false, 'id'|'content'>;
 user: IModelRelationBelongsTo<ModelPost, ModelUser, true, 'id'|'name'>;
         };
       }
 export interface IModelOptionsPostContent {
         relations: {
-          post: IModelRelationBelongsTo<ModelPostContent, ModelPost, false, '*'>;
+          post: IModelRelationBelongsTo<ModelPostContent, ModelPost, false, undefined>;
         };
       }
 export interface IModelOptionsRole {
@@ -489,19 +489,19 @@ export interface IModelOptionsRole {
       }
 export interface IModelOptionsUser {
         relations: {
-          posts: IModelRelationHasMany<ModelPost, false, 'id'|'title',['test-vona:user',ModelPostContent],undefined,undefined>;
+          posts: IModelRelationHasMany<ModelPost, 'userId', false, 'id'|'title', ['test-vona:user',ModelPostContent], undefined, undefined>;
 roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, 'id'|'name',undefined,undefined,undefined>;
         };
       }
 export interface IModelOptionsUserStats {
         relations: {
-          posts: IModelRelationHasMany<ModelPost, true, '*',undefined,{ count?: '*'|'title' | Array<'*'|'title'>;sum?: 'stars' | Array<'stars'> },undefined>;
-roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, '*',undefined,{ count?: '*' | Array<'*'> },undefined>;
+          posts: IModelRelationHasMany<ModelPost, 'userId', true, undefined, undefined, { count?: '*'|'title' | Array<'*'|'title'>;sum?: 'stars' | Array<'stars'> }, undefined>;
+roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, undefined,undefined,{ count?: '*' | Array<'*'> },undefined>;
         };
       }
 export interface IModelOptionsUserStatsGroup {
         relations: {
-          posts: IModelRelationHasMany<ModelPost, true, undefined,undefined,{ count?: '*'|'title' | Array<'*'|'title'>;sum?: 'stars' | Array<'stars'> },'title' | Array<'title'>>;
+          posts: IModelRelationHasMany<ModelPost, 'userId', true, undefined, undefined, { count?: '*'|'title' | Array<'*'|'title'>;sum?: 'stars' | Array<'stars'> }, 'title' | Array<'title'>>;
 roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, undefined,undefined,{ count?: '*' | Array<'*'> },'name' | Array<'name'>>;
         };
       }
@@ -1331,13 +1331,16 @@ export interface IModuleSummerCache {
 export * from '../dto/categoryTree.ts';
 export * from '../dto/orderCreate.ts';
 export * from '../dto/orderQuery.ts';
+export * from '../dto/orderQueryPage.ts';
 export * from '../dto/orderResult.ts';
+export * from '../dto/orderResultPage.ts';
 export * from '../dto/orderUpdate.ts';
 export * from '../dto/postCreate.ts';
 export * from '../dto/postQuery.ts';
 export * from '../dto/postQueryRes.ts';
 export * from '../dto/profile.ts';
 export * from '../dto/roleLazy.ts';
+export * from '../dto/serializerTest.ts';
 export * from '../dto/signin.ts';
 export * from '../dto/user.ts';
 export * from '../dto/userCreate.ts';
@@ -1346,13 +1349,16 @@ export * from '../dto/userUpdate.ts';
 import type { IDtoOptionsCategoryTree } from '../dto/categoryTree.ts';
 import type { IDtoOptionsOrderCreate } from '../dto/orderCreate.ts';
 import type { IDtoOptionsOrderQuery } from '../dto/orderQuery.ts';
+import type { IDtoOptionsOrderQueryPage } from '../dto/orderQueryPage.ts';
 import type { IDtoOptionsOrderResult } from '../dto/orderResult.ts';
+import type { IDtoOptionsOrderResultPage } from '../dto/orderResultPage.ts';
 import type { IDtoOptionsOrderUpdate } from '../dto/orderUpdate.ts';
 import type { IDtoOptionsPostCreate } from '../dto/postCreate.ts';
 import type { IDtoOptionsPostQuery } from '../dto/postQuery.ts';
 import type { IDtoOptionsPostQueryRes } from '../dto/postQueryRes.ts';
 import type { IDtoOptionsProfile } from '../dto/profile.ts';
 import type { IDtoOptionsRoleLazy } from '../dto/roleLazy.ts';
+import type { IDtoOptionsSerializerTest } from '../dto/serializerTest.ts';
 import type { IDtoOptionsSignin } from '../dto/signin.ts';
 import type { IDtoOptionsUser } from '../dto/user.ts';
 import type { IDtoOptionsUserCreate } from '../dto/userCreate.ts';
@@ -1365,13 +1371,16 @@ declare module 'vona-module-a-web' {
       'test-vona:categoryTree': IDtoOptionsCategoryTree;
 'test-vona:orderCreate': IDtoOptionsOrderCreate;
 'test-vona:orderQuery': IDtoOptionsOrderQuery;
+'test-vona:orderQueryPage': IDtoOptionsOrderQueryPage;
 'test-vona:orderResult': IDtoOptionsOrderResult;
+'test-vona:orderResultPage': IDtoOptionsOrderResultPage;
 'test-vona:orderUpdate': IDtoOptionsOrderUpdate;
 'test-vona:postCreate': IDtoOptionsPostCreate;
 'test-vona:postQuery': IDtoOptionsPostQuery;
 'test-vona:postQueryRes': IDtoOptionsPostQueryRes;
 'test-vona:profile': IDtoOptionsProfile;
 'test-vona:roleLazy': IDtoOptionsRoleLazy;
+'test-vona:serializerTest': IDtoOptionsSerializerTest;
 'test-vona:signin': IDtoOptionsSignin;
 'test-vona:user': IDtoOptionsUser;
 'test-vona:userCreate': IDtoOptionsUserCreate;
@@ -1389,13 +1398,16 @@ declare module 'vona-module-test-vona' {
 import type { DtoCategoryTree } from '../dto/categoryTree.ts';
 import type { DtoOrderCreate } from '../dto/orderCreate.ts';
 import type { DtoOrderQuery } from '../dto/orderQuery.ts';
+import type { DtoOrderQueryPage } from '../dto/orderQueryPage.ts';
 import type { DtoOrderResult } from '../dto/orderResult.ts';
+import type { DtoOrderResultPage } from '../dto/orderResultPage.ts';
 import type { DtoOrderUpdate } from '../dto/orderUpdate.ts';
 import type { DtoPostCreate } from '../dto/postCreate.ts';
 import type { DtoPostQuery } from '../dto/postQuery.ts';
 import type { DtoPostQueryRes } from '../dto/postQueryRes.ts';
 import type { DtoProfile } from '../dto/profile.ts';
 import type { DtoRoleLazy } from '../dto/roleLazy.ts';
+import type { DtoSerializerTest } from '../dto/serializerTest.ts';
 import type { DtoSignin } from '../dto/signin.ts';
 import type { DtoUser } from '../dto/user.ts';
 import type { DtoUserCreate } from '../dto/userCreate.ts';
@@ -1415,10 +1427,18 @@ declare module 'vona-module-test-vona' {
       fields?: TypeEntityOptionsFields<DtoOrderQuery, IDtoOptionsOrderQuery[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsOrderQueryPage {
+      fields?: TypeEntityOptionsFields<DtoOrderQueryPage, IDtoOptionsOrderQueryPage[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsOrderResult {
       fields?: TypeEntityOptionsFields<DtoOrderResult, IDtoOptionsOrderResult[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsOrderResultPage {
+      fields?: TypeEntityOptionsFields<DtoOrderResultPage, IDtoOptionsOrderResultPage[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsOrderUpdate {
       fields?: TypeEntityOptionsFields<DtoOrderUpdate, IDtoOptionsOrderUpdate[TypeSymbolKeyFieldsMore]>;
     }
@@ -1443,6 +1463,10 @@ declare module 'vona-module-test-vona' {
       fields?: TypeEntityOptionsFields<DtoRoleLazy, IDtoOptionsRoleLazy[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsSerializerTest {
+      fields?: TypeEntityOptionsFields<DtoSerializerTest, IDtoOptionsSerializerTest[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsSignin {
       fields?: TypeEntityOptionsFields<DtoSignin, IDtoOptionsSignin[TypeSymbolKeyFieldsMore]>;
     }
@@ -1802,6 +1826,7 @@ declare module 'vona-module-a-web' {
 '/test/vona/onion/echo5': undefined;
 '/test/vona/onion/echo6': undefined;
 '/test/vona/order/findAll': undefined;
+'/test/vona/order/findMany': undefined;
 '/test/vona/passport/echo/:name': undefined;
 '/test/vona/passport/isAuthenticated': undefined;
 '/test/vona/post/findManyEcho': undefined;
@@ -1816,6 +1841,7 @@ export interface IApiPathPostRecord{
 '/test/vona/onion/echo2/:userId/:userName': undefined;
 '/test/vona/onion/echo4': undefined;
 '/test/vona/order/create': undefined;
+'/test/vona/order/update/:id': undefined;
 '/test/vona/passport/login': undefined;
 '/test/vona/passport/refresh': undefined;
 '/test/vona/passport/logout': undefined;

package/src/controller/order.ts

@@ -1,3 +1,4 @@
+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';
@@ -7,7 +8,10 @@ import { Api, v } from 'vona-module-a-openapi';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 import { DtoOrderCreate } from '../dto/orderCreate.ts';
 import { DtoOrderQuery } from '../dto/orderQuery.ts';
+import { DtoOrderQueryPage } from '../dto/orderQueryPage.ts';
 import { DtoOrderResult } from '../dto/orderResult.ts';
+import { DtoOrderResultPage } from '../dto/orderResultPage.ts';
+import { DtoOrderUpdate } from '../dto/orderUpdate.ts';
 
 export interface IControllerOptionsOrder extends IDecoratorControllerOptions {}
 
@@ -23,10 +27,18 @@ function myCustomQueryTransform(_ctx: VonaContext, info: IPipeOptionsQueryTransf
 export class ControllerOrder extends BeanBase {
   @Web.post('create')
   @Api.body(DtoOrderResult)
-  async create(@Arg.body(DtoOrderCreate) data: DtoOrderCreate) {
+  async create(@Arg.body() data: DtoOrderCreate) {
     return await this.scope.model.order.insert(data);
   }
 
+  @Web.post('update/:id')
+  async update(@Arg.param('id') id: TableIdentity, @Arg.body() data: DtoOrderUpdate) {
+    return await this.scope.model.order.update({
+      ...data,
+      id,
+    });
+  }
+
   @Web.get('findAll')
   @Api.body(v.array(DtoOrderResult))
   async findAll(
@@ -39,4 +51,17 @@ export class ControllerOrder extends BeanBase {
       },
     });
   }
+
+  @Web.get('findMany')
+  @Api.body(DtoOrderResultPage)
+  async findMany(
+    @Arg.queryPro(DtoOrderQueryPage) params: IQueryParams<ModelOrder>,
+  ) {
+    return this.scope.model.order.selectAndCount({
+      ...params,
+      include: {
+        products: true,
+      },
+    });
+  }
 }

package/src/dto/orderCreate.ts

@@ -6,5 +6,4 @@ import { ModelOrder } from '../model/order.ts';
 export interface IDtoOptionsOrderCreate extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsOrderCreate>()
-export class DtoOrderCreate
-  extends $Dto.create(() => ModelOrder, { columns: ['orderNo', 'remark'] }) {}
+export class DtoOrderCreate extends $Dto.create(() => ModelOrder, { columns: ['orderNo', 'remark'] }) {}

package/src/dto/orderQueryPage.ts

@@ -0,0 +1,20 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { $Class } from 'vona';
+import { Api } from 'vona-module-a-openapi';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import z from 'zod';
+import { EntityOrder } from '../entity/order.ts';
+
+export interface IDtoOptionsOrderQueryPage extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderQueryPage>({
+  fields: {
+    pageSize: z.number().min(1).max(300).default(30),
+  },
+})
+export class DtoOrderQueryPage
+  extends $Class.omit($Dto.queryPage(EntityOrder, ['orderNo', 'remark']), ['pageSize']) {
+  @Api.field(z.number().min(1).max(300).default(30))
+  pageSize: number;
+}

package/src/dto/orderResultPage.ts

@@ -0,0 +1,9 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ModelOrder } from 'vona-module-test-vona';
+
+export interface IDtoOptionsOrderResultPage extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderResultPage>()
+export class DtoOrderResultPage extends $Dto.selectAndCount(() => ModelOrder) {}

package/src/dto/serializerTest.ts

@@ -0,0 +1,13 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+import { Api, v } from 'vona-module-a-openapi';
+import { Serializer } from 'vona-module-a-serialization';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsSerializerTest extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsSerializerTest>()
+export class DtoSerializerTest {
+  @Serializer.exclude()
+  @Api.field(v.min(6))
+  password: string;
+}