vona-module-test-vona 5.0.50 → 5.0.52

package/dist/service/post.d.ts

@@ -11,13 +11,14 @@ export declare class ServicePost extends BeanBase {
         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;
         where?: import("vona-module-a-orm").TypeModelWhereInner<{
-            "testVonaPostContent.content": string;
-            "testVonaPostContent.postId": TableIdentity;
-            "testVonaPostContent.id": TableIdentity;
-            "testVonaPostContent.createdAt": Date;
-            "testVonaPostContent.updatedAt": Date;
-            "testVonaPostContent.deleted": boolean;
-            "testVonaPostContent.iid": number;
+            "testVonaUser.name": string;
+            "testVonaUser.age"?: number | undefined;
+            "testVonaUser.scores"?: number | undefined;
+            "testVonaUser.id": TableIdentity;
+            "testVonaUser.createdAt": Date;
+            "testVonaUser.updatedAt": Date;
+            "testVonaUser.deleted": boolean;
+            "testVonaUser.iid": number;
         } & {
             "testVonaPost.title": string;
             "testVonaPost.userId": TableIdentity;
@@ -28,14 +29,13 @@ export declare class ServicePost extends BeanBase {
             "testVonaPost.deleted": boolean;
             "testVonaPost.iid": number;
         } & import("vona-module-test-vona").EntityPost> | import("vona-module-a-orm").TypeModelWhereInner<{
-            "testVonaUser.name": string;
-            "testVonaUser.age"?: number | undefined;
-            "testVonaUser.scores"?: number | undefined;
-            "testVonaUser.id": TableIdentity;
-            "testVonaUser.createdAt": Date;
-            "testVonaUser.updatedAt": Date;
-            "testVonaUser.deleted": boolean;
-            "testVonaUser.iid": number;
+            "testVonaPostContent.content": string;
+            "testVonaPostContent.postId": TableIdentity;
+            "testVonaPostContent.id": TableIdentity;
+            "testVonaPostContent.createdAt": Date;
+            "testVonaPostContent.updatedAt": Date;
+            "testVonaPostContent.deleted": boolean;
+            "testVonaPostContent.iid": number;
         } & {
             "testVonaPost.title": string;
             "testVonaPost.userId": TableIdentity;
@@ -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.postId" | "testVonaPostContent.id" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.deleted" | "testVonaPostContent.iid";
-            user: "testVonaUser.name" | "testVonaUser.age" | "testVonaUser.scores" | "testVonaUser.id" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.iid";
+            postContent: "testVonaPostContent.id" | "testVonaPostContent.content" | "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";
         }>>[] | undefined;
         orders?: import("vona-module-a-orm").IModelSelectParamsOrder<import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelPost> | import("vona").TypeRecordValues<{
-            postContent: "testVonaPostContent.content" | "testVonaPostContent.postId" | "testVonaPostContent.id" | "testVonaPostContent.createdAt" | "testVonaPostContent.updatedAt" | "testVonaPostContent.deleted" | "testVonaPostContent.iid";
-            user: "testVonaUser.name" | "testVonaUser.age" | "testVonaUser.scores" | "testVonaUser.id" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.iid";
+            postContent: "testVonaPostContent.id" | "testVonaPostContent.content" | "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";
         }>>[] | undefined;
         limit?: number;
         offset?: number;

package/package.json

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

package/src/.metadata/index.ts

@@ -1331,7 +1331,9 @@ 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';
@@ -1346,7 +1348,9 @@ 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';
@@ -1365,7 +1369,9 @@ 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;
@@ -1389,7 +1395,9 @@ 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';
@@ -1415,10 +1423,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]>;
     }
@@ -1802,6 +1818,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;
@@ -1815,6 +1832,7 @@ export interface IApiPathPostRecord{
 '//echo': undefined;
 '/test/vona/onion/echo2/:userId/:userName': undefined;
 '/test/vona/onion/echo4': undefined;
+'/test/vona/order/create': undefined;
 '/test/vona/passport/login': undefined;
 '/test/vona/passport/refresh': undefined;
 '/test/vona/passport/logout': undefined;

package/src/controller/order.ts

@@ -7,7 +7,9 @@ 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';
 
 export interface IControllerOptionsOrder extends IDecoratorControllerOptions {}
 
@@ -39,4 +41,17 @@ export class ControllerOrder extends BeanBase {
       },
     });
   }
+
+  @Web.get('findMany')
+  @Api.body(DtoOrderResultPage)
+  async findMany(
+    @Arg.queryPro(DtoOrderQueryPage) params: IQueryParams<ModelOrder>,
+  ): Promise<DtoOrderResultPage> {
+    return this.scope.model.order.selectAndCount({
+      ...params,
+      include: {
+        products: true,
+      },
+    });
+  }
 }

package/src/controller/passport.ts

@@ -5,7 +5,7 @@ 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 { $getUserName, Passport } from 'vona-module-a-user';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 
 export interface IControllerOptionsPassport extends IDecoratorControllerOptions {}
@@ -17,7 +17,7 @@ export class ControllerPassport extends BeanBase {
   @Passport.public()
   echo(@Arg.param('name') name: string, @Arg.user() user: IUserBase) {
     assert.equal(name, 'admin');
-    assert.equal($getUserName(user), 'admin');
+    assert.equal(user.name, 'admin');
     return { name, user };
   }
 

package/src/controller/tail.ts

@@ -17,10 +17,10 @@ export class ControllerTail extends BeanBase {
     cast(this.ctx)._tail_test = 1;
 
     // tail
-    this.ctx.db.commit(() => {
+    this.ctx.commit(() => {
       assert.equal(cast(this.ctx)._tail_test_als_caller, undefined);
       assert.equal(cast(this.ctx)._tail_test, 2);
-      this.ctx.db.commit(() => {
+      this.ctx.commit(() => {
         assert.equal(cast(this.ctx)._tail_test, 3);
       });
       cast(this.ctx)._tail_test = 3;

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) {}