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

package/dist/src/channels/whatsapp/EnvWhatsAppRepository.js

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from 'tslib';
 import { singleton } from '../../injection/index.js';
 import { WhatsApp } from './WhatsApp.js';
-import { WabotEnv } from '../../env/WabotEnv.js';
+import { Env } from '../../env/Env.js';
 
 let EnvWhatsAppRepository = class EnvWhatsAppRepository {
     env;
@@ -43,7 +43,7 @@ let EnvWhatsAppRepository = class EnvWhatsAppRepository {
 };
 EnvWhatsAppRepository = __decorate([
     singleton(),
-    __metadata("design:paramtypes", [WabotEnv])
+    __metadata("design:paramtypes", [Env])
 ], EnvWhatsAppRepository);
 
 export { EnvWhatsAppRepository };

package/dist/src/env/{WabotEnv.js → Env.js}

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from 'tslib';
 import { singleton } from 'tsyringe';
 
-let WabotEnv = class WabotEnv {
+let Env = class Env {
     envType;
     constructor() {
         this.envType = process.env.WABOT_ENV ?? 'development';
@@ -12,16 +12,28 @@ let WabotEnv = class WabotEnv {
     isProduction() {
         return this.envType === 'production';
     }
+    isTesting() {
+        return this.envType === 'testing';
+    }
     requireString(varName) {
         const value = process.env[varName];
         if (!value)
             throw new Error(`Env Variable ${varName} is required`);
         return value;
     }
+    requireNumber(varName) {
+        const strValue = process.env[varName];
+        if (!strValue)
+            throw new Error(`Env Variable ${varName} is required`);
+        const value = Number(strValue);
+        if (isNaN(value))
+            throw new Error(`Env Variable ${varName} should have number format`);
+        return value;
+    }
 };
-WabotEnv = __decorate([
+Env = __decorate([
     singleton(),
     __metadata("design:paramtypes", [])
-], WabotEnv);
+], Env);
 
-export { WabotEnv };
+export { Env };

package/dist/src/index.d.ts

@@ -589,18 +589,20 @@ interface IWhatsAppRepository {
     findByBusinessNumber(number: string): Promise<WhatsApp | null>;
 }
 
-type IWabotEnvType = 'development' | 'staging' | 'testing' | 'production';
-declare class WabotEnv {
+type IEnvType = 'development' | 'staging' | 'testing' | 'production';
+declare class Env {
     private envType;
     constructor();
     isDevelopment(): boolean;
     isProduction(): boolean;
+    isTesting(): boolean;
     requireString(varName: string): string;
+    requireNumber(varName: string): number;
 }
 
 declare class EnvWhatsAppRepository implements IWhatsAppRepository {
     private env;
-    constructor(env: WabotEnv);
+    constructor(env: Env);
     findBySlug(slug: string): Promise<WhatsApp | null>;
     findByBusinessNumber(number: string): Promise<WhatsApp | null>;
     private getFromEnvVars;
@@ -1194,4 +1196,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 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 };
+export { AuthenticationModule, Chat, ChatBot, ChatBotAdapter, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, ClaudeChatBotAdapter, CmdChannel, Container, ControllerMetadataStore, CustomError, DeepSeekChatBotAdapter, EmailService, Entity, Env, 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 IEnvType, type IGetConfig, type IGetWhatsAppTemplateRequest, type IHtmlModuleOptions, type IListenWhatsAppMessageRequest, type IMessageContext, type IMessageMetadata, type IMiddleware, 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 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, 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

@@ -42,7 +42,7 @@ 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 { Env } from './env/Env.js';
 export { CustomError } from './error/CustomError.js';
 export { container, inject, injectable, singleton } from './injection/index.js';
 export { Logger } from './logger/Logger.js';

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

@@ -9,11 +9,12 @@ function validateModel(value, info) {
         const propertyValidators = propertyInfo.validators ?? [];
         resultValue[propertyName] = value[propertyName] ?? resultValue[propertyName];
         if (resultValue[propertyName] == null && propertyInfo.isOptional) {
-            resultValue[propertyName] = null;
+            resultValue[propertyName] = undefined;
             continue;
         }
         for (let propertyValidatorInfo of propertyValidators) {
             const propertyValidatorResult = propertyValidatorInfo.validator(resultValue[propertyName], propertyValidatorInfo.validatorOptions);
+            resultValue[propertyName] = propertyValidatorResult.value;
             if (propertyValidatorResult.error) {
                 let propertyErrors = propertiesErrors[propertyName];
                 if (!propertyErrors) {
@@ -22,9 +23,6 @@ function validateModel(value, info) {
                 }
                 propertyErrors.push(propertyValidatorResult.error.description);
             }
-            else {
-                resultValue[propertyName] = propertyValidatorResult.value;
-            }
         }
     }
     if (Object.keys(propertiesErrors).length > 0) {

package/package.json

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