@zenofolio/hyper-decor 1.0.52 → 1.0.54

package/dist/__internals/creators/routes.creator.d.ts

@@ -8,4 +8,4 @@ import { Request, Response } from "hyper-express";
  * @returns {(path?: string) => MethodDecorator} - A method decorator for defining routes.
  *
  */
-export default function createRouteDecorator(method: string, resolver?: (req: Request, res: Response) => any): (path?: string) => MethodDecorator & ClassDecorator;
+export default function createRouteDecorator<T extends any = undefined>(method: string, resolver?: (req: Request, res: Response) => any): (path?: string, options?: T) => MethodDecorator & ClassDecorator;

package/dist/__internals/creators/routes.creator.js

@@ -13,7 +13,7 @@ const decorator_base_1 = require("../decorator-base");
  *
  */
 function createRouteDecorator(method, resolver) {
-    return (path = "/") => (0, decorator_base_1.DecoratorHelper)({
+    return (path = "/", options) => (0, decorator_base_1.DecoratorHelper)({
         type: constants_1.KEY_TYPE_CONTROLLER,
         key: constants_1.KEY_PARAMS_ROUTE,
         targetResolver: (target) => { var _a; return (_a = target.constructor) !== null && _a !== void 0 ? _a : target; },
@@ -32,6 +32,7 @@ function createRouteDecorator(method, resolver) {
                 path,
                 propertyKey,
                 handler: handler,
+                options,
             });
             return saved;
         },

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

@@ -75,16 +75,7 @@ function prepareApplication(options, Target, app, log) {
         const data = getData(Target);
         const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : "/";
         const imports = (_b = options.imports) !== null && _b !== void 0 ? _b : [];
-        {
-            // initialize servies stored
-            for (const service of service_store_1.serviceStore) {
-                const instance = tsyringe_1.container.resolve(service);
-                if (instance.onInit)
-                    yield instance.onInit();
-            }
-            // clean up the service store
-            service_store_1.serviceStore.clear();
-        }
+        yield prepareServices(service_store_1.serviceStore);
         yield (0, imports_helper_1.prepareImports)(Target, imports);
         if (data.middlewares.length) {
             app.use(...data.middlewares);
@@ -218,7 +209,7 @@ function prepareTarget(_a) {
 function prepareRoutes(_a) {
     return __awaiter(this, arguments, void 0, function* ({ target, router, route, instance, namespace, log, }) {
         var _b, _c, _d;
-        const { method, path, handler, propertyKey } = route;
+        const { method, path, handler, propertyKey, options } = route;
         const metadata = getData(handler);
         const params = (_d = (_c = (_b = metadata.params) === null || _b === void 0 ? void 0 : _b.params) === null || _c === void 0 ? void 0 : _c[propertyKey]) !== null && _d !== void 0 ? _d : [];
         const $fn = Reflect.get(router, method);
@@ -233,6 +224,10 @@ function prepareRoutes(_a) {
         });
         log("routes", `${namespace}/${propertyKey} ${method.toUpperCase()} { ${path} }`);
         if (!hasParams) {
+            if (method === "ws" && options) {
+                router.ws(path, options, handler.bind(instance));
+                return;
+            }
             $fn.call(router, path, ...middlewares, handler.bind(instance));
         }
         else {
@@ -246,3 +241,12 @@ function prepareRoutes(_a) {
         }
     });
 }
+function prepareServices(list) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(Array.from(list).map((service) => __awaiter(this, void 0, void 0, function* () {
+            const instance = tsyringe_1.container.resolve(service);
+            if (instance.onInit)
+                yield instance.onInit();
+        })));
+    });
+}

package/dist/decorators/Routes.d.ts

@@ -1,14 +1,15 @@
 import "reflect-metadata";
-export declare const Get: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Post: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Put: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Delete: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Patch: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Options: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Head: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Trace: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Any: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const All: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Connect: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const WS: (path?: string) => MethodDecorator & ClassDecorator;
-export declare const Upgrade: (path?: string) => MethodDecorator & ClassDecorator;
+import { WSRouteOptions } from "hyper-express/types";
+export declare const Get: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Post: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Put: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Delete: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Patch: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Options: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Head: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Trace: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Any: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const All: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const Connect: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;
+export declare const WS: (path?: string, options?: WSRouteOptions | undefined) => MethodDecorator & ClassDecorator;
+export declare const Upgrade: (path?: string, options?: undefined) => MethodDecorator & ClassDecorator;

package/dist/decorators/Service.d.ts

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

package/dist/decorators/Service.js

@@ -3,18 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = void 0;
 const tsyringe_1 = require("tsyringe");
 const service_store_1 = require("../__internals/stores/service.store");
-const Service = () => {
+const Service = ({ singleton = true, } = {}) => {
     return (target) => {
-        if (!service_store_1.serviceStore.has(target)) {
-            service_store_1.serviceStore.add(target);
-        }
-        const instance = tsyringe_1.container.resolve(target);
         if (!tsyringe_1.container.isRegistered(target)) {
-            tsyringe_1.container.registerInstance(target, instance);
+            singleton
+                ? tsyringe_1.container.registerSingleton(target)
+                : tsyringe_1.container.register(target, target);
         }
-        return function (...args) {
-            return instance;
-        };
+        service_store_1.serviceStore.add(target);
     };
 };
 exports.Service = Service;

package/dist/decorators/types.d.ts

@@ -89,6 +89,7 @@ export interface RouteMetadata {
     method: string;
     path: string;
     propertyKey: string;
+    options?: any;
     handler: (...args: any[]) => any;
 }
 export declare abstract class MiddlewareClass {

package/package.json

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