@tanstack/react-router 0.0.1-beta.253 → 0.0.1-beta.255

package/build/umd/index.development.js

@@ -2224,9 +2224,10 @@
     buildLocation = opts => {
       const build = (dest = {}, matches) => {
         const from = this.latestLocation;
+        const fromSearch = (this.state.pendingMatches || this.state.matches).at(-1)?.search || from.search;
         const fromPathname = dest.from ?? from.pathname;
         let pathname = this.resolvePathWithBase(fromPathname, `${dest.to ?? ''}`);
-        const fromMatches = this.matchRoutes(fromPathname, from.search);
+        const fromMatches = this.matchRoutes(fromPathname, fromSearch);
         const stayingMatches = matches?.filter(d => fromMatches?.find(e => e.routeId === d.routeId));
         const prevParams = {
           ...last(fromMatches)?.params
@@ -2245,7 +2246,7 @@
         const postSearchFilters = stayingMatches?.map(match => this.looseRoutesById[match.routeId].options.postSearchFilters ?? []).flat().filter(Boolean) ?? [];
 
         // Pre filters first
-        const preFilteredSearch = preSearchFilters?.length ? preSearchFilters?.reduce((prev, next) => next(prev), from.search) : from.search;
+        const preFilteredSearch = preSearchFilters?.length ? preSearchFilters?.reduce((prev, next) => next(prev), fromSearch) : fromSearch;
 
         // Then the link/navigate function
         const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
@@ -2255,7 +2256,7 @@
 
         // Then post filters
         const postFilteredSearch = postSearchFilters?.length ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
-        const search = replaceEqualDeep(from.search, postFilteredSearch);
+        const search = replaceEqualDeep(fromSearch, postFilteredSearch);
         const searchStr = this.options.stringifySearch(search);
         const hash = dest.hash === true ? from.hash : dest.hash ? functionalUpdate(dest.hash, from.hash) : from.hash;
         const hashStr = hash ? `#${hash}` : '';
@@ -2420,7 +2421,7 @@
         for (let [index, match] of matches.entries()) {
           const parentMatch = matches[index - 1];
           const route = this.looseRoutesById[match.routeId];
-          const handleError = (err, code) => {
+          const handleErrorAndRedirect = (err, code) => {
             err.routerCode = code;
             firstBadMatchIndex = firstBadMatchIndex ?? index;
             if (isRedirect(err)) {
@@ -2443,10 +2444,10 @@
           };
           try {
             if (match.paramsError) {
-              handleError(match.paramsError, 'PARSE_PARAMS');
+              handleErrorAndRedirect(match.paramsError, 'PARSE_PARAMS');
             }
             if (match.searchError) {
-              handleError(match.searchError, 'VALIDATE_SEARCH');
+              handleErrorAndRedirect(match.searchError, 'VALIDATE_SEARCH');
             }
             const parentContext = parentMatch?.context ?? this.options.context ?? {};
             const beforeLoadContext = (await route.options.beforeLoad?.({
@@ -2464,6 +2465,9 @@
               buildLocation: this.buildLocation,
               cause: match.cause
             })) ?? {};
+            if (isRedirect(beforeLoadContext)) {
+              throw beforeLoadContext;
+            }
             const context = {
               ...parentContext,
               ...beforeLoadContext
@@ -2473,7 +2477,7 @@
               context: replaceEqualDeep(match.context, context)
             };
           } catch (err) {
-            handleError(err, 'BEFORE_LOAD');
+            handleErrorAndRedirect(err, 'BEFORE_LOAD');
             break;
           }
         }
@@ -2490,7 +2494,7 @@
         matchPromises.push((async () => {
           const parentMatchPromise = matchPromises[index - 1];
           const route = this.looseRoutesById[match.routeId];
-          const handleIfRedirect = err => {
+          const handleErrorAndRedirect = err => {
             if (isRedirect(err)) {
               if (!preload) {
                 this.navigate(err);
@@ -2592,6 +2596,9 @@
             try {
               const loaderData = await loadPromise;
               if (latestPromise = checkLatest()) return await latestPromise;
+              if (isRedirect(loaderData)) {
+                if (handleErrorAndRedirect(loaderData)) return;
+              }
               if (didShowPending && pendingMinMs) {
                 await new Promise(r => setTimeout(r, pendingMinMs));
               }
@@ -2607,12 +2614,12 @@
               };
             } catch (error) {
               if (latestPromise = checkLatest()) return await latestPromise;
-              if (handleIfRedirect(error)) return;
+              if (handleErrorAndRedirect(error)) return;
               try {
                 route.options.onError?.(error);
               } catch (onErrorError) {
                 error = onErrorError;
-                if (handleIfRedirect(onErrorError)) return;
+                if (handleErrorAndRedirect(onErrorError)) return;
               }
               matches[index] = match = {
                 ...match,