Refactor route prefixing logic in RuntimeRoutesMapper

Refactor route handling to ensure secondary paths are prefixed correctly with the current app webroot. Update addRoute and addSecondary methods for better clarity and functionality.

Author: TDannhauer

src/RuntimeRoutesMapper.php

@@ -131,30 +131,29 @@ public function connect($first, $second = null, $third = null)
     /**
      * Prefix secondary route paths with the current app webroot.
      *
-     * buildRoute() already prefixes the primary URI; secondary paths added via
-     * withSecondaryRoute() are app-relative and need the same prefix for
-     * routematch(). We build the RouteBuilder here, prefix secondary Route
-     * objects, and pass the final array to the parent.
+     * buildRoute() already prefixes the primary URI; withSecondaryRoute() paths
+     * are app-relative. Prefix them on the builder before build() so Route's
+     * match regex (built in the constructor) uses the full path.
      */
     public function addRoute(RouteBuilder|Route|array $routeOrBuilder): void
     {
-        if ($this->currentAppPrefix === '') {
-            parent::addRoute($routeOrBuilder);
-            return;
+        if ($routeOrBuilder instanceof RouteBuilder && $this->currentAppPrefix !== '') {
+            $routeOrBuilder->prefixSecondaryPaths($this->currentAppPrefix);
         }
 
-        if ($routeOrBuilder instanceof RouteBuilder) {
-            $routeOrBuilder = $routeOrBuilder->build();
-        }
+        parent::addRoute($routeOrBuilder);
+    }
 
-        $routes = is_array($routeOrBuilder) ? $routeOrBuilder : [$routeOrBuilder];
-        foreach ($routes as $route) {
-            if ($route->secondary && !str_starts_with($route->routePath, $this->currentAppPrefix)) {
-                $route->routePath = $this->currentAppPrefix . '/' . ltrim($route->routePath, '/');
-            }
+    /**
+     * Prefix legacy addSecondary() paths with the current app webroot.
+     */
+    public function addSecondary(string $path, string $namedRoute): void
+    {
+        if ($this->currentAppPrefix !== '') {
+            $path = $this->currentAppPrefix . '/' . ltrim($path, '/');
         }
 
-        parent::addRoute($routes);
+        parent::addSecondary($path, $namedRoute);
     }
 
     /**