framework-do-dede 5.5.4 → 5.5.6

package/README.md

@@ -218,6 +218,7 @@ vira:
 ### Middlewares
 
 Middlewares devem implementar `execute(input: Input<any>)`. Podem ser classe, factory ou instancia.
+Podem ser aplicados no controller (valem para todas as rotas) e/ou no método.
 
 ```ts
 import { Middleware, UseMiddleware, UseMiddlewares, Input } from './src';
@@ -228,7 +229,14 @@ class AuthMiddleware implements Middleware {
   }
 }
 
+class LoggerMiddleware implements Middleware {
+  async execute(input: Input<any>) {
+    input.context.logged = true;
+  }
+}
+
 @Controller('/secure')
+@UseMiddleware(LoggerMiddleware)
 class SecureController {
   @Get()
   @UseMiddleware(AuthMiddleware)

package/dist/application/controller.d.ts

@@ -31,8 +31,8 @@ export declare function Controller(basePath?: string): (target: any) => void;
 export declare function Tracing<R>(tracer: Tracer<R>): (target: any, propertyKey?: string) => void;
 export declare function Version(version: number): (target: any, propertyKey?: string) => void;
 export declare function PresetIgnore(ignorePrefix?: boolean, ignoreVersion?: boolean): (target: any, propertyKey?: string) => void;
-export declare function UseMiddleware(middlewareClass: MiddlewareDefinition): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
-export declare function UseMiddlewares(middlewareClasses: MiddlewareDefinition[]): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export declare function UseMiddleware(middlewareClass: MiddlewareDefinition): (target: any, propertyKey?: string, descriptor?: PropertyDescriptor) => void;
+export declare function UseMiddlewares(middlewareClasses: MiddlewareDefinition[]): (target: any, propertyKey?: string, descriptor?: PropertyDescriptor) => void;
 export declare function Post(config?: {
     path?: string;
     statusCode?: number;

package/dist/application/controller.js

@@ -52,15 +52,31 @@ export function UseMiddleware(middlewareClass) {
         if (typeof middlewareClass === 'function' && isClass(middlewareClass) && !middlewareClass.prototype?.execute) {
             throw new FrameworkError('Middleware must implement execute()');
         }
+        const metadataTarget = propertyKey ? target : target;
+        const metadataKey = propertyKey ?? undefined;
         if (typeof middlewareClass === 'function' && middlewareClass.prototype?.execute) {
-            const middlewares = Reflect.getMetadata('middlewares', target, propertyKey) || [];
+            const middlewares = metadataKey
+                ? Reflect.getMetadata('middlewares', metadataTarget, metadataKey) || []
+                : Reflect.getMetadata('middlewares', metadataTarget) || [];
             middlewares.push(middlewareClass);
-            Reflect.defineMetadata('middlewares', middlewares, target, propertyKey);
+            if (metadataKey) {
+                Reflect.defineMetadata('middlewares', middlewares, metadataTarget, metadataKey);
+            }
+            else {
+                Reflect.defineMetadata('middlewares', middlewares, metadataTarget);
+            }
             return;
         }
-        const middlewares = Reflect.getMetadata('middlewares', target, propertyKey) || [];
+        const middlewares = metadataKey
+            ? Reflect.getMetadata('middlewares', metadataTarget, metadataKey) || []
+            : Reflect.getMetadata('middlewares', metadataTarget) || [];
         middlewares.push(middlewareClass);
-        Reflect.defineMetadata('middlewares', middlewares, target, propertyKey);
+        if (metadataKey) {
+            Reflect.defineMetadata('middlewares', middlewares, metadataTarget, metadataKey);
+        }
+        else {
+            Reflect.defineMetadata('middlewares', middlewares, metadataTarget);
+        }
     };
 }
 export function UseMiddlewares(middlewareClasses) {
@@ -73,9 +89,18 @@ export function UseMiddlewares(middlewareClasses) {
                 throw new FrameworkError('Middleware must implement execute()');
             }
         }
-        const existingMiddlewares = Reflect.getMetadata('middlewares', target, propertyKey) || [];
+        const metadataTarget = propertyKey ? target : target;
+        const metadataKey = propertyKey ?? undefined;
+        const existingMiddlewares = metadataKey
+            ? Reflect.getMetadata('middlewares', metadataTarget, metadataKey) || []
+            : Reflect.getMetadata('middlewares', metadataTarget) || [];
         existingMiddlewares.push(...middlewareClasses);
-        Reflect.defineMetadata('middlewares', existingMiddlewares, target, propertyKey);
+        if (metadataKey) {
+            Reflect.defineMetadata('middlewares', existingMiddlewares, metadataTarget, metadataKey);
+        }
+        else {
+            Reflect.defineMetadata('middlewares', existingMiddlewares, metadataTarget);
+        }
     };
 }
 export function Post(config = {}) {

package/dist/http/controller.handler.js

@@ -98,10 +98,12 @@ export default class ControllerHandler {
             let tracer = Reflect.getMetadata('tracer', controller) || null;
             const controllerVersion = Reflect.getMetadata('version', controller);
             const controllerPresetIgnore = Reflect.getMetadata('presetIgnore', controller);
+            const controllerMiddlewares = Reflect.getMetadata('middlewares', controller) || [];
             const instance = new controller();
             for (const methodName of methodNames) {
                 const routeConfig = Reflect.getMetadata('route', controller.prototype, methodName);
-                const middlewares = Reflect.getMetadata('middlewares', controller.prototype, methodName);
+                const methodMiddlewares = Reflect.getMetadata('middlewares', controller.prototype, methodName) || [];
+                const middlewares = [...controllerMiddlewares, ...methodMiddlewares];
                 const responseType = Reflect.getMetadata('responseType', controller.prototype, methodName) || 'json';
                 tracer = Reflect.getMetadata('tracer', controller.prototype, methodName) || tracer;
                 const methodVersion = Reflect.getMetadata('version', controller.prototype, methodName);
@@ -128,7 +130,7 @@ export default class ControllerHandler {
                         tracer
                     },
                     responseType,
-                    middlewares: middlewares ? middlewares.map(middleware => this.resolveMiddleware(middleware)) : [],
+                    middlewares: middlewares.length ? middlewares.map(middleware => this.resolveMiddleware(middleware)) : [],
                 });
             }
         }

package/dist/http/http-server.js

@@ -28,9 +28,11 @@ export default class HttpServer {
     mountRoute(httpServerParams) {
         const params = httpServerParams.params?.map((param) => param.split('|')[0]);
         if (params && params.length > 0) {
-            const paramsMounted = params.map((v) => {
-                return v.includes('_') ? `${v.replace('_', '/')}` : `/:${v}`;
-            }).join('');
+            const routeSegments = httpServerParams.route.split('/');
+            const paramsMounted = params
+                .filter((v) => !routeSegments.includes(`:${v}`))
+                .map((v) => `/:${v}`)
+                .join('');
             return `${httpServerParams.route}${paramsMounted}`;
         }
         return httpServerParams.route;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-do-dede",
-  "version": "5.5.4",
+  "version": "5.5.6",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",