try fix alias

Author: ChiragAgg5k

src/Http/Http.php

@@ -648,7 +648,9 @@ public function execute(Route $route, Request $request): static
     {
         $arguments = [];
         $groups = $route->getGroups();
-        $pathValues = $route->getPathValues($request);
+
+        $preparedPath = Router::preparePath($route->getMatchedPath());
+        $pathValues = $route->getPathValues($request, $preparedPath[0]);
 
         try {
             if ($route->getHook()) {

src/Http/Route.php

@@ -30,7 +30,7 @@ class Route extends Hook
     /**
      * Path params.
      *
-     * @var array<string,string>
+     * @var array<string,array<string, string>>
      */
     protected array $pathParams = [];
 
@@ -48,13 +48,25 @@ class Route extends Hook
      */
     protected int $order;
 
+    protected string $matchedPath = '';
+
     public function __construct(string $method, string $path)
     {
+        parent::__construct();
         $this->path($path);
         $this->method = $method;
         $this->order = ++self::$counter;
-        $this->action = function (): void {
-        };
+    }
+
+    public function setMatchedPath(string $path): self
+    {
+        $this->matchedPath = $path;
+        return $this;
+    }
+
+    public function getMatchedPath(): string
+    {
+        return $this->matchedPath;
     }
 
     /**
@@ -143,23 +155,30 @@ public function getHook(): bool
      * @param int $index
      * @return void
      */
-    public function setPathParam(string $key, int $index): void
+    public function setPathParam(string $key, int $index, string $path = ''): void
     {
-        $this->pathParams[$key] = $index;
+        $this->pathParams[$path][$key] = $index;
     }
 
     /**
      * Get path params.
      *
      * @param \Utopia\Http\Request $request
+     * @param string $path
      * @return array
      */
-    public function getPathValues(Request $request): array
+    public function getPathValues(Request $request, string $path = ''): array
     {
         $pathValues = [];
         $parts = explode('/', ltrim($request->getURI(), '/'));
 
-        foreach ($this->pathParams as $key => $index) {
+        if (empty($path)) {
+            $pathParams = $this->pathParams[$path] ?? \array_values($this->pathParams)[0] ?? [];
+        } else {
+            $pathParams = $this->pathParams[$path] ?? [];
+        }
+
+        foreach ($pathParams as $key => $index) {
             if (array_key_exists($index, $parts)) {
                 $pathValues[$key] = $parts[$index];
             }

src/Http/Router.php

@@ -86,7 +86,7 @@ public static function addRoute(Route $route): void
         }
 
         foreach ($params as $key => $index) {
-            $route->setPathParam($key, $index);
+            $route->setPathParam($key, $index, $path);
         }
 
         self::$routes[$route->getMethod()][$path] = $route;
@@ -101,12 +101,16 @@ public static function addRoute(Route $route): void
      */
     public static function addRouteAlias(string $path, Route $route): void
     {
-        [$alias] = self::preparePath($path);
+        [$alias, $params] = self::preparePath($path);
 
         if (array_key_exists($alias, self::$routes[$route->getMethod()]) && !self::$allowOverride) {
             throw new Exception("Route for ({$route->getMethod()}:{$alias}) already registered.");
         }
 
+        foreach ($params as $key => $index) {
+            $route->setPathParam($key, $index, $alias);
+        }
+
         self::$routes[$route->getMethod()][$alias] = $route;
     }
 
@@ -123,7 +127,7 @@ public static function match(string $method, string $path): Route|null
             return null;
         }
 
-        $parts = array_values(array_filter(explode('/', $path)));
+        $parts = array_values(array_filter(explode('/', $path), fn ($segment) => $segment !== ''));
         $length = count($parts) - 1;
         $filteredParams = array_filter(self::$params, fn ($i) => $i <= $length);
 
@@ -138,7 +142,9 @@ public static function match(string $method, string $path): Route|null
             );
 
             if (array_key_exists($match, self::$routes[$method])) {
-                return self::$routes[$method][$match];
+                $route = self::$routes[$method][$match];
+                $route->setMatchedPath($match);
+                return $route;
             }
         }
 
@@ -147,7 +153,9 @@ public static function match(string $method, string $path): Route|null
          */
         $match = self::WILDCARD_TOKEN;
         if (array_key_exists($match, self::$routes[$method])) {
-            return self::$routes[$method][$match];
+            $route = self::$routes[$method][$match];
+            $route->setMatchedPath($match);
+            return $route;
         }
 
         /**
@@ -157,7 +165,9 @@ public static function match(string $method, string $path): Route|null
             $current = ($current ?? '') . "{$part}/";
             $match = $current . self::WILDCARD_TOKEN;
             if (array_key_exists($match, self::$routes[$method])) {
-                return self::$routes[$method][$match];
+                $route = self::$routes[$method][$match];
+                $route->setMatchedPath($match);
+                return $route;
             }
         }
 
@@ -192,7 +202,7 @@ protected static function combinations(array $set): iterable
      * @param string $path
      * @return array
      */
-    protected static function preparePath(string $path): array
+    public static function preparePath(string $path): array
     {
         $parts = array_values(array_filter(explode('/', $path)));
         $prepare = '';