refactor: add debug log for middleware execution

Author: thetutlage

src/define_middleware.ts

@@ -27,9 +27,9 @@ function middlewareReferenceBuilder(
   const handler = moduleImporter(middleware, 'handle').toHandleMethod()
   return function (...args: any[]) {
     return {
+      ...handler,
       name,
       args: args[0],
-      ...handler,
     }
   }
 }
@@ -55,7 +55,8 @@ export function defineNamedMiddleware<
       ) => {
         name: K
         args: Args[0]
-      } & ParsedGlobalMiddleware
+        handle: ParsedGlobalMiddleware['handle']
+      }
     }
   )
 }

src/router/route.ts

@@ -153,7 +153,7 @@ export class Route<Controller extends Constructor<any> = any> extends Macroable
       /**
        * The first item of the tuple is a class constructor
        */
-      if (is.class_(handler[0])) {
+      if (is.class(handler[0])) {
         return {
           reference: handler,
           ...moduleCaller(handler[0], (handler[1] || 'handle') as string).toHandleMethod(),

src/server/factories/middleware_handler.ts

@@ -12,12 +12,14 @@ import type { ContainerResolver } from '@adonisjs/fold'
 
 import type { HttpContext } from '../../http_context/main.js'
 import { ParsedGlobalMiddleware } from '../../types/middleware.js'
+import debug from '../../debug.js'
 
 /**
  * The middleware handler invokes the middleware functions.
  */
 export function middlewareHandler(resolver: ContainerResolver<any>, ctx: HttpContext) {
   return function (fn: ParsedGlobalMiddleware, next: NextFn) {
+    debug('executing middleware %s', fn.name)
     return fn.handle(resolver, ctx, next)
   }
 }

src/types/middleware.ts

@@ -44,6 +44,7 @@ export type MiddlewareFn = (ctx: HttpContext, next: NextFn) => any
  * Parsed global middleware
  */
 export type ParsedGlobalMiddleware = {
+  name?: string
   handle: (
     resolver: ContainerResolver<any>,
     ...args: [ctx: HttpContext, next: NextFn, params?: any]
@@ -53,7 +54,8 @@ export type ParsedGlobalMiddleware = {
 /**
  * Parsed named middleware
  */
-export type ParsedNamedMiddleware = ParsedGlobalMiddleware & {
+export type ParsedNamedMiddleware = {
   name: string
+  handle: ParsedGlobalMiddleware['handle']
   args: any
 }