@tanstack/router-core 0.0.1-beta.157 → 0.0.1-beta.159

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/router-core",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.157",
+  "version": "0.0.1-beta.159",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -43,7 +43,7 @@
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
     "@gisatcz/cross-package-react-context": "^0.2.0",
-    "@tanstack/react-store": "0.0.1-beta.157"
+    "@tanstack/react-store": "0.0.1-beta.159"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js",

package/src/router.ts

@@ -74,7 +74,7 @@ export type RegisteredRouter = Register extends {
   router: infer TRouter extends AnyRouter
 }
   ? TRouter
-  : Router
+  : AnyRouter
 
 export interface LocationState {}
 
@@ -107,7 +107,7 @@ export type HydrationCtx = {
 }
 
 export interface RouteMatch<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TRoute extends AnyRoute = Route,
 > {
   id: string
@@ -182,16 +182,16 @@ export interface RouterOptions<
 }
 
 export interface RouterState<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   // TState extends LocationState = LocationState,
 > {
   status: 'idle' | 'pending'
   isFetching: boolean
-  matchesById: Record<string, RouteMatch<any, any>>
+  matchesById: Record<string, RouteMatch<TRouteTree, AnyRoute>>
   matchIds: string[]
   pendingMatchIds: string[]
-  matches: RouteMatch<any, any>[]
-  pendingMatches: RouteMatch<any, any>[]
+  matches: RouteMatch<TRouteTree, AnyRoute>[]
+  pendingMatches: RouteMatch<TRouteTree, AnyRoute>[]
   location: ParsedLocation<FullSearchSchema<TRouteTree>>
   resolvedLocation: ParsedLocation<FullSearchSchema<TRouteTree>>
   lastUpdated: number
@@ -250,7 +250,7 @@ export const componentTypes = [
 ] as const
 
 export class Router<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TDehydrated extends Record<string, any> = Record<string, any>,
 > {
   types!: {
@@ -641,43 +641,38 @@ export class Router<
       if (routeCursor) matchedRoutes.unshift(routeCursor)
     }
 
-    // Alright, by now we should have all of our
-    // matching routes and their param pairs, let's
-    // Turn them into actual `Match` objects and
-    // accumulate the params into a single params bag
-    let allParams = {}
-
     // Existing matches are matches that are already loaded along with
     // pending matches that are still loading
 
-    const matches = matchedRoutes.map((route) => {
-      let parsedParams
+    const parseErrors = matchedRoutes.map((route) => {
       let parsedParamsError
 
-      try {
-        parsedParams =
-          (route.options.parseParams as any)?.(routeParams!) ?? routeParams
-        // (typeof route.options.parseParams === 'object' &&
-        // route.options.parseParams.parse
-        //   ? route.options.parseParams.parse(routeParams)
-        //   : (route.options.parseParams as any)?.(routeParams!)) ?? routeParams
-      } catch (err: any) {
-        parsedParamsError = new PathParamError(err.message, {
-          cause: err,
-        })
+      if (route.options.parseParams) {
+        try {
+          const parsedParams = route.options.parseParams(routeParams)
+          // Add the parsed params to the accumulated params bag
+          Object.assign(routeParams, parsedParams)
+        } catch (err: any) {
+          parsedParamsError = new PathParamError(err.message, {
+            cause: err,
+          })
 
-        if (opts?.throwOnError) {
-          throw parsedParamsError
+          if (opts?.throwOnError) {
+            throw parsedParamsError
+          }
+
+          return parsedParamsError
         }
       }
 
-      // Add the parsed params to the accumulated params bag
-      Object.assign(allParams, parsedParams)
+      return
+    })
 
-      const interpolatedPath = interpolatePath(route.path, allParams)
+    const matches = matchedRoutes.map((route, index) => {
+      const interpolatedPath = interpolatePath(route.path, routeParams)
       const key = route.options.key
         ? route.options.key({
-            params: allParams,
+            params: routeParams,
             search: locationSearch,
           }) ?? ''
         : ''
@@ -685,7 +680,7 @@ export class Router<
       const stringifiedKey = key ? JSON.stringify(key) : ''
 
       const matchId =
-        interpolatePath(route.id, allParams, true) + stringifiedKey
+        interpolatePath(route.id, routeParams, true) + stringifiedKey
 
       // Waste not, want not. If we already have a match for this route,
       // reuse it. This is important for layout routes, which might stick
@@ -706,7 +701,7 @@ export class Router<
         id: matchId,
         key: stringifiedKey,
         routeId: route.id,
-        params: allParams,
+        params: routeParams,
         pathname: joinPaths([this.basepath, interpolatedPath]),
         updatedAt: Date.now(),
         invalidAt: Infinity,
@@ -717,7 +712,7 @@ export class Router<
         isFetching: false,
         invalid: false,
         error: undefined,
-        paramsError: parsedParamsError,
+        paramsError: parseErrors[index],
         searchError: undefined,
         loaderData: undefined,
         loadPromise: Promise.resolve(),
@@ -1129,7 +1124,7 @@ export class Router<
     preload,
     preloadDelay: userPreloadDelay,
     disabled,
-    state
+    state,
   }: LinkOptions<TRouteTree, TFrom, TTo>): LinkInfo => {
     // If this link simply reloads the current route,
     // make sure it has a new key so it will trigger a data refresh
@@ -1152,7 +1147,7 @@ export class Router<
       params,
       hash,
       replace,
-      state
+      state,
     }
 
     const next = this.buildNext(nextOpts)
@@ -1740,7 +1735,7 @@ function isCtrlEvent(e: MouseEvent) {
 export type AnyRedirect = Redirect<any, any, any>
 
 export type Redirect<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
 > = NavigateOptions<TRouteTree, TFrom, TTo> & {
@@ -1748,7 +1743,7 @@ export type Redirect<
 }
 
 export function redirect<
-  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
   TFrom extends RoutePaths<TRouteTree> = '/',
   TTo extends string = '',
 >(opts: Redirect<TRouteTree, TFrom, TTo>): Redirect<TRouteTree, TFrom, TTo> {