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

package/dist/src/core/Entity.js

@@ -26,7 +26,7 @@ class Entity extends Storable {
         return this.createdAt;
     }
     update(newData) {
-        this.data = { ...this.data, newData, updatedAt: new Date().getTime() };
+        this.data = { ...this.data, ...newData, updatedAt: new Date().getTime() };
     }
     wasCreated() {
         return !!this.data.createdAt || !!this.data.id;

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;
@@ -1188,4 +1194,4 @@ declare function validateModel<V>(value: any, info: IModelValidatorsInfo<V>): IM
 
 declare function validate<V>(value: any, modelConstructor: IConstructor<V>): IModelValidationResult<V>;
 
-export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatBotAdapter, CmdChannel, Container, ControllerMetadataStore, CustomError, DeepSeekChatBotAdapter, EmailService, Entity, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IChannelMetadata, type IChatBot, type IChatBotAdapter, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatFunctionCall, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type IConnectionChatMessage, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEmailService, type IEndPointMetadata, type IEntityData, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPropertyValidatorInfo, type IReceivedMessage, type IReceivedMessageItem, type IRestControllerConfig, type IRestControllerMetadata, type ISendEmailRequest, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type IServerConfig, type IServerProvider, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWabotEnvType, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, type IrunChannelProps, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, MessageContext, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatBotAdapter, OtpService, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgRepositoryBase, PgUserRepository, PgWhatsAppRepository, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, RestControllerMetadataStore, SendOneTimePasswordRequest, SocketChannel, SocketChannelConfig, SocketServerProvider, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, ValidationMetadataStore, WabotEnv, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, cmd, container, get, inject, injectable, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, max, middleware, min, mindset, mindsetFunction, mindsetModule, param, post, prepareChatContainer, restController, runChannel, runRestControllers, runServer, singleton, socket, telegram, validate, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };
+export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatBotAdapter, CmdChannel, Container, ControllerMetadataStore, CustomError, DeepSeekChatBotAdapter, EmailService, Entity, EnvWhatsAppRepository, ExpressProvider, HtmlModule, HttpServerProvider, type IChannelMetadata, type IChatBot, type IChatBotAdapter, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatFunctionCall, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type IConnectionChatMessage, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEmailService, type IEndPointMetadata, type IEntityData, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IOtpService, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPostConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IReceivedMessageItem, type IRestControllerConfig, type IRestControllerMetadata, type ISendEmailRequest, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type IServerConfig, type IServerProvider, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type IStorableData, type ISystemFunctionCallItem, type ISystemMessageItem, type ITelegramChannelConfig, type IUserConnection, type IUserData, type IUserRepository, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWabotEnvType, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppContact, type IWhatsAppData, type IWhatsAppMessage, type IWhatsAppMessageListener, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsAppTemplate, type IWhatsAppTemplateComponent, type IWhatsAppTemplateMessage, type IWhatsAppTemplateParameter, type IWhatsAppTemplateResponse, type IWhatsAppWebhookPayload, type IWhatsappChannelConfig, type IchatControllerConfig, type IrunChannelProps, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, MessageContext, Mindset, MindsetMetadataStore, MindsetOperator, OpenaiChatBotAdapter, OtpService, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Persistent, PgChatMemory, PgChatRepository, PgCrudRepository, PgRepositoryBase, PgUserRepository, PgWhatsAppRepository, RamChatMemory, RamChatRepository, RamUserRepository, RegisterUserModule, RegisterUserWithEmailRequest, RestControllerMetadataStore, SendOneTimePasswordRequest, SocketChannel, SocketChannelConfig, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, User, UserRepository, UserResolver, ValidateOneTimePasswordRequest, ValidationMetadataStore, WabotEnv, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByDevConnection, WhatsAppReceiverByWebHook, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByDevConnection, WhatsappChannelConfig, chatBot, chatController, cmd, container, get, inject, injectable, isBoolean, isDate, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, max, middleware, min, mindset, mindsetFunction, mindsetModule, param, post, prepareChatContainer, restController, runChannel, runRestControllers, runServer, singleton, socket, telegram, validate, validateIsBoolean, validateIsDate, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsapp };

package/dist/src/index.js

@@ -41,6 +41,7 @@ export { User } from './core/user/User.js';
 export { UserRepository } from './core/user/IUserRepository.js';
 export { MessageContext } from './core/IMessageContext.js';
 export { Entity, Persistent } from './core/Entity.js';
+export { Storable } from './core/Storable.js';
 export { WabotEnv } from './env/WabotEnv.js';
 export { CustomError } from './error/CustomError.js';
 export { container, inject, injectable, singleton } from './injection/index.js';

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.14",
+  "version": "0.1.0-beta.16",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",