@zerooneit/expressive-tea 1.3.0-beta.6 → 2.0.0

package/decorators/proxy.d.ts

@@ -1,13 +1,28 @@
-import { type ExpressiveTeaProxyOptions, type ExpressiveTeaProxyProperty, type MethodDecorator } from '@expressive-tea/commons/types';
-import { type Express, type RequestHandler } from 'express';
-export declare function ProxyContainer(source: string, targetUrl: string): <T extends new (...args: any[]) => any>(ProxyContainerClass: T) => {
-    new (...args: any[]): {
-        [x: string]: any;
-        readonly source: string;
-        readonly target: string;
-        readonly proxyHandler: RequestHandler;
-        __register(server: Express): void;
-    };
-} & T;
+import { type ExpressiveTeaProxyOptions, type ExpressiveTeaProxyProperty, type MethodDecorator } from '@expressive-tea/commons';
+import { type ProxifiedClass } from '../mixins/proxy';
+import { type Constructor } from '../types/core';
+/**
+ * ProxyContainer decorator - Creates an HTTP proxy for a microservice
+ *
+ * Transforms a class into an HTTP proxy that forwards requests from a source path
+ * to a target URL. Supports custom request/response transformations and options.
+ *
+ * @template TBase - The base constructor type being decorated
+ * @param {string} source - The source path to proxy from (e.g., '/api')
+ * @param {string} targetUrl - The target URL to proxy to (e.g., 'http://api.example.com')
+ * @returns {(target: TBase) => ProxifiedClass<TBase>} Decorator function that returns a proxified class
+ *
+ * @example
+ * {REPLACE-AT}ProxyContainer('/api', 'http://api.example.com')
+ * class ApiProxy {
+ *   {REPLACE-AT}ProxyOption('host')
+ *   getHost() {
+ *     return 'http://api.example.com';
+ *   }
+ * }
+ *
+ * @since 1.0.0
+ */
+export declare function ProxyContainer<TBase extends Constructor = Constructor>(source: string, targetUrl: string): (ProxyContainerClass: TBase) => ProxifiedClass<TBase>;
 export declare function ProxyOption(option: ExpressiveTeaProxyOptions): MethodDecorator;
 export declare function ProxyProperty(option: ExpressiveTeaProxyProperty, value: any): PropertyDecorator;

package/decorators/proxy.js

@@ -1,74 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProxyProperty = exports.ProxyOption = exports.ProxyContainer = void 0;
-const Metadata_1 = require("@expressive-tea/commons/classes/Metadata");
-const httpProxy = require("express-http-proxy");
-const object_helper_1 = require("@expressive-tea/commons/helpers/object-helper");
-const lodash_1 = require("lodash");
+exports.ProxyContainer = ProxyContainer;
+exports.ProxyOption = ProxyOption;
+exports.ProxyProperty = ProxyProperty;
+const commons_1 = require("@expressive-tea/commons");
+const commons_2 = require("@expressive-tea/commons");
 const RequestExceptions_1 = require("../exceptions/RequestExceptions");
-const constants_1 = require("@expressive-tea/commons/constants");
-const NON_ASYNC_METHODS = ['host'];
+const commons_3 = require("@expressive-tea/commons");
+const proxy_1 = require("../mixins/proxy");
+const NON_ASYNC_METHODS = new Set(['host']);
+/**
+ * ProxyContainer decorator - Creates an HTTP proxy for a microservice
+ *
+ * Transforms a class into an HTTP proxy that forwards requests from a source path
+ * to a target URL. Supports custom request/response transformations and options.
+ *
+ * @template TBase - The base constructor type being decorated
+ * @param {string} source - The source path to proxy from (e.g., '/api')
+ * @param {string} targetUrl - The target URL to proxy to (e.g., 'http://api.example.com')
+ * @returns {(target: TBase) => ProxifiedClass<TBase>} Decorator function that returns a proxified class
+ *
+ * @example
+ * {REPLACE-AT}ProxyContainer('/api', 'http://api.example.com')
+ * class ApiProxy {
+ *   {REPLACE-AT}ProxyOption('host')
+ *   getHost() {
+ *     return 'http://api.example.com';
+ *   }
+ * }
+ *
+ * @since 1.0.0
+ */
 function ProxyContainer(source, targetUrl) {
     return (ProxyContainerClass) => {
-        class ExpressiveTeaProxy extends ProxyContainerClass {
-            constructor(...args) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                super(...args);
-                this.source = source;
-                this.target = targetUrl;
-                const options = {};
-                const host = Metadata_1.default.get(constants_1.PROXY_SETTING_KEY, this, constants_1.PROXY_METHODS.HOST);
-                for (const value of Object.values(constants_1.PROXY_METHODS)) {
-                    if (value !== constants_1.PROXY_METHODS.HOST) {
-                        options[value] = Metadata_1.default.get(constants_1.PROXY_SETTING_KEY, this, value);
-                    }
-                }
-                for (const value of Object.values(constants_1.PROXY_PROPERTIES)) {
-                    const key = Metadata_1.default.get(constants_1.PROXY_SETTING_KEY, this, value);
-                    if (!(0, lodash_1.isUndefined)(key)) {
-                        // @ts-expect-error:next-line
-                        options[value] = this[key];
-                    }
-                }
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                this.proxyHandler = httpProxy(host ? host.value.bind(this) : this.target);
-            }
-            __register(server) {
-                const proxyMetadata = Metadata_1.default.get(constants_1.PROXY_SETTING_KEY, (0, object_helper_1.getClass)(this));
-                console.info(`[PROXY - ${proxyMetadata.name}] ${this.source} -> ${this.target}`);
-                server.use(this.source, this.proxyHandler);
-            }
-        }
-        ;
         const settings = {
             source,
             targetUrl,
             name: ProxyContainerClass.name
         };
-        Metadata_1.default.set(constants_1.PROXY_SETTING_KEY, settings, ProxyContainerClass);
-        return ExpressiveTeaProxy;
+        commons_1.Metadata.set(commons_3.PROXY_SETTING_KEY, settings, ProxyContainerClass);
+        return (0, proxy_1.Proxify)(ProxyContainerClass, source, targetUrl);
     };
 }
-exports.ProxyContainer = ProxyContainer;
 function ProxyOption(option) {
     return (target, propertyKey, descriptor) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        if (NON_ASYNC_METHODS.includes(option) && (0, object_helper_1.isAsyncFunction)(descriptor.value)) {
+        if (NON_ASYNC_METHODS.has(option) && (0, commons_2.isAsyncFunction)(descriptor.value)) {
             throw new RequestExceptions_1.GenericRequestException(`${String(propertyKey)} must not be declared as Async Function.`);
         }
-        Metadata_1.default.set(constants_1.PROXY_SETTING_KEY, descriptor, target, option);
+        commons_1.Metadata.set(commons_3.PROXY_SETTING_KEY, descriptor, target, option);
     };
 }
-exports.ProxyOption = ProxyOption;
 function ProxyProperty(option, value) {
     return (target, propertyKey) => {
-        Metadata_1.default.set(constants_1.PROXY_SETTING_KEY, propertyKey, target, option);
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        let currentValue = target[propertyKey];
+        commons_1.Metadata.set(commons_3.PROXY_SETTING_KEY, propertyKey, target, option);
         Object.defineProperty(target, propertyKey, {
             get: () => value,
-            set: () => { currentValue = value; }
         });
     };
 }
-exports.ProxyProperty = ProxyProperty;

package/decorators/router.d.ts

@@ -1,6 +1,7 @@
-import { Router } from 'express';
-import { type ExpressiveTeaHandlerOptions } from '@expressive-tea/commons/interfaces';
-import { type ClassDecorator, type ExpressMiddlewareHandler, type MethodDecorator } from '@expressive-tea/commons/types';
+import { type ClassDecorator, type MethodDecorator } from '@expressive-tea/commons';
+import { type RouterizedClass } from '../mixins/route';
+import { type Constructor, TFunction } from '../types/core';
+import { type RequestHandler } from 'express';
 /**
  * @module Decorators/Router
  */
@@ -11,21 +12,21 @@ import { type ClassDecorator, type ExpressMiddlewareHandler, type MethodDecorato
  * to allow Expressive Tea Setting up the Controller as part of a Module.
  *
  * @decorator {ClassDecorator} Route - Assign a route to controller endpoints.
+ * @template TBase - The base constructor type being decorated
+ * @param {string} mountpoint - Register the url part to mount the Controller (default: '/')
+ * @returns {(target: TBase) => RouterizedClass<TBase>} Decorator function that returns a routerized class
  * @summary Generate a Placeholder endpoint root for controller routes.
- * @param {string} mountpoint Register the url part to mount the Controller.
+ *
  * @example
- * {REPLACE-AT}Route('/)
- * class Example {}
+ * {REPLACE-AT}Route('/users')
+ * class UserController {
+ *   {REPLACE-AT}Get('/')
+ *   getUsers() { return ['user1', 'user2']; }
+ * }
+ *
+ * @since 1.0.0
  */
-export declare function Route(mountpoint?: string): <T extends new (...args: any[]) => any>(RouterClass: T) => {
-    new (...args: any[]): {
-        [x: string]: any;
-        readonly router: Router;
-        readonly mountpoint: string;
-        __mount(parent: Router): this;
-        __registerHandler(options: ExpressiveTeaHandlerOptions): ExpressMiddlewareHandler;
-    };
-} & T;
+export declare function Route<TBase extends Constructor = Constructor>(mountpoint?: string): (RouterClass: TBase) => RouterizedClass<TBase>;
 /**
  * Define a GET Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -178,7 +179,7 @@ export declare function Param(route?: string): (target: object, propertyKey: str
  *
  * @param {Function} middleware Register a middleware over router.
  */
-export declare function Middleware(middleware: (...args: any[]) => any): ClassDecorator & MethodDecorator;
+export declare function Middleware(middleware: RequestHandler | TFunction<RequestHandler>): ClassDecorator & MethodDecorator;
 /**
  * Will generate a GET route to respond rendering a view template setting up before; the controller method <b>MUST</b>
  * return an object in order to fulfilled the local variables into the view.

package/decorators/router.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.View = exports.Middleware = exports.Param = exports.Delete = exports.Patch = exports.Put = exports.Post = exports.Get = exports.Route = void 0;
-const express_1 = require("express");
-const lodash_1 = require("lodash");
-const Metadata_1 = require("@expressive-tea/commons/classes/Metadata");
+exports.Route = Route;
+exports.Get = Get;
+exports.Post = Post;
+exports.Put = Put;
+exports.Patch = Patch;
+exports.Delete = Delete;
+exports.Param = Param;
+exports.Middleware = Middleware;
+exports.View = View;
+const commons_1 = require("@expressive-tea/commons");
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
 const decorators_1 = require("../helpers/decorators");
 const server_1 = require("../helpers/server");
-const constants_1 = require("@expressive-tea/commons/constants");
+const commons_2 = require("@expressive-tea/commons");
+const route_1 = require("../mixins/route");
 /**
  * @module Decorators/Router
  */
@@ -17,47 +25,25 @@ const constants_1 = require("@expressive-tea/commons/constants");
  * to allow Expressive Tea Setting up the Controller as part of a Module.
  *
  * @decorator {ClassDecorator} Route - Assign a route to controller endpoints.
+ * @template TBase - The base constructor type being decorated
+ * @param {string} mountpoint - Register the url part to mount the Controller (default: '/')
+ * @returns {(target: TBase) => RouterizedClass<TBase>} Decorator function that returns a routerized class
  * @summary Generate a Placeholder endpoint root for controller routes.
- * @param {string} mountpoint Register the url part to mount the Controller.
+ *
  * @example
- * {REPLACE-AT}Route('/)
- * class Example {}
+ * {REPLACE-AT}Route('/users')
+ * class UserController {
+ *   {REPLACE-AT}Get('/')
+ *   getUsers() { return ['user1', 'user2']; }
+ * }
+ *
+ * @since 1.0.0
  */
 function Route(mountpoint = '/') {
     return (RouterClass) => {
-        return class ExpressiveTeaRoute extends RouterClass {
-            constructor(...args) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                super(...args);
-                const handlers = Metadata_1.default.get(constants_1.ROUTER_HANDLERS_KEY, this) || [];
-                this.router = (0, express_1.Router)();
-                this.mountpoint = mountpoint;
-                (0, lodash_1.each)(handlers, h => {
-                    var _a;
-                    const middlewares = (_a = h.handler.$middlewares) !== null && _a !== void 0 ? _a : [];
-                    this.router[h.verb](h.route, ...middlewares, this.__registerHandler(h));
-                });
-            }
-            __mount(parent) {
-                const rootMiddlewares = Metadata_1.default.get(constants_1.ROUTER_MIDDLEWARES_KEY, this) || [];
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                parent.use(this.mountpoint, ...rootMiddlewares, this.router);
-                return this;
-            }
-            __registerHandler(options) {
-                const decoratedArguments = Metadata_1.default.get(constants_1.ARGUMENTS_KEY, options.target, options.propertyKey);
-                const annotations = Metadata_1.default.get(constants_1.ROUTER_ANNOTATIONS_KEY, options.target, options.propertyKey);
-                return server_1.executeRequest.bind({
-                    options,
-                    decoratedArguments,
-                    annotations,
-                    self: this
-                });
-            }
-        };
+        return (0, route_1.Routerize)(RouterClass, mountpoint);
     };
 }
-exports.Route = Route;
 /**
  * Define a GET Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -78,7 +64,6 @@ exports.Route = Route;
 function Get(route = '*') {
     return (0, server_1.generateRoute)(route, 'get');
 }
-exports.Get = Get;
 /**
  * Define a POST Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -99,7 +84,6 @@ exports.Get = Get;
 function Post(route = '*') {
     return (0, server_1.generateRoute)(route, 'post');
 }
-exports.Post = Post;
 /**
  * Define a PUT Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -120,7 +104,6 @@ exports.Post = Post;
 function Put(route = '*') {
     return (0, server_1.generateRoute)(route, 'put');
 }
-exports.Put = Put;
 /**
  * Define a PATCH Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -141,7 +124,6 @@ exports.Put = Put;
 function Patch(route = '*') {
     return (0, server_1.generateRoute)(route, 'patch');
 }
-exports.Patch = Patch;
 /**
  * Define a DELETE Endpoint response over the controller router and can define in which route should be responds and
  * by default this is responding to everything on the controller root path.
@@ -162,7 +144,6 @@ exports.Patch = Patch;
 function Delete(route = '*') {
     return (0, server_1.generateRoute)(route, 'delete');
 }
-exports.Delete = Delete;
 /**
  * Define a Route path parameter transformation method as mentioned on Express this is just call by controller endpoints
  * route paths and it helps to define logic on each route path parameters. Example, you can require transform userId
@@ -199,7 +180,6 @@ exports.Delete = Delete;
 function Param(route = '*') {
     return (0, server_1.generateRoute)(route, 'param');
 }
-exports.Param = Param;
 /**
  * Middleware Decorator is following the middleware functionality inheritance from Express framework itself and follow
  * the same rules, that execute any code before response the request and can change the current request or response
@@ -230,15 +210,14 @@ exports.Param = Param;
  */
 function Middleware(middleware) {
     return (target, property, descriptor) => {
-        if (!property) {
-            rootMiddleware(target, middleware);
+        if (property) {
+            routeMiddleware(target, descriptor, middleware);
         }
         else {
-            routeMiddleware(target, descriptor, middleware);
+            rootMiddleware(target, middleware);
         }
     };
 }
-exports.Middleware = Middleware;
 /**
  * Will generate a GET route to respond rendering a view template setting up before; the controller method <b>MUST</b>
  * return an object in order to fulfilled the local variables into the view.
@@ -262,13 +241,12 @@ function View(viewName, route) {
         (0, server_1.router)('get', route, target, descriptor.value, propertyKey);
     };
 }
-exports.View = View;
 function rootMiddleware(target, middleware) {
-    const existedRoutesHandlers = Metadata_1.default.get(constants_1.ROUTER_MIDDLEWARES_KEY, target) || [];
+    const existedRoutesHandlers = commons_1.Metadata.get(commons_2.ROUTER_MIDDLEWARES_KEY, target) || [];
     existedRoutesHandlers.unshift(middleware);
-    Metadata_1.default.set(constants_1.ROUTER_MIDDLEWARES_KEY, existedRoutesHandlers, target);
+    commons_1.Metadata.set(commons_2.ROUTER_MIDDLEWARES_KEY, existedRoutesHandlers, target);
 }
-function routeMiddleware(target, descriptor, middleware) {
+function routeMiddleware(_, descriptor, middleware) {
     descriptor.value.$middlewares = descriptor.value.$middlewares || [];
     descriptor.value.$middlewares.unshift(middleware);
 }

package/decorators/server.d.ts

@@ -1,6 +1,7 @@
 import { type Express } from 'express';
-import { type BOOT_STAGES } from '@expressive-tea/commons/constants';
-import { type ExpressiveTeaPotSettings, type ExpressiveTeaServerProps, type ExpressiveTeaStaticFileServer, type ExpressiveTeaCupSettings } from '@expressive-tea/commons/interfaces';
+import { type BOOT_STAGES } from '@expressive-tea/commons';
+import { type ExpressiveTeaPotSettings, type ExpressiveTeaServerProps, type ExpressiveTeaStaticFileServer, type ExpressiveTeaCupSettings } from '@expressive-tea/commons';
+import { Newable } from 'inversify';
 /**
  * Plug Class Decorator create a simple plugin to execute in one of the public stages defined on BOOT_STAGES, might
  * be useful to attach a simple Express Server configuration.
@@ -16,7 +17,7 @@ import { type ExpressiveTeaPotSettings, type ExpressiveTeaServerProps, type Expr
  * {REPLACE-AT}Plug(BOOT_STAGES.BOOT_DEPENDENCIES, 'test', s => console.log, true)
  * class Example extends Boot {}
  */
-export declare function Plug(stage: BOOT_STAGES, name: string, method: (server?: Express | never, ...extraArgs: unknown[]) => Promise<any> | any, required?: boolean): (target: any) => void;
+export declare function Plug(stage: BOOT_STAGES, name: string, method: (server?: Express, ...extraArgs: unknown[]) => Promise<void> | void, required?: boolean): (target: any) => void;
 /**
  * Since version 1.1.0 Expressive Tea allow to use external plugins using the node
  * package @expressive-tea/plugin. This plugin engine allows to create more complex plugin configuration and provision
@@ -29,7 +30,7 @@ export declare function Plug(stage: BOOT_STAGES, name: string, method: (server?:
  * @version 1.1.0
  * @link https://www.npmjs.com/package/@expressive-tea/plugin Expressive Tea Plugin
  */
-export declare function Pour(Plugin: any, ...pluginArgs: any[]): (target: any) => void;
+export declare function Pour(Plugin: Newable<any>, ...pluginArgs: any[]): (target: any) => void;
 /**
  * Server Settings Singleton Class Decorator this Provide the Configuration to the server or another component on
  * the projects,is working as a container to store user and library settings.
@@ -67,9 +68,8 @@ export declare function ExpressDirective(name: string, ...settings: any[]): (tar
  * All properties will contains the settings value or undefined if current settings is not founded.
  * @decorator {PropertyDecorator} Setting - Assign Server Settings to Property as default value.
  * @summary Automatically assign a settings declared on the Server Settings decorator to a class property.
- * @param {string} settingName The Setting name tha
  */
-export declare function Setting(settingName: string): (target: any, propertyName: string) => any;
+export declare function Setting(): (target: any, propertyName: string) => any;
 /**
  * Register Modules Method Decorator this Method Decorator is used at bootstrap level and should decorate bootstrap class
  * and register modules.
@@ -87,6 +87,6 @@ export declare function Proxies(proxyContainers: any[]): (target: any) => void;
  * @param {Class} Module
  * @deprecated Use the new decorator Modules that allow add modules into registered modules.
  */
-export declare function RegisterModule(Module: any): (target: any, property: string | symbol) => void;
+export declare function RegisterModule(Module: any): (_: any, __: any) => never;
 export declare function Teapot(teapotSettings: ExpressiveTeaPotSettings): (target: object) => void;
 export declare function Teacup(teacupSettings: ExpressiveTeaCupSettings): (target: object) => void;

package/decorators/server.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Teacup = exports.Teapot = exports.RegisterModule = exports.Proxies = exports.Modules = exports.Setting = exports.ExpressDirective = exports.Static = exports.ServerSettings = exports.Pour = exports.Plug = void 0;
-const lodash_1 = require("lodash");
-const Metadata_1 = require("@expressive-tea/commons/classes/Metadata");
+exports.Plug = Plug;
+exports.Pour = Pour;
+exports.ServerSettings = ServerSettings;
+exports.Static = Static;
+exports.ExpressDirective = ExpressDirective;
+exports.Setting = Setting;
+exports.Modules = Modules;
+exports.Proxies = Proxies;
+exports.RegisterModule = RegisterModule;
+exports.Teapot = Teapot;
+exports.Teacup = Teacup;
+const utilities_1 = require("../libs/utilities");
+const commons_1 = require("@expressive-tea/commons");
 const Settings_1 = require("../classes/Settings");
-const constants_1 = require("@expressive-tea/commons/constants");
+const commons_2 = require("@expressive-tea/commons");
+const DependencyInjection_1 = require("../services/DependencyInjection");
 /**
  * Define the Main Plugins Properties.
  * @typedef {Object} ExpressiveTeaPluginProps
@@ -46,10 +57,10 @@ const constants_1 = require("@expressive-tea/commons/constants");
  * @module Decorators/Server
  */
 function getStages(target) {
-    return Metadata_1.default.get(constants_1.BOOT_STAGES_KEY, target) || {};
+    return commons_1.Metadata.get(commons_2.BOOT_STAGES_KEY, target) || {};
 }
 function getRegisteredPlugins(target) {
-    return Metadata_1.default.get(constants_1.PLUGINS_KEY, target) || [];
+    return commons_1.Metadata.get(commons_2.PLUGINS_KEY, target) || [];
 }
 function getStage(stage, target) {
     const stages = getStages(target);
@@ -61,10 +72,10 @@ function getStage(stage, target) {
 function setStage(stage, value, target) {
     const stages = getStages(target);
     stages[stage] = value;
-    Metadata_1.default.set(constants_1.BOOT_STAGES_KEY, stages, target);
+    commons_1.Metadata.set(commons_2.BOOT_STAGES_KEY, stages, target);
 }
 function setPlugins(plugins, target) {
-    Metadata_1.default.set(constants_1.PLUGINS_KEY, plugins, target);
+    commons_1.Metadata.set(commons_2.PLUGINS_KEY, plugins, target);
 }
 /**
  * Plug Class Decorator create a simple plugin to execute in one of the public stages defined on BOOT_STAGES, might
@@ -88,7 +99,6 @@ function Plug(stage, name, method, required = false) {
         setStage(stage, selectedStage, target);
     };
 }
-exports.Plug = Plug;
 /**
  * Since version 1.1.0 Expressive Tea allow to use external plugins using the node
  * package @expressive-tea/plugin. This plugin engine allows to create more complex plugin configuration and provision
@@ -104,15 +114,17 @@ exports.Plug = Plug;
 function Pour(Plugin, ...pluginArgs) {
     return (target) => {
         const stages = getStages(target);
-        const instance = new Plugin(...pluginArgs);
+        DependencyInjection_1.default.Container.bind(Plugin)
+            .toDynamicValue(() => new Plugin(...pluginArgs))
+            .inSingletonScope();
+        const instance = DependencyInjection_1.default.Container.get(Plugin);
         const plugins = instance.register(Settings_1.default.getInstance(target).getOptions(), getRegisteredPlugins(target));
-        constants_1.BOOT_STAGES_LIST.forEach(STAGE => {
+        commons_2.BOOT_STAGES_LIST.forEach(STAGE => {
             setStage(STAGE, (stages[STAGE] || []).concat(instance.getRegisteredStage(STAGE)), target);
         });
-        setPlugins((0, lodash_1.orderBy)(plugins, ['priority'], ['asc']), target);
+        setPlugins((0, utilities_1.orderBy)(plugins, ['priority'], ['asc']), target);
     };
 }
-exports.Pour = Pour;
 /**
  * Server Settings Singleton Class Decorator this Provide the Configuration to the server or another component on
  * the projects,is working as a container to store user and library settings.
@@ -121,12 +133,11 @@ exports.Pour = Pour;
  * @param {ExpressiveTeaModuleProps} options
  */
 function ServerSettings(options = {}) {
-    return target => {
+    return (target) => {
         Settings_1.default.getInstance(target).merge(options);
         return target;
     };
 }
-exports.ServerSettings = ServerSettings;
 /**
  * Create a new middleware function to serve files from within a given root directory. The file to serve will be
  * determined by combining req.url with the provided root directory. When a file is not found, instead of sending a 404
@@ -141,16 +152,15 @@ exports.ServerSettings = ServerSettings;
  * with virtual path if defined.
  */
 function Static(root, virtual = null, options = {}) {
-    return target => {
-        if ((0, lodash_1.isNil)(root)) {
+    return (target) => {
+        if ((0, utilities_1.isNil)(root)) {
             throw new Error('Root must be defined');
         }
-        const registeredStatics = Metadata_1.default.get(constants_1.REGISTERED_STATIC_KEY, target) || [];
+        const registeredStatics = commons_1.Metadata.get(commons_2.REGISTERED_STATIC_KEY, target) || [];
         registeredStatics.unshift({ root, options, virtual });
-        Metadata_1.default.set(constants_1.REGISTERED_STATIC_KEY, registeredStatics, target);
+        commons_1.Metadata.set(commons_2.REGISTERED_STATIC_KEY, registeredStatics, target);
     };
 }
-exports.Static = Static;
 /**
  * Set or Update Express application settings, and allow to change the behavior of the server where is listed on the
  * next link {@link http://expressjs.com/en/4x/api.html#app.settings.table Express Settings} as this is using the same
@@ -161,24 +171,22 @@ exports.Static = Static;
  * @decorator {ClassDecorator} ExpressDirective - Set a Express App Setting.
  */
 function ExpressDirective(name, ...settings) {
-    return target => {
-        if (!constants_1.EXPRESS_DIRECTIVES.includes(name)) {
+    return (target) => {
+        if (!commons_2.EXPRESS_DIRECTIVES.includes(name)) {
             throw new Error(`Directive Name ${name} is not valid express behavior setting`);
         }
-        const registeredDirectives = Metadata_1.default.get(constants_1.REGISTERED_DIRECTIVES_KEY, target) || [];
+        const registeredDirectives = commons_1.Metadata.get(commons_2.REGISTERED_DIRECTIVES_KEY, target) || [];
         registeredDirectives.unshift({ name, settings });
-        Metadata_1.default.set(constants_1.REGISTERED_DIRECTIVES_KEY, registeredDirectives, target);
+        commons_1.Metadata.set(commons_2.REGISTERED_DIRECTIVES_KEY, registeredDirectives, target);
     };
 }
-exports.ExpressDirective = ExpressDirective;
 /**
  * Setting Property Decorator Automatically assign a settings declared on Settings Service into the decorated property.
  * All properties will contains the settings value or undefined if current settings is not founded.
  * @decorator {PropertyDecorator} Setting - Assign Server Settings to Property as default value.
  * @summary Automatically assign a settings declared on the Server Settings decorator to a class property.
- * @param {string} settingName The Setting name tha
  */
-function Setting(settingName) {
+function Setting() {
     return (target, propertyName) => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
@@ -186,7 +194,6 @@ function Setting(settingName) {
         });
     };
 }
-exports.Setting = Setting;
 /**
  * Register Modules Method Decorator this Method Decorator is used at bootstrap level and should decorate bootstrap class
  * and register modules.
@@ -195,25 +202,23 @@ exports.Setting = Setting;
  * @param Modules
  */
 function Modules(Modules) {
-    return target => {
+    return (target) => {
         for (const Module of Modules) {
-            const registeredModules = Metadata_1.default.get(constants_1.REGISTERED_MODULE_KEY, target, 'start') || [];
+            const registeredModules = commons_1.Metadata.get(commons_2.REGISTERED_MODULE_KEY, target, 'start') || [];
             registeredModules.unshift(Module);
-            Metadata_1.default.set(constants_1.REGISTERED_MODULE_KEY, registeredModules, target, 'start');
+            commons_1.Metadata.set(commons_2.REGISTERED_MODULE_KEY, registeredModules, target, 'start');
         }
     };
 }
-exports.Modules = Modules;
 function Proxies(proxyContainers) {
-    return target => {
+    return (target) => {
         for (const proxyContainer of proxyContainers) {
-            const registeredProxyContainers = Metadata_1.default.get(constants_1.ROUTER_PROXIES_KEY, target) || [];
+            const registeredProxyContainers = commons_1.Metadata.get(commons_2.ROUTER_PROXIES_KEY, target) || [];
             registeredProxyContainers.unshift(proxyContainer);
-            Metadata_1.default.set(constants_1.ROUTER_PROXIES_KEY, registeredProxyContainers, target);
+            commons_1.Metadata.set(commons_2.ROUTER_PROXIES_KEY, registeredProxyContainers, target);
         }
     };
 }
-exports.Proxies = Proxies;
 /**
  * Register Module Method Decorator this Method Decorator is used at bootstrap level and should decorate the start
  * method with a Module Class.
@@ -222,28 +227,21 @@ exports.Proxies = Proxies;
  * @param {Class} Module
  * @deprecated Use the new decorator Modules that allow add modules into registered modules.
  */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function RegisterModule(Module) {
-    return (target, property) => {
-        if (property !== 'start') {
-            throw new Error('Register Module needs to decorate ONLY start method');
-        }
-        const registeredModules = Metadata_1.default.get(constants_1.REGISTERED_MODULE_KEY, target, property) || [];
-        registeredModules.push(Module);
-        Metadata_1.default.set(constants_1.REGISTERED_MODULE_KEY, registeredModules, target, property);
+    return (_, __) => {
+        throw new Error('RegisterModule is deprecated, use the new decorator Modules that allow add modules into registered modules.');
     };
 }
-exports.RegisterModule = RegisterModule;
 function Teapot(teapotSettings) {
     return (target) => {
-        Metadata_1.default.set(constants_1.ASSIGN_TEAPOT_KEY, true, target, 'isTeapotActive');
-        Metadata_1.default.set(constants_1.ASSIGN_TEAPOT_KEY, teapotSettings, target);
+        commons_1.Metadata.set(commons_2.ASSIGN_TEAPOT_KEY, true, target, 'isTeapotActive');
+        commons_1.Metadata.set(commons_2.ASSIGN_TEAPOT_KEY, teapotSettings, target);
     };
 }
-exports.Teapot = Teapot;
 function Teacup(teacupSettings) {
     return (target) => {
-        Metadata_1.default.set(constants_1.ASSIGN_TEACUP_KEY, true, target, 'isTeacupActive');
-        Metadata_1.default.set(constants_1.ASSIGN_TEACUP_KEY, teacupSettings, target);
+        commons_1.Metadata.set(commons_2.ASSIGN_TEACUP_KEY, true, target, 'isTeacupActive');
+        commons_1.Metadata.set(commons_2.ASSIGN_TEACUP_KEY, teacupSettings, target);
     };
 }
-exports.Teacup = Teacup;