fix(express): added fix to handle arrow functions as middlewares (#132)

serhiisol · Jan 30, 2023 · 87d8c72 · 87d8c72
1 parent 03f7c58
commit 87d8c72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/express/package.json b/express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decorators/express",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "node decorators - decorators for express library",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/express/src/middleware.ts b/express/src/middleware.ts
@@ -46,22 +46,21 @@ function invokeMiddleware(
   args: Parameters<MiddlewareFunction> | Parameters<ErrorMiddlewareFunction>,
 ) {
   const next = args[args.length - 1] as NextFunction;
-  let instance: InstanceType<Type<MiddlewareClass | ErrorMiddlewareClass>>;
 
   try {
-    instance = Container.get(middleware as InjectionToken);
-  } catch {
-    try {
-      instance = new (middleware as Type<MiddlewareClass | ErrorMiddlewareClass>)(...args);
-    } catch (err) {
-      next(err);
+    let instance: MiddlewareClass | ErrorMiddlewareClass | MiddlewareFunction;
 
-      return;
+    if (typeof middleware === 'function') {
+      if (middleware.prototype?.use) {
+        instance = new (middleware as Type<MiddlewareClass | ErrorMiddlewareClass>)(...args);
+      } else {
+        instance = middleware as MiddlewareFunction;
+      }
+    } else {
+      instance = Container.get(middleware);
     }
-  }
 
-  try {
-    const handler = instance.use ?? instance;
+    const handler = (instance as MiddlewareClass | ErrorMiddlewareClass)?.use ?? instance;
     const result = typeof handler === 'function' ? handler.apply(instance, args) : instance;
 
     if (result instanceof Promise) {