feat(core): add middleware priority and discovery (#1109)

Author: brendt

src/Tempest/Auth/src/AuthBootstrap.php

@@ -5,13 +5,15 @@
 namespace Tempest\Auth;
 
 use Tempest\Container\Container;
+use Tempest\Core\Priority;
 use Tempest\Router\HttpMiddleware;
 use Tempest\Router\HttpMiddlewareCallable;
 use Tempest\Router\MatchedRoute;
 use Tempest\Router\Request;
 use Tempest\Router\Response;
 use Tempest\Router\Responses\Forbidden;
 
+#[Priority(Priority::HIGHEST)]
 final readonly class AuthorizerMiddleware implements HttpMiddleware
 {
     public function __construct(

src/Tempest/Auth/src/AuthorizerMiddleware.php

@@ -5,23 +5,16 @@
 namespace Tempest\CommandBus;
 
 use Symfony\Component\Uid\Uuid;
-use Tempest\Core\KernelEvent;
-use Tempest\EventBus\EventHandler;
+use Tempest\Core\Priority;
 use Tempest\Reflection\ClassReflector;
 
+#[Priority(Priority::FRAMEWORK)]
 final readonly class AsyncCommandMiddleware implements CommandBusMiddleware
 {
     public function __construct(
-        private CommandBusConfig $commandBusConfig,
         private CommandRepository $repository,
     ) {}
 
-    #[EventHandler(KernelEvent::BOOTED)]
-    public function onBooted(): void
-    {
-        $this->commandBusConfig->addMiddleware(self::class);
-    }
-
     public function __invoke(object $command, CommandBusMiddlewareCallable $next): void
     {
         $reflector = new ClassReflector($command);

src/Tempest/CommandBus/src/AsyncCommandMiddleware.php

@@ -5,6 +5,7 @@
 namespace Tempest\CommandBus;
 
 use Tempest\CommandBus\AsyncCommandRepositories\FileCommandRepository;
+use Tempest\Core\Middleware;
 use Tempest\Reflection\MethodReflector;
 
 final class CommandBusConfig
@@ -13,8 +14,8 @@ public function __construct(
         /** @var \Tempest\CommandBus\CommandHandler[] */
         public array $handlers = [],
 
-        /** @var array<array-key, class-string<\Tempest\CommandBus\CommandBusMiddleware>> */
-        public array $middleware = [],
+        /** @var Middleware<\Tempest\CommandBus\CommandBusMiddleware> */
+        public Middleware $middleware = new Middleware(),
 
         /** @var class-string<\Tempest\CommandBus\CommandRepository> $commandRepositoryClass */
         public string $commandRepositoryClass = FileCommandRepository::class,
@@ -35,12 +36,4 @@ public function addHandler(CommandHandler $commandHandler, string $commandName,
 
         return $this;
     }
-
-    /** @param class-string<\Tempest\CommandBus\CommandBusMiddleware> $middlewareClass */
-    public function addMiddleware(string $middlewareClass): self
-    {
-        $this->middleware[] = $middlewareClass;
-
-        return $this;
-    }
 }

src/Tempest/CommandBus/src/CommandBusConfig.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tempest\CommandBus;
+
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class CommandBusMiddlewareDiscovery implements Discovery
+{
+    use IsDiscovery;
+
+    public function __construct(
+        private readonly CommandBusConfig $commandBusConfig,
+    ) {}
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+        if ($class->implements(CommandBusMiddleware::class)) {
+            $this->discoveryItems->add($location, $class->getName());
+        }
+    }
+
+    public function apply(): void
+    {
+        $this->commandBusConfig->middleware->add(...$this->discoveryItems);
+    }
+}

src/Tempest/CommandBus/src/CommandBusMiddlewareDiscovery.php

@@ -42,9 +42,9 @@ private function getCallable(CommandHandler $commandHandler): CommandBusMiddlewa
 
         $middlewareStack = $this->commandBusConfig->middleware;
 
-        while ($middlewareClass = array_pop($middlewareStack)) {
+        foreach ($middlewareStack->unwrap() as $middlewareClass) {
             $callable = new CommandBusMiddlewareCallable(
-                fn (object $command) => $this->container->get($middlewareClass)($command, $callable),
+                fn (object $command) => $this->container->get($middlewareClass->getName())($command, $callable),
             );
         }
 

src/Tempest/CommandBus/src/GenericCommandBus.php

@@ -68,11 +68,14 @@ private function getCallable(array $commandMiddleware): ConsoleMiddlewareCallabl
             return $exitCode ?? ExitCode::SUCCESS;
         });
 
-        $middlewareStack = [...$this->consoleConfig->middleware, ...$commandMiddleware];
+        $middleware = $this->consoleConfig
+            ->middleware
+            ->clone()
+            ->add(...$commandMiddleware);
 
-        while ($middlewareClass = array_pop($middlewareStack)) {
+        foreach ($middleware->unwrap() as $middlewareClass) {
             $callable = new ConsoleMiddlewareCallable(
-                fn (Invocation $invocation) => $this->container->get($middlewareClass)($invocation, $callable),
+                fn (Invocation $invocation) => $this->container->get($middlewareClass->getName())($invocation, $callable),
             );
         }
 

src/Tempest/Console/src/Actions/ExecuteConsoleCommand.php

@@ -9,6 +9,7 @@
 use Tempest\Console\Middleware\InvalidCommandMiddleware;
 use Tempest\Console\Middleware\OverviewMiddleware;
 use Tempest\Console\Middleware\ResolveOrRescueMiddleware;
+use Tempest\Core\Middleware;
 use Tempest\Reflection\MethodReflector;
 
 final class ConsoleConfig
@@ -20,14 +21,8 @@ public function __construct(
         public array $commands = [],
         public ?string $logPath = null,
 
-        /** @var array<array-key, class-string<\Tempest\Console\ConsoleMiddleware>> */
-        public array $middleware = [
-            OverviewMiddleware::class,
-            ConsoleExceptionMiddleware::class,
-            ResolveOrRescueMiddleware::class,
-            InvalidCommandMiddleware::class,
-            HelpMiddleware::class,
-        ],
+        /** @var Middleware<\Tempest\Console\ConsoleMiddleware> */
+        public Middleware $middleware = new Middleware(),
     ) {}
 
     public function addCommand(MethodReflector $handler, ConsoleCommand $consoleCommand): self

src/Tempest/Console/src/ConsoleConfig.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Tempest\Console\Discovery;
+
+use Tempest\Console\ConsoleConfig;
+use Tempest\Console\ConsoleMiddleware;
+use Tempest\Discovery\Discovery;
+use Tempest\Discovery\DiscoveryLocation;
+use Tempest\Discovery\IsDiscovery;
+use Tempest\Reflection\ClassReflector;
+
+final class ConsoleMiddlewareDiscovery implements Discovery
+{
+    use IsDiscovery;
+
+    public function __construct(
+        private readonly ConsoleConfig $consoleConfig,
+    ) {}
+
+    public function discover(DiscoveryLocation $location, ClassReflector $class): void
+    {
+        if ($class->implements(ConsoleMiddleware::class)) {
+            $this->discoveryItems->add($location, $class->getName());
+        }
+    }
+
+    public function apply(): void
+    {
+        $this->consoleConfig->middleware->add(...$this->discoveryItems);
+    }
+}

src/Tempest/Console/src/Discovery/ConsoleMiddlewareDiscovery.php

@@ -10,7 +10,9 @@
 use Tempest\Console\ExitCode;
 use Tempest\Console\Initializers\Invocation;
 use Tempest\Core\AppConfig;
+use Tempest\Discovery\DoNotDiscover;
 
+#[DoNotDiscover]
 final readonly class CautionMiddleware implements ConsoleMiddleware
 {
     public function __construct(