cabloy 5.1.248 → 5.1.250

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/boilerplate/src/controller/{{resourceName}}.ts_

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type { IQueryParams, TypeAnalysisGroupParams, TypeAnalysisAggregateParams } from 'vona-module-a-orm';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 
 import { BeanBase } from 'vona';
@@ -17,6 +17,9 @@ import { Dto<%=argv.resourceNameCapitalize%>SelectReq } from '../dto/<%=argv.res
 import { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>GroupResItem } from '../dto/<%=argv.resourceName%>GroupResItem.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>AggregateRes } from '../dto/<%=argv.resourceName%>AggregateRes.tsx';
+import type { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 
@@ -39,6 +42,20 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.service.<%=argv.resourceName%>.select(params);
   }
 
+  @Web.get('group', { summary: $locale('<%=argv.resourceNameCapitalize%>Group') })
+  @Api.body(v.array(v.object(Dto<%=argv.resourceNameCapitalize%>GroupResItem)))
+  @Passport.rbac({ actionInherit: 'select' })
+  async group(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq, { mode: 'group' }) params: TypeAnalysisGroupParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>GroupResItem[]> {
+    return await this.scope.service.<%=argv.resourceName%>.group(params);
+  }
+
+  @Web.get('aggregate', { summary: $locale('<%=argv.resourceNameCapitalize%>Aggregate') })
+  @Api.body(Dto<%=argv.resourceNameCapitalize%>AggregateRes)
+  @Passport.rbac({ actionInherit: 'select' })
+  async aggregate(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq, { mode: 'aggregate' }) params: TypeAnalysisAggregateParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>AggregateRes> {
+    return await this.scope.service.<%=argv.resourceName%>.aggregate(params);
+  }
+
   @Web.get(':id', { summary: $locale('<%=argv.resourceNameCapitalize%>View') })
   @Api.body(v.optional(), v.object(Dto<%=argv.resourceNameCapitalize%>View))
   @Passport.rbac()

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/boilerplate/src/dto/{{resourceName}}SelectReq.tsx_

@@ -7,10 +7,12 @@ import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
+import { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq>({
+  analysis: <%=argv.resourceName%>Analysis,
   openapi: { filter: { table: '<%=argv.moduleResourceName%>' } },
   fields: {
     name: $makeSchema(v.optional(), z.string()),

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,9 +1,10 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type { IQueryParams, TypeAnalysisGroupParams, TypeAnalysisAggregateParams } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { Core } from 'vona-module-a-core';
+import { $executeAnalysisGroup, $executeAnalysisAggregate } from 'vona-module-a-orm';
 
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
@@ -11,6 +12,10 @@ import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.r
 import type { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+import type { Dto<%=argv.resourceNameCapitalize%>GroupResItem } from '../dto/<%=argv.resourceName%>GroupResItem.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>AggregateRes } from '../dto/<%=argv.resourceName%>AggregateRes.tsx';
+
+import { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 @Service()
 export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
@@ -22,6 +27,14 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.selectAndCount(params);
   }
 
+  async group(params?: TypeAnalysisGroupParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>GroupResItem[]> {
+    return await $executeAnalysisGroup(this.scope.model.<%=argv.resourceName%>, <%=argv.resourceName%>Analysis, params);
+  }
+
+  async aggregate(params?: TypeAnalysisAggregateParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>AggregateRes> {
+    return await $executeAnalysisAggregate(this.scope.model.<%=argv.resourceName%>, <%=argv.resourceName%>Analysis, params);
+  }
+
   async view(id: TableIdentity): Promise<Dto<%=argv.resourceNameCapitalize%>View | undefined> {
     return await this.scope.model.<%=argv.resourceName%>.getById(id);
   }

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/boilerplate/test/{{resourceName}}.test.ts_

@@ -29,6 +29,8 @@ describe('<%=argv.resourceName%>.test.ts', { concurrency: false }, () => {
       const expectedSummaries = {
         create: ['post', moduleApiPath, 'Create <%=argv.resourceNameCapitalize%>'],
         select: ['get', moduleApiPath, 'Query <%=argv.resourceNameCapitalize%> List'],
+        group: ['get', `${moduleApiPath}/group`, 'Group <%=argv.resourceNameCapitalize%>'],
+        aggregate: ['get', `${moduleApiPath}/aggregate`, 'Aggregate <%=argv.resourceNameCapitalize%>'],
         view: ['get', `${moduleApiPath}/{id}`, 'View <%=argv.resourceNameCapitalize%>'],
         update: ['patch', `${moduleApiPath}/{id}`, 'Update <%=argv.resourceNameCapitalize%>'],
         delete: ['delete', `${moduleApiPath}/{id}`, 'Delete <%=argv.resourceNameCapitalize%>'],
@@ -54,6 +56,8 @@ describe('<%=argv.resourceName%>.test.ts', { concurrency: false }, () => {
       const expectedInherits = {
         create: undefined,
         select: undefined,
+        group: `${controllerBeanFullName}#select`,
+        aggregate: `${controllerBeanFullName}#select`,
         view: undefined,
         update: undefined,
         delete: undefined,

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/snippets/3-en-us.ts

@@ -40,6 +40,8 @@ export default metadataCustomSnippet({
       [`${resource}Update`]: `Update ${resource}`,
       [`${resource}Delete`]: `Delete ${resource}`,
       [`${resource}DeleteBulk`]: `Bulk Delete ${resource}`,
+      [`${resource}Group`]: `Group ${resource}`,
+      [`${resource}Aggregate`]: `Aggregate ${resource}`,
     };
     return locale_transform({ ast, argv, resources });
   },

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudBasic/snippets/4-zh-cn.ts

@@ -23,6 +23,8 @@ export default metadataCustomSnippet({
       [`${resource}Update`]: `更新${resource}`,
       [`${resource}Delete`]: `删除${resource}`,
       [`${resource}DeleteBulk`]: `批量删除${resource}`,
+      [`${resource}Group`]: `${resource}分组统计`,
+      [`${resource}Aggregate`]: `${resource}汇总统计`,
     };
     return locale_transform({ ast, argv, resources });
   },

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/boilerplate/src/controller/{{resourceName}}.ts_

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type { IQueryParams, TypeAnalysisGroupParams, TypeAnalysisAggregateParams } from 'vona-module-a-orm';
 import type { IRbacScopeAccess } from 'vona-module-a-rbac';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 
@@ -18,6 +18,9 @@ import { Dto<%=argv.resourceNameCapitalize%>SelectReq } from '../dto/<%=argv.res
 import { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.resourceName%>Update.tsx';
 import { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>GroupResItem } from '../dto/<%=argv.resourceName%>GroupResItem.tsx';
+import { Dto<%=argv.resourceNameCapitalize%>AggregateRes } from '../dto/<%=argv.resourceName%>AggregateRes.tsx';
+import type { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 export interface IControllerOptions<%=argv.resourceNameCapitalize%> extends IDecoratorControllerOptions {}
 
@@ -40,6 +43,20 @@ export class Controller<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.service.<%=argv.resourceName%>.select(params);
   }
 
+  @Web.get('group', { summary: $locale('<%=argv.resourceNameCapitalize%>Group') })
+  @Api.body(v.array(v.object(Dto<%=argv.resourceNameCapitalize%>GroupResItem)))
+  @Passport.rbac({ actionInherit: 'select' })
+  async group(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq, { mode: 'group' }) params: TypeAnalysisGroupParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>GroupResItem[]> {
+    return await this.scope.service.<%=argv.resourceName%>.group(params);
+  }
+
+  @Web.get('aggregate', { summary: $locale('<%=argv.resourceNameCapitalize%>Aggregate') })
+  @Api.body(Dto<%=argv.resourceNameCapitalize%>AggregateRes)
+  @Passport.rbac({ actionInherit: 'select' })
+  async aggregate(@Arg.filter(Dto<%=argv.resourceNameCapitalize%>SelectReq, { mode: 'aggregate' }) params: TypeAnalysisAggregateParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>AggregateRes> {
+    return await this.scope.service.<%=argv.resourceName%>.aggregate(params);
+  }
+
   @Web.get(':id', { summary: $locale('<%=argv.resourceNameCapitalize%>View') })
   @Api.body(v.optional(), v.object(Dto<%=argv.resourceNameCapitalize%>View))
   @Passport.rbac()

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/boilerplate/src/dto/{{resourceName}}SelectReq.tsx_

@@ -7,10 +7,12 @@ import z from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-start-admin';
 
 import { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
+import { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 export interface IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=argv.resourceNameCapitalize%>SelectReq>({
+  analysis: <%=argv.resourceName%>Analysis,
   openapi: { filter: { table: '<%=argv.moduleResourceName%>' } },
   fields: {
     name: $makeSchema(v.optional(), z.string()),

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/boilerplate/src/service/{{resourceName}}.ts_

@@ -1,9 +1,10 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams } from 'vona-module-a-orm';
+import type { IQueryParams, TypeAnalysisGroupParams, TypeAnalysisAggregateParams } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { Core } from 'vona-module-a-core';
+import { $executeAnalysisGroup, $executeAnalysisAggregate } from 'vona-module-a-orm';
 
 import type { Dto<%=argv.resourceNameCapitalize%>Create } from '../dto/<%=argv.resourceName%>Create.tsx';
 import type { Dto<%=argv.resourceNameCapitalize%>SelectRes } from '../dto/<%=argv.resourceName%>SelectRes.tsx';
@@ -11,6 +12,10 @@ import type { Dto<%=argv.resourceNameCapitalize%>Update } from '../dto/<%=argv.r
 import type { Dto<%=argv.resourceNameCapitalize%>View } from '../dto/<%=argv.resourceName%>View.tsx';
 import type { Entity<%=argv.resourceNameCapitalize%> } from '../entity/<%=argv.resourceName%>.tsx';
 import type { Model<%=argv.resourceNameCapitalize%> } from '../model/<%=argv.resourceName%>.ts';
+import type { Dto<%=argv.resourceNameCapitalize%>GroupResItem } from '../dto/<%=argv.resourceName%>GroupResItem.tsx';
+import type { Dto<%=argv.resourceNameCapitalize%>AggregateRes } from '../dto/<%=argv.resourceName%>AggregateRes.tsx';
+
+import { <%=argv.resourceName%>Analysis } from '../lib/<%=argv.resourceName%>Analysis.ts';
 
 @Service()
 export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
@@ -22,6 +27,14 @@ export class Service<%=argv.resourceNameCapitalize%> extends BeanBase {
     return await this.scope.model.<%=argv.resourceName%>.selectAndCount(params);
   }
 
+  async group(params?: TypeAnalysisGroupParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>GroupResItem[]> {
+    return await $executeAnalysisGroup(this.scope.model.<%=argv.resourceName%>, <%=argv.resourceName%>Analysis, params);
+  }
+
+  async aggregate(params?: TypeAnalysisAggregateParams<typeof <%=argv.resourceName%>Analysis>): Promise<Dto<%=argv.resourceNameCapitalize%>AggregateRes> {
+    return await $executeAnalysisAggregate(this.scope.model.<%=argv.resourceName%>, <%=argv.resourceName%>Analysis, params);
+  }
+
   async view(id: TableIdentity): Promise<Dto<%=argv.resourceNameCapitalize%>View | undefined> {
     return await this.scope.model.<%=argv.resourceName%>.getById(id);
   }

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/boilerplate/test/{{resourceName}}.test.ts_

@@ -19,7 +19,7 @@ describe('<%=argv.resourceName%>.test.ts', () => {
       await app.bean.passport.signinMock();
       try {
         app.bean.passport.current!.roles = [];
-        const actions = ['create', 'select', 'view', 'update', 'delete'];
+        const actions = ['create', 'select', 'view', 'update', 'delete', 'group', 'aggregate'];
         const permissions = await Promise.all(
           actions.map(action =>
             app.bean.permission.retrievePermissionAction(

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/snippets/3-en-us.ts

@@ -40,6 +40,8 @@ export default metadataCustomSnippet({
       [`${resource}View`]: `View ${resource}`,
       [`${resource}Update`]: `Update ${resource}`,
       [`${resource}Delete`]: `Delete ${resource}`,
+      [`${resource}Group`]: `Group ${resource}`,
+      [`${resource}Aggregate`]: `Aggregate ${resource}`,
     };
     return locale_transform({ ast, argv, resources });
   },

package/vona/packages-cli/cli-set-api/cli/templates/tools/crudStart/snippets/4-zh-cn.ts

@@ -23,6 +23,8 @@ export default metadataCustomSnippet({
       [`${resource}View`]: `查看${resource}`,
       [`${resource}Update`]: `更新${resource}`,
       [`${resource}Delete`]: `删除${resource}`,
+      [`${resource}Group`]: `${resource}分组统计`,
+      [`${resource}Aggregate`]: `${resource}汇总统计`,
     };
     return locale_transform({ ast, argv, resources });
   },

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.174",
+  "version": "1.1.175",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudBasic.ts

@@ -5,6 +5,7 @@ import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { renderCrudAnalysis } from '../crudAnalysis.ts';
 import { __ThisSetName__ } from '../this.ts';
 
 declare module '@cabloy/cli' {
@@ -55,6 +56,7 @@ export class CliToolsCrudBasic extends BeanCliBase {
       snippetsPath: 'tools/crudBasic/snippets',
       boilerplatePath: 'tools/crudBasic/boilerplate',
     });
+    await renderCrudAnalysis(this, targetDir, __ThisSetName__);
     // tools.metadata
     if (!argv.nometadata) {
       await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.crudStart.ts

@@ -5,6 +5,7 @@ import { combineApiPathControllerAndActionRaw } from '@cabloy/utils';
 import fs from 'node:fs';
 import path from 'node:path';
 
+import { renderCrudAnalysis } from '../crudAnalysis.ts';
 import { __ThisSetName__ } from '../this.ts';
 
 declare module '@cabloy/cli' {
@@ -55,6 +56,7 @@ export class CliToolsCrudStart extends BeanCliBase {
       snippetsPath: 'tools/crudStart/snippets',
       boilerplatePath: 'tools/crudStart/boilerplate',
     });
+    await renderCrudAnalysis(this, targetDir, __ThisSetName__);
     // tools.metadata
     if (!argv.nometadata) {
       await this.helper.invokeCli([':tools:metadata', moduleName], { cwd: argv.projectPath });

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.masterDetail.ts

@@ -613,6 +613,8 @@ export class CliToolsMasterDetail extends BeanCliBase {
       service: path.join(detailRoot, 'src/service', `${argv.detailResourceName}.ts`),
       dtoDir: path.join(detailRoot, 'src/dto'),
       test: path.join(detailRoot, 'test', `${argv.detailResourceName}.test.ts`),
+      analysisTest: path.join(detailRoot, 'test', `${argv.detailResourceName}Analysis.test.ts`),
+      analysis: path.join(detailRoot, 'src/lib', `${argv.detailResourceName}Analysis.ts`),
       metaVersion: path.join(detailRoot, 'src/bean', 'meta.version.ts'),
       metaIndex: path.join(detailRoot, 'src/bean', 'meta.index.ts'),
     };
@@ -627,7 +629,13 @@ export class CliToolsMasterDetail extends BeanCliBase {
 
   private _removeStandaloneDetailSurface() {
     const files = this._detailPaths();
-    for (const file of [files.controller, files.service, files.test]) {
+    for (const file of [
+      files.controller,
+      files.service,
+      files.test,
+      files.analysisTest,
+      files.analysis,
+    ]) {
       if (fs.existsSync(file)) {
         fs.rmSync(file, { force: true });
       }

package/vona/packages-cli/cli-set-api/src/lib/crudAnalysis.ts

@@ -0,0 +1,11 @@
+import type { BeanCliBase } from '@cabloy/cli';
+
+export async function renderCrudAnalysis(cli: BeanCliBase, targetDir: string, setName: string) {
+  for (const part of ['common', 'group', 'aggregate']) {
+    await cli.template.renderBoilerplateAndSnippets({
+      targetDir,
+      setName,
+      boilerplatePath: `tools/crudAnalysis/${part}`,
+    });
+  }
+}