@wabot-dev/framework 0.1.0-beta.15 → 0.1.0-beta.17

package/dist/src/error/CustomError.js

@@ -8,6 +8,7 @@ class CustomError extends Error {
         this.humanMessage = data.humanMessage;
         this.code = data.code;
         this.httpCode = data.httpCode;
+        this.info = data.info;
     }
 }
 

package/dist/src/index.d.ts

@@ -1072,7 +1072,7 @@ declare class RestControllerMetadataStore {
     }[];
 }
 
-declare function runRestControllers(controllers: IConstructor<any>[], container: DependencyContainer$1): void;
+declare function runRestControllers(controllers: IConstructor<any>[]): void;
 
 declare function prepareChatContainer(container: DependencyContainer$1, context: IMessageContext, mindsetCtor?: IConstructor<IMindset>): Promise<DependencyContainer$1>;
 
@@ -1121,18 +1121,23 @@ interface IValidationError {
 }
 interface IModelValidationError extends IValidationError {
     properties: {
-        name: string;
-        errors: IValidationError[];
-    }[];
-}
-interface IValidationResult<V> {
-    value?: V;
-    error?: IValidationError;
-}
-interface IModelValidationResult<V> {
-    value?: V;
-    error?: IModelValidationError;
+        [key: string]: string[];
+    };
 }
+type IValidationResult<V> = {
+    value: V;
+    error?: undefined;
+} | {
+    value?: undefined;
+    error: IValidationError;
+};
+type IModelValidationResult<V> = {
+    value: V;
+    error?: undefined;
+} | {
+    value?: undefined;
+    error: IModelValidationError;
+};
 type IValidator = (value: any, options: any) => IValidationResult<any>;
 interface IPropertyValidatorInfo {
     propertyName: string;
@@ -1160,6 +1165,7 @@ declare class ValidationMetadataStore {
     private validators;
     saveValidatorMetadata(validatorMetadata: IValidatorMetadata): void;
     getModelValidatorsInfo<V>(modelConstructor: IConstructor<V>): IModelValidatorsInfo<V>;
+    private getConstructorPropertiesValidatorsInfo;
 }
 
 declare function validateIsBoolean(value: any): IValidationResult<boolean>;

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

@@ -1,6 +1,6 @@
 import '../controller/channel/ChatResolver.js';
 import '../controller/channel/UserResolver.js';
-import '../injection/index.js';
+import { container } from '../injection/index.js';
 import '../controller/metadata/ControllerMetadataStore.js';
 import '../channels/cmd/CmdChannel.js';
 import { ExpressProvider } from '../channels/express/ExpressProvider.js';
@@ -28,7 +28,7 @@ import { CustomError } from '../error/CustomError.js';
 function buildRequest(req) {
     return Object.assign({}, req.body, req.query, req.params);
 }
-function runRestControllers(controllers, container) {
+function runRestControllers(controllers) {
     const logger = new Logger('wabot:rest');
     const metadataStore = container.resolve(RestControllerMetadataStore);
     const expressProvider = container.resolve(ExpressProvider);

package/dist/src/validation/metadata/ValidationMetadataStore.js

@@ -2,6 +2,15 @@ import { __decorate } from 'tslib';
 import { singleton } from '../../injection/index.js';
 import { _IS_OPTIONAL_DUMMY_VALIDATOR_ } from '../validators/validateIsOptional.js';
 
+function getClassHierarchy(cls) {
+    const classes = [];
+    let proto = Object.getPrototypeOf(cls.prototype);
+    while (proto && proto.constructor !== Object) {
+        classes.push(proto.constructor);
+        proto = Object.getPrototypeOf(proto);
+    }
+    return classes;
+}
 let ValidationMetadataStore = class ValidationMetadataStore {
     validators = new Map();
     saveValidatorMetadata(validatorMetadata) {
@@ -17,19 +26,25 @@ let ValidationMetadataStore = class ValidationMetadataStore {
         propertyValidators.unshift(validatorMetadata);
     }
     getModelValidatorsInfo(modelConstructor) {
+        const constructors = getClassHierarchy(modelConstructor);
+        constructors.unshift(modelConstructor);
         const modelValidators = {
             modelConstructor: modelConstructor,
-            properties: {},
+            properties: Object.assign({}, ...constructors.map((x) => this.getConstructorPropertiesValidatorsInfo(x))),
         };
+        return modelValidators;
+    }
+    getConstructorPropertiesValidatorsInfo(modelConstructor) {
+        const properties = {};
         [...(this.validators.get(modelConstructor)?.values() ?? [])].forEach((propertyValidatorsMetadata) => {
             const propertyName = propertyValidatorsMetadata.at(0)?.propertyName;
             if (!propertyName) {
                 return;
             }
-            let propertyInfo = modelValidators.properties[propertyName];
+            let propertyInfo = properties[propertyName];
             if (!propertyInfo) {
                 propertyInfo = {};
-                modelValidators.properties[propertyName] = propertyInfo;
+                properties[propertyName] = propertyInfo;
             }
             let validators = propertyInfo.validators;
             if (!validators) {
@@ -45,7 +60,7 @@ let ValidationMetadataStore = class ValidationMetadataStore {
                 }
             });
         });
-        return modelValidators;
+        return properties;
     }
 };
 ValidationMetadataStore = __decorate([

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

@@ -1,43 +1,36 @@
 function validateModel(value, info) {
-    const result = {};
-    if (typeof value !== 'object') {
-        result.error = {
-            description: 'the value should be an object',
-            properties: [],
-        };
-        return result;
+    if (typeof value !== 'object' || value === null) {
+        return { error: { description: 'Invalid object', properties: {} } };
     }
-    const validatedValue = new info.modelConstructor();
+    let propertiesErrors = {};
+    let resultValue = new info.modelConstructor();
     for (const propertyName in info.properties) {
         const propertyInfo = info.properties[propertyName];
         const propertyValidators = propertyInfo.validators ?? [];
-        validatedValue[propertyName] = value[propertyName] ?? validatedValue[propertyName];
-        if (validatedValue[propertyName] == null && propertyInfo.isOptional) {
-            validatedValue[propertyName] = null;
+        resultValue[propertyName] = value[propertyName] ?? resultValue[propertyName];
+        if (resultValue[propertyName] == null && propertyInfo.isOptional) {
+            resultValue[propertyName] = null;
             continue;
         }
         for (let propertyValidatorInfo of propertyValidators) {
-            const propertyValidatorResult = propertyValidatorInfo.validator(validatedValue[propertyName], propertyValidatorInfo.validatorOptions);
-            validatedValue[propertyName] = propertyValidatorResult.value;
+            const propertyValidatorResult = propertyValidatorInfo.validator(resultValue[propertyName], propertyValidatorInfo.validatorOptions);
             if (propertyValidatorResult.error) {
-                let resultError = result.error;
-                if (!resultError) {
-                    resultError = { description: `Error on properties`, properties: [] };
-                    result.error = resultError;
-                }
-                let propertyErrors = resultError.properties.find((x) => x.name === propertyName);
+                let propertyErrors = propertiesErrors[propertyName];
                 if (!propertyErrors) {
-                    propertyErrors = { name: propertyName, errors: [] };
-                    resultError.properties.push(propertyErrors);
+                    propertyErrors = [];
+                    propertiesErrors[propertyName] = propertyErrors;
                 }
-                propertyErrors.errors.push(propertyValidatorResult.error);
+                propertyErrors.push(propertyValidatorResult.error.description);
+            }
+            else {
+                resultValue[propertyName] = propertyValidatorResult.value;
             }
         }
     }
-    if (!result.error) {
-        result.value = validatedValue;
+    if (Object.keys(propertiesErrors).length > 0) {
+        return { error: { description: 'Invalid properties', properties: propertiesErrors } };
     }
-    return result;
+    return { value: resultValue };
 }
 
 export { validateModel };

package/package.json

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