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

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>;
 
@@ -1125,14 +1125,20 @@ interface IModelValidationError extends IValidationError {
         errors: IValidationError[];
     }[];
 }
-interface IValidationResult<V> {
-    value?: V;
-    error?: IValidationError;
-}
-interface IModelValidationResult<V> {
-    value?: V;
-    error?: IModelValidationError;
-}
+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;

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/validators/validateModel.js

@@ -1,43 +1,34 @@
 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);
+            resultValue[propertyName] = propertyValidatorResult.value;
             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.find((x) => x.name === propertyName);
                 if (!propertyErrors) {
                     propertyErrors = { name: propertyName, errors: [] };
-                    resultError.properties.push(propertyErrors);
+                    propertiesErrors.push(propertyErrors);
                 }
                 propertyErrors.errors.push(propertyValidatorResult.error);
             }
         }
     }
-    if (!result.error) {
-        result.value = validatedValue;
+    if (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.16",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",