@tsoa-next/runtime 7.1.0 → 7.3.1

package/dist/routeGeneration/templates/koa/koaTemplateService.d.ts

@@ -2,28 +2,37 @@ import type { Context, Next } from 'koa';
 import { Controller } from '../../../interfaces/controller';
 import { TsoaRoute } from '../../tsoa-route';
 import { TemplateService } from '../templateService';
+type HeaderRecord = Record<string, string | string[] | undefined>;
 type KoaApiHandlerParameters = {
     methodName: string;
     controller: Controller | object;
     context: Context;
-    validatedArgs: any[];
+    validatedArgs: unknown[];
     successStatus?: number;
 };
 type KoaValidationArgsParameters = {
     args: Record<string, TsoaRoute.ParameterSchema>;
+    controllerClass?: object;
+    methodName?: string;
     context: Context;
     next: Next;
 };
 type KoaReturnHandlerParameters = {
     context: Context;
     next?: Next;
-    headers: any;
+    headers: HeaderRecord | undefined;
     statusCode?: number;
-    data?: any;
+    data?: unknown;
 };
 export declare class KoaTemplateService extends TemplateService<KoaApiHandlerParameters, KoaValidationArgsParameters, KoaReturnHandlerParameters> {
-    apiHandler(params: KoaApiHandlerParameters): Promise<any>;
-    getValidatedArgs(params: KoaValidationArgsParameters): any[];
-    protected returnHandler(params: KoaReturnHandlerParameters): Promise<any> | Context | undefined;
+    apiHandler(params: KoaApiHandlerParameters): Promise<void | Context>;
+    getValidatedArgs(params: KoaValidationArgsParameters): unknown[];
+    protected returnHandler(params: KoaReturnHandlerParameters): Promise<void> | Context | undefined;
+    private getRequestBody;
+    private getHeaderValue;
+    private getPathValue;
+    private getErrorStatus;
+    private getErrorMessage;
+    private getErrorProperties;
 }
 export {};

package/dist/routeGeneration/templates/koa/koaTemplateService.js

@@ -18,14 +18,20 @@ class KoaTemplateService extends templateService_1.TemplateService {
             return this.returnHandler({ context, headers, statusCode, data });
         }
         catch (error) {
-            context.status = error.status || 500;
-            context.throw(context.status, error.message, error);
+            const status = this.getErrorStatus(error) ?? 500;
+            context.status = status;
+            const properties = this.getErrorProperties(error);
+            if (properties) {
+                context.throw(status, this.getErrorMessage(error), properties);
+            }
+            context.throw(status, this.getErrorMessage(error));
         }
     }
     getValidatedArgs(params) {
-        const { args, context, next } = params;
+        const { args, controllerClass, methodName, context, next } = params;
         const errorFields = {};
         const values = Object.values(args).map(param => {
+            const metadata = { controllerClass, methodName, parameterIndex: param.parameterIndex };
             const name = param.name;
             switch (param.in) {
                 case 'request':
@@ -33,31 +39,29 @@ class KoaTemplateService extends templateService_1.TemplateService {
                 case 'request-prop': {
                     const descriptor = Object.getOwnPropertyDescriptor(context.request, name);
                     const value = descriptor ? descriptor.value : undefined;
-                    return this.validationService.ValidateParam(param, value, name, errorFields, false, undefined);
+                    return this.validationService.ValidateParam(param, value, name, errorFields, false, undefined, metadata);
                 }
                 case 'query':
-                    return this.validationService.ValidateParam(param, context.request.query[name], name, errorFields, false, undefined);
+                    return this.validationService.ValidateParam(param, context.request.query[name], name, errorFields, false, undefined, metadata);
                 case 'queries':
-                    return this.validationService.ValidateParam(param, context.request.query, name, errorFields, false, undefined);
+                    return this.validationService.ValidateParam(param, context.request.query, name, errorFields, false, undefined, metadata);
                 case 'path':
-                    return this.validationService.ValidateParam(param, context.params[name], name, errorFields, false, undefined);
+                    return this.validationService.ValidateParam(param, this.getPathValue(context.params, name), name, errorFields, false, undefined, metadata);
                 case 'header':
-                    return this.validationService.ValidateParam(param, context.request.headers[name], name, errorFields, false, undefined);
+                    return this.validationService.ValidateParam(param, this.getHeaderValue(context.request.headers, name), name, errorFields, false, undefined, metadata);
                 case 'body': {
-                    const descriptor = Object.getOwnPropertyDescriptor(context.request, 'body');
-                    const value = descriptor ? descriptor.value : undefined;
+                    const value = this.normalizeRequestBody(this.getRequestBody(context.request), context.request.headers);
                     const bodyFieldErrors = {};
-                    const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, undefined);
+                    const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, undefined, metadata);
                     Object.keys(bodyFieldErrors).forEach(key => {
                         errorFields[key] = { message: bodyFieldErrors[key].message };
                     });
                     return result;
                 }
                 case 'body-prop': {
-                    const descriptor = Object.getOwnPropertyDescriptor(context.request, 'body');
-                    const value = descriptor ? descriptor.value[name] : undefined;
+                    const value = this.getBodyProperty(this.getRequestBody(context.request), context.request.headers, name);
                     const bodyFieldErrors = {};
-                    const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, 'body.');
+                    const result = this.validationService.ValidateParam(param, value, name, bodyFieldErrors, true, 'body.', metadata);
                     Object.keys(bodyFieldErrors).forEach(key => {
                         errorFields[key] = { message: bodyFieldErrors[key].message };
                     });
@@ -67,18 +71,23 @@ class KoaTemplateService extends templateService_1.TemplateService {
                     const files = Object.values(args).filter(p => p.dataType === 'file' || (p.dataType === 'array' && p.array && p.array.dataType === 'file'));
                     const contextRequest = context.request;
                     if ((param.dataType === 'file' || (param.dataType === 'array' && param.array && param.array.dataType === 'file')) && files.length > 0) {
-                        const fileArgs = this.validationService.ValidateParam(param, contextRequest.files?.[name], name, errorFields, false, undefined);
-                        if (param.dataType === 'array') {
-                            return fileArgs;
+                        const rawFileValue = contextRequest.files?.[name];
+                        let fileValue = rawFileValue;
+                        if (param.dataType !== 'array' && Array.isArray(rawFileValue)) {
+                            fileValue = rawFileValue[0];
                         }
-                        return Array.isArray(fileArgs) && fileArgs.length === 1 ? fileArgs[0] : fileArgs;
+                        const fileArgs = this.validationService.ValidateParam(param, fileValue, name, errorFields, false, undefined, metadata);
+                        return fileArgs;
                     }
-                    return this.validationService.ValidateParam(param, contextRequest.body?.[name], name, errorFields, false, undefined);
+                    const bodyValue = this.isRecord(contextRequest.body) ? contextRequest.body[name] : undefined;
+                    return this.validationService.ValidateParam(param, bodyValue, name, errorFields, false, undefined, metadata);
                 }
                 case 'res':
-                    return async (status, data, headers) => {
+                    return (async (status, data, headers) => {
                         await this.returnHandler({ context, headers, statusCode: status, data, next });
-                    };
+                    });
+                default:
+                    return undefined;
             }
         });
         if (Object.keys(errorFields).length > 0) {
@@ -102,7 +111,11 @@ class KoaTemplateService extends templateService_1.TemplateService {
             if (statusCode) {
                 context.status = statusCode;
             }
-            context.set(headers);
+            Object.entries(headers).forEach(([name, value]) => {
+                if (value !== undefined) {
+                    context.set(name, value);
+                }
+            });
             Object.defineProperty(context.response, koaTsoaResponsed, {
                 value: true,
                 writable: false,
@@ -111,6 +124,34 @@ class KoaTemplateService extends templateService_1.TemplateService {
         }
         return undefined;
     }
+    getRequestBody(request) {
+        const requestWithBody = request;
+        return requestWithBody.body;
+    }
+    getHeaderValue(headers, name) {
+        return headers[name];
+    }
+    getPathValue(params, name) {
+        return params[name];
+    }
+    getErrorStatus(error) {
+        if (this.isRecord(error) && typeof error.status === 'number') {
+            return error.status;
+        }
+        return undefined;
+    }
+    getErrorMessage(error) {
+        if (error instanceof Error) {
+            return error.message;
+        }
+        if (this.isRecord(error) && typeof error.message === 'string') {
+            return error.message;
+        }
+        return 'Internal Server Error';
+    }
+    getErrorProperties(error) {
+        return this.isRecord(error) ? error : undefined;
+    }
 }
 exports.KoaTemplateService = KoaTemplateService;
 //# sourceMappingURL=koaTemplateService.js.map

package/dist/routeGeneration/templates/koa/koaTemplateService.js.map

@@ -1 +1 @@
-{"version":3,"file":"koaTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/koa/koaTemplateService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"koaTemplateService.js","sourceRoot":"","sources":["../../../../src/routeGeneration/templates/koa/koaTemplateService.ts"],"names":[],"mappings":";;;AAKA,2DAAqD;AACrD,wDAAoD;AAEpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,yCAAyC,CAAC,CAAA;AA8B1E,MAAa,kBAAmB,SAAQ,iCAAiG;IACvI,KAAK,CAAC,UAAU,CAAC,MAA+B;QAC9C,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;QAEhF,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,CAAC,CAAA;YAC3E,IAAI,UAAU,GAAG,aAAa,CAAA;YAC9B,IAAI,OAAiC,CAAA;YAErC,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;gBAClC,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;gBACjC,UAAU,GAAG,UAAU,CAAC,SAAS,EAAE,IAAI,UAAU,CAAA;YACnD,CAAC;YACD,OAAO,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;QACnE,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,GAAG,CAAA;YAChD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;YACvB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YACjD,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,CAAA;YAChE,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAA;QACpD,CAAC;IACH,CAAC;IAED,gBAAgB,CAAC,MAAmC;QAClD,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;QAEnE,MAAM,WAAW,GAAgB,EAAE,CAAA;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC7C,MAAM,QAAQ,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAA;YACtF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;YACvB,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;gBACjB,KAAK,SAAS;oBACZ,OAAO,OAAO,CAAC,OAAO,CAAA;gBACxB,KAAK,cAAc,CAAC,CAAC,CAAC;oBACpB,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;oBACzE,MAAM,KAAK,GAAY,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;oBAChE,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAC1G,CAAC;gBACD,KAAK,OAAO;oBACV,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAChI,KAAK,SAAS;oBACZ,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAC1H,KAAK,MAAM;oBACT,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAC5I,KAAK,QAAQ;oBACX,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBACvJ,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;oBACtG,MAAM,eAAe,GAAgB,EAAE,CAAA;oBACvC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;oBACnH,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACzC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;oBAC9D,CAAC,CAAC,CAAA;oBACF,OAAO,MAAM,CAAA;gBACf,CAAC;gBACD,KAAK,WAAW,CAAC,CAAC,CAAC;oBACjB,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;oBACvG,MAAM,eAAe,GAAgB,EAAE,CAAA;oBACvC,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;oBACjH,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACzC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAA;oBAC9D,CAAC,CAAC,CAAA;oBACF,OAAO,MAAM,CAAA;gBACf,CAAC;gBACD,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAA;oBAC1I,MAAM,cAAc,GAAG,OAAO,CAAC,OAA6B,CAAA;oBAC5D,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACtI,MAAM,YAAY,GAAY,cAAc,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAA;wBAC1D,IAAI,SAAS,GAAY,YAAY,CAAA;wBACrC,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;4BAC9D,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;wBAC7B,CAAC;wBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;wBACtH,OAAO,QAAQ,CAAA;oBACjB,CAAC;oBACD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;oBAC5F,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;gBAC9G,CAAC;gBACD,KAAK,KAAK;oBACR,OAAO,CAAC,KAAK,EAAE,MAA0B,EAAE,IAAa,EAAE,OAAqB,EAAiB,EAAE;wBAChG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBAChF,CAAC,CAAwB,CAAA;gBAC3B;oBACE,OAAO,SAAS,CAAA;YACpB,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,+BAAa,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAES,aAAa,CAAC,MAAkC;QACxD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;QAClD,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;QACxB,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;QAEvB,MAAM,WAAW,GAAG,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;QACvF,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,WAAW,EAAE,CAAC;YACxC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA;gBACnB,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;YACtB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;YACtB,CAAC;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,MAAM,GAAG,UAAU,CAAA;YAC7B,CAAC;YAED,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;gBAChD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;gBAC1B,CAAC;YACH,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE;gBACxD,KAAK,EAAE,IAAI;gBACX,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAA;YACF,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAA;QAChC,CAAC;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,cAAc,CAAC,OAA2B;QAChD,MAAM,eAAe,GAAG,OAA6B,CAAA;QACrD,OAAO,eAAe,CAAC,IAAI,CAAA;IAC7B,CAAC;IAEO,cAAc,CAAC,OAAsC,EAAE,IAAY;QACzE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC;IAEO,YAAY,CAAC,MAAyB,EAAE,IAAY;QAC1D,OAAQ,MAAkC,CAAC,IAAI,CAAC,CAAA;IAClD,CAAC;IAEO,cAAc,CAAC,KAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7D,OAAO,KAAK,CAAC,MAAM,CAAA;QACrB,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAEO,eAAe,CAAC,KAAc;QACpC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC,OAAO,CAAA;QACtB,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9D,OAAO,KAAK,CAAC,OAAO,CAAA;QACtB,CAAC;QAED,OAAO,uBAAuB,CAAA;IAChC,CAAC;IAEO,kBAAkB,CAAC,KAAc;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IACjD,CAAC;CACF;AAnKD,gDAmKC"}

package/dist/routeGeneration/templates/templateService.d.ts

@@ -7,9 +7,14 @@ export declare abstract class TemplateService<ApiHandlerParameters, ValidationAr
     protected readonly config: AdditionalProps;
     protected validationService: ValidationService;
     constructor(models: TsoaRoute.Models, config: AdditionalProps);
-    abstract apiHandler(params: ApiHandlerParameters): Promise<any>;
-    abstract getValidatedArgs(params: ValidationArgsParameters): any[];
-    protected abstract returnHandler(params: ReturnHandlerParameters): any;
+    abstract apiHandler(params: ApiHandlerParameters): Promise<unknown>;
+    abstract getValidatedArgs(params: ValidationArgsParameters): unknown[];
+    protected abstract returnHandler(params: ReturnHandlerParameters): unknown;
     protected isController(object: Controller | object): object is Controller;
-    protected buildPromise(methodName: string, controller: Controller | object, validatedArgs: any): Promise<any>;
+    protected requestHasBody(headers: Record<string, unknown>): boolean;
+    protected requestUsesTransferEncoding(headers: Record<string, unknown>): boolean;
+    protected normalizeRequestBody(body: unknown, headers: Record<string, unknown>): unknown;
+    protected getBodyProperty(body: unknown, headers: Record<string, unknown>, propertyName: string): unknown;
+    protected isRecord(value: unknown): value is Record<string, unknown>;
+    protected buildPromise(methodName: string, controller: Controller | object, validatedArgs: unknown[]): Promise<unknown>;
 }

package/dist/routeGeneration/templates/templateService.js

@@ -14,6 +14,39 @@ class TemplateService {
     isController(object) {
         return 'getHeaders' in object && 'getStatus' in object && 'setStatus' in object;
     }
+    requestHasBody(headers) {
+        const contentLength = headers['content-length'];
+        if (Array.isArray(contentLength)) {
+            return contentLength.some(value => Number(value) > 0);
+        }
+        if (typeof contentLength === 'string') {
+            return Number(contentLength) > 0;
+        }
+        if (typeof contentLength === 'number') {
+            return contentLength > 0;
+        }
+        return false;
+    }
+    requestUsesTransferEncoding(headers) {
+        return headers['transfer-encoding'] !== undefined;
+    }
+    normalizeRequestBody(body, headers) {
+        if (this.requestHasBody(headers) || this.requestUsesTransferEncoding(headers)) {
+            return body;
+        }
+        return undefined;
+    }
+    getBodyProperty(body, headers, propertyName) {
+        const normalizedBody = this.normalizeRequestBody(body, headers);
+        if (!this.isRecord(normalizedBody)) {
+            return undefined;
+        }
+        const descriptor = Object.getOwnPropertyDescriptor(normalizedBody, propertyName);
+        return descriptor ? descriptor.value : undefined;
+    }
+    isRecord(value) {
+        return typeof value === 'object' && value !== null && !Array.isArray(value);
+    }
     buildPromise(methodName, controller, validatedArgs) {
         const ownPrototype = Object.getPrototypeOf(controller);
         let prototype = ownPrototype;
@@ -30,7 +63,12 @@ class TemplateService {
         // Keep previous behavior when nothing is found by allowing the same
         // descriptor access failure path to occur on the original prototype.
         const resolvedDescriptor = descriptor || Object.getOwnPropertyDescriptor(ownPrototype, methodName);
-        return resolvedDescriptor.value.apply(controller, validatedArgs);
+        const method = resolvedDescriptor?.value;
+        if (typeof method !== 'function') {
+            throw new TypeError(`Controller method '${methodName}' is not callable`);
+        }
+        const callable = method;
+        return Promise.resolve(callable.apply(controller, validatedArgs));
     }
 }
 exports.TemplateService = TemplateService;

package/dist/routeGeneration/templates/templateService.js.map

@@ -1 +1 @@
-{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/templateService.ts"],"names":[],"mappings":";;;AAEA,wDAAsD;AAGtD,MAAsB,eAAe;IAId;IACA;IAJX,iBAAiB,CAAmB;IAE9C,YACqB,MAAwB,EACxB,MAAuB;QADvB,WAAM,GAAN,MAAM,CAAkB;QACxB,WAAM,GAAN,MAAM,CAAiB;QAE1C,IAAI,CAAC,iBAAiB,GAAG,IAAI,mCAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChE,CAAC;IAQS,YAAY,CAAC,MAA2B;QAChD,OAAO,YAAY,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,IAAI,WAAW,IAAI,MAAM,CAAA;IACjF,CAAC;IAES,YAAY,CAAC,UAAkB,EAAE,UAA+B,EAAE,aAAkB;QAC5F,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;QACtD,IAAI,SAAS,GAAkB,YAAY,CAAA;QAC3C,IAAI,UAA0C,CAAA;QAE9C,mFAAmF;QACnF,qFAAqF;QACrF,OAAO,SAAS,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC;YACnD,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;YACnE,IAAI,UAAU,EAAE,KAAK,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;gBAChE,MAAK;YACP,CAAC;YAED,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QAC9C,CAAC;QAED,oEAAoE;QACpE,qEAAqE;QACrE,MAAM,kBAAkB,GAAG,UAAU,IAAI,MAAM,CAAC,wBAAwB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;QAClG,OAAQ,kBAAmB,CAAC,KAA0C,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,CAAC,CAAA;IACzG,CAAC;CACF;AAzCD,0CAyCC"}
+{"version":3,"file":"templateService.js","sourceRoot":"","sources":["../../../src/routeGeneration/templates/templateService.ts"],"names":[],"mappings":"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"}

package/dist/routeGeneration/tsoa-route.d.ts

@@ -5,6 +5,8 @@ import { Tsoa } from './../metadataGeneration/tsoa';
  */
 export declare function isDefaultForAdditionalPropertiesAllowed(test: TsoaRoute.RefObjectModelSchema['additionalProperties']): test is undefined;
 export declare namespace TsoaRoute {
+    type ValidationStrategy = Tsoa.ValidationStrategy;
+    type ExternalValidatorDescriptor = Tsoa.ExternalValidatorDescriptor;
     interface Models {
         [name: string]: ModelSchema;
     }
@@ -35,6 +37,8 @@ export declare namespace TsoaRoute {
         dataType?: Tsoa.TypeStringLiteral;
         ref?: string;
         required?: boolean;
+        validationStrategy?: ValidationStrategy;
+        externalValidator?: ExternalValidatorDescriptor;
         array?: PropertySchema;
         enums?: Array<string | number | boolean | null>;
         type?: PropertySchema;
@@ -47,6 +51,7 @@ export declare namespace TsoaRoute {
         };
     }
     interface ParameterSchema extends PropertySchema {
+        parameterIndex?: number;
         name: string;
         in: string;
     }

package/dist/swagger/swagger.d.ts

@@ -143,55 +143,49 @@ export declare namespace Swagger {
         summary?: string;
         description?: string;
     }
-    export type BaseParameter = {
+    type ParameterCommonFields = {
         name: string;
-        in: 'query' | 'header' | 'path' | 'formData' | 'body' | 'cookie';
         required?: boolean;
         description?: string;
-        deprecated?: boolean;
         [ext: `x-${string}`]: unknown;
-    } & Pick<BaseSchema, 'type' | 'items' | 'enum' | 'format' | 'minimum' | 'maximum' | 'minLength' | 'maxLength' | 'pattern'>;
-    export type BodyParameter = BaseParameter & {
-        in: 'body';
     };
-    export type FormDataParameter = BaseParameter & {
-        in: 'formData';
+    type Swagger2ParameterValue = Pick<BaseSchema, 'items' | 'enum' | 'minimum' | 'maximum' | 'minLength' | 'maxLength' | 'pattern'> & {
         type: DataType;
         format?: DataFormat;
-        collectionFormat?: 'csv' | 'ssv' | 'tsv' | 'pipes' | 'multi';
         default?: unknown;
     };
-    type QueryParameter = BaseParameter & {
+    export type BodyParameter = ParameterCommonFields & {
+        in: 'body';
+        schema: Schema2;
+    };
+    export type FormDataParameter = ParameterCommonFields & Swagger2ParameterValue & {
+        in: 'formData';
+        collectionFormat?: 'csv' | 'ssv' | 'tsv' | 'pipes' | 'multi';
+    };
+    type QueryParameter = ParameterCommonFields & Swagger2ParameterValue & {
         in: 'query';
-        type: DataType;
-        format?: DataFormat;
         collectionFormat?: 'csv' | 'ssv' | 'tsv' | 'pipes' | 'multi';
-        default?: unknown;
     };
-    type PathParameter = BaseParameter & {
+    type PathParameter = ParameterCommonFields & Swagger2ParameterValue & {
         in: 'path';
-        type: DataType;
-        format?: DataFormat;
-        default?: unknown;
     };
-    type HeaderParameter = BaseParameter & {
+    type HeaderParameter = ParameterCommonFields & Swagger2ParameterValue & {
         in: 'header';
-        type: DataType;
-        format?: DataFormat;
-        default?: unknown;
     };
-    type Swagger2BaseParameter = BaseParameter & {
-        schema: Schema2;
+    type Swagger2NonBodyParameter = {
+        exclusiveMaximum?: boolean;
+        exclusiveMinimum?: boolean;
     };
-    export type Swagger2BodyParameter = Swagger2BaseParameter & BodyParameter;
-    export type Swagger2FormDataParameter = Swagger2BaseParameter & FormDataParameter;
-    export type Swagger2QueryParameter = Swagger2BaseParameter & QueryParameter;
-    export type Swagger2PathParameter = Swagger2BaseParameter & PathParameter;
-    export type Swagger2HeaderParameter = Swagger2BaseParameter & HeaderParameter;
-    export type Parameter2 = Swagger2BodyParameter | Swagger2FormDataParameter | Swagger2QueryParameter | Swagger2PathParameter | Swagger2HeaderParameter;
+    export type Swagger2FormDataParameter = FormDataParameter & Swagger2NonBodyParameter;
+    export type Swagger2QueryParameter = QueryParameter & Swagger2NonBodyParameter;
+    export type Swagger2PathParameter = PathParameter & Swagger2NonBodyParameter;
+    export type Swagger2HeaderParameter = HeaderParameter & Swagger2NonBodyParameter;
+    export type Parameter2 = BodyParameter | Swagger2FormDataParameter | Swagger2QueryParameter | Swagger2PathParameter | Swagger2HeaderParameter;
     export function isQueryParameter(parameter: unknown): parameter is Swagger2QueryParameter;
-    export interface Parameter3 extends BaseParameter {
+    export function isBodyParameter(parameter: unknown): parameter is BodyParameter;
+    export interface Parameter3 extends ParameterCommonFields {
         in: 'query' | 'header' | 'path' | 'cookie';
+        deprecated?: boolean;
         schema: Schema3;
         style?: string;
         explode?: boolean;
@@ -204,6 +198,7 @@ export declare namespace Swagger {
     export interface Parameter31 extends Omit<Parameter3, 'schema'> {
         schema: Schema31;
     }
+    export type BaseParameter = Parameter2 | Parameter3 | Parameter31;
     export interface Path {
         $ref?: string;
         get?: Operation;
@@ -309,14 +304,12 @@ export declare namespace Swagger {
     }
     export interface Response {
         description: string;
-        schema?: BaseSchema;
+        schema?: Schema2;
         headers?: {
             [name: string]: Header;
         };
         examples?: {
-            [responseMediaType: string]: {
-                [exampleName: string]: Example3 | string;
-            };
+            [responseMediaType: string]: unknown;
         };
     }
     export interface Response3 {
@@ -363,9 +356,7 @@ export declare namespace Swagger {
         default?: string | boolean | number | unknown;
         multipleOf?: number;
         maximum?: number;
-        exclusiveMaximum?: number;
         minimum?: number;
-        exclusiveMinimum?: number;
         maxLength?: number;
         minLength?: number;
         pattern?: string;
@@ -389,8 +380,10 @@ export declare namespace Swagger {
         required?: string[];
         items?: BaseSchema;
     }
-    export interface Schema31 extends Omit<Schema3, 'items' | 'properties' | 'additionalProperties' | 'discriminator' | 'anyOf' | 'allOf'> {
+    export interface Schema31 extends Omit<Schema3, 'items' | 'properties' | 'additionalProperties' | 'discriminator' | 'anyOf' | 'allOf' | 'exclusiveMaximum' | 'exclusiveMinimum'> {
         examples?: unknown[];
+        exclusiveMaximum?: number;
+        exclusiveMinimum?: number;
         properties?: {
             [key: string]: Schema31;
         };
@@ -408,18 +401,26 @@ export declare namespace Swagger {
             mapping?: Record<string, string>;
         };
     }
-    export interface Schema3 extends Omit<BaseSchema, 'type'> {
+    export interface Schema3 extends Omit<BaseSchema, 'additionalProperties' | 'items' | 'properties' | 'type'> {
         type?: DataType;
         nullable?: boolean;
-        anyOf?: BaseSchema[];
-        allOf?: BaseSchema[];
+        additionalProperties?: boolean | Schema3;
+        items?: Schema3;
+        anyOf?: Schema3[];
+        allOf?: Schema3[];
         deprecated?: boolean;
+        exclusiveMaximum?: boolean;
+        exclusiveMinimum?: boolean;
         properties?: {
             [propertyName: string]: Schema3;
         };
     }
-    export interface Schema2 extends BaseSchema {
+    export interface Schema2 extends Omit<BaseSchema, 'additionalProperties' | 'items' | 'properties'> {
+        additionalProperties?: boolean | Schema2;
+        items?: Schema2;
         type?: DataType;
+        exclusiveMaximum?: boolean;
+        exclusiveMinimum?: boolean;
         properties?: {
             [propertyName: string]: Schema2;
         };

package/dist/swagger/swagger.js

@@ -8,5 +8,9 @@ var Swagger;
         return typeof parameter === 'object' && parameter !== null && 'in' in parameter && parameter.in === 'query';
     }
     Swagger.isQueryParameter = isQueryParameter;
+    function isBodyParameter(parameter) {
+        return typeof parameter === 'object' && parameter !== null && 'in' in parameter && parameter.in === 'body';
+    }
+    Swagger.isBodyParameter = isBodyParameter;
 })(Swagger || (exports.Swagger = Swagger = {}));
 //# sourceMappingURL=swagger.js.map

package/dist/swagger/swagger.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../src/swagger/swagger.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,IAAiB,OAAO,CA2iBvB;AA3iBD,WAAiB,OAAO;IA0LtB,SAAgB,gBAAgB,CAAC,SAAkB;QACjD,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,IAAI,IAAI,IAAI,SAAS,IAAI,SAAS,CAAC,EAAE,KAAK,OAAO,CAAA;IAC7G,CAAC;IAFe,wBAAgB,mBAE/B,CAAA;AA+WH,CAAC,EA3iBgB,OAAO,uBAAP,OAAO,QA2iBvB"}
+{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../src/swagger/swagger.ts"],"names":[],"mappings":";;;AAAA,2DAA2D;AAC3D,IAAiB,OAAO,CAwjBvB;AAxjBD,WAAiB,OAAO;IAuLtB,SAAgB,gBAAgB,CAAC,SAAkB;QACjD,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,IAAI,IAAI,IAAI,SAAS,IAAI,SAAS,CAAC,EAAE,KAAK,OAAO,CAAA;IAC7G,CAAC;IAFe,wBAAgB,mBAE/B,CAAA;IAED,SAAgB,eAAe,CAAC,SAAkB;QAChD,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,IAAI,IAAI,IAAI,SAAS,IAAI,SAAS,CAAC,EAAE,KAAK,MAAM,CAAA;IAC5G,CAAC;IAFe,uBAAe,kBAE9B,CAAA;AA2XH,CAAC,EAxjBgB,OAAO,uBAAP,OAAO,QAwjBvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsoa-next/runtime",
-  "version": "7.1.0",
+  "version": "7.3.1",
   "description": "Build swagger-compliant REST APIs using TypeScript and Node",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",
@@ -42,23 +42,52 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "express": "^4.21.0 || ^5.0.0"
+    "express": "^4.21.0 || ^5.0.0",
+    "fp-ts": "^2.16.11",
+    "io-ts": "^2.2.21",
+    "io-ts-types": "^0.5.19",
+    "joi": "^17.13.3",
+    "superstruct": "^2.0.2",
+    "yup": "^1.7.1",
+    "zod": "^4.1.11"
   },
   "peerDependenciesMeta": {
     "express": {
       "optional": true
+    },
+    "fp-ts": {
+      "optional": true
+    },
+    "io-ts": {
+      "optional": true
+    },
+    "io-ts-types": {
+      "optional": true
+    },
+    "joi": {
+      "optional": true
+    },
+    "superstruct": {
+      "optional": true
+    },
+    "yup": {
+      "optional": true
+    },
+    "zod": {
+      "optional": true
     }
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/vannadii/tsoa-next.git"
+    "url": "https://github.com/tsoa-next/tsoa-next.git"
   },
   "engines": {
-    "node": ">=24.14.0",
-    "npm": ">=11.0.0"
+    "node": ">=22.0.0",
+    "npm": ">=10.0.0"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
-  }
+  },
+  "homepage": "https://tsoa-next.dev"
 }