fixup! refactor(@angular/ssr): combine redirect URL parameter helpers and use DefaultUrlSerializer

Author: alan-agius4

packages/angular/ssr/src/routes/ng-routes.ts

@@ -178,12 +178,22 @@ async function* handleRoute(options: {
 
     const parentRoutes = new Map<string, RouteTreeNodeMetadata>();
 
+    if (typeof redirectTo === 'string') {
+      let routeSegments: string[] | undefined;
+      // Reference the route parameters by their position in the URL (see `buildUrlWithParams`).
+      metadata.redirectTo = resolveRedirectTo(parentRoute, route, redirectTo, (parameter) => {
+        routeSegments ??= joinUrlParts(baseHref, currentRoutePath).split('/');
+
+        return `*${routeSegments.lastIndexOf(parameter)}`;
+      });
+      metadata.relativeRedirect = redirectTo[0] !== '/' ? true : undefined;
+    }
+
     if (metadata.renderMode === RenderMode.Prerender) {
       for await (const result of handleSSGRoute(
         serverConfigRouteTree,
         route,
         parentRoute,
-        baseHref,
         metadata,
         parentInjector,
         invokeGetPrerenderParams,
@@ -195,28 +205,16 @@ async function* handleRoute(options: {
           parentRoutes.set(result.route, result);
         }
       }
-    } else if (redirectTo !== undefined) {
-      if (metadata.status && !isValidRedirectResponseCode(metadata.status)) {
-        yield {
-          error:
-            `The '${metadata.status}' status code is not a valid redirect response code. ` +
-            `Please use one of the following redirect response codes: ${[...VALID_REDIRECT_RESPONSE_CODES.values()].join(', ')}.`,
-        };
-      } else if (typeof redirectTo === 'string') {
-        let routeSegments: string[] | undefined;
-        parentRoutes.set(metadata.route, {
-          ...metadata,
-          // Reference the route parameters by their position in the URL (see `buildUrlWithParams`).
-          redirectTo: resolveRedirectTo(parentRoute, route, redirectTo, (parameter) => {
-            routeSegments ??= joinUrlParts(baseHref, currentRoutePath).split('/');
-
-            return `*${routeSegments.lastIndexOf(parameter)}`;
-          }),
-          relativeRedirect: redirectTo[0] !== '/' ? true : undefined,
-        });
-      } else {
-        parentRoutes.set(metadata.route, metadata);
-      }
+    } else if (
+      redirectTo !== undefined &&
+      metadata.status &&
+      !isValidRedirectResponseCode(metadata.status)
+    ) {
+      yield {
+        error:
+          `The '${metadata.status}' status code is not a valid redirect response code. ` +
+          `Please use one of the following redirect response codes: ${[...VALID_REDIRECT_RESPONSE_CODES.values()].join(', ')}.`,
+      };
     } else {
       parentRoutes.set(metadata.route, metadata);
     }
@@ -433,7 +431,6 @@ function appendPreloadToMetadata(
  * @param serverConfigRouteTree - The tree representing the server's routing setup.
  * @param route - The route configuration.
  * @param parentRoute - The path of the parent route.
- * @param baseHref - The base href of the application.
  * @param metadata - The metadata associated with the route tree node.
  * @param parentInjector - The dependency injection container for the parent route.
  * @param invokeGetPrerenderParams - A flag indicating whether to invoke the `getPrerenderParams` function.
@@ -444,7 +441,6 @@ async function* handleSSGRoute(
   serverConfigRouteTree: RouteTree<ServerConfigRouteTreeAdditionalMetadata> | undefined,
   route: Route,
   parentRoute: string,
-  baseHref: string,
   metadata: ServerConfigRouteTreeNodeMetadata,
   parentInjector: Injector,
   invokeGetPrerenderParams: boolean,
@@ -463,18 +459,6 @@ async function* handleSSGRoute(
     delete meta['getPrerenderParams'];
   }
 
-  const redirectTo = typeof route.redirectTo === 'string' ? route.redirectTo : undefined;
-  if (redirectTo !== undefined) {
-    let routeSegments: string[] | undefined;
-    // Reference the route parameters by their position in the URL (see `buildUrlWithParams`).
-    meta.redirectTo = resolveRedirectTo(parentRoute, route, redirectTo, (parameter) => {
-      routeSegments ??= joinUrlParts(baseHref, currentRoutePath).split('/');
-
-      return `*${routeSegments.lastIndexOf(parameter)}`;
-    });
-    meta.relativeRedirect = redirectTo[0] !== '/' ? true : undefined;
-  }
-
   const isCatchAllRoute = CATCH_ALL_REGEXP.test(currentRoutePath);
   if (
     (isCatchAllRoute && !getPrerenderParams) ||
@@ -516,6 +500,7 @@ async function* handleSSGRoute(
       }
     }
 
+    const redirectTo = typeof route.redirectTo === 'string' ? route.redirectTo : undefined;
     const parameters = await runInInjectionContext(parentInjector, () => getPrerenderParams());
     try {
       for (const params of parameters) {
@@ -607,6 +592,10 @@ function resolveRedirectTo(
   redirectTo: string,
   resolveParam: (parameter: string) => string,
 ): string {
+  if (redirectTo[0] === '/' && (route.matcher || !redirectTo.includes('/:'))) {
+    return redirectTo;
+  }
+
   const [path] = redirectTo.split(/[?#]/, 1);
   let resolvedPath = path;
 

packages/angular/ssr/src/utils/url.ts

@@ -164,7 +164,7 @@ let urlSerializer: DefaultUrlSerializer | undefined;
  * placeholders in the query of `toUrl` from `fromSearch`, matching Angular router redirect semantics.
  *
  * - Each `*` path segment is replaced with the segment at the same index in `fromPath`.
- * - Each `*<n>` path segment is replaced with the segment at index `n` in `fromPath`.
+ * - Each `*<n>` path segment is replaced with the 1-based segment at position `n` in `fromPath`.
  * - When `fromSearch` is provided, each query parameter whose value is `:name` is replaced with the
  *   values of `name` from `fromSearch`, or `undefined` if missing. Repeated query parameters are not
  *   resolved, matching the Angular router.
@@ -173,6 +173,13 @@ let urlSerializer: DefaultUrlSerializer | undefined;
  * @param fromPath - A base path string starting with `/` that provides segments for path placeholders.
  * @param fromSearch - Optional query string (e.g. `url.search`) that provides values for query placeholders.
  * @returns The URL with its path and query placeholders resolved.
+ *
+ * @example
+ * ```ts
+ * buildUrlWithParams('/*\/details', '/123/abc'); // '/123/details'
+ * buildUrlWithParams('/user/*2/*1', '/a/b'); // '/user/b/a'
+ * buildUrlWithParams('/find?q=:x', '/search', '?x=cats'); // '/find?q=cats'
+ * ```
  */
 export function buildUrlWithParams(toUrl: string, fromPath: string, fromSearch?: string): string {
   if (toUrl[0] !== '/') {
@@ -197,12 +204,14 @@ export function buildUrlWithParams(toUrl: string, fromPath: string, fromSearch?:
       ...path
         .split('/')
         .map((part, index) =>
-          part[0] === '*' ? fromPathParts[part.length === 1 ? index : +part.slice(1)] : part,
+          part[0] === '*'
+            ? (fromPathParts[part.length === 1 ? index : +part.slice(1)] ?? part)
+            : part,
         ),
     );
   }
 
-  if (fromSearch !== undefined && suffix.includes('=:')) {
+  if (fromSearch !== undefined && suffix[0] === '?' && suffix.includes('=:')) {
     urlSerializer ??= new DefaultUrlSerializer();
     const toTree = urlSerializer.parse(suffix);
     const actualParams = fromSearch ? urlSerializer.parse(fromSearch).queryParams : {};