@tanstack/react-router 1.93.0 → 1.94.1

package/dist/esm/typePrimitives.d.ts

@@ -1,4 +1,4 @@
-import { FromPathOption, NavigateOptions, PathParamOptions, SearchParamOptions, ToPathOption } from './link.js';
+import { FromPathOption, LinkComponentProps, NavigateOptions, PathParamOptions, SearchParamOptions, ToPathOption } from './link.js';
 import { RouteIds } from './routeInfo.js';
 import { AnyRouter, RegisteredRouter } from './router.js';
 import { UseParamsOptions, UseParamsResult } from './useParams.js';
@@ -27,15 +27,19 @@ export type InferMaskTo<TOptions> = TOptions extends {
     mask: {
         to: infer TTo extends string;
     };
-} ? TTo : string;
+} ? TTo : '';
 export type InferMaskFrom<TOptions> = TOptions extends {
     mask: {
         from: infer TFrom extends string;
     };
 } ? TFrom : string;
 export type ValidateNavigateOptions<TOptions, TRouter extends AnyRouter = RegisteredRouter> = Constrain<TOptions, NavigateOptions<TRouter, InferFrom<TOptions>, InferTo<TOptions>, InferMaskFrom<TOptions>, InferMaskTo<TOptions>>>;
-export type ValidateNavigateOptionsArray<TOptions extends ReadonlyArray<any>> = {
-    [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K]>;
+export type ValidateNavigateOptionsArray<TOptions extends ReadonlyArray<any>, TRouter extends AnyRouter = RegisteredRouter> = {
+    [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K], TRouter>;
+};
+export type ValidateLinkOptions<TOptions, TComp = 'a', TRouter extends AnyRouter = RegisteredRouter> = Constrain<TOptions, LinkComponentProps<TComp, TRouter, InferFrom<TOptions>, InferTo<TOptions>, InferMaskFrom<TOptions>, InferMaskTo<TOptions>>>;
+export type ValidateLinkOptionsArray<TOptions extends ReadonlyArray<any>, TComp = 'a', TRouter extends AnyRouter = RegisteredRouter> = {
+    [K in keyof TOptions]: ValidateLinkOptions<TOptions[K], TComp, TRouter>;
 };
 export type ValidateId<TId extends string, TRouter extends AnyRouter = RegisteredRouter> = ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>;
 /**

package/package.json

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

package/src/link.tsx

@@ -46,6 +46,10 @@ import type {
   WithoutEmpty,
 } from './utils'
 import type { ReactNode } from 'react'
+import type {
+  ValidateLinkOptions,
+  ValidateLinkOptionsArray,
+} from './typePrimitives'
 
 export type ParsePathParams<T extends string, TAcc = never> = T &
   `${string}$${string}` extends never
@@ -1040,19 +1044,21 @@ function isCtrlEvent(e: MouseEvent) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)
 }
 
+export type LinkOptionsFnOptions<
+  TOptions,
+  TComp,
+  TRouter extends AnyRouter = RegisteredRouter,
+> =
+  TOptions extends ReadonlyArray<any>
+    ? ValidateLinkOptionsArray<TOptions, TComp, TRouter>
+    : ValidateLinkOptions<TOptions, TComp, TRouter>
+
 export type LinkOptionsFn<TComp> = <
-  const TProps,
+  const TOptions,
   TRouter extends AnyRouter = RegisteredRouter,
-  TFrom extends string = string,
-  TTo extends string | undefined = undefined,
-  TMaskFrom extends string = TFrom,
-  TMaskTo extends string = '',
 >(
-  options: Constrain<
-    TProps,
-    LinkComponentProps<TComp, TRouter, TFrom, TTo, TMaskFrom, TMaskTo>
-  >,
-) => TProps
+  options: LinkOptionsFnOptions<TOptions, TComp, TRouter>,
+) => TOptions
 
 export const linkOptions: LinkOptionsFn<'a'> = (options) => {
   return options as any

package/src/router.ts

@@ -2492,6 +2492,10 @@ export class Router<
 
                   if (prevLoaderPromise) {
                     await prevLoaderPromise
+                    const match = this.getMatch(matchId)!
+                    if (match.error) {
+                      handleRedirectAndNotFound(match, match.error)
+                    }
                   } else {
                     const parentMatchPromise = matchPromises[index - 1] as any
                     const route = this.looseRoutesById[routeId]!

package/src/typePrimitives.ts

@@ -1,5 +1,6 @@
 import type {
   FromPathOption,
+  LinkComponentProps,
   NavigateOptions,
   PathParamOptions,
   SearchParamOptions,
@@ -59,7 +60,7 @@ export type InferMaskTo<TOptions> = TOptions extends {
   mask: { to: infer TTo extends string }
 }
   ? TTo
-  : string
+  : ''
 
 export type InferMaskFrom<TOptions> = TOptions extends {
   mask: { from: infer TFrom extends string }
@@ -81,8 +82,34 @@ export type ValidateNavigateOptions<
   >
 >
 
-export type ValidateNavigateOptionsArray<TOptions extends ReadonlyArray<any>> =
-  { [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K]> }
+export type ValidateNavigateOptionsArray<
+  TOptions extends ReadonlyArray<any>,
+  TRouter extends AnyRouter = RegisteredRouter,
+> = { [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K], TRouter> }
+
+export type ValidateLinkOptions<
+  TOptions,
+  TComp = 'a',
+  TRouter extends AnyRouter = RegisteredRouter,
+> = Constrain<
+  TOptions,
+  LinkComponentProps<
+    TComp,
+    TRouter,
+    InferFrom<TOptions>,
+    InferTo<TOptions>,
+    InferMaskFrom<TOptions>,
+    InferMaskTo<TOptions>
+  >
+>
+
+export type ValidateLinkOptionsArray<
+  TOptions extends ReadonlyArray<any>,
+  TComp = 'a',
+  TRouter extends AnyRouter = RegisteredRouter,
+> = {
+  [K in keyof TOptions]: ValidateLinkOptions<TOptions[K], TComp, TRouter>
+}
 
 export type ValidateId<
   TId extends string,