Emit correct middleware precedence

basketry · Oct 9, 2024 · 665c064 · 665c064
1 parent 323fb0a
commit 665c064
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/router-factory-factory.ts b/src/router-factory-factory.ts
@@ -59,7 +59,16 @@ function getMiddleware<
   if (!middleware) return [];
   const middlewareArray = Array.isArray(middleware) ? middleware : [middleware];
 
-  return middlewareArray.flatMap((m) => (m[name] ? m[name] : []));
+  return middlewareArray.flatMap((m) => {
+    const _exceptSwaggerUI =
+      m['_exceptSwaggerUI'] && name !== '_onlySwaggerUI'
+        ? m['_exceptSwaggerUI']
+        : [];
+
+    const base = m[name] ? m[name] : [];
+    const baseArray = Array.isArray(base) ? base : [base];
+    return [...baseArray, ..._exceptSwaggerUI];
+  });
 }
 
 /**
@@ -116,7 +125,6 @@ function getHandlers<TRequestHandler extends RequestHandler>(
   >(methodName: TName, defaultHandler: RequestHandler): RequestHandler[] {
     return [
       ...getMiddleware(middleware, methodName),
-      ...getMiddleware(middleware, '_exceptSwaggerUI'),
       ...getHandlers(handlerOverrides?.[methodName], defaultHandler),
     ];
   }`;

diff --git a/src/snapshot/v1/express/router-factory.ts b/src/snapshot/v1/express/router-factory.ts
@@ -41,7 +41,6 @@ export function getRouter({
   >(methodName: TName, defaultHandler: RequestHandler): RequestHandler[] {
     return [
       ...getMiddleware(middleware, methodName),
-      ...getMiddleware(middleware, '_exceptSwaggerUI'),
       ...getHandlers(handlerOverrides?.[methodName], defaultHandler),
     ];
   }
@@ -195,7 +194,16 @@ function getMiddleware<
   if (!middleware) return [];
   const middlewareArray = Array.isArray(middleware) ? middleware : [middleware];
 
-  return middlewareArray.flatMap((m) => (m[name] ? m[name] : []));
+  return middlewareArray.flatMap((m) => {
+    const _exceptSwaggerUI =
+      m['_exceptSwaggerUI'] && name !== '_onlySwaggerUI'
+        ? m['_exceptSwaggerUI']
+        : [];
+
+    const base = m[name] ? m[name] : [];
+    const baseArray = Array.isArray(base) ? base : [base];
+    return [...baseArray, ..._exceptSwaggerUI];
+  });
 }
 
 /**