@wabot-dev/framework 0.5.4 → 0.5.6

package/dist/src/addon/auth/api-key/@apiKeyGuard.js

@@ -7,7 +7,7 @@ import '../../../core/validation/metadata/ValidationMetadataStore.js';
 import '../../../feature/express/ExpressProvider.js';
 import 'express';
 import 'path';
-import '../../../feature/rest-controller/RestRequest.js';
+import 'http';
 import { ApiKeyGuardMiddleware } from './ApiKeyGuardMiddleware.js';
 
 function apiKeyGuard() {

package/dist/src/addon/auth/jwt/@jwtGuard.js

@@ -7,7 +7,7 @@ import '../../../core/validation/metadata/ValidationMetadataStore.js';
 import '../../../feature/express/ExpressProvider.js';
 import 'express';
 import 'path';
-import '../../../feature/rest-controller/RestRequest.js';
+import 'http';
 import { JwtGuardMiddleware } from './JwtGuardMiddleware.js';
 
 function jwtGuard() {

package/dist/src/core/validation/core/validateModel.js

@@ -33,7 +33,7 @@ function validateModel(value, info) {
                     propertyErrors = [];
                     propertiesErrors[propertyName] = propertyErrors;
                 }
-                propertyErrors.push(propertyValidatorResult.error.description);
+                propertyErrors.push(propertyValidatorResult.error);
             }
             else {
                 currentPropValue = propertyValidatorResult.value;
@@ -56,7 +56,7 @@ function validateModel(value, info) {
                     propertyErrors = [];
                     propertiesErrors[propertyName] = propertyErrors;
                 }
-                propertyErrors.push(propertyValidatorResult.error.description);
+                propertyErrors.push(propertyValidatorResult.error);
             }
         }
     }

package/dist/src/feature/rest-controller/RestRequest.js

@@ -1,14 +1,4 @@
-import { __decorate, __metadata } from 'tslib';
-import '../../core/injection/index.js';
-import '../../core/validation/metadata/ValidationMetadataStore.js';
-import { isRecord } from '../../core/validation/validators/is-record/@isRecord.js';
-
 class RestRequest {
-    headers;
 }
-__decorate([
-    isRecord('string', 'string'),
-    __metadata("design:type", Object)
-], RestRequest.prototype, "headers", void 0);
 
 export { RestRequest };

package/dist/src/feature/rest-controller/runRestControllers.js

@@ -10,6 +10,7 @@ import path__default from 'path';
 import { EXPRESS_REQ, EXPRESS_RES } from './injection-tokens.js';
 import { RestControllerMetadataStore } from './metadata/RestControllerMetadataStore.js';
 import { RestRequest } from './RestRequest.js';
+import { IncomingMessage } from 'http';
 
 function buildRequest(req) {
     return Object.assign({}, req.body, req.query, req.params);
@@ -51,18 +52,23 @@ function runRestControllers(controllers) {
                     }
                     if (endPoint.paramsTypes.length === 1) {
                         const paramType = endPoint.paramsTypes[0];
-                        if (typeof paramType !== 'function') {
-                            throw new Error(`invalid rest controller endpoint parameter type`);
+                        if (paramType === IncomingMessage) {
+                            endPointArgs.push(req);
                         }
-                        const paramInfo = validationMetadataStore.getModelValidatorsInfo(paramType);
-                        const validableReq = paramInfo.modelHierarchy.includes(RestRequest)
-                            ? req
-                            : buildRequest(req);
-                        const { value, error } = validateModel(validableReq, paramInfo);
-                        if (error) {
-                            throw new CustomError({ httpCode: 400, message: error.description, info: error });
+                        else {
+                            if (typeof paramType !== 'function') {
+                                throw new Error(`invalid rest controller endpoint parameter type`);
+                            }
+                            const paramInfo = validationMetadataStore.getModelValidatorsInfo(paramType);
+                            const validableReq = paramInfo.modelHierarchy.includes(RestRequest)
+                                ? req
+                                : buildRequest(req);
+                            const { value, error } = validateModel(validableReq, paramInfo);
+                            if (error) {
+                                throw new CustomError({ httpCode: 400, message: error.description, info: error });
+                            }
+                            endPointArgs.push(value);
                         }
-                        endPointArgs.push(value);
                     }
                     const response = await controllerInstance[endPoint.functionName].apply(controllerInstance, endPointArgs);
                     res.status(200).json(response ?? null);

package/dist/src/index.d.ts

@@ -219,7 +219,7 @@ interface IValidationError {
 }
 interface IModelValidationError extends IValidationError {
     properties: {
-        [key: string]: string[];
+        [key: string]: IValidationError[];
     };
 }
 interface IArrayValidationError extends IValidationError {
@@ -1221,7 +1221,6 @@ declare const EXPRESS_REQ = "EXPRESS_REQ";
 declare const EXPRESS_RES = "EXPRESS_RES";
 
 declare class RestRequest {
-    headers?: Record<string, string>;
 }
 
 declare class SocketServerConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",