@tanstack/react-router 1.77.7 → 1.77.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-router",
-  "version": "1.77.7",
+  "version": "1.77.9",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/fileRoute.ts

@@ -100,6 +100,7 @@ export class FileRoute<
   >(
     options?: FileBaseRouteOptions<
       TParentRoute,
+      TId,
       TPath,
       TSearchValidator,
       TParams,
@@ -161,6 +162,7 @@ export function FileRouteLoader<
     TLoaderFn,
     RouteLoaderFn<
       TRoute['parentRoute'],
+      TRoute['types']['id'],
       TRoute['types']['params'],
       TRoute['types']['loaderDeps'],
       TRoute['types']['routerContext'],

package/src/index.tsx

@@ -73,6 +73,7 @@ export type {
   ActiveLinkOptions,
   LinkProps,
   LinkComponent,
+  LinkComponentProps,
   CreateLinkProps,
   MakeOptionalPathParams,
 } from './link'

package/src/route.ts

@@ -57,6 +57,7 @@ export type RoutePathOptionsIntersection<TCustomId, TPath> = {
 
 export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
+  TId extends string = string,
   TCustomId extends string = string,
   TFullPath extends string = string,
   TPath extends string = string,
@@ -69,6 +70,7 @@ export type RouteOptions<
   TBeforeLoadFn = AnyContext,
 > = BaseRouteOptions<
   TParentRoute,
+  TId,
   TCustomId,
   TPath,
   TSearchValidator,
@@ -173,6 +175,7 @@ export type BeforeLoadFn<
 
 export type FileBaseRouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
+  TId extends string = string,
   TPath extends string = string,
   TSearchValidator = undefined,
   TParams = {},
@@ -193,6 +196,7 @@ export type FileBaseRouteOptions<
     | ((
         match: LoaderFnContext<
           TParentRoute,
+          TId,
           TParams,
           TLoaderDeps,
           TRouterContext,
@@ -239,6 +243,7 @@ export type FileBaseRouteOptions<
     (
       ctx: LoaderFnContext<
         TParentRoute,
+        TId,
         TParams,
         TLoaderDeps,
         TRouterContext,
@@ -251,6 +256,7 @@ export type FileBaseRouteOptions<
 
 export type BaseRouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
+  TId extends string = string,
   TCustomId extends string = string,
   TPath extends string = string,
   TSearchValidator = undefined,
@@ -263,6 +269,7 @@ export type BaseRouteOptions<
 > = RoutePathOptions<TCustomId, TPath> &
   FileBaseRouteOptions<
     TParentRoute,
+    TId,
     TPath,
     TSearchValidator,
     TParams,
@@ -555,6 +562,7 @@ export type DefaultSearchValidator = SearchValidator<
 
 export type RouteLoaderFn<
   in out TParentRoute extends AnyRoute = AnyRoute,
+  in out TId extends string = string,
   in out TParams = {},
   in out TLoaderDeps = {},
   in out TRouterContext = {},
@@ -563,6 +571,7 @@ export type RouteLoaderFn<
 > = (
   match: LoaderFnContext<
     TParentRoute,
+    TId,
     TParams,
     TLoaderDeps,
     TRouterContext,
@@ -573,6 +582,7 @@ export type RouteLoaderFn<
 
 export interface LoaderFnContext<
   in out TParentRoute extends AnyRoute = AnyRoute,
+  in out TId extends string = string,
   in out TParams = {},
   in out TLoaderDeps = {},
   in out TRouterContext = {},
@@ -596,7 +606,10 @@ export interface LoaderFnContext<
    * @deprecated Use `throw redirect({ to: '/somewhere' })` instead
    **/
   navigate: (opts: NavigateOptions<AnyRouter>) => Promise<void>
-  parentMatchPromise?: Promise<MakeRouteMatchFromRoute<TParentRoute>>
+  // root route does not have a parent match
+  parentMatchPromise: TId extends RootRouteId
+    ? never
+    : Promise<MakeRouteMatchFromRoute<TParentRoute>>
   cause: 'preload' | 'enter' | 'stay'
   route: Route
 }
@@ -925,6 +938,7 @@ export class Route<
   isRoot: TParentRoute extends Route<any> ? true : false
   options: RouteOptions<
     TParentRoute,
+    TId,
     TCustomId,
     TFullPath,
     TPath,
@@ -997,6 +1011,7 @@ export class Route<
   constructor(
     options?: RouteOptions<
       TParentRoute,
+      TId,
       TCustomId,
       TFullPath,
       TPath,
@@ -1057,6 +1072,7 @@ export class Route<
     const options = this.options as
       | (RouteOptions<
           TParentRoute,
+          TId,
           TCustomId,
           TFullPath,
           TPath,
@@ -1192,6 +1208,7 @@ export class Route<
       TNewLoaderFn,
       RouteLoaderFn<
         TParentRoute,
+        TCustomId,
         TParams,
         TLoaderDeps,
         TRouterContext,
@@ -1340,6 +1357,7 @@ export function createRoute<
 >(
   options: RouteOptions<
     TParentRoute,
+    TId,
     TCustomId,
     TFullPath,
     TPath,
@@ -1381,8 +1399,9 @@ export type RootRouteOptions<
 > = Omit<
   RouteOptions<
     any, // TParentRoute
-    RootRouteId,
-    '', // TCustomId
+    RootRouteId, // TId
+    RootRouteId, // TCustomId
+    '', // TFullPath
     '', // TPath
     TSearchValidator,
     {}, // TParams
@@ -1696,6 +1715,7 @@ export class NotFoundRoute<
         string,
         string,
         string,
+        string,
         TSearchValidator,
         {},
         TLoaderDeps,

package/src/router.ts

@@ -2310,7 +2310,7 @@ export class Router<
                   if (prevLoaderPromise) {
                     await prevLoaderPromise
                   } else {
-                    const parentMatchPromise = matchPromises[index - 1]
+                    const parentMatchPromise = matchPromises[index - 1] as any
                     const route = this.looseRoutesById[routeId]!
 
                     const getLoaderContext = (): LoaderFnContext => {