vona-cli-set-api 1.0.164 → 1.0.167

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.97"
+    "vona": "^5.0.99"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-base/src/controller/menu.ts

@@ -2,8 +2,8 @@ import type { IMenus } from 'vona-module-a-menu';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 import { BeanBase } from 'vona';
 import { DtoMenus } from 'vona-module-a-menu';
-import { Api, Arg, v } from 'vona-module-a-openapi';
-import { Controller, Web } from 'vona-module-a-web';
+import { Api, v } from 'vona-module-a-openapi';
+import { Arg, Controller, Web } from 'vona-module-a-web';
 
 export interface IControllerOptionsMenu extends IDecoratorControllerOptions {}
 

package/cli/templates/create/project/basic/boilerplate/src/suite/a-home/modules/home-user/src/controller/passport.ts

@@ -6,9 +6,9 @@ import type { EntityUser } from '../entity/user.ts';
 import { BeanBase } from 'vona';
 import { DtoAuthSimple } from 'vona-module-a-authsimple';
 import { DtoJwtToken } from 'vona-module-a-jwt';
-import { Api, Arg, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapi';
 import { Passport } from 'vona-module-a-user';
-import { Controller, Web } from 'vona-module-a-web';
+import { Arg, Controller, Web } from 'vona-module-a-web';
 import { z } from 'zod';
 import { DtoPassport } from '../dto/passport.ts';
 import { DtoPassportJwt } from '../dto/passportJwt.ts';

package/cli/templates/tools/crud/boilerplate/src/controller/{{resourceName}}.ts_

@@ -1,9 +1,12 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { IQueryParams, TableIdentity } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';
-import { Api, Arg, v } from 'vona-module-a-openapi';
-import { Controller, Web } from 'vona-module-a-web';
+import { Api, v } from 'vona-module-a-openapi';
+import { Arg, Controller, Web } from 'vona-module-a-web';
 import { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
+import { Dto<%=argv.resourceNameCapitalize%>Query } from '../dto/<%=argv.resourceName%>Query.ts';
+import { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.ts';
 import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
 
@@ -18,9 +21,12 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
   }
 
   @Web.get()
-  @Api.body(v.array(v.object(Entity<%=argv.resourceNameCapitalize%>)))
-  async findAll(): Promise<Entity<%=argv.resourceNameCapitalize%>[]> {
-    return await this.scope.service.<%=argv.resourceName%>.findAll();
+  @Api.body(Dto<%=argv.resourceNameCapitalize%>QueryRes)
+  async findMany(@Arg.queryPro(Dto<%=argv.resourceNameCapitalize%>Query) params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+    if (!params.orders) {
+      params.orders = [['<%=argv.moduleResourceName%>.createdAt', 'desc']];
+    }
+    return await this.scope.service.<%=argv.resourceName%>.findMany(params);
   }
 
   @Web.get(':id')

package/cli/templates/tools/crud/boilerplate/src/dto/{{resourceName}}Query.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 { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>Query extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>Query>()
+export class Dto<%=argv.resourceNameCapitalize%>Query extends $Dto.queryPage(Entity<%=argv.resourceNameCapitalize%>, ['name']) {}

package/cli/templates/tools/crud/boilerplate/src/dto/{{resourceName}}QueryRes.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 { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+
+export interface IDtoOptions<%=argv.resourceNameCapitalize%>QueryRes extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptions<%=argv.resourceNameCapitalize%>QueryRes>()
+export class Dto<%=argv.resourceNameCapitalize%>QueryRes extends $Dto.selectAndCount(() => Model<%=argv.resourceNameCapitalize%>) {}

package/cli/templates/tools/crud/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,7 +1,9 @@
-import type { TableIdentity } from 'vona-module-a-orm';
+import type { IQueryParams, TableIdentity } from 'vona-module-a-orm';
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.ts';
+import type { Dto<%=argv.resourceNameCapitalize%>QueryRes } from '../dto/<%=argv.resourceName%>QueryRes.ts';
 import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.ts';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.ts';
+import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
@@ -11,8 +13,10 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.insert(<%=argv.resourceName%>);
   }
 
-  async findAll(): Promise<Entity<%=argv.resourceNameCapitalize%>[]> {
-    return await this.scope.model.<%=argv.resourceName%>.select();
+  async findMany(params: IQueryParams<Model<%=argv.resourceNameCapitalize%>>): Promise<Dto<%=argv.resourceNameCapitalize%>QueryRes> {
+    return await this.scope.model.<%=argv.resourceName%>.selectAndCount({
+      ...params,
+    });
   }
 
   async findOne(id: TableIdentity): Promise<Entity<%=argv.resourceNameCapitalize%> | undefined> {

package/cli/templates/tools/crud/boilerplate/test/{{resourceName}}.test.ts_

@@ -1,4 +1,4 @@
-import type { Dto<%=argv.resourceNameCapitalize%>Create, Dto<%=argv.resourceNameCapitalize%>Update, Entity<%=argv.resourceNameCapitalize%> } from 'vona-module-<%=argv.moduleInfo.relativeName%>';
+import type { Dto<%=argv.resourceNameCapitalize%>Create, Dto<%=argv.resourceNameCapitalize%>QueryRes, Dto<%=argv.resourceNameCapitalize%>Update, Entity<%=argv.resourceNameCapitalize%> } from 'vona-module-<%=argv.moduleInfo.relativeName%>';
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { catchError } from '@cabloy/utils';
@@ -21,9 +21,9 @@ describe('<%=argv.resourceName%>.test.ts', () => {
       // create
       const <%=argv.resourceName%>: Entity<%=argv.resourceNameCapitalize%> = await app.bean.executor.performAction('post', '<%=argv.moduleActionPathRaw%>', { body: data });
       assert.equal(<%=argv.resourceName%>.name, data.name);
-      // findAll
-      const <%=argv.resourceName%>s: Entity<%=argv.resourceNameCapitalize%>[] = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>');
-      assert.equal(<%=argv.resourceName%>s.findIndex(item => item.name === data.name) > -1, true);
+      // findMany
+      const queryRes: Dto<%=argv.resourceNameCapitalize%>QueryRes = await app.bean.executor.performAction('get', '<%=argv.moduleActionPathRaw%>');
+      assert.equal(queryRes.list.findIndex(item => item.name === data.name) > -1, true);
       // update
       await app.bean.executor.performAction('patch', '<%=argv.moduleActionPathRaw%>/:id', {
         params: { id: <%=argv.resourceName%>.id },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.164",
+  "version": "1.0.167",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.2",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.46",
+    "vona-core": "^5.0.47",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },