@zenofolio/hyper-decor 1.0.42 → 1.0.45

package/.mocharc.js

@@ -1,5 +1,5 @@
 module.exports = {
-    "extension": ["ts"],
-    "spec": "**/*.spec.ts",
+    "extension": ["ts", "cjs"],
+    "spec": "**/*.test.ts",
     "require": "ts-node/register"
 };

package/README.md

@@ -144,7 +144,7 @@ class TestController extends CRUD<string> {
 ```typescript
 @HyperModule({
     path: "users",
-    controllers: [HyperController]
+    controllers: [TestController]
 })
 class UserModule {}
 ```

package/dist/__internals/constants.d.ts

@@ -3,6 +3,7 @@ export declare const KEY_TYPE_CONTROLLER = "hyper:type:controller";
 export declare const KEY_TYPE_MODULE = "hyper:type:module";
 export declare const KEY_TYPE_ROUTE = "hyper:type:route";
 export declare const KEY_TYPE_SERVICE = "hyper:type:service";
+export declare const KEY_TYPE_GUARD = "hyper:type:guard";
 export type KeyTypes = typeof KEY_TYPE_APP | typeof KEY_TYPE_CONTROLLER | typeof KEY_TYPE_MODULE | typeof KEY_TYPE_SERVICE | typeof KEY_TYPE_ROUTE;
 export declare const KEY_PARAMS_APP = "hyper:type:app";
 export declare const KEY_PARAMS_CONTROLLER = "hyper:type:controller";

package/dist/__internals/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METADATA_STATE_KEYS = exports.METADATA_PARAMS_KEYS = exports.METADATA_METHOD_KEYS = exports.METADATA_STORE_KEYS = exports.METADATA_KEYS = exports.METADATA_HYPER_TYPE = exports.DESIGN_TYPE = exports.DESIGN_RETURNTYPE = exports.DESIGN_PARAMTYPES = exports.KEY_STATE_BY_PASS = exports.KEY_STATE_PREPARED = exports.KEY_STATE_CREATED = exports.KEY_STATE_UPDATED = exports.KEY_PARAMS_PASS = exports.KEY_PARAMS_ROLE = exports.KEY_PARAMS_SCOPE = exports.KEY_PARAMS_MIDDLEWARES = exports.KEY_PARAMS_PARAM = exports.KEY_PARAMS_ROUTE = exports.KEY_PARAMS_MODULE = exports.KEY_PARAMS_CONTROLLER = exports.KEY_PARAMS_APP = exports.KEY_TYPE_SERVICE = exports.KEY_TYPE_ROUTE = exports.KEY_TYPE_MODULE = exports.KEY_TYPE_CONTROLLER = exports.KEY_TYPE_APP = void 0;
+exports.METADATA_STATE_KEYS = exports.METADATA_PARAMS_KEYS = exports.METADATA_METHOD_KEYS = exports.METADATA_STORE_KEYS = exports.METADATA_KEYS = exports.METADATA_HYPER_TYPE = exports.DESIGN_TYPE = exports.DESIGN_RETURNTYPE = exports.DESIGN_PARAMTYPES = exports.KEY_STATE_BY_PASS = exports.KEY_STATE_PREPARED = exports.KEY_STATE_CREATED = exports.KEY_STATE_UPDATED = exports.KEY_PARAMS_PASS = exports.KEY_PARAMS_ROLE = exports.KEY_PARAMS_SCOPE = exports.KEY_PARAMS_MIDDLEWARES = exports.KEY_PARAMS_PARAM = exports.KEY_PARAMS_ROUTE = exports.KEY_PARAMS_MODULE = exports.KEY_PARAMS_CONTROLLER = exports.KEY_PARAMS_APP = exports.KEY_TYPE_GUARD = exports.KEY_TYPE_SERVICE = exports.KEY_TYPE_ROUTE = exports.KEY_TYPE_MODULE = exports.KEY_TYPE_CONTROLLER = exports.KEY_TYPE_APP = void 0;
 //////////////////////////////
 /// Types constants
 //////////////////////////////
@@ -9,6 +9,7 @@ exports.KEY_TYPE_CONTROLLER = "hyper:type:controller";
 exports.KEY_TYPE_MODULE = "hyper:type:module";
 exports.KEY_TYPE_ROUTE = "hyper:type:route";
 exports.KEY_TYPE_SERVICE = "hyper:type:service";
+exports.KEY_TYPE_GUARD = "hyper:type:guard";
 //////////////////////////////
 /// Params constants
 //////////////////////////////

package/dist/__internals/store.d.ts

@@ -1,3 +1,21 @@
+import { MiddlewareHandler } from "hyper-express";
+import { RoleType, ScopeType } from "../decorators";
+interface HyperAppStoreItemBase {
+    middlewares: Set<MiddlewareHandler>;
+    roles: Set<RoleType>;
+    scopes: Set<ScopeType>;
+}
+interface HyperAppStoreRoute extends HyperAppStoreItemBase {
+    method: string;
+    path: string;
+    handler: string;
+}
+export interface HyperAppStoreController extends HyperAppStoreItemBase {
+    routes: Map<string, HyperAppStoreRoute>;
+}
+export interface HyperAppStoreModule {
+    controllers: Map<string, string>;
+}
 export default class HyperAppStore {
     private roles;
     private scopes;
@@ -8,3 +26,4 @@ export default class HyperAppStore {
     addRole(role: string): void;
     addModuleRole(module: string, role: string): void;
 }
+export {};

package/dist/__internals/transform/middleware.transform.d.ts

@@ -0,0 +1,3 @@
+import { MiddlewareHandler } from "hyper-express";
+import { MiddlewareType } from "../../decorators";
+export default function middlewareTransformer(list: MiddlewareType[]): MiddlewareHandler[];

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = middlewareTransformer;
+const tsyringe_1 = require("tsyringe");
+function middlewareTransformer(list) {
+    return list
+        .map((middleware) => {
+        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);
+}

package/dist/common/helpers/scopes.d.ts

@@ -16,8 +16,8 @@ export declare const getScopes: (request: Request) => string[] | undefined;
 /**
  * Check if request has required scopes
  *
- * @param request
- * @param scopes
- * @returns
+ * @param request - The incoming request
+ * @param scopes - Required scopes to check
+ * @returns `true` if the request has all required scopes, otherwise `false`
  */
 export declare const hasScopes: (request: Request, scopes: HyperScopeOptions) => boolean;

package/dist/common/helpers/scopes.js

@@ -33,15 +33,14 @@ exports.getScopes = getScopes;
 /**
  * Check if request has required scopes
  *
- * @param request
- * @param scopes
- * @returns
+ * @param request - The incoming request
+ * @param scopes - Required scopes to check
+ * @returns `true` if the request has all required scopes, otherwise `false`
  */
 const hasScopes = (request, scopes) => {
-    const requestScopes = (0, exports.getScopes)(request);
-    if (!requestScopes) {
-        return false;
-    }
-    return (0, object_util_1.$array)(scopes).every((scope) => requestScopes.includes(scope));
+    const requestScopes = new Set((0, exports.getScopes)(request) || []);
+    if (requestScopes.has("*"))
+        return true;
+    return (0, object_util_1.$array)(scopes).every(scope => requestScopes.has(scope));
 };
 exports.hasScopes = hasScopes;

package/dist/decorators/HyperApp.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HyperApp = void 0;
 require("reflect-metadata");
-const constants_1 = require("../__internals/constants");
 const hyper_express_1 = require("hyper-express");
+const constants_1 = require("../__internals/constants");
 const decorator_base_1 = require("../__internals/decorator-base");
 const path_util_1 = require("../__internals/utils/path.util");
 const scope_transfrom_1 = __importDefault(require("../__internals/transform/scope.transfrom"));
@@ -24,6 +24,7 @@ const object_util_1 = require("../__internals/utils/object.util");
 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"));
 /**
  * Decorator to define the main application class with assigned modules.
  * @param modules - List of modules to be used in the application.
@@ -89,6 +90,7 @@ const HyperApp = (options) => (0, decorator_base_1.DecoratorHelper)({
                 content.push("");
             });
             (_c = options.logger) === null || _c === void 0 ? void 0 : _c.call(this, content.join("\n"));
+            this.storeLogs = {};
         }
     };
 });
@@ -106,7 +108,7 @@ function getData(target) {
     const app = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_APP, target);
     const module = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_MODULE, target);
     const controller = (0, decorator_base_1.getDecorData)(constants_1.KEY_TYPE_CONTROLLER, target);
-    const middlewares = (_a = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_MIDDLEWARES, target)) !== null && _a !== void 0 ? _a : [];
+    const middlewares = (0, middleware_transform_1.default)((_a = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_MIDDLEWARES, target)) !== null && _a !== void 0 ? _a : []);
     const scopes = (_b = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_SCOPE, target)) !== null && _b !== void 0 ? _b : [];
     const roles = (_c = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_ROLE, target)) !== null && _c !== void 0 ? _c : [];
     const routes = (_d = (0, decorator_base_1.getDecorData)(constants_1.KEY_PARAMS_ROUTE, target)) !== null && _d !== void 0 ? _d : {

package/dist/decorators/Middleware.d.ts

@@ -1,10 +1,11 @@
 import "reflect-metadata";
 import { MiddlewareHandler } from "hyper-express";
+import { MiddlewareType } from "./types";
 /**
  * Middleware decorator to attach middleware to controllers, modules, and routes.
  */
 export declare const Middleware: {
-    (...middleware: MiddlewareHandler[]): ClassDecorator & MethodDecorator;
+    (...middleware: MiddlewareType[]): ClassDecorator & MethodDecorator;
     /**
      * Exclude middleware from matching paths.
      *

package/dist/decorators/types.d.ts

@@ -1,4 +1,4 @@
-import type { MiddlewareHandler, Request, Response, ServerConstructorOptions } from "hyper-express";
+import type { MiddlewareHandler, MiddlewareNext, Request, Response, ServerConstructorOptions } from "hyper-express";
 export type Constructor<R extends any = any> = new (...args: any[]) => R;
 export type ConstructorDecorator = (target: Constructor, kay?: any, descriptor?: PropertyDescriptor) => Constructor;
 export type HyperClassDecorator<T> = (options?: T) => ConstructorDecorator;
@@ -21,7 +21,9 @@ export interface HyperAppMetadata {
     imports?: Constructor[];
     options?: ServerConstructorOptions;
 }
-export type HyperAppDecorator = (options?: HyperAppMetadata) => (target: Constructor) => Constructor;
+export interface HyperAppDecorator {
+    (options?: HyperAppMetadata): (target: Constructor) => Constructor;
+}
 export type HyperModuleMetadata = {
     path: string;
     name?: string;
@@ -82,8 +84,14 @@ export interface RouteMetadata {
     propertyKey: string;
     handler: (...args: any[]) => any;
 }
+export declare abstract class MiddlewareClass {
+    abstract handle(req: Request, res: Response, next: MiddlewareNext): void;
+}
+export interface MiddlewareClassConstructor {
+    new (...args: any[]): MiddlewareClass;
+}
 /**
  * Type definition for Middleware.
  * Middleware can be a single handler or an array of handlers.
  */
-export type MiddlewareType = MiddlewareHandler | MiddlewareHandler[];
+export type MiddlewareType = MiddlewareHandler | MiddlewareClassConstructor;

package/dist/decorators/types.js

@@ -1,2 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MiddlewareClass = void 0;
+class MiddlewareClass {
+}
+exports.MiddlewareClass = MiddlewareClass;

package/dist/extension.js

@@ -18,6 +18,9 @@ const requestMethods = {
     setScopes(scopes) {
         (0, helpers_1.setScopes)(this, scopes);
     },
+    setFullScopes() {
+        (0, helpers_1.setScopes)(this, ["*"]);
+    },
     hasScopes(scopes) {
         return (0, helpers_1.hasScopes)(this, scopes);
     },
@@ -25,8 +28,8 @@ const requestMethods = {
         return (0, helpers_1.getScopes)(this);
     },
     setRoleScopes(role, scopes) {
-        this.setRole(role);
-        this.setScopes(scopes);
+        (0, helpers_1.setRole)(this, role);
+        (0, helpers_1.setScopes)(this, scopes);
     },
 };
 /////////////////////////////

package/hyper-express-decorators.d.ts

@@ -6,6 +6,7 @@ declare module "hyper-express" {
 
     getScopes(): string[] | undefined;
     setScopes(scopes: HyperScopeOptions): void;
+    setFullScopes(): void
 
     getRoles(): string[] | undefined;
     setRole(role: HyperRoleOptions): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenofolio/hyper-decor",
-  "version": "1.0.42",
+  "version": "1.0.45",
   "description": "Project core with utilities and features",
   "main": "dist/index.js",
   "author": "zenozaga",
@@ -24,10 +24,8 @@
     "typescript": "5.6.2"
   },
   "dependencies": {
-    "@zenofolio/hyper-decor": "file:",
     "core-decorators": "^0.20.0",
     "file-type": "^19.5.0",
-    "hyper-express-decorators": "file:",
     "reflect-metadata": "^0.2.2",
     "tsyringe": "^4.8.0"
   },
@@ -58,4 +56,4 @@
       "default": "./src/extension.ts"
     }
   }
-}
+}