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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.253",
+  "version": "0.0.1-beta.255",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.253"
+    "@tanstack/history": "0.0.1-beta.255"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/routeInfo.ts

@@ -25,12 +25,12 @@ export type ParseRouteChildren<TRouteTree extends AnyRoute> =
     ? unknown extends TChildren
       ? never
       : TChildren extends AnyRoute[]
-      ? {
-          [TId in TChildren[number]['id'] as string]: ParseRoute<
-            TChildren[number]
-          >
-        }[string]
-      : never
+        ? {
+            [TId in TChildren[number]['id'] as string]: ParseRoute<
+              TChildren[number]
+            >
+          }[string]
+        : never
     : never
 
 export type RoutesById<TRouteTree extends AnyRoute> = {

package/src/router.ts

@@ -710,11 +710,14 @@ export class Router<
       matches?: AnyRouteMatch[],
     ): ParsedLocation => {
       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),
       )
@@ -761,9 +764,9 @@ export class Router<
       const preFilteredSearch = preSearchFilters?.length
         ? preSearchFilters?.reduce(
             (prev, next) => next(prev) as any,
-            from.search,
+            fromSearch,
           )
-        : from.search
+        : fromSearch
 
       // Then the link/navigate function
       const destSearch =
@@ -780,7 +783,7 @@ export class Router<
         ? 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)
 
@@ -1006,7 +1009,7 @@ export class Router<
         const parentMatch = matches[index - 1]
         const route = this.looseRoutesById[match.routeId]!
 
-        const handleError = (err: any, code: string) => {
+        const handleErrorAndRedirect = (err: any, code: string) => {
           err.routerCode = code
           firstBadMatchIndex = firstBadMatchIndex ?? index
 
@@ -1034,11 +1037,11 @@ export class Router<
 
         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 =
@@ -1059,6 +1062,10 @@ export class Router<
               cause: match.cause,
             })) ?? ({} as any)
 
+          if (isRedirect(beforeLoadContext)) {
+            throw beforeLoadContext
+          }
+
           const context = {
             ...parentContext,
             ...beforeLoadContext,
@@ -1069,7 +1076,7 @@ export class Router<
             context: replaceEqualDeep(match.context, context),
           }
         } catch (err) {
-          handleError(err, 'BEFORE_LOAD')
+          handleErrorAndRedirect(err, 'BEFORE_LOAD')
           break
         }
       }
@@ -1091,7 +1098,7 @@ export class Router<
           const parentMatchPromise = matchPromises[index - 1]
           const route = this.looseRoutesById[match.routeId]!
 
-          const handleIfRedirect = (err: any) => {
+          const handleErrorAndRedirect = (err: any) => {
             if (isRedirect(err)) {
               if (!preload) {
                 this.navigate(err as any)
@@ -1230,6 +1237,10 @@ export class Router<
               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))
               }
@@ -1247,13 +1258,13 @@ export class Router<
               }
             } 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 = {