vona-module-a-web 5.0.22 → 5.0.24

package/dist/bean/pipe.query.d.ts

@@ -5,25 +5,33 @@ import type { IQueryParams } from 'vona-module-a-orm';
 import type { ValidatorOptions } from 'vona-module-a-validation';
 import type z from 'zod';
 import { BeanBase } from 'vona';
+export type TypePipeQueryData = unknown;
+export type TypePipeQueryResult = TypePipeQueryData;
 export interface IPipeOptionsQuery extends IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, ValidatorOptions {
-    transform?: TypePipeOptionsQueryTransform;
+    transformFn?: TypePipeOptionsQueryTransform | string;
 }
+export type TypeQueryParamsPatch = IQueryParams & {
+    where: {};
+};
 export interface IPipeOptionsQueryTransformInfo {
-    params: IQueryParams;
+    params: TypeQueryParamsPatch;
     query: any;
     options: IPipeOptionsQuery;
     originalName: string;
     fullName: string;
-    key: string;
-    value: any;
-    schema: z.ZodSchema;
+    key?: string;
+    value?: any;
+    schema?: z.ZodType;
     openapi?: ISchemaObjectExtensionField;
 }
 export type TypePipeOptionsQueryTransform = (ctx: VonaContext, info: IPipeOptionsQueryTransformInfo) => boolean | undefined;
-export declare class PipeQuery extends BeanBase implements IPipeTransform<any> {
-    transform(value: any, metadata: RouteHandlerArgumentMeta, options: IPipeOptionsQuery): Promise<any>;
+export declare class PipeQuery extends BeanBase implements IPipeTransform<TypePipeQueryData, TypePipeQueryResult> {
+    transform(value: TypePipeQueryData, metadata: RouteHandlerArgumentMeta, options: IPipeOptionsQuery): Promise<TypePipeQueryResult>;
     private _transform;
     private _transformSystem;
+    private _transformOrders;
+    private _transformField;
     private _transformFields;
+    private _performTransformFn;
 }
-export declare const ArgQuery: (options?: Partial<IPipeOptionsQuery> | undefined) => any;
+export declare const ArgQueryPro: (options?: Partial<IPipeOptionsQuery> | undefined) => any;

package/dist/bean/pipe.valid.d.ts

@@ -2,9 +2,11 @@ import type { IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, IPipeTransfo
 import type { RouteHandlerArgumentMeta } from 'vona-module-a-openapi';
 import type { ValidatorOptions } from 'vona-module-a-validation';
 import { BeanBase } from 'vona';
+export type TypePipeValidData = unknown;
+export type TypePipeValidResult = TypePipeValidData;
 export interface IPipeOptionsValid extends IDecoratorPipeOptions, IDecoratorPipeOptionsArgument, ValidatorOptions {
 }
-export declare class PipeValid extends BeanBase implements IPipeTransform<any> {
-    transform(value: any, metadata: RouteHandlerArgumentMeta, options: IPipeOptionsValid): Promise<any>;
+export declare class PipeValid extends BeanBase implements IPipeTransform<TypePipeValidData, TypePipeValidResult> {
+    transform(value: TypePipeValidData, metadata: RouteHandlerArgumentMeta, options: IPipeOptionsValid): Promise<TypePipeValidResult>;
 }
 export declare const ArgValid: (options?: Partial<IPipeOptionsValid> | undefined) => any;

package/dist/index.js

@@ -1,6 +1,6 @@
-import { HttpStatus, BeanInfo, BeanBase, appMetadata, appResource, deepExtend, compose, cast, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
+import { BeanInfo, BeanBase, cast, appMetadata, appResource, deepExtend, compose, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
 import { isNil, combineParamsAndQuery } from '@cabloy/utils';
-import { ZodMetadata } from '@cabloy/zod-query';
+import { ZodMetadata } from '@cabloy/zod-openapi';
 import { Pipe, createArgumentPipe, setArgumentPipe } from 'vona-module-a-aspect';
 import * as ModuleInfo from '@cabloy/module-info';
 import { Bean, Service, Scope } from 'vona-module-a-bean';
@@ -19,8 +19,8 @@ const __FieldsSystem = ['columns', 'where', 'orders', 'pageNo', 'pageSize'];
 let PipeQuery = (_dec$5 = Pipe({
   // ValidatorOptions
   disableErrorMessages: false,
-  errorHttpStatusCode: HttpStatus.BAD_REQUEST,
-  passthrough: false,
+  errorHttpStatusCode: 400,
+  loose: false,
   strict: false
 }), _dec2$5 = BeanInfo({
   module: "a-web"
@@ -38,7 +38,11 @@ let PipeQuery = (_dec$5 = Pipe({
     // 1. system: columns/where/orders/pageNo/pageSize
     const params = this._transformSystem(value);
     // 2. fields
-    return this._transformFields(params, value, options);
+    this._transformFields(params, value, options);
+    // 3. system: orders
+    this._transformOrders(params, options);
+    // ok
+    return params;
   }
 
   // system: columns/where/orders/pageNo/pageSize
@@ -68,75 +72,133 @@ let PipeQuery = (_dec$5 = Pipe({
     // ok
     return params;
   }
-  _transformFields(params, value, options) {
-    for (const key in value) {
-      if (__FieldsSystem.includes(key)) continue;
-      const fieldSchema = ZodMetadata.unwrapChained(ZodMetadata.getFieldSchema(options.schema, key));
-      if (!fieldSchema) continue;
-      // openapi
-      const openapi = ZodMetadata.getOpenapiMetadata(fieldSchema);
-      // name
-      const originalName = openapi?.query?.originalName ?? key;
-      let fullName;
-      // joins
-      if (openapi?.query?.join) {
-        if (!params.joins) params.joins = [];
-        const joinType = openapi.query.join.type ?? 'innerJoin';
-        const joinTable = openapi.query.join.table;
-        const joinOn = openapi.query.join.on;
-        if (params.joins.findIndex(item => item[1] === joinTable) === -1) {
-          params.joins.push([joinType, joinTable, joinOn]);
+  _transformOrders(params, options) {
+    if (!params.orders) return;
+    // openapi
+    const openapi = ZodMetadata.getOpenapiMetadata(options.schema);
+    const table = openapi?.query?.table;
+    // loop
+    for (const order of params.orders) {
+      const field = order[0];
+      if (field.includes('.')) continue;
+      let tableCurrent = table;
+      let fieldCurrent = field;
+      const fieldSchema = ZodMetadata.unwrapChained(ZodMetadata.getFieldSchema(options.schema, field));
+      if (fieldSchema) {
+        const openapi = ZodMetadata.getOpenapiMetadata(fieldSchema);
+        if (openapi?.query?.table) {
+          tableCurrent = openapi?.query?.table;
+        }
+        if (openapi?.query?.originalName) {
+          fieldCurrent = openapi?.query?.originalName;
         }
-        fullName = `${joinTable}.${originalName}`;
-      } else {
-        fullName = originalName;
       }
-      // check where
-      if (params.where[fullName]) continue;
-      // custom transform
-      if (options.transform) {
-        const res = options.transform(this.ctx, {
-          params,
-          query: value,
-          options,
-          originalName,
-          fullName,
-          key,
-          value: value[key],
-          schema: fieldSchema,
-          openapi
-        });
-        if (res === true || res === false) continue;
+      cast(order)[0] = tableCurrent ? `${tableCurrent}.${fieldCurrent}` : fieldCurrent;
+    }
+  }
+  _transformField(key, fieldValue, params, value, options) {
+    if (__FieldsSystem.includes(key)) return;
+    const fieldSchema = ZodMetadata.unwrapChained(ZodMetadata.getFieldSchema(options.schema, key));
+    if (!fieldSchema) return;
+    // openapi
+    const openapi = ZodMetadata.getOpenapiMetadata(fieldSchema);
+    // name
+    const originalName = openapi?.query?.originalName ?? key;
+    let fullName;
+    // joins
+    let joinInfo;
+    if (openapi?.query?.joinOn) {
+      const joinType = openapi.query.joinType ?? 'innerJoin';
+      const joinTable = openapi.query.table;
+      const joinOn = openapi.query.joinOn;
+      joinInfo = [joinType, joinTable, joinOn];
+      fullName = `${joinTable}.${originalName}`;
+    } else {
+      fullName = originalName;
+    }
+    // check where
+    if (Object.prototype.hasOwnProperty.call(params.where, fullName)) return;
+    // custom transform
+    const resTransform = this._performTransformFn(options, {
+      params,
+      query: value,
+      options,
+      originalName,
+      fullName,
+      key,
+      value: fieldValue,
+      schema: fieldSchema,
+      openapi
+    });
+    // res: ignore
+    if (resTransform === false) return;
+    // join
+    if (joinInfo) {
+      if (!params.joins) params.joins = [];
+      if (params.joins.findIndex(item => item[1] === joinInfo.joinTable) === -1) {
+        params.joins.push(joinInfo);
       }
-      // default transform
-      let op = openapi?.query?.op;
-      if (!op) {
-        const typeName = fieldSchema._def.typeName;
-        if (typeName === 'ZodString') {
-          op = '_includesI_';
-        } else {
-          op = '_eq_';
-        }
+    }
+    // res: done
+    if (resTransform === true) return;
+    // default transform
+    let op = openapi?.query?.op;
+    if (!op) {
+      const typeName = fieldSchema.type;
+      if (typeName === 'string') {
+        op = '_includesI_';
+      } else {
+        op = '_eq_';
       }
-      if (op === '_eq_') {
-        params.where[fullName] = value[key];
+    }
+    if (op === '_eq_') {
+      params.where[fullName] = fieldValue;
+    } else {
+      params.where[fullName] = {
+        [op]: fieldValue
+      };
+    }
+  }
+  _transformFields(params, value, options) {
+    // loop
+    for (const key in value) {
+      this._transformField(key, value[key], params, value, options);
+    }
+    // custom transform
+    this._performTransformFn(options, {
+      params,
+      query: value,
+      options
+    });
+  }
+  _performTransformFn(options, info) {
+    if (options.transformFn) {
+      if (typeof options.transformFn === 'string') {
+        const controller = this.ctx.getControllerBean();
+        if (!controller[options.transformFn]) {
+          throw new Error(`transformFn not found: ${this.ctx.getControllerBeanFullName()}`);
+        }
+        return controller[options.transformFn](info);
       } else {
-        params.where[fullName] = {
-          [op]: value[key]
-        };
+        return options.transformFn(this.ctx, info);
+      }
+    } else {
+      const controller = this.ctx.getControllerBean();
+      const transformFn = `${String(this.ctx.getHandlerName())}QueryTransform`;
+      if (controller[transformFn]) {
+        return controller[transformFn](info);
       }
     }
-    return params;
   }
 }) || _class$5) || _class$5);
-const ArgQuery = createArgumentPipe('a-web:query');
+const ArgQueryPro$1 = createArgumentPipe('a-web:query');
 
 var _dec$4, _dec2$4, _class$4;
 let PipeValid = (_dec$4 = Pipe({
   // ValidatorOptions
   disableErrorMessages: false,
-  errorHttpStatusCode: HttpStatus.BAD_REQUEST,
-  passthrough: false,
+  errorHttpStatusCode: 400,
+  loose: false,
   strict: false
 }), _dec2$4 = BeanInfo({
   module: "a-web"
@@ -219,8 +281,6 @@ async function middlewarePipe(ctx, next) {
   // check handler
   const handler = ctx.getHandler();
   if (!handler) return next();
-  // body parser
-  await ctx.app.bean._getBean('a-body.service.body').parse(true);
   // arguments
   ctx[SymbolRouteHandlersArgumentsValue] = await _transformArguments(ctx, ctx.getController(), handler);
   // next
@@ -260,6 +320,7 @@ async function _transformArguments(ctx, controller, handler) {
 async function _transformArgument(ctx, argMeta, metadata, value) {
   // pipes
   const pipes = composePipes(ctx, argMeta, (beanInstance, value, options, _next) => {
+    if (!isNil(options.argIndex) && argMeta.index !== options.argIndex) return value;
     return beanInstance.transform(value, metadata, options);
   });
   if (pipes.length === 0) return value;
@@ -444,24 +505,23 @@ let BeanRouter = (_dec$3 = Bean(), _dec2$3 = BeanInfo({
   }
 }) || _class$3) || _class$3);
 function classControllerMiddleware(ctx) {
-  const beanFullName = ctx.getControllerBeanFullName();
-  const handlerName = ctx.getHandler().name;
-  const controller = ctx.app.bean._getBean(beanFullName);
+  const handlerName = ctx.getHandlerName();
+  const controller = ctx.getControllerBean();
   return controller[handlerName](...(ctx[SymbolRouteHandlersArgumentsValue] || []));
 }
 async function routeStartMiddleware(ctx, next) {
   // next
   const res = await next();
-  // invoke callbackes: handle secondly
-  await ctx.commitDone();
+  // invoke callbacks: handle secondly
+  await ctx.commitsDone();
   // ok
   return res;
 }
 async function routeTailDoneMiddleware(ctx, next) {
   // next
   const res = await next();
-  // invoke callbackes: handle firstly
-  await ctx.commitDone();
+  // invoke callbacks: handle firstly
+  await ctx.commitsDone();
   // ok
   return res;
 }
@@ -478,7 +538,7 @@ async function routeTailDoneMiddleware(ctx, next) {
 //     // next
 //     const res = await next();
 //     // invoke callbackes: handle secondly
-//     await ctx.commitDone();
+//     await ctx.commitsDone();
 //     // ok
 //     return res;
 //   };
@@ -497,7 +557,7 @@ async function routeTailDoneMiddleware(ctx, next) {
 //     // next
 //     const res = await next();
 //     // invoke callbackes: handle firstly
-//     await ctx.commitDone();
+//     await ctx.commitsDone();
 //     // ok
 //     return res;
 //   };
@@ -706,12 +766,13 @@ function File(property, ...schemaLikes) {
 function User(...schemaLikes) {
   return createPipesArgumentDecorator('user')(undefined, ...schemaLikes);
 }
-function ArgQueryPro(schemaLike) {
+function ArgQueryPro(schemaLike, transformFn) {
   return function (target, prop, index) {
     const schema = $schema(schemaLike);
     setArgumentPipe('a-web:query', {
       type: 'query',
-      schema
+      schema,
+      transformFn
     }, target, prop, index);
   };
 }
@@ -825,4 +886,4 @@ function $apiPathAndCombineParamsAndQuery(path, options) {
   return combineParamsAndQuery(path, options);
 }
 
-export { $apiPath, $apiPathAndCombineParamsAndQuery, Arg, ArgQuery, ArgValid, BeanRouter, Controller, Dto, Main, PipeQuery, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, mergeActionsOpenapiMetadata };
+export { $apiPath, $apiPathAndCombineParamsAndQuery, Arg, ArgQueryPro$1 as ArgQueryPro, ArgValid, BeanRouter, Controller, Dto, Main, PipeQuery, PipeValid, RequestMapping, ScopeModuleAWeb, ServiceWeb, StartupListen, SymbolRequestMappingHandler, Web, config, createPipesArgumentDecorator, mergeActionsOpenapiMetadata };

package/dist/lib/decorator/arguments.d.ts

@@ -1,6 +1,7 @@
 import type { Constructable } from 'vona';
 import type { SchemaLike } from 'vona-module-a-openapiutils';
 import type z from 'zod';
+import type { TypePipeOptionsQueryTransform } from '../../bean/pipe.query.ts';
 declare function Param(): ParameterDecorator;
 declare function Param(...schemaLikes: SchemaLike[]): ParameterDecorator;
 declare function Param(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
@@ -26,7 +27,7 @@ declare function File(): ParameterDecorator;
 declare function File(...schemaLikes: SchemaLike[]): ParameterDecorator;
 declare function File(property: string, ...schemaLikes: SchemaLike[]): ParameterDecorator;
 declare function User(...schemaLikes: SchemaLike[]): ParameterDecorator;
-declare function ArgQueryPro(schemaLike: z.ZodSchema | Constructable): any;
+declare function ArgQueryPro(schemaLike: z.ZodType | Constructable, transformFn?: TypePipeOptionsQueryTransform | string): any;
 export declare const Arg: {
     param: typeof Param;
     query: typeof Query;

package/dist/types/controller.d.ts

@@ -28,7 +28,7 @@ export interface IDecoratorControllerOptions extends TypeOnionOptionsEnableSimpl
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {
-        controller: ServiceOnion<IDecoratorControllerOptions, keyof IControllerRecord>;
+        controller: ServiceOnion<IControllerRecord>;
     }
 }
 declare module 'vona' {

package/dist/types/dto.d.ts

@@ -1,6 +1,7 @@
 import type { OmitNever } from 'vona';
 import type { ServiceOnion } from 'vona-module-a-onion';
 import type { TypeOpenapiMetadata } from 'vona-module-a-openapi';
+import type { SchemaLike } from 'vona-module-a-openapiutils';
 import type { SymbolKeyFieldsMore } from 'vona-module-a-orm';
 export interface IDtoRecord {
 }
@@ -8,10 +9,11 @@ export interface IDecoratorDtoOptions<FieldsMore = never> {
     [SymbolKeyFieldsMore]?: FieldsMore;
     independent?: boolean;
     openapi?: TypeOpenapiMetadata;
+    pipes?: SchemaLike | SchemaLike[];
 }
 declare module 'vona-module-a-onion' {
     interface BeanOnion {
-        dto: ServiceOnion<IDecoratorDtoOptions, keyof IDtoRecord>;
+        dto: ServiceOnion<IDtoRecord>;
     }
 }
 declare module 'vona' {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-web",
   "type": "module",
-  "version": "5.0.22",
+  "version": "5.0.24",
   "title": "a-web",
   "vonaModule": {
     "capabilities": {