fixup! fix(@angular/ssr): preserve trailing slashes in query and fragment of redirect URLs

Author: alan-agius4

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

@@ -100,14 +100,8 @@ export function addTrailingSlash(url: string): string {
 export function joinUrlParts(...parts: string[]): string {
   const normalizedParts: string[] = [];
   let suffix = '';
-  let len = parts.length;
 
-  while (len > 0 && parts[len - 1] === '') {
-    len--;
-  }
-
-  for (let i = 0; i < len; i++) {
-    const part = parts[i];
+  for (const part of parts) {
     if (part === '') {
       // Skip any empty parts
       continue;
@@ -116,15 +110,18 @@ export function joinUrlParts(...parts: string[]): string {
     let start = 0;
     let end = part.length;
 
-    if (i === len - 1) {
-      const queryIndex = part.indexOf('?');
-      const hashIndex = queryIndex === 0 ? -1 : part.indexOf('#');
-      const suffixIndex =
-        queryIndex !== -1 && (hashIndex === -1 || queryIndex < hashIndex) ? queryIndex : hashIndex;
-      if (suffixIndex !== -1) {
-        suffix = part.slice(suffixIndex);
-        end = suffixIndex;
-      }
+    const queryIndex = part.indexOf('?');
+    const hashIndex = part.indexOf('#');
+    const suffixIndex =
+      queryIndex === -1
+        ? hashIndex
+        : hashIndex === -1
+          ? queryIndex
+          : Math.min(queryIndex, hashIndex);
+
+    if (suffixIndex !== -1) {
+      suffix = part.slice(suffixIndex);
+      end = suffixIndex;
     }
 
     // Use "Pointers" to avoid intermediate slices