@angular/ssr 22.2.2 → 22.2.4

package/fesm2022/ssr.mjs

@@ -1,4 +1,4 @@
-import { normalizeTrustProxyHeaders, sanitizeRequestHeaders, validateRequest } from './_validation-chunk.mjs';
+import { getFirstHeaderValue, normalizeTrustProxyHeaders, sanitizeRequestHeaders, validateRequest } from './_validation-chunk.mjs';
 import { APP_BASE_HREF, PlatformLocation } from '@angular/common';
 import { ɵConsole as _Console, ApplicationRef, REQUEST, makeEnvironmentProviders, provideEnvironmentInitializer, inject, InjectionToken, ɵENABLE_ROOT_COMPONENT_BOOTSTRAP as _ENABLE_ROOT_COMPONENT_BOOTSTRAP, Compiler, createEnvironmentInjector, EnvironmentInjector, runInInjectionContext, ɵresetCompiledComponents as _resetCompiledComponents, REQUEST_CONTEXT, RESPONSE_INIT, LOCALE_ID } from '@angular/core';
 import { platformServer, INITIAL_CONFIG, ɵSERVER_CONTEXT as _SERVER_CONTEXT, ɵrenderInternal as _renderInternal, provideServerRendering as provideServerRendering$1 } from '@angular/platform-server';
@@ -95,6 +95,7 @@ function stripIndexHtmlFromURL(url) {
   }
   return url;
 }
+const POSITIONAL_PLACEHOLDER_REGEXP = /^\*(\d+)$/;
 function buildPathWithParams(toPath, fromPath) {
   if (toPath[0] !== '/') {
     throw new Error(`Invalid toPath: The string must start with a '/'. Received: '${toPath}'`);
@@ -102,13 +103,35 @@ function buildPathWithParams(toPath, fromPath) {
   if (fromPath[0] !== '/') {
     throw new Error(`Invalid fromPath: The string must start with a '/'. Received: '${fromPath}'`);
   }
-  if (!toPath.includes('/*')) {
+  const [path] = toPath.split(/[?#]/, 1);
+  if (!path.includes('/*')) {
     return toPath;
   }
   const fromPathParts = fromPath.split('/');
-  const toPathParts = toPath.split('/');
-  const resolvedParts = toPathParts.map((part, index) => toPathParts[index] === '*' ? fromPathParts[index] : part);
-  return joinUrlParts(...resolvedParts);
+  const toPathParts = path.split('/');
+  const resolvedParts = toPathParts.map((part, index) => part === '*' ? fromPathParts[index] : part.replace(POSITIONAL_PLACEHOLDER_REGEXP, (_, position) => fromPathParts[position]));
+  return joinUrlParts(...resolvedParts) + toPath.slice(path.length);
+}
+function buildQueryWithParams(toUrl, fromParams) {
+  const [, path, query, fragment] = /^([^?#]*)\?([^#]*)(.*)$/.exec(toUrl) ?? [];
+  if (query === undefined) {
+    return toUrl;
+  }
+  const params = query.split('&');
+  const names = params.map(param => param.split('=', 1)[0]);
+  const resolvedQuery = params.map((param, index) => {
+    const name = names[index];
+    const value = param.slice(name.length + 1);
+    if (value[0] !== ':' || names.indexOf(name) !== names.lastIndexOf(name)) {
+      return param;
+    }
+    const sourceValues = fromParams.getAll(value.slice(1));
+    return (sourceValues.length ? sourceValues : ['undefined']).map(sourceValue => `${name}=${encodeQueryValue(sourceValue)}`).join('&');
+  }).join('&');
+  return `${path}?${resolvedQuery}${fragment}`;
+}
+function encodeQueryValue(value) {
+  return encodeURIComponent(value).replace(/%(40|3A|24|2C|3B)/g, match => decodeURIComponent(match));
 }
 const MATRIX_PARAMS_REGEX = /;[^/]+/g;
 function stripMatrixParams(pathname) {
@@ -158,9 +181,9 @@ async function renderAngular(html, bootstrap, url, platformProviders, serverCont
       hasNavigationError = false;
       const requestPrefix = envInjector.get(APP_BASE_HREF, null, {
         optional: true
-      }) ?? envInjector.get(REQUEST, null, {
+      }) ?? getFirstHeaderValue(envInjector.get(REQUEST, null, {
         optional: true
-      })?.headers.get('X-Forwarded-Prefix');
+      })?.headers.get('X-Forwarded-Prefix'));
       const {
         pathname,
         search,
@@ -348,7 +371,7 @@ function provideServerRendering(...args) {
     providers.push(...ɵproviders);
   }
   if (!hasServerRoutes && hasAppShell) {
-    throw new Error(`Configuration error: found 'withAppShell()' without 'withRoutes()' in the same call to 'provideServerRendering()'.` + `The 'withAppShell()' function requires 'withRoutes()' to be used.`);
+    throw new Error(`Configuration error: found 'withAppShell()' without 'withRoutes()' in the same call to 'provideServerRendering()'. ` + `The 'withAppShell()' function requires 'withRoutes()' to be used.`);
   }
   return makeEnvironmentProviders(providers);
 }
@@ -450,6 +473,8 @@ async function* handleRoute(options) {
     const {
       metadata,
       currentRoutePath,
+      parentRoute,
+      baseHref,
       route,
       compiler,
       parentInjector,
@@ -465,55 +490,75 @@ async function* handleRoute(options) {
       children,
       ɵentryName
     } = route;
-    if (ɵentryName && loadComponent) {
+    if (ɵentryName && (loadComponent || loadChildren)) {
       appendPreloadToMetadata(ɵentryName, entryPointToBrowserMapping, metadata);
     }
+    const parentRoutes = new Map();
     if (metadata.renderMode === RenderMode.Prerender) {
-      yield* handleSSGRoute(serverConfigRouteTree, typeof redirectTo === 'string' ? redirectTo : undefined, metadata, parentInjector, invokeGetPrerenderParams, includePrerenderFallbackRoutes);
+      for await (const result of handleSSGRoute(serverConfigRouteTree, route, parentRoute, baseHref, metadata, parentInjector, invokeGetPrerenderParams, includePrerenderFallbackRoutes)) {
+        if ('error' in result) {
+          yield result;
+        } else {
+          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') {
-        yield {
+        const routeSegments = joinUrlParts(baseHref, currentRoutePath).split('/');
+        parentRoutes.set(metadata.route, {
           ...metadata,
-          redirectTo: resolveRedirectTo(metadata.route, redirectTo)
-        };
+          redirectTo: resolveRedirectTo(parentRoute, replaceRedirectParams(route, redirectTo, parameter => `*${routeSegments.lastIndexOf(parameter)}`)),
+          relativeRedirect: redirectTo[0] !== '/' ? true : undefined
+        });
       } else {
-        yield metadata;
+        parentRoutes.set(metadata.route, metadata);
       }
     } else {
-      yield metadata;
-    }
-    if (children?.length) {
-      yield* traverseRoutesConfig({
-        ...options,
-        routes: children,
-        parentRoute: currentRoutePath,
-        parentPreloads: metadata.preload
-      });
+      parentRoutes.set(metadata.route, metadata);
     }
-    if (loadChildren) {
-      if (ɵentryName) {
-        appendPreloadToMetadata(ɵentryName, entryPointToBrowserMapping, metadata);
-      }
+    let childRoutes = children;
+    let childInjector = parentInjector;
+    if (!childRoutes?.length && loadChildren) {
       const routeInjector = route.providers ? createEnvironmentInjector(route.providers, parentInjector.get(EnvironmentInjector), `Route: ${route.path}`) : parentInjector;
       const loadedChildRoutes = await _loadChildren(route, compiler, routeInjector);
       if (loadedChildRoutes) {
-        const {
-          routes: childRoutes,
-          injector = routeInjector
-        } = loadedChildRoutes;
-        yield* traverseRoutesConfig({
-          ...options,
-          routes: childRoutes,
-          parentInjector: injector,
-          parentRoute: currentRoutePath,
-          parentPreloads: metadata.preload
-        });
+        childRoutes = loadedChildRoutes.routes;
+        childInjector = loadedChildRoutes.injector ?? routeInjector;
+      }
+    }
+    if (!childRoutes?.length) {
+      yield* parentRoutes.values();
+      return;
+    }
+    const childResults = [];
+    const overriddenParentRoutes = new Set();
+    const traverseChildRoutes = traverseRoutesConfig({
+      ...options,
+      routes: childRoutes,
+      parentInjector: childInjector,
+      parentRoute: currentRoutePath,
+      parentPreloads: metadata.preload
+    });
+    for await (const result of traverseChildRoutes) {
+      if ('error' in result) {
+        childResults.push(result);
+        continue;
+      }
+      if (parentRoutes.has(result.route)) {
+        if (!overriddenParentRoutes.has(result.route)) {
+          overriddenParentRoutes.add(result.route);
+          parentRoutes.set(result.route, result);
+        }
+      } else {
+        childResults.push(result);
       }
     }
+    yield* parentRoutes.values();
+    yield* childResults;
   } catch (error) {
     yield {
       error: `Error in handleRoute for '${options.currentRoutePath}': ${error.message}`
@@ -590,7 +635,7 @@ async function* traverseRoutesConfig(options) {
         renderMode: RenderMode.Prerender,
         ...matchedMetaData,
         preload: parentPreloads,
-        route: path === '' ? addTrailingSlash(currentRoutePath) : currentRoutePath,
+        route: currentRoutePath,
         presentInClientRouter: undefined
       },
       currentRoutePath,
@@ -616,7 +661,7 @@ function appendPreloadToMetadata(entryName, entryPointToBrowserMapping, metadata
   }
   metadata.preload = Array.from(combinedPreloads);
 }
-async function* handleSSGRoute(serverConfigRouteTree, redirectTo, metadata, parentInjector, invokeGetPrerenderParams, includePrerenderFallbackRoutes) {
+async function* handleSSGRoute(serverConfigRouteTree, route, parentRoute, baseHref, metadata, parentInjector, invokeGetPrerenderParams, includePrerenderFallbackRoutes) {
   if (metadata.renderMode !== RenderMode.Prerender) {
     throw new Error(`'handleSSGRoute' was called for a route which rendering mode is not prerender.`);
   }
@@ -629,8 +674,11 @@ async function* handleSSGRoute(serverConfigRouteTree, redirectTo, metadata, pare
   if ('getPrerenderParams' in meta) {
     delete meta['getPrerenderParams'];
   }
+  const redirectTo = typeof route.redirectTo === 'string' ? route.redirectTo : undefined;
   if (redirectTo !== undefined) {
-    meta.redirectTo = resolveRedirectTo(currentRoutePath, redirectTo);
+    const routeSegments = joinUrlParts(baseHref, currentRoutePath).split('/');
+    meta.redirectTo = resolveRedirectTo(parentRoute, replaceRedirectParams(route, redirectTo, parameter => `*${routeSegments.lastIndexOf(parameter)}`));
+    meta.relativeRedirect = redirectTo[0] !== '/' ? true : undefined;
   }
   const isCatchAllRoute = CATCH_ALL_REGEXP.test(currentRoutePath);
   if (isCatchAllRoute && !getPrerenderParams || !isCatchAllRoute && !URL_PARAMETER_REGEXP.test(currentRoutePath)) {
@@ -666,7 +714,7 @@ async function* handleSSGRoute(serverConfigRouteTree, redirectTo, metadata, pare
         yield {
           ...meta,
           route: routeWithResolvedParams,
-          redirectTo: redirectTo === undefined ? undefined : resolveRedirectTo(routeWithResolvedParams, redirectTo)
+          redirectTo: redirectTo === undefined ? undefined : resolveRedirectTo(parentRoute.replace(URL_PARAMETER_GLOBAL_REGEXP, replacer), replaceRedirectParams(route, redirectTo, parameter => params[parameter.slice(1)]))
         };
       }
     } catch (error) {
@@ -694,13 +742,29 @@ function handlePrerenderParamsReplacement(params, currentRoutePath) {
     return parameterName === '**' ? `/${value}` : value;
   };
 }
-function resolveRedirectTo(routePath, redirectTo) {
+function resolveRedirectTo(parentRoute, redirectTo) {
   if (redirectTo[0] === '/') {
     return redirectTo;
   }
-  const segments = routePath.replace(URL_PARAMETER_GLOBAL_REGEXP, '*').split('/');
-  segments.pop();
-  return joinUrlParts(...segments, redirectTo);
+  const [path] = redirectTo.split(/[?#]/, 1);
+  return joinUrlParts(parentRoute.replace(URL_PARAMETER_GLOBAL_REGEXP, '*'), path);
+}
+function replaceRedirectParams(route, redirectTo, resolve) {
+  if (route.matcher) {
+    return redirectTo;
+  }
+  const routeSegments = route.path?.split('/') ?? [];
+  const [path] = redirectTo.split(/[?#]/, 1);
+  const resolvedPath = path.split('/').map(segment => {
+    if (segment[0] !== ':') {
+      return segment;
+    }
+    if (!routeSegments.includes(segment)) {
+      throw new Error(`Cannot redirect to '${redirectTo}'. Cannot find '${segment}'.`);
+    }
+    return resolve(segment);
+  }).join('/');
+  return resolvedPath + redirectTo.slice(path.length);
 }
 function buildServerConfigRouteTree({
   routes,
@@ -800,6 +864,7 @@ async function getRoutesFromAngularRouterConfig(bootstrap, document, url, invoke
         compiler,
         parentInjector: injector,
         parentRoute: '',
+        baseHref,
         serverConfigRouteTree,
         invokeGetPrerenderParams,
         includePrerenderFallbackRoutes,
@@ -995,12 +1060,14 @@ class AngularServerApp {
     }
     const {
       redirectTo,
+      relativeRedirect,
       status,
       renderMode,
       headers
     } = matchedRoute;
     if (redirectTo !== undefined) {
-      return createRedirectResponse(joinUrlParts(request.headers.get('X-Forwarded-Prefix') ?? '', buildPathWithParams(redirectTo, url.pathname)), status, headers);
+      const location = joinUrlParts(getFirstHeaderValue(request.headers.get('X-Forwarded-Prefix')) ?? '', buildPathWithParams(redirectTo, url.pathname));
+      return createRedirectResponse(relativeRedirect ? location + url.search : buildQueryWithParams(location, url.searchParams), status, headers);
     }
     if (renderMode === RenderMode.Prerender) {
       const response = await this.handleServe(request, matchedRoute);
@@ -1341,7 +1408,7 @@ class AngularAppEngine {
     if (preferredLocale) {
       const subPath = supportedLocales[preferredLocale];
       if (subPath !== undefined) {
-        const prefix = request.headers.get('X-Forwarded-Prefix') ?? '';
+        const prefix = getFirstHeaderValue(request.headers.get('X-Forwarded-Prefix')) ?? '';
         return createRedirectResponse(joinUrlParts(prefix, pathname, subPath), 302, {
           'Vary': 'Accept-Language'
         });