@zenofolio/hyper-decor 1.0.45 → 1.0.47

package/dist/__internals/helpers/imports.helper.d.ts

@@ -0,0 +1,8 @@
+import { ImportType } from "../../decorators/types";
+/**
+ * Prepare imports for the target class.
+ *
+ * @param target
+ * @param imports
+ */
+export declare function prepareImports(target: any, imports: ImportType[]): Promise<void>;

package/dist/__internals/helpers/imports.helper.js

@@ -0,0 +1,45 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareImports = prepareImports;
+const tsyringe_1 = require("tsyringe");
+/**
+ * Prepare imports for the target class.
+ *
+ * @param target
+ * @param imports
+ */
+function prepareImports(target, imports) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        for (const service of imports) {
+            const _class = tsyringe_1.container.resolve(service);
+            if (!_class)
+                continue;
+            const isSingleton = ((_a = _class.isSingleton) === null || _a === void 0 ? void 0 : _a.call(_class)) === true;
+            if (isSingleton) {
+                if (isInitialized(_class))
+                    continue;
+                tsyringe_1.container.registerInstance(service, _class);
+            }
+            if (typeof _class.onInit === "function") {
+                yield _class.onInit();
+                if (isSingleton)
+                    setInitialized(_class);
+            }
+        }
+    });
+}
+////////////////////////
+/// Utils
+////////////////////////
+const isInitialized = (target) => Reflect.get(target, "____initialized") === true;
+const setInitialized = (target) => Reflect.set(target, "____initialized", true);

package/dist/__internals/transform/middleware.transform.js

@@ -5,14 +5,15 @@ const tsyringe_1 = require("tsyringe");
 function middlewareTransformer(list) {
     return list
         .map((middleware) => {
+        if (isClass(middleware)) {
+            const instance = tsyringe_1.container.resolve(middleware);
+            return instance.handle.bind(instance);
+        }
         if (typeof middleware === "function") {
-            if (middleware.constructor) {
-                const instance = tsyringe_1.container.resolve(middleware);
-                return instance.handle.bind(instance);
-            }
             return middleware;
         }
         return null;
     })
-        .filter((middleware) => middleware);
+        .filter((middleware) => !!middleware);
 }
+const isClass = (fn) => typeof fn === "function" && `${fn}`.indexOf("class") === 0;

package/dist/decorators/HyperApp.js

@@ -25,6 +25,7 @@ const merge_metadata_1 = require("../__internals/helpers/merge-metadata");
 const tsyringe_1 = require("tsyringe");
 const collectors_1 = require("../collectors");
 const middleware_transform_1 = __importDefault(require("../__internals/transform/middleware.transform"));
+const imports_helper_1 = require("../__internals/helpers/imports.helper");
 /**
  * Decorator to define the main application class with assigned modules.
  * @param modules - List of modules to be used in the application.
@@ -133,7 +134,8 @@ function applyAppOptions(options, Target, app, log) {
         var _a, _b;
         const data = getData(Target);
         const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : "/";
-        const services = (_b = options.imports) !== null && _b !== void 0 ? _b : [];
+        const imports = (_b = options.imports) !== null && _b !== void 0 ? _b : [];
+        yield (0, imports_helper_1.prepareImports)(Target, imports);
         if (data.middlewares.length) {
             app.use(...data.middlewares);
             log("middleware", `${Target.name} with middlewares: ${data.middlewares
@@ -150,14 +152,17 @@ function applyAppOptions(options, Target, app, log) {
             log("middleware", `${Target.name} with roles: ${data.roles.join(", ")}`);
         });
         const routers = yield Promise.all(options.modules.map((module) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const path = (_b = (_a = getData(module).module) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : "/";
+            var _a, _b, _c, _d;
+            const data = getData(module);
+            const path = (_b = (_a = data.module) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : "/";
+            const imports = (_d = (_c = data.module) === null || _c === void 0 ? void 0 : _c.imports) !== null && _d !== void 0 ? _d : [];
             return prepareTarget({
                 target: module,
                 router: if_router(module),
                 namespace: `${Target.name}/${module.name}`,
                 instance: app,
                 prefix: path,
+                imports: imports,
                 log,
             });
         })));
@@ -166,8 +171,15 @@ function applyAppOptions(options, Target, app, log) {
         });
     });
 }
+/**
+ * Prepare the target class
+ * HyperModule or HyperController can be used as target.
+ *
+ * @param param0
+ * @returns
+ */
 function prepareTarget(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ target, router, prefix = "/", namespace = "", instance, log, }) {
+    return __awaiter(this, arguments, void 0, function* ({ target, router, prefix = "/", namespace = "", instance, imports = [], log, }) {
         var _b, _c, _d, _e, _f, _g, _h, _j;
         const _router = router !== null && router !== void 0 ? router : if_router(target);
         const data = getData(target);
@@ -178,6 +190,10 @@ function prepareTarget(_a) {
         const scopes = (_h = data.scopes) !== null && _h !== void 0 ? _h : [];
         const roles = (_j = data.roles) !== null && _j !== void 0 ? _j : [];
         ////////////////////////////////
+        /// Prepare Imports
+        ////////////////////////////////
+        yield (0, imports_helper_1.prepareImports)(target, imports);
+        ////////////////////////////////
         /// Attach Middlewares
         ////////////////////////////////
         _router.use(...middlewares);
@@ -195,6 +211,7 @@ function prepareTarget(_a) {
                 return;
             const router = yield prepareTarget({
                 target: module,
+                imports: moduleData.module.imports,
                 namespace: `${namespace}/${module.name}`,
                 prefix: moduleData.module.path,
                 instance: tsyringe_1.container.resolve(module),
@@ -214,6 +231,7 @@ function prepareTarget(_a) {
                 target: controller,
                 namespace: `${namespace}/${controller.name}`,
                 prefix: controllerData.path,
+                imports: controllerData.imports,
                 instance: tsyringe_1.container.resolve(controller),
                 log,
             });
@@ -241,6 +259,12 @@ function prepareTarget(_a) {
         };
     });
 }
+/**
+ * Prepare the routes for the target class.
+ *
+ * @param param0
+ * @returns
+ */
 function prepareRoutes(_a) {
     return __awaiter(this, arguments, void 0, function* ({ target, router, route, instance, namespace, log, }) {
         var _b, _c, _d;

package/dist/decorators/HyperController.js

@@ -4,7 +4,7 @@ exports.HyperController = void 0;
 const decorator_base_1 = require("../__internals/decorator-base");
 const constants_1 = require("../__internals/constants");
 const HyperController = (options) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const isString = typeof options === "string";
     return (0, decorator_base_1.DecoratorHelper)({
         type: constants_1.KEY_TYPE_CONTROLLER,
@@ -13,6 +13,7 @@ const HyperController = (options) => {
             path: isString ? options : (_a = options === null || options === void 0 ? void 0 : options.path) !== null && _a !== void 0 ? _a : "/",
             roles: isString ? [] : (_b = options === null || options === void 0 ? void 0 : options.roles) !== null && _b !== void 0 ? _b : [],
             scopes: isString ? [] : (_c = options === null || options === void 0 ? void 0 : options.scopes) !== null && _c !== void 0 ? _c : [],
+            imports: isString ? [] : (_d = options === null || options === void 0 ? void 0 : options.imports) !== null && _d !== void 0 ? _d : [],
         },
     });
 };

package/dist/decorators/Service.d.ts

@@ -0,0 +1,5 @@
+interface ServiceOptions {
+    singleton?: boolean;
+}
+export declare const Service: ({ singleton, }: ServiceOptions) => ClassDecorator;
+export {};

package/dist/decorators/Service.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Service = void 0;
+const tsyringe_1 = require("tsyringe");
+const Service = ({ singleton = true, }) => {
+    return (target) => {
+        const instance = tsyringe_1.container.resolve(target);
+        if (singleton) {
+            tsyringe_1.container.registerInstance(target, instance);
+        }
+        return function (...args) {
+            return instance;
+        };
+    };
+};
+exports.Service = Service;

package/dist/decorators/index.d.ts

@@ -9,3 +9,4 @@ export * from "./types";
 export * from "./Http";
 export * from "./Pass";
 export * from "./File";
+export * from "./Service";

package/dist/decorators/index.js

@@ -25,3 +25,4 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./Http"), exports);
 __exportStar(require("./Pass"), exports);
 __exportStar(require("./File"), exports);
+__exportStar(require("./Service"), exports);

package/dist/decorators/types.d.ts

@@ -1,5 +1,12 @@
 import type { MiddlewareHandler, MiddlewareNext, Request, Response, ServerConstructorOptions } from "hyper-express";
+export interface OnInit {
+    onInit(): Promise<any>;
+}
+export interface IsSingleton {
+    isSingleton(): boolean;
+}
 export type Constructor<R extends any = any> = new (...args: any[]) => R;
+export type ImportType = Constructor<Partial<OnInit> & Partial<IsSingleton>>;
 export type ConstructorDecorator = (target: Constructor, kay?: any, descriptor?: PropertyDescriptor) => Constructor;
 export type HyperClassDecorator<T> = (options?: T) => ConstructorDecorator;
 export type HyperMethodDecorator<T> = (options?: T) => (target: any, key?: any, descriptor?: PropertyDescriptor) => void;
@@ -18,7 +25,7 @@ export interface HyperAppMetadata {
     logger?: (...args: any[]) => void;
     logs?: LogSpaces;
     modules: Constructor[];
-    imports?: Constructor[];
+    imports?: ImportType[];
     options?: ServerConstructorOptions;
 }
 export interface HyperAppDecorator {
@@ -31,14 +38,14 @@ export type HyperModuleMetadata = {
     scopes?: string[];
     modules?: Constructor[];
     controllers?: Constructor[];
-    imports?: Constructor[];
+    imports?: ImportType[];
 };
 export type HyperModuleDecorator = HyperClassDecorator<HyperModuleMetadata>;
 export type HyperControllerMetadata = {
     path?: string;
     roles?: string[];
     scopes?: string[];
-    imports?: Constructor[];
+    imports?: ImportType[];
 };
 export type HyperControllerDecorator = HyperClassDecorator<HyperControllerMetadata | string>;
 export type ParameterResolver = (req: Request, res: Response) => any | Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenofolio/hyper-decor",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "Project core with utilities and features",
   "main": "dist/index.js",
   "author": "zenozaga",