@tanstack/router-core 1.136.13 → 1.136.15

package/src/route.ts

@@ -14,7 +14,7 @@ import type {
   RouteMatch,
 } from './Matches'
 import type { RootRouteId } from './root'
-import type { ParseRoute, RouteById, RoutePaths } from './routeInfo'
+import type { ParseRoute, RouteById, RouteIds, RoutePaths } from './routeInfo'
 import type { AnyRouter, Register, RegisteredRouter, SSROption } from './router'
 import type { BuildLocationFn, NavigateFn } from './RouterProvider'
 import type {
@@ -1488,9 +1488,11 @@ export type ErrorComponentProps<TError = Error> = {
   info?: { componentStack: string }
   reset: () => void
 }
+
 export type NotFoundRouteProps = {
-  // TODO: Make sure this is `| null | undefined` (this is for global not-founds)
-  data: unknown
+  data?: unknown
+  isNotFound: boolean
+  routeId: RouteIds<RegisteredRouter['routeTree']>
 }
 
 export class BaseRoute<

package/src/router.ts

@@ -1388,7 +1388,7 @@ export class RouterCore<
 
       const strictParams = existingMatch?._strictParams ?? usedParams
 
-      let paramsError: PathParamError | undefined = undefined
+      let paramsError: unknown = undefined
 
       if (!existingMatch) {
         const strictParseParams =
@@ -1401,9 +1401,13 @@ export class RouterCore<
               strictParseParams(strictParams as Record<string, string>),
             )
           } catch (err: any) {
-            paramsError = new PathParamError(err.message, {
-              cause: err,
-            })
+            if (isNotFound(err) || isRedirect(err)) {
+              paramsError = err
+            } else {
+              paramsError = new PathParamError(err.message, {
+                cause: err,
+              })
+            }
 
             if (opts?.throwOnError) {
               throw paramsError