wip

Author: brendt

packages/router/src/Prefix.php

@@ -13,7 +13,7 @@
 final readonly class Prefix implements RouteDecorator
 {
     public function __construct(
-        private string $prefix,
+        public string $prefix,
     ) {}
 
     public function decorate(Route $route): Route

packages/router/src/RouteDiscovery.php

@@ -27,8 +27,8 @@ public function discover(DiscoveryLocation $location, ClassReflector $class): vo
 
             foreach ($routeAttributes as $routeAttribute) {
                 $decorators = [
-                    ...$method->getDeclaringClass()->getAttributes(RouteDecorator::class),
                     ...$method->getAttributes(RouteDecorator::class),
+                    ...$method->getDeclaringClass()->getAttributes(RouteDecorator::class),
                 ];
 
                 $route = DiscoveredRoute::fromRoute($routeAttribute, $decorators, $method);

packages/router/src/UriGenerator.php

@@ -19,6 +19,7 @@
 use Tempest\Support\Regex;
 use Tempest\Support\Str;
 
+use function Tempest\Support\path;
 use function Tempest\Support\str;
 
 final class UriGenerator
@@ -41,7 +42,7 @@ public function hasValidSignature(Request $request): bool
             return false;
         }
 
-        if ($expiresAt !== null && is_numeric($expiresAt) && DateTime::fromTimestamp((int) $expiresAt)->isPast()) {
+        if ($expiresAt !== null && is_numeric($expiresAt) && DateTime::fromTimestamp((int)$expiresAt)->isPast()) {
             return false;
         }
 
@@ -74,7 +75,7 @@ public function createTemporarySignedUri(array|string|MethodReflector $action, D
         }
 
         if ($duration instanceof Duration) {
-            $duration = DateTime::now()->plusMilliseconds((int) $duration->getTotalMilliseconds());
+            $duration = DateTime::now()->plusMilliseconds((int)$duration->getTotalMilliseconds());
         }
 
         return $this->createSignedUri($uri, ...[
@@ -149,7 +150,7 @@ public function createUri(array|string|MethodReflector $action, mixed ...$params
 
             $uri = $uri->replaceRegex(
                 regex: '#\{' . $key . DiscoveredRoute::ROUTE_PARAM_CUSTOM_REGEX . '\}#',
-                replace: (string) $value,
+                replace: (string)$value,
             );
         }
 
@@ -206,14 +207,24 @@ private function normalizeActionToUri(array|string|MethodReflector $action): str
 
         [$controllerClass, $controllerMethod] = is_array($action) ? $action : [$action, '__invoke'];
 
-        $routeAttribute = new ClassReflector($controllerClass)
-            ->getMethod($controllerMethod)
-            ->getAttribute(Route::class);
+        $method = new ClassReflector($controllerClass)->getMethod($controllerMethod);
+
+        $routeAttribute = $method->getAttribute(Route::class);
 
         if ($routeAttribute === null) {
             throw new ControllerMethodHadNoRouteAttribute($controllerClass, $controllerMethod);
         }
 
-        return Str\ensure_starts_with($routeAttribute->uri, '/');
+        $parts = array_map(
+            fn (Prefix $prefix) => $prefix->prefix,
+            array_filter([
+                $method->getDeclaringClass()->getAttribute(Prefix::class),
+                $method->getAttribute(Prefix::class),
+            ]),
+        );
+
+        $parts[] = $routeAttribute->uri;
+
+        return Str\ensure_starts_with(path(...$parts)->toString(), '/');
     }
 }

tests/Fixtures/Controllers/PrefixController.php

@@ -9,7 +9,7 @@
 #[Prefix('/prefix')]
 final class PrefixController
 {
-    #[Get('/endpoint')]
+    #[Prefix('/methodPrefix'), Get('/endpoint')]
     public function __invoke(): Ok
     {
         return new Ok();

tests/Integration/Route/RouterTest.php

@@ -272,7 +272,7 @@ public function test_stateless_decorator(): void
     public function test_prefix_decorator(): void
     {
         $this->http
-            ->get('/prefix/endpoint')
+            ->get('/prefix/methodPrefix/endpoint')
             ->assertOk();
     }
 

tests/Integration/Route/UriGeneratorTest.php

@@ -13,6 +13,7 @@
 use Tempest\Router\UriGenerator;
 use Tests\Tempest\Fixtures\Controllers\ControllerWithEnumBinding;
 use Tests\Tempest\Fixtures\Controllers\EnumForController;
+use Tests\Tempest\Fixtures\Controllers\PrefixController;
 use Tests\Tempest\Fixtures\Controllers\TestController;
 use Tests\Tempest\Fixtures\Controllers\UriGeneratorController;
 use Tests\Tempest\Fixtures\Modules\Books\BookController;
@@ -47,6 +48,14 @@ public function generates_uri(): void
         $this->assertEquals('https://test.com/test/1/a/b/c/d', $this->generator->createUri([TestController::class, 'withCustomRegexParams'], id: 1, name: 'a/b/c/d'));
     }
 
+    #[Test]
+    public function test_generate_uri_with_prefix_decorator(): void
+    {
+        $uri = uri(PrefixController::class);
+
+        $this->assertSame('/prefix/methodPrefix/endpoint', $uri);
+    }
+
     #[Test]
     public function uri_functions(): void
     {