Improve middleware extendability on implementation

index.d.ts

@@ -19,13 +19,12 @@ export abstract class Middleware {
   /**
    * Returns a function that have access to the request object,
    * the response object, and the next middleware function.
+   * @param routeMetadata - A route metadata
    */
-  abstract getHandler(): Promise<RouteHandler>;
-  getRegisterCondition(): MiddlewareCondition;
+  abstract getHandler(routeMetadata: RouteMetadata): Promise<RouteHandler>;
+  getRegisterCondition(routeMethod: Methods, routeMetadata: RouteMetadata): boolean;
 }
 
-export type MiddlewareCondition = (routeMethod: Methods, routeMetadata: RouteMetadata) => boolean;
-
 export class ControllerRegistry {
   constructor(app: Express);
   /**

lib/controllers/ControllerRegistry.js

@@ -28,10 +28,10 @@ class ControllerRegistry {
 
       const registerMiddleware = (middleware) => {
         const canRegisterMiddleware = middleware
-          .getRegisterCondition()(routeMethod, routeMetadata);
+          .getRegisterCondition(routeMethod, routeMetadata);
 
         if (canRegisterMiddleware) {
-          return middleware;
+          return middleware.getHandler(routeMetadata);
         }
       };
 

lib/controllers/Middleware.js

@@ -8,7 +8,7 @@ class Middleware {
     }
   }
 
-  async getHandler() {
+  async getHandler(routeMetadata) {
     throw new Error("Method 'getHandler()' must be implemented.");
   }
 

test/mock/MockMiddleware.ts

@@ -1,4 +1,4 @@
-import { Middleware, MiddlewareCondition, RouteHandler } from '../..';
+import { Methods, Middleware, RouteHandler, RouteMetadata } from '../..';
 
 export class MockMiddleware extends Middleware {
 
@@ -18,10 +18,8 @@ export class MockConditionalMiddleware extends Middleware {
     };
   }
 
-  public getRegisterCondition(): MiddlewareCondition {
-    return (routeMethod, routeMetadata) => {
-      return routeMetadata.path === '/test2';
-    };
+  public getRegisterCondition(routeMethod: Methods, routeMetadata: RouteMetadata): boolean {
+    return routeMetadata.path === '/test2';
   }
 
 }