@tanstack/router-core 1.157.16 → 1.157.18

package/dist/cjs/router.cjs

@@ -1104,6 +1104,11 @@ class RouterCore {
   get looseRoutesById() {
     return this.routesById;
   }
+  getParentContext(parentMatch) {
+    const parentMatchId = parentMatch?.id;
+    const parentContext = !parentMatchId ? this.options.context ?? void 0 : parentMatch.context ?? this.options.context ?? void 0;
+    return parentContext;
+  }
   matchRoutesInternal(next, opts) {
     const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
     const { foundRoute, routeParams, parsedParams } = matchedRoutesResult;
@@ -1123,27 +1128,24 @@ class RouterCore {
       }
     }
     const globalNotFoundRouteId = isGlobalNotFound ? findGlobalNotFoundRouteId(this.options.notFoundMode, matchedRoutes) : void 0;
-    const matches = [];
-    const getParentContext = (parentMatch) => {
-      const parentMatchId = parentMatch?.id;
-      const parentContext = !parentMatchId ? this.options.context ?? void 0 : parentMatch.context ?? this.options.context ?? void 0;
-      return parentContext;
-    };
-    matchedRoutes.forEach((route, index) => {
+    const matches = new Array(matchedRoutes.length);
+    for (let index = 0; index < matchedRoutes.length; index++) {
+      const route = matchedRoutes[index];
       const parentMatch = matches[index - 1];
-      const [preMatchSearch, strictMatchSearch, searchError] = (() => {
+      let preMatchSearch;
+      let strictMatchSearch;
+      let searchError;
+      {
         const parentSearch = parentMatch?.search ?? next.search;
         const parentStrictSearch = parentMatch?._strictSearch ?? void 0;
         try {
           const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? void 0;
-          return [
-            {
-              ...parentSearch,
-              ...strictSearch
-            },
-            { ...parentStrictSearch, ...strictSearch },
-            void 0
-          ];
+          preMatchSearch = {
+            ...parentSearch,
+            ...strictSearch
+          };
+          strictMatchSearch = { ...parentStrictSearch, ...strictSearch };
+          searchError = void 0;
         } catch (err) {
           let searchParamError = err;
           if (!(err instanceof SearchParamError)) {
@@ -1154,9 +1156,11 @@ class RouterCore {
           if (opts?.throwOnError) {
             throw searchParamError;
           }
-          return [parentSearch, {}, searchParamError];
+          preMatchSearch = parentSearch;
+          strictMatchSearch = {};
+          searchError = searchParamError;
         }
-      })();
+      }
       const loaderDeps = route.options.loaderDeps?.({
         search: preMatchSearch
       }) ?? "";
@@ -1249,20 +1253,21 @@ class RouterCore {
         match.globalNotFound = globalNotFoundRouteId === route.id;
       }
       match.searchError = searchError;
-      const parentContext = getParentContext(parentMatch);
+      const parentContext = this.getParentContext(parentMatch);
       match.context = {
         ...parentContext,
         ...match.__routeContext,
         ...match.__beforeLoadContext
       };
-      matches.push(match);
-    });
-    matches.forEach((match, index) => {
+      matches[index] = match;
+    }
+    for (let index = 0; index < matches.length; index++) {
+      const match = matches[index];
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
       if (!existingMatch) {
         const parentMatch = matches[index - 1];
-        const parentContext = getParentContext(parentMatch);
+        const parentContext = this.getParentContext(parentMatch);
         if (route.options.context) {
           const contextFnContext = {
             deps: match.loaderDeps,
@@ -1284,7 +1289,7 @@ class RouterCore {
           ...match.__beforeLoadContext
         };
       }
-    });
+    }
     return matches;
   }
   /**