fix(commandkit): middlewares run order

Author: notunderctrl

apps/website/docs/guide/02-commands/07-middlewares.mdx

@@ -89,7 +89,7 @@ export function beforeExecute(ctx: MiddlewareContext) {
 :::tip
 
 Middleware execution (both before and after) follows a hierarchy:
-directory-scoped middleware runs first, then command-specific
-middleware, and finally global middleware.
+command-scoped middlewares run first, then directory-scoped
+middlewares, and finally global middlewares.
 
 :::

packages/commandkit/src/app/router/CommandsRouter.ts

@@ -285,17 +285,30 @@ export class CommandsRouter {
   private applyMiddlewares() {
     this.commands.forEach((command) => {
       const commandPath = command.parentPath;
-      const samePathMiddlewares = Array.from(this.middlewares.values())
-        .filter((middleware) => {
-          if (middleware.global) return true;
-          if (middleware.command) return middleware.command === command.name;
-          return middleware.parentPath === commandPath;
-        })
+      const allMiddlewares = Array.from(this.middlewares.values());
+
+      const commandSpecificMiddlewares = allMiddlewares
+        .filter((middleware) => middleware.command === command.name)
+        .map((middleware) => middleware.id);
+
+      const directorySpecificMiddlewares = allMiddlewares
+        .filter(
+          (middleware) =>
+            !middleware.global &&
+            !middleware.command &&
+            middleware.parentPath === commandPath,
+        )
+        .map((middleware) => middleware.id);
+
+      const globalMiddlewares = allMiddlewares
+        .filter((middleware) => middleware.global)
         .map((middleware) => middleware.id);
 
-      command.middlewares = Array.from(
-        new Set([...command.middlewares, ...samePathMiddlewares]),
-      );
+      command.middlewares = [
+        ...commandSpecificMiddlewares,
+        ...directorySpecificMiddlewares,
+        ...globalMiddlewares,
+      ];
     });
   }