@tanstack/solid-router 1.108.0 → 1.110.0

package/dist/esm/typePrimitives.d.ts

@@ -1,19 +1,20 @@
 import { FromPathOption, LinkComponentProps, NavigateOptions, PathParamOptions, SearchParamOptions, ToPathOption } from './link.js';
+import { Redirect } from './redirects.js';
 import { RouteIds } from './routeInfo.js';
 import { AnyRouter, RegisteredRouter } from './router.js';
 import { UseParamsOptions, UseParamsResult } from './useParams.js';
 import { UseSearchOptions, UseSearchResult } from './useSearch.js';
 import { Constrain, ConstrainLiteral } from '@tanstack/router-core';
-export type ValidateFromPath<TFrom, TRouter extends AnyRouter = RegisteredRouter> = FromPathOption<TRouter, TFrom>;
-export type ValidateToPath<TTo extends string | undefined, TFrom extends string = string, TRouter extends AnyRouter = RegisteredRouter> = ToPathOption<TRouter, TFrom, TTo>;
-export type ValidateSearch<TTo extends string | undefined, TFrom extends string = string, TRouter extends AnyRouter = RegisteredRouter> = SearchParamOptions<TRouter, TFrom, TTo>;
-export type ValidateParams<TTo extends string | undefined, TFrom extends string = string, TRouter extends AnyRouter = RegisteredRouter> = PathParamOptions<TRouter, TFrom, TTo>;
+export type ValidateFromPath<TRouter extends AnyRouter = RegisteredRouter, TFrom = string> = FromPathOption<TRouter, TFrom>;
+export type ValidateToPath<TRouter extends AnyRouter = RegisteredRouter, TTo extends string | undefined = undefined, TFrom extends string = string> = ToPathOption<TRouter, TFrom, TTo>;
+export type ValidateSearch<TRouter extends AnyRouter = RegisteredRouter, TTo extends string | undefined = undefined, TFrom extends string = string> = SearchParamOptions<TRouter, TFrom, TTo>;
+export type ValidateParams<TRouter extends AnyRouter = RegisteredRouter, TTo extends string | undefined = undefined, TFrom extends string = string> = PathParamOptions<TRouter, TFrom, TTo>;
 /**
  * @internal
  */
-export type InferFrom<TOptions> = TOptions extends {
+export type InferFrom<TOptions, TDefaultFrom extends string = string> = TOptions extends {
     from: infer TFrom extends string;
-} ? TFrom : string;
+} ? TFrom : TDefaultFrom;
 /**
  * @internal
  */
@@ -33,15 +34,19 @@ export type InferMaskFrom<TOptions> = TOptions extends {
         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>, TRouter extends AnyRouter = RegisteredRouter> = {
-    [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K], TRouter>;
+export type ValidateNavigateOptions<TRouter extends AnyRouter = RegisteredRouter, TOptions = unknown, TDefaultFrom extends string = string> = Constrain<TOptions, NavigateOptions<TRouter, InferFrom<TOptions, TDefaultFrom>, InferTo<TOptions>, InferMaskFrom<TOptions>, InferMaskTo<TOptions>>>;
+export type ValidateNavigateOptionsArray<TRouter extends AnyRouter = RegisteredRouter, TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>, TDefaultFrom extends string = string> = {
+    [K in keyof TOptions]: ValidateNavigateOptions<TRouter, TOptions[K], TDefaultFrom>;
+};
+export type ValidateRedirectOptions<TRouter extends AnyRouter = RegisteredRouter, TOptions = unknown, TDefaultFrom extends string = string> = Constrain<TOptions, Redirect<TRouter, InferFrom<TOptions, TDefaultFrom>, InferTo<TOptions>, InferMaskFrom<TOptions>, InferMaskTo<TOptions>>>;
+export type ValidateRedirectOptionsArray<TRouter extends AnyRouter = RegisteredRouter, TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>, TDefaultFrom extends string = string> = {
+    [K in keyof TOptions]: ValidateRedirectOptions<TRouter, TOptions[K], TDefaultFrom>;
 };
-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 ValidateLinkOptions<TRouter extends AnyRouter = RegisteredRouter, TOptions = unknown, TDefaultFrom extends string = string, TComp = 'a'> = Constrain<TOptions, LinkComponentProps<TComp, TRouter, InferFrom<TOptions, TDefaultFrom>, InferTo<TOptions>, InferMaskFrom<TOptions>, InferMaskTo<TOptions>>>;
+export type ValidateLinkOptionsArray<TRouter extends AnyRouter = RegisteredRouter, TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>, TDefaultFrom extends string = string, TComp = 'a'> = {
+    [K in keyof TOptions]: ValidateLinkOptions<TRouter, TOptions[K], TDefaultFrom, TComp>;
 };
-export type ValidateId<TId extends string, TRouter extends AnyRouter = RegisteredRouter> = ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>;
+export type ValidateId<TRouter extends AnyRouter = RegisteredRouter, TId extends string = string> = ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>;
 /**
  * @internal
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.108.0",
+  "version": "1.110.0",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/link.tsx

@@ -987,8 +987,8 @@ export type LinkOptionsFnOptions<
   TRouter extends AnyRouter = RegisteredRouter,
 > =
   TOptions extends ReadonlyArray<any>
-    ? ValidateLinkOptionsArray<TOptions, TComp, TRouter>
-    : ValidateLinkOptions<TOptions, TComp, TRouter>
+    ? ValidateLinkOptionsArray<TRouter, TOptions, string, TComp>
+    : ValidateLinkOptions<TRouter, TOptions, string, TComp>
 
 export type LinkOptionsFn<TComp> = <
   const TOptions,

package/src/router.ts

@@ -1586,8 +1586,8 @@ export class Router<
               }
               if (opts._includeValidateSearch && route.options.validateSearch) {
                 const validate: SearchMiddleware<any> = ({ search, next }) => {
+                  const result = next(search)
                   try {
-                    const result = next(search)
                     const validatedSearch = {
                       ...result,
                       ...(validateSearch(
@@ -1598,6 +1598,7 @@ export class Router<
                     return validatedSearch
                   } catch {
                     // ignore errors here because they are already handled in matchRoutes
+                    return result
                   }
                 }
                 middlewares.push(validate)

package/src/typePrimitives.ts

@@ -6,6 +6,7 @@ import type {
   SearchParamOptions,
   ToPathOption,
 } from './link'
+import type { Redirect } from './redirects'
 import type { RouteIds } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { UseParamsOptions, UseParamsResult } from './useParams'
@@ -13,36 +14,39 @@ import type { UseSearchOptions, UseSearchResult } from './useSearch'
 import type { Constrain, ConstrainLiteral } from '@tanstack/router-core'
 
 export type ValidateFromPath<
-  TFrom,
   TRouter extends AnyRouter = RegisteredRouter,
+  TFrom = string,
 > = FromPathOption<TRouter, TFrom>
 
 export type ValidateToPath<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = ToPathOption<TRouter, TFrom, TTo>
 
 export type ValidateSearch<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = SearchParamOptions<TRouter, TFrom, TTo>
 
 export type ValidateParams<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = PathParamOptions<TRouter, TFrom, TTo>
 
 /**
  * @internal
  */
-export type InferFrom<TOptions> = TOptions extends {
+export type InferFrom<
+  TOptions,
+  TDefaultFrom extends string = string,
+> = TOptions extends {
   from: infer TFrom extends string
 }
   ? TFrom
-  : string
+  : TDefaultFrom
 
 /**
  * @internal
@@ -69,13 +73,14 @@ export type InferMaskFrom<TOptions> = TOptions extends {
   : string
 
 export type ValidateNavigateOptions<
-  TOptions,
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
 > = Constrain<
   TOptions,
   NavigateOptions<
     TRouter,
-    InferFrom<TOptions>,
+    InferFrom<TOptions, TDefaultFrom>,
     InferTo<TOptions>,
     InferMaskFrom<TOptions>,
     InferMaskTo<TOptions>
@@ -83,20 +88,54 @@ export type ValidateNavigateOptions<
 >
 
 export type ValidateNavigateOptionsArray<
-  TOptions extends ReadonlyArray<any>,
   TRouter extends AnyRouter = RegisteredRouter,
-> = { [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K], TRouter> }
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+> = {
+  [K in keyof TOptions]: ValidateNavigateOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom
+  >
+}
+export type ValidateRedirectOptions<
+  TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
+> = Constrain<
+  TOptions,
+  Redirect<
+    TRouter,
+    InferFrom<TOptions, TDefaultFrom>,
+    InferTo<TOptions>,
+    InferMaskFrom<TOptions>,
+    InferMaskTo<TOptions>
+  >
+>
+
+export type ValidateRedirectOptionsArray<
+  TRouter extends AnyRouter = RegisteredRouter,
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+> = {
+  [K in keyof TOptions]: ValidateRedirectOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom
+  >
+}
 
 export type ValidateLinkOptions<
-  TOptions,
-  TComp = 'a',
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
+  TComp = 'a',
 > = Constrain<
   TOptions,
   LinkComponentProps<
     TComp,
     TRouter,
-    InferFrom<TOptions>,
+    InferFrom<TOptions, TDefaultFrom>,
     InferTo<TOptions>,
     InferMaskFrom<TOptions>,
     InferMaskTo<TOptions>
@@ -104,16 +143,22 @@ export type ValidateLinkOptions<
 >
 
 export type ValidateLinkOptionsArray<
-  TOptions extends ReadonlyArray<any>,
-  TComp = 'a',
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+  TComp = 'a',
 > = {
-  [K in keyof TOptions]: ValidateLinkOptions<TOptions[K], TComp, TRouter>
+  [K in keyof TOptions]: ValidateLinkOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom,
+    TComp
+  >
 }
 
 export type ValidateId<
-  TId extends string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TId extends string = string,
 > = ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>
 
 /**