@zanobijs/core 1.0.0-beta.4 → 1.0.0-beta.5

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.0.0-beta.4](https://github.com/devdroide/ZanobiJS/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2024-04-12)
+# [1.0.0-beta.5](https://github.com/devdroide/ZanobiJS/compare/v1.0.0-beta.4...v1.0.0-beta.5) (2024-04-15)
 
 **Note:** Version bump only for package @zanobijs/core

package/README.md

@@ -5,7 +5,7 @@
 <H1 align="center">Welcome to ZanobiJS</H1>
 
 [![npm](https://img.shields.io/badge/npm-v1.0.0-darkorange.svg)](https://www.npmjs.com/package/@zanobijs/cli)
-[![coverage](https://img.shields.io/badge/coverage-98-green.svg)](https://mochajs.org/)
+[![coverage](https://img.shields.io/badge/coverage-100-green.svg)](https://mochajs.org/)
 [![test](https://img.shields.io/badge/test-mocha-CC0000.svg)](https://mochajs.org/)
 [![nodejs](https://img.shields.io/badge/nodejs->=16.0.0-darkgreen.svg)](https://nodejs.org)
 [![typescrit](https://img.shields.io/badge/TS->=5.2.2-darkblue.svg)](https://www.typescriptlang.org/)

package/exceptions/constant.message.d.ts

@@ -1,2 +1,3 @@
 export declare const MODULE_INVALID_ANNOTATION_ERROR: () => string;
-export declare const CONTAINER_RESOLUTION_ERROR: (entity: string) => string;
+export declare const CONTAINER_RESOLUTION_ERROR: (entity: string, resolutionError: string) => string;
+export declare const CONTAINER_RESOLUTION_ENTITY_ERROR: (entity: string) => string;

package/exceptions/constant.message.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONTAINER_RESOLUTION_ERROR = exports.MODULE_INVALID_ANNOTATION_ERROR = void 0;
+exports.CONTAINER_RESOLUTION_ENTITY_ERROR = exports.CONTAINER_RESOLUTION_ERROR = exports.MODULE_INVALID_ANNOTATION_ERROR = void 0;
 const MODULE_INVALID_ANNOTATION_ERROR = () => `The class must have an annotation @Module()`;
 exports.MODULE_INVALID_ANNOTATION_ERROR = MODULE_INVALID_ANNOTATION_ERROR;
-const CONTAINER_RESOLUTION_ERROR = (entity) => `'${entity}' is not registered in any @module.`;
+const CONTAINER_RESOLUTION_ERROR = (entity, resolutionError) => `${resolutionError} please review '${entity}' and its dependencies.`;
 exports.CONTAINER_RESOLUTION_ERROR = CONTAINER_RESOLUTION_ERROR;
-// export const CONTAINER_RESOLUTION_INJECT_ERROR = (
-//   entity: string,
-//   targetName: any,
-// ) =>
-//   `'@Inject(${entity})' was not found in any loaded @module. Check the "${targetName}" file`;
+const CONTAINER_RESOLUTION_ENTITY_ERROR = (entity) => `Please check that the entity '${entity}' exists and is registered in @modulo`;
+exports.CONTAINER_RESOLUTION_ENTITY_ERROR = CONTAINER_RESOLUTION_ENTITY_ERROR;

package/exceptions/resolution.exception.d.ts

@@ -1,4 +1,20 @@
 import { RuntimeException } from "@zanobijs/common/exceptions/runtime.exception";
+/**
+ * Excepción lanzada cuando se intenta obtener una dependencia
+ * de un controlador o servicio y esta no fue registrada
+ * en un modulo
+ *
+ * @remarks
+ * Esta clase extiende la base `RuntimeException`de @zanobijs/core
+ * para proporcionar detalles adicionales del error.
+ *
+ * @example
+ * private service1: Service1
+ * @Module{... services:["otherService"]}
+ */
+export declare class ContainerResolutionException extends RuntimeException {
+    constructor(entity: string, resolutionError: string, detail: any);
+}
 /**
  * Excepción lanzada cuando se intenta obtener una entidad
  * (importar, controlador, servicio o exportar) que no fue
@@ -8,6 +24,6 @@ import { RuntimeException } from "@zanobijs/common/exceptions/runtime.exception"
  * Esta clase extiende la base `RuntimeException`de @zanobijs/core
  * para proporcionar detalles adicionales del error.
  */
-export declare class ContainerResolutionException extends RuntimeException {
+export declare class ContainerResolutionEntityException extends RuntimeException {
     constructor(entity: string, detail: any);
 }

package/exceptions/resolution.exception.js

@@ -1,8 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContainerResolutionException = void 0;
+exports.ContainerResolutionEntityException = exports.ContainerResolutionException = void 0;
 const runtime_exception_1 = require("@zanobijs/common/exceptions/runtime.exception");
 const constant_message_1 = require("./constant.message");
+/**
+ * Excepción lanzada cuando se intenta obtener una dependencia
+ * de un controlador o servicio y esta no fue registrada
+ * en un modulo
+ *
+ * @remarks
+ * Esta clase extiende la base `RuntimeException`de @zanobijs/core
+ * para proporcionar detalles adicionales del error.
+ *
+ * @example
+ * private service1: Service1
+ * @Module{... services:["otherService"]}
+ */
+class ContainerResolutionException extends runtime_exception_1.RuntimeException {
+    constructor(entity, resolutionError, detail) {
+        super((0, constant_message_1.CONTAINER_RESOLUTION_ERROR)(entity, resolutionError), detail);
+    }
+}
+exports.ContainerResolutionException = ContainerResolutionException;
 /**
  * Excepción lanzada cuando se intenta obtener una entidad
  * (importar, controlador, servicio o exportar) que no fue
@@ -12,14 +31,9 @@ const constant_message_1 = require("./constant.message");
  * Esta clase extiende la base `RuntimeException`de @zanobijs/core
  * para proporcionar detalles adicionales del error.
  */
-class ContainerResolutionException extends runtime_exception_1.RuntimeException {
+class ContainerResolutionEntityException extends runtime_exception_1.RuntimeException {
     constructor(entity, detail) {
-        super((0, constant_message_1.CONTAINER_RESOLUTION_ERROR)(entity), detail);
+        super((0, constant_message_1.CONTAINER_RESOLUTION_ENTITY_ERROR)(entity), detail);
     }
 }
-exports.ContainerResolutionException = ContainerResolutionException;
-// export class ContainerInjectResolutionException extends RuntimeException {
-//   constructor(entity: string, targetName: any, detail: any = ``) {
-//     super(CONTAINER_RESOLUTION_INJECT_ERROR(entity, targetName), detail);
-//   }
-// }
+exports.ContainerResolutionEntityException = ContainerResolutionEntityException;

package/factory.d.ts

@@ -37,5 +37,5 @@ export declare class Factory {
      * @returns {any} - Instancia resuelta.
      */
     get<T>(entity: string): T;
-    evaluateOptions(): void;
+    private evaluateOptions;
 }

package/factory.js

@@ -19,6 +19,8 @@ class Factory {
     logger;
     options;
     constructor(appModule, options = {}) {
+        process.env.ZANOBIJS_LOGGER = "false";
+        process.env.ZANOBIJS_LOGGER_USER = "false";
         this.options = options;
         this.evaluateOptions();
         this.logger = (0, utils_1.Logger)();
@@ -32,6 +34,7 @@ class Factory {
      * @private
      */
     registerClassesFromModule(module) {
+        this.logger.debug("Factory - Registering classes for module:", module.name);
         this.registerFromModule(module);
         const importedModules = this.moduleHandler.getImports();
         if (importedModules && importedModules.length) {
@@ -46,9 +49,13 @@ class Factory {
      * @private
      */
     registerFromModule(module) {
+        this.logger.debug("Factory - Setup:", module.name);
         this.moduleHandler.setup(module);
+        this.logger.debug("Factory - Initialize:", module.name);
         this.moduleHandler.initialize();
         Object.assign(this.registeredClasses, this.moduleHandler.getRegisterClass());
+        this.logger.success("Factory - Completion of module ", module.name);
+        this.logger.debug("===================================================");
     }
     /**
      * Crea el contenedor de inyección de dependencias y registra las clases.
@@ -57,7 +64,7 @@ class Factory {
     create() {
         this.container = (0, awilix_1.createContainer)({ injectionMode: awilix_1.InjectionMode.CLASSIC });
         this.container.register(this.registeredClasses);
-        this.logger.info("Registered Classes", this.registeredClasses);
+        this.logger.info("Factory - classes and providers registered in the container", Object.keys(this.registeredClasses));
         return this;
     }
     /**
@@ -71,14 +78,19 @@ class Factory {
         }
         catch (error) {
             this.logger.info("Error resolving entity: ", error.message + "\n");
-            throw new resolution_exception_1.ContainerResolutionException(entity, error.message);
+            const resolutionError = error.message.split("\n");
+            const EntityFound = resolutionError[0].match(/'([^']+)'/);
+            if (EntityFound[1] === entity) {
+                throw new resolution_exception_1.ContainerResolutionEntityException(entity, error.message);
+            }
+            throw new resolution_exception_1.ContainerResolutionException(entity, resolutionError[0], error.message);
         }
     }
     evaluateOptions() {
         if (this.options.activeLoggerSystem)
             process.env.ZANOBIJS_LOGGER = "true";
         if (this.options.activeLoggerUser)
-            process.env.ZANOBIJS_LOGGER = "true";
+            process.env.ZANOBIJS_LOGGER_USER = "true";
     }
 }
 exports.Factory = Factory;

package/injector/injector.d.ts

@@ -10,7 +10,6 @@ export declare class Injector {
     private listProviders;
     private metadata;
     private logger;
-    private registeredClassParentModule;
     private moduleName;
     /**
      * En Constructor de la clase Injector obtenermos las instancias
@@ -18,7 +17,7 @@ export declare class Injector {
      * @param {Module} module - El módulo debe tener el decorador `@Module`
      * para poderlo procesar.
      */
-    constructor(module: any);
+    constructor(module: any, listProviders: Map<string, any>);
     /**
      * Este método privado recorre el array de los servicios del modulo para
      * buscar los proveedores tipo objeto a injectar y los almacena en una
@@ -26,7 +25,6 @@ export declare class Injector {
      * @private
      */
     private scanProviders;
-    setRegisteredClassParentModule(registerClass: any): void;
     /**
      * Método para obtener un objeto con los parámetros y valores
      * que se inyectarán en la clase (target).
@@ -41,7 +39,7 @@ export declare class Injector {
      * @param {any} target - La clase objetivo.
      * @returns - El injector configurado.
      */
-    getInjector(target: any): {
+    getInjectorClass(target: any): {
         interface: any;
         injectionMode?: import("awilix").InjectionModeType;
         injector?: import("awilix").InjectorFunction;
@@ -61,6 +59,7 @@ export declare class Injector {
         dispose?: import("awilix").Disposer<object>;
         disposer(dispose: import("awilix").Disposer<object>): import("awilix").BuildResolver<object> & import("awilix").DisposableResolver<object>;
     };
-    getAllProvider(): Map<any, any>;
+    getAllProvider(): Map<string, any>;
     getInjectProvider(provider: any): import("awilix").Resolver<any>;
+    funtionInjectData(injectData: any): () => any;
 }

package/injector/injector.js

@@ -11,10 +11,9 @@ const awilix_1 = require("awilix");
  */
 class Injector {
     module;
-    listProviders = new Map();
+    listProviders;
     metadata;
     logger;
-    registeredClassParentModule = {};
     moduleName = "";
     /**
      * En Constructor de la clase Injector obtenermos las instancias
@@ -22,11 +21,12 @@ class Injector {
      * @param {Module} module - El módulo debe tener el decorador `@Module`
      * para poderlo procesar.
      */
-    constructor(module) {
+    constructor(module, listProviders) {
         this.metadata = metadata_1.Metadata.getInstance();
         this.logger = (0, utils_1.Logger)();
         this.moduleName = module.name;
         this.module = module;
+        this.listProviders = listProviders;
         this.scanProviders();
     }
     /**
@@ -36,6 +36,7 @@ class Injector {
      * @private
      */
     scanProviders() {
+        this.logger.debug("Injector - Scan provider to module:", this.moduleName);
         const { services } = this.metadata.getMetadataModule(this.module);
         services.forEach((service) => {
             if (typeof service === "object")
@@ -43,9 +44,6 @@ class Injector {
         });
         this.logger.debug("Injector - list provider", this.listProviders);
     }
-    setRegisteredClassParentModule(registerClass) {
-        this.registeredClassParentModule = registerClass;
-    }
     /**
      * Método para obtener un objeto con los parámetros y valores
      * que se inyectarán en la clase (target).
@@ -59,21 +57,13 @@ class Injector {
         if (dInject.size > 0) {
             for (const key of dInject.keys()) {
                 if (this.listProviders.has(key)) {
-                    this.logger.info(`"${key}" is on providers list.`);
                     const paramName = dInject.get(key);
                     const useValue = this.listProviders.get(key);
                     injectData[paramName] = useValue;
                 }
                 else {
-                    if (key in this.registeredClassParentModule) {
-                        this.logger.info(`"${key}" is on registered Class in Parent Module.`);
-                        const paramName = dInject.get(key);
-                        injectData[paramName] = (0, awilix_1.aliasTo)(key);
-                    }
-                    else {
-                        this.logger.important(`It is injecting @INJECT('${key}') provider in '${target.name}' but is not registered in '${this.moduleName}' or in previously loaded @modules`);
-                        // throw new ContainerInjectResolutionException(key, target.name);
-                    }
+                    this.logger.important(`It is injecting @INJECT('${key}') provider in '${target.name}' but is not registered in '${this.moduleName}' or in previously loaded @modules`);
+                    // throw new ContainerInjectResolutionException(key, target.name);
                 }
             }
         }
@@ -85,11 +75,12 @@ class Injector {
      * @param {any} target - La clase objetivo.
      * @returns - El injector configurado.
      */
-    getInjector(target) {
+    getInjectorClass(target) {
         const injectData = this.getInjectData(target);
         let injector = (0, awilix_1.asClass)(target).scoped();
         if (!(0, shared_utils_1.isEmpty)(injectData)) {
-            injector = injector.inject(() => injectData);
+            this.logger.debug(`Inject - list dependencies to inject of ${target.name}:`, injectData);
+            injector = injector.inject(this.funtionInjectData(injectData));
         }
         return {
             ...injector,
@@ -104,5 +95,8 @@ class Injector {
             ? (0, awilix_1.asFunction)(provider.value).scoped()
             : (0, awilix_1.asValue)(provider.value);
     }
+    funtionInjectData(injectData) {
+        return () => injectData;
+    }
 }
 exports.Injector = Injector;

package/injector/module.d.ts

@@ -11,6 +11,7 @@ export declare class Module {
     private dependenciesClass;
     private metadata;
     private types;
+    private listProviders;
     /**
      * Constructor del módulo.
      */

package/injector/module.js

@@ -20,6 +20,7 @@ class Module {
     dependenciesClass = [];
     metadata;
     types = ["controller", "service"];
+    listProviders = new Map();
     /**
      * Constructor del módulo.
      */
@@ -34,7 +35,8 @@ class Module {
     setup(module) {
         if (this.metadata.isTypeModule(module)) {
             this.module = module;
-            this.injector = new injector_1.Injector(module);
+            this.logger.debug("Module - Create Injector to module:", module.name);
+            this.injector = new injector_1.Injector(module, this.listProviders);
         }
         else {
             throw new exceptions_1.InvalidModuleAnnotationException();
@@ -44,9 +46,9 @@ class Module {
      * Inicializa el módulo extrayendo metadatos y registrando las entidades.
      */
     initialize() {
-        this.getMetadataModule();
+        this.logger.debug("Module - Initialize:", this.module.name);
         this.registerAllProviders();
-        this.injector.setRegisteredClassParentModule(this.registerClass);
+        this.getMetadataModule();
         this.registerDependencies();
         this.registerDependenciesToAlias();
     }
@@ -72,6 +74,7 @@ class Module {
      */
     registerEntities(entityType) {
         const entities = this.config[entityType];
+        this.logger.debug("Module - ..... searching for entities type ", entityType);
         if (entities && entities.length > 0) {
             const registeredEntities = entities
                 .filter((target) => {
@@ -79,15 +82,19 @@ class Module {
                     this.types.includes(this.metadata.determineType(target)));
             })
                 .map((target) => {
+                this.logger.debug(`Module - Entity <<< ${target.name} >>>`);
                 this.groupDependenciesForAlias(target);
                 const targetName = (0, shared_utils_1.unCapitalize)(target.name);
                 return {
-                    [target.name]: this.injector.getInjector(target),
+                    [target.name]: this.injector.getInjectorClass(target),
                     [targetName]: (0, awilix_1.aliasTo)(target.name),
                 };
             });
             Object.assign(this.registerClass, ...registeredEntities);
         }
+        else {
+            this.logger.debug("Module - Does not have entities of that type", entityType);
+        }
     }
     /**
      * Agrupación de dependencias para alias
@@ -103,6 +110,7 @@ class Module {
      */
     groupDependenciesForAlias(target) {
         const dependencies = this.metadata.getClassDependencies(target);
+        this.logger.debug(`Module - List dependecies of ${target.name}`, dependencies);
         if (dependencies && !(0, shared_utils_1.isEmpty)(dependencies)) {
             this.dependenciesClass = [...this.dependenciesClass, ...dependencies];
         }
@@ -117,6 +125,7 @@ class Module {
      * contructor(private sA: ServiceA) // parametro con nombre diferente
      */
     registerDependenciesToAlias() {
+        this.logger.debug("Module - dependencies to register as candidates ", this.dependenciesClass);
         this.dependenciesClass.forEach((dependency) => {
             if (!this.registerClass[dependency.nameParameter]) {
                 this.registerClass[dependency.nameParameter] = (0, awilix_1.aliasTo)(dependency.nameClassContainer);
@@ -124,6 +133,7 @@ class Module {
         });
     }
     registerAllProviders() {
+        this.logger.debug("Module - Register list provider:", this.module.name);
         const listProviders = this.injector.getAllProvider();
         listProviders.forEach((value, key) => {
             const providerInject = this.injector.getInjectProvider({
@@ -131,7 +141,7 @@ class Module {
                 value,
             });
             this.registerClass[key] = providerInject;
-            this.registerClass[(0, shared_utils_1.snakeToCamel)(key)] = (0, awilix_1.aliasTo)(key);
+            // this.registerClass[snakeToCamel(key)] = aliasTo(key);
         });
     }
     /**
@@ -146,7 +156,7 @@ class Module {
      * @returns {any} - Clases registradas.
      */
     getRegisterClass() {
-        this.logger.debug("Module - register class", this.registerClass);
+        this.logger.debug("Module - List of candidate classes to register in container.", this.registerClass);
         return this.registerClass;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zanobijs/core",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "description": "Zanobi - modern, small, powerful node.js lambda framework (@core)",
   "keywords": [],
   "author": "John Edison Cortes Rivera [Devdroide] <johne.aplicativos@gmail.com>",
@@ -29,5 +29,5 @@
   "peerDependencies": {
     "@zanobijs/common": "*"
   },
-  "gitHead": "fd630539d6115c6aa87037f5839011c9e6e42384"
+  "gitHead": "83ec232affe492416cca5de8ee6bd19fcee99c0c"
 }