@wabot-dev/framework 0.2.0 → 0.2.1-beta.1

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

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

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

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

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

@@ -58,6 +58,7 @@ let ValidationMetadataStore = class ValidationMetadataStore {
         constructors.unshift(modelConstructor);
         const modelValidators = {
             modelConstructor: modelConstructor,
+            modelHierarchy: constructors,
             properties: Object.assign({}, ...constructors.map((x) => this.getConstructorPropertiesValidatorsInfo(x))),
         };
         return modelValidators;

package/dist/src/core/validation/validators/is-record/@isRecord.js

@@ -0,0 +1,18 @@
+import { container } from '../../../injection/index.js';
+import { ValidationMetadataStore } from '../../metadata/ValidationMetadataStore.js';
+import { validateIsRecord } from './validateIsRecord.js';
+
+function isRecord(keyType, valueType) {
+    return function (target, propertyKey) {
+        const propertyName = propertyKey.toString();
+        const store = container.resolve(ValidationMetadataStore);
+        store.saveValidatorMetadata({
+            modelConstructor: target.constructor,
+            propertyName,
+            validator: validateIsRecord,
+            validatorOptions: { keyType, valueType },
+        });
+    };
+}
+
+export { isRecord };

package/dist/src/core/validation/validators/is-record/validateIsRecord.js

@@ -0,0 +1,35 @@
+function validateIsRecord(value, options) {
+    if (value == null) {
+        return {
+            error: { description: `null is not allowed` },
+        };
+    }
+    if (typeof value !== 'object') {
+        return {
+            error: { description: `value should be an object` },
+        };
+    }
+    if (Array.isArray(value)) {
+        return {
+            error: { description: `array is not allowed` },
+        };
+    }
+    for (const key in value) {
+        if (typeof key !== options.keyType) {
+            return {
+                error: { description: `record keys should be ${options.keyType}` },
+            };
+        }
+        const keyValue = value[key];
+        if (typeof keyValue !== options.valueType) {
+            return {
+                error: { description: `record values should be ${options.valueType}` },
+            };
+        }
+    }
+    return {
+        value,
+    };
+}
+
+export { validateIsRecord };

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

@@ -0,0 +1,14 @@
+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

@@ -1,13 +1,14 @@
 import { CustomError } from '../../core/error/CustomError.js';
 import { container } from '../../core/injection/index.js';
 import { Logger } from '../../core/logger/Logger.js';
-import '../../core/validation/metadata/ValidationMetadataStore.js';
-import { validateAndTransform } from '../../core/validation/validateAndTransform.js';
+import { validateModel } from '../../core/validation/core/validateModel.js';
+import { ValidationMetadataStore } from '../../core/validation/metadata/ValidationMetadataStore.js';
 import { ExpressProvider } from '../express/ExpressProvider.js';
 import { json, urlencoded } from 'express';
 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';
 
 function buildRequest(req) {
     return Object.assign({}, req.body, req.query, req.params);
@@ -16,6 +17,7 @@ function runRestControllers(controllers) {
     const logger = new Logger('wabot:rest');
     const metadataStore = container.resolve(RestControllerMetadataStore);
     const expressProvider = container.resolve(ExpressProvider);
+    const validationMetadataStore = container.resolve(ValidationMetadataStore);
     const expressApp = expressProvider.getExpress();
     controllers.forEach((controller) => {
         const endPoints = metadataStore.getControllerEndPointsInfo(controller);
@@ -43,20 +45,23 @@ function runRestControllers(controllers) {
                     }
                     const controllerInstance = requestContainer.resolve(endPoint.controllerConstructor);
                     const endPointArgs = [];
-                    let defaultArgFound = false;
-                    for (let paramIndex = 0; paramIndex < endPoint.paramsTypes.length; paramIndex++) {
-                        const paramType = endPoint.paramsTypes[paramIndex];
-                        if (defaultArgFound) {
-                            throw new Error(`Cant determine de parameter ${paramIndex} value`);
+                    if (endPoint.paramsTypes.length > 1) {
+                        throw new Error(`rest controller endpoints should have zero or one parameter only`);
+                    }
+                    if (endPoint.paramsTypes.length === 1) {
+                        const paramType = endPoint.paramsTypes[0];
+                        if (typeof paramType !== 'function') {
+                            throw new Error(`invalid rest controller endpoint parameter type`);
                         }
-                        defaultArgFound = true;
-                        if (typeof paramType === 'function') {
-                            const { value, error } = validateAndTransform(buildRequest(req), paramType);
-                            if (error) {
-                                throw new CustomError({ httpCode: 400, message: error.description, info: error });
-                            }
-                            endPointArgs.push(value);
+                        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);
                     }
                     const response = await controllerInstance[endPoint.functionName].apply(controllerInstance, endPointArgs);
                     res.status(200).json(response ?? null);

package/dist/src/index.d.ts

@@ -175,6 +175,7 @@ interface IPropertyValidatorInfo {
 }
 type IModelValidatorsInfo<V> = {
     modelConstructor: IConstructor<V>;
+    modelHierarchy: IConstructor<any>[];
     properties: {
         [prop: string]: {
             isOptional?: boolean;
@@ -265,6 +266,14 @@ interface IValidateMinOptions {
 }
 declare function validateMin(value: any, options: IValidateMinOptions): IValidationResult<any>;
 
+declare function isRecord(keyType: 'number' | 'string', valueType: 'number' | 'string' | 'boolean'): (target: object, propertyKey: string | symbol) => void;
+
+interface IValidateIsRecordOptions {
+    keyType: 'string' | 'number';
+    valueType: 'string' | 'number' | 'boolean';
+}
+declare function validateIsRecord(value: any, options: IValidateIsRecordOptions): IValidationResult<any>;
+
 declare class Mapper {
     map<T>(data: IValidateInputShape<T>, ctor: IConstructor<T>): T;
 }
@@ -915,6 +924,10 @@ declare function runRestControllers(controllers: IConstructor<any>[]): void;
 declare const EXPRESS_REQ = "EXPRESS_REQ";
 declare const EXPRESS_RES = "EXPRESS_RES";
 
+declare class RestRequest {
+    headers?: Record<string, string>;
+}
+
 declare class SocketServerProvider {
     private httpServerProvider;
     private socketServer;
@@ -1625,4 +1638,4 @@ declare function HtmlModule(options: IHtmlModuleOptions): {
     new (): {};
 };
 
-export { AnthropicChatAdapter, ApiKey, ApiKeyGuardMiddleware, ApiKeyHandshakeGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, type GoogleChatAdapterV2Options, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemsReq, type IChatAdapterNextItemsRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHandshakeMiddleware, type IHandshakeMiddlewareMetadata, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateInputShape, type IValidateIsInOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtHandshakeGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, SocketChannel, SocketChannelConfig, SocketChannelReceivedMessage, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyGuard, apiKeyHandshakeGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, handshakeMiddlewares, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isString, jwtGuard, jwtHandshakeGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, onSocketEvent, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketController, telegram, validateAndTransform, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };
+export { AnthropicChatAdapter, ApiKey, ApiKeyGuardMiddleware, ApiKeyHandshakeGuardMiddleware, ApiKeyRepository, Async, Auth, Chat, ChatAdapter, ChatBot, ChatBotMetadataStore, ChatItem, ChatMemory, ChatRepository, ChatResolver, CmdChannel, Command, CommandMetadataStore, Container, ControllerMetadataStore, CustomError, DeepSeekChatAdapter, EXPRESS_REQ, EXPRESS_RES, Entity, Env, EnvWhatsAppRepository, ExpressProvider, GoogleChatAdapter, type GoogleChatAdapterV2Options, HtmlModule, HttpServerProvider, type IApiKeyData, type IApiKeyRepository, type IArrayValidationError, type IArrayValidationResult, type IBotMessageItem, type IChannelMessage, type IChannelMetadata, type IChatAdapter, type IChatAdapterNextItemsReq, type IChatAdapterNextItemsRes, type IChatBot, type IChatBotMetadata, type IChatChannel, type IChatConnection, type IChatControllerMetadata, type IChatData, type IChatItem, type IChatItemData, type IChatItemType, type IChatMemory, type IChatMessage, type IChatRepository, type IChatType, type ICommandConfig, type ICommandHandler, type ICommandHandlerConfig, type IConstructor, type ICrudRepository, type ICustomErrorData, type IEndPointConfig, type IEndPointMetadata, type IEntityData, type IEnvType, type IFunctionCall, type IFunctionCallItem, type IGenerateApiKeyReq, type IGenerateApiKeyRes, type IGetWhatsAppTemplateRequest, type IHandshakeMiddleware, type IHandshakeMiddlewareMetadata, type IHtmlModuleOptions, type IHumanMessageItem, type IJobData, type IJobEvent, type IJobEventListener, type IJobRepository, type IJwtRefreshTokenData, type IJwtRefreshTokenRepository, type ILanguageModelUsage, type IListenWhatsAppMessageRequest, type IMessageContext, type IMiddleware, type IMiddlewareMetadata, type IMindset, type IMindsetDecoration, type IMindsetFunctionConfig, type IMindsetFunctionDecoration, type IMindsetFunctionMetadata, type IMindsetFunctionParamMetadata, type IMindsetIdentity, type IMindsetLlm, type IMindsetMetadata, type IMindsetModuleConfig, type IMindsetModuleDecoration, type IMindsetModuleMetadata, type IMindsetTool, type IMindsetToolParameter, type IModelValidationError, type IModelValidationResult, type IModelValidatorsInfo, type IMoneyData, type IParamConfig, type IParamDecoration, type IPersistentData, type IPgRepositoryConfig, type IPrimitive, type IPropertyValidatorInfo, type IReceivedMessage, type IRemoteApiKeyFetcher, type IRestControllerConfig, type IRestControllerMetadata, type ISendWhatsAppRequest, type ISendWhatsAppTemplateRequest, type ISocketChannelConfig, type ISocketChannelReceivedMessage, type ISocketControllerConfig, type ISocketControllerMetadata, type ISocketEventConfig, type ISocketEventMetadata, type IStorableData, type ITelegramChannelConfig, type IValidateArrayOptions, type IValidateArrayOptionsWithItemsValidators, type IValidateInputShape, type IValidateIsInOptions, type IValidateIsRecordOptions, type IValidateMaxOptions, type IValidateMinOptions, type IValidationError, type IValidationResult, type IValidator, type IValidatorMetadata, type IWhatsAppBusinessAccount, type IWhatsAppBusinessNumber, type IWhatsAppCloudContact, type IWhatsAppCloudMessage, type IWhatsAppCloudMessageMetadata, type IWhatsAppCloudTemplate, type IWhatsAppCloudTemplateComponent, type IWhatsAppCloudTemplateMessage, type IWhatsAppCloudTemplateParameter, type IWhatsAppCloudTemplateResponse, type IWhatsAppCloudWebhookPayload, type IWhatsAppData, type IWhatsAppMessageListener, type IWhatsAppProxyListenMessageEventData, type IWhatsAppProxyListenMessageEventReq, type IWhatsAppProxyMessage, type IWhatsAppProxyMessageContent, type IWhatsAppProxyMessageEventReq, type IWhatsAppProxySendMessageEventReq, type IWhatsAppRepository, type IWhatsAppSenderOptions, type IWhatsappChannelConfig, type IchatControllerConfig, Job, JobRepository, JobRunner, JobsEventsHub, Jwt, JwtAccessAndRefreshTokenDto, JwtConfig, JwtGuardMiddleware, JwtHandshakeGuardMiddleware, JwtRefreshToken, JwtRefreshTokenRepository, JwtSigner, JwtTokenDto, Lifecycle, Logger, MINDSET_DECORATION_MINDSET, MINDSET_FUNCTION_DECORATION_FUNCTION, MINDSET_MODULE_DECORATION_MODULE, Mapper, Mindset, MindsetMetadataStore, MindsetOperator, Money, MoneyDto, OpenaiChatAdapter, PARAM_DECORATION_IS_OPTIONAL, PARAM_DECORATION_PARAM, Password, type PasswordHashOptions, Persistent, PgApiKeyRepository, PgChatMemory, PgChatRepository, PgCrudRepository, PgJobRepository, PgJwtRefreshTokenRepository, PgRepositoryBase, PgWhatsAppRepository, RamChatMemory, RamChatRepository, Random, RemoteApiKeyRepository, RestControllerMetadataStore, RestRequest, SocketChannel, SocketChannelConfig, SocketChannelReceivedMessage, SocketControllerMetadataStore, SocketServerProvider, Storable, TelegramChannel, TelegramChannelConfig, ValidationMetadataStore, WHATSAPP_MESSAGE_EVENT, WHATSAPP_PROXY_LISTEN_MESSAGE_EVENT, WHATSAPP_PROXY_SEND_MESSAGE_EVENT, WabotChatAdapter, WhatsApp, WhatsAppChannel, WhatsAppReceiver, WhatsAppReceiverByCloudApi, WhatsAppReceiverByWabotProxy, WhatsAppRepository, WhatsAppSender, WhatsAppSenderByCloudApi, WhatsAppSenderByWabotProxy, WhatsAppWabotProxyConnection, WhatsappChannelConfig, apiKeyGuard, apiKeyHandshakeGuard, chatBot, chatController, chatItemTypeOptions, cmd, command, commandHandler, container, handshakeMiddlewares, inject, injectable, isArray, isBoolean, isDate, isIn, isModel, isNotEmpty, isNumber, isOptional, isPresent, isRecord, isString, jwtGuard, jwtHandshakeGuard, max, middleware, min, mindset, mindsetFunction, mindsetModule, modelInfo, onDelete, onGet, onPost, onPut, onSocketEvent, param, readJsonFromFile, restController, runAsyncCommandHandlers, runChatControllers, runRestControllers, runSocketControllers, scoped, singleton, socket, socketController, telegram, validateAndTransform, validateArray, validateIsBoolean, validateIsDate, validateIsIn, validateIsNotEmpty, validateIsNumber, validateIsPresent, validateIsRecord, validateIsString, validateMax, validateMin, validateModel, whatsApp, writeJsonToFile };

package/dist/src/index.js

@@ -34,6 +34,8 @@ export { max } from './core/validation/validators/max/@max.js';
 export { validateMax } from './core/validation/validators/max/validateMax.js';
 export { min } from './core/validation/validators/min/@min.js';
 export { validateMin } from './core/validation/validators/min/validateMin.js';
+export { isRecord } from './core/validation/validators/is-record/@isRecord.js';
+export { validateIsRecord } from './core/validation/validators/is-record/validateIsRecord.js';
 export { command } from './feature/async/@command.js';
 export { commandHandler } from './feature/async/@commandHandler.js';
 export { Async } from './feature/async/Async.js';
@@ -83,6 +85,7 @@ export { restController } from './feature/rest-controller/metadata/@restControll
 export { RestControllerMetadataStore } from './feature/rest-controller/metadata/RestControllerMetadataStore.js';
 export { runRestControllers } from './feature/rest-controller/runRestControllers.js';
 export { EXPRESS_REQ, EXPRESS_RES } from './feature/rest-controller/injection-tokens.js';
+export { RestRequest } from './feature/rest-controller/RestRequest.js';
 export { SocketServerProvider } from './feature/socket/SocketServerProvider.js';
 export { handshakeMiddlewares } from './feature/socket-controller/metadata/@handshakeMiddlewares.js';
 export { socketController } from './feature/socket-controller/metadata/@socketController.js';

package/package.json

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