@tanstack/react-router 1.47.5 → 1.48.1

package/src/route.ts

@@ -54,9 +54,7 @@ export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
   TPath extends string = string,
-  TSearchSchemaInput = Record<string, unknown>,
-  TSearchSchema = {},
-  TFullSearchSchema = TSearchSchema,
+  TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TParams = AnyPathParams,
   TAllParams = TParams,
   TRouteContextReturn = RouteContext,
@@ -70,9 +68,7 @@ export type RouteOptions<
   TParentRoute,
   TCustomId,
   TPath,
-  TSearchSchemaInput,
-  TSearchSchema,
-  TFullSearchSchema,
+  TSearchValidator,
   TParams,
   TAllParams,
   TRouteContextReturn,
@@ -82,9 +78,10 @@ export type RouteOptions<
   TLoaderDataReturn
 > &
   UpdatableRouteOptions<
+    NoInfer<TParentRoute>,
     NoInfer<TCustomId>,
     NoInfer<TAllParams>,
-    NoInfer<TFullSearchSchema>,
+    NoInfer<TSearchValidator>,
     NoInfer<TLoaderData>,
     NoInfer<TAllContext>,
     NoInfer<TRouteContext>,
@@ -123,10 +120,9 @@ export interface FullSearchSchemaOption<TFullSearchSchema> {
 }
 
 export type FileBaseRouteOptions<
+  TParentRoute extends AnyRoute = AnyRoute,
   TPath extends string = string,
-  TSearchSchemaInput = Record<string, unknown>,
-  TSearchSchema = {},
-  TFullSearchSchema = TSearchSchema,
+  TSearchValidator extends AnySearchValidator = undefined,
   TParams = {},
   TAllParams = {},
   TRouteContextReturn = RouteContext,
@@ -135,22 +131,32 @@ export type FileBaseRouteOptions<
   TLoaderDeps extends Record<string, any> = {},
   TLoaderDataReturn = {},
 > = {
-  validateSearch?:
-    | ((input: TSearchSchemaInput) => TSearchSchema)
-    | { parse: (input: TSearchSchemaInput) => TSearchSchema }
+  validateSearch?: TSearchValidator
   shouldReload?:
     | boolean
     | ((
-        match: LoaderFnContext<TAllParams, TFullSearchSchema, TAllContext>,
+        match: LoaderFnContext<
+          TAllParams,
+          ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+          TAllContext
+        >,
       ) => any)
   // This async function is called before a route is loaded.
   // If an error is thrown here, the route's loader will not be called.
   // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onError` function.
   // If thrown during a preload event, the error will be logged to the console.
   beforeLoad?: (
-    ctx: BeforeLoadContext<TFullSearchSchema, TAllParams, TParentAllContext>,
+    ctx: BeforeLoadContext<
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+      TAllParams,
+      TParentAllContext
+    >,
   ) => Promise<TRouteContextReturn> | TRouteContextReturn | void
-  loaderDeps?: (opts: FullSearchSchemaOption<TFullSearchSchema>) => TLoaderDeps
+  loaderDeps?: (
+    opts: FullSearchSchemaOption<
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>
+    >,
+  ) => TLoaderDeps
   loader?: (
     ctx: LoaderFnContext<TAllParams, TLoaderDeps, TAllContext>,
   ) => TLoaderDataReturn | Promise<TLoaderDataReturn>
@@ -160,9 +166,7 @@ export type BaseRouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
   TPath extends string = string,
-  TSearchSchemaInput = Record<string, unknown>,
-  TSearchSchema = {},
-  TFullSearchSchema = TSearchSchema,
+  TSearchValidator extends AnySearchValidator = undefined,
   TParams = {},
   TAllParams = {},
   TRouteContextReturn = RouteContext,
@@ -172,10 +176,9 @@ export type BaseRouteOptions<
   TLoaderDataReturn = {},
 > = RoutePathOptions<TCustomId, TPath> &
   FileBaseRouteOptions<
+    TParentRoute,
     TPath,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -206,22 +209,14 @@ export interface BeforeLoadContext<
 }
 
 export type UpdatableRouteOptions<
+  TParentRoute extends AnyRoute,
   TRouteId,
   TAllParams,
-  TFullSearchSchema,
+  TSearchValidator extends AnySearchValidator,
   TLoaderData,
   TAllContext,
   TRouteContext,
   TLoaderDeps,
-  TRouteMatch = RouteMatch<
-    TRouteId,
-    TAllParams,
-    TFullSearchSchema,
-    TLoaderData,
-    TAllContext,
-    TRouteContext,
-    TLoaderDeps
-  >,
 > = {
   // test?: (args: TAllContext) => void
   // If true, this route will be matched as case-sensitive
@@ -241,20 +236,72 @@ export type UpdatableRouteOptions<
   preloadGcTime?: number
   // Filter functions that can manipulate search params *before* they are passed to links and navigate
   // calls that match this route.
-  preSearchFilters?: Array<SearchFilter<TFullSearchSchema>>
+  preSearchFilters?: Array<
+    SearchFilter<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
+  >
   // Filter functions that can manipulate search params *after* they are passed to links and navigate
   // calls that match this route.
-  postSearchFilters?: Array<SearchFilter<TFullSearchSchema>>
+  postSearchFilters?: Array<
+    SearchFilter<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
+  >
   onCatch?: (error: Error, errorInfo: React.ErrorInfo) => void
   onError?: (err: any) => void
   // These functions are called as route matches are loaded, stick around and leave the active
   // matches
-  onEnter?: (match: TRouteMatch) => void
-  onStay?: (match: TRouteMatch) => void
-  onLeave?: (match: TRouteMatch) => void
+  onEnter?: (
+    match: RouteMatch<
+      TRouteId,
+      TAllParams,
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+      TLoaderData,
+      TAllContext,
+      TRouteContext,
+      TLoaderDeps
+    >,
+  ) => void
+  onStay?: (
+    match: RouteMatch<
+      TRouteId,
+      TAllParams,
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+      TLoaderData,
+      TAllContext,
+      TRouteContext,
+      TLoaderDeps
+    >,
+  ) => void
+  onLeave?: (
+    match: RouteMatch<
+      TRouteId,
+      TAllParams,
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+      TLoaderData,
+      TAllContext,
+      TRouteContext,
+      TLoaderDeps
+    >,
+  ) => void
   meta?: (ctx: {
-    matches: Array<TRouteMatch>
-    match: TRouteMatch
+    matches: Array<
+      RouteMatch<
+        TRouteId,
+        TAllParams,
+        ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+        TLoaderData,
+        TAllContext,
+        TRouteContext,
+        TLoaderDeps
+      >
+    >
+    match: RouteMatch<
+      TRouteId,
+      TAllParams,
+      ResolveFullSearchSchema<TParentRoute, TSearchValidator>,
+      TLoaderData,
+      TAllContext,
+      TRouteContext,
+      TLoaderDeps
+    >
     params: TAllParams
     loaderData: TLoaderData
   }) => Array<React.JSX.IntrinsicElements['meta']>
@@ -291,18 +338,38 @@ type LdJsonValue = LdJsonPrimitive | LdJsonObject | LdJsonArray
 
 export type RouteLinkEntry = {}
 
-// The parse type here allows a zod schema to be passed directly to the validator
-export type SearchSchemaValidator<TInput, TReturn> =
-  | SearchSchemaValidatorObj<TInput, TReturn>
-  | SearchSchemaValidatorFn<TInput, TReturn>
+export interface SearchValidatorObj<TInput, TOutput> {
+  parse: SearchValidatorFn<TInput, TOutput>
+}
+
+export type AnySearchValidatorObj = SearchValidatorObj<any, any>
 
-export type SearchSchemaValidatorObj<TInput, TReturn> = {
-  parse?: SearchSchemaValidatorFn<TInput, TReturn>
+export interface SearchValidatorAdapter<TInput, TOutput> {
+  types: {
+    input: TInput
+    output: TOutput
+  }
+  parse: (input: unknown) => TOutput
 }
 
-export type SearchSchemaValidatorFn<TInput, TReturn> = (
-  searchObj: TInput,
-) => TReturn
+export type AnySearchValidatorAdapter = SearchValidatorAdapter<any, any>
+
+export type AnySearchValidatorFn = SearchValidatorFn<any, any>
+
+export type SearchValidatorFn<TInput, TOutput> = (input: TInput) => TOutput
+
+export type SearchValidator<TInput, TOutput> =
+  | SearchValidatorObj<TInput, TOutput>
+  | SearchValidatorFn<TInput, TOutput>
+  | SearchValidatorAdapter<TInput, TOutput>
+  | undefined
+
+export type AnySearchValidator = SearchValidator<any, any>
+
+export type DefaultSearchValidator = SearchValidator<
+  Record<string, unknown>,
+  AnySearchSchema
+>
 
 export type RouteLoaderFn<
   in out TAllParams = {},
@@ -375,20 +442,53 @@ export type InferAllContext<TRoute> = TRoute extends {
   ? TAllContext
   : {}
 
-export type ResolveSearchSchemaUsed<TSearchSchemaInput, TSearchSchema> =
-  TSearchSchemaInput extends SearchSchemaInput
+export type ResolveSearchSchemaFnInput<
+  TSearchValidator extends AnySearchValidator,
+> = TSearchValidator extends (input: infer TSearchSchemaInput) => any
+  ? TSearchSchemaInput extends SearchSchemaInput
     ? Omit<TSearchSchemaInput, keyof SearchSchemaInput>
-    : TSearchSchema
+    : ResolveSearchSchemaFn<TSearchValidator>
+  : AnySearchSchema
+
+export type ResolveSearchSchemaInput<
+  TSearchValidator extends AnySearchValidator,
+> = TSearchValidator extends AnySearchValidatorAdapter
+  ? TSearchValidator['types']['input']
+  : TSearchValidator extends AnySearchValidatorObj
+    ? ResolveSearchSchemaFnInput<TSearchValidator['parse']>
+    : ResolveSearchSchemaFnInput<TSearchValidator>
+
+export type ResolveSearchSchemaFn<TSearchValidator extends AnySearchValidator> =
+  TSearchValidator extends (...args: any) => infer TSearchSchema
+    ? TSearchSchema
+    : AnySearchSchema
+
+export type ResolveSearchSchema<TSearchValidator extends AnySearchValidator> =
+  unknown extends TSearchValidator
+    ? TSearchValidator
+    : TSearchValidator extends AnySearchValidatorAdapter
+      ? TSearchValidator['types']['output']
+      : TSearchValidator extends AnySearchValidatorObj
+        ? ResolveSearchSchemaFn<TSearchValidator['parse']>
+        : ResolveSearchSchemaFn<TSearchValidator>
 
 export type ResolveFullSearchSchema<
   TParentRoute extends AnyRoute,
-  TSearchSchema,
-> = Assign<InferFullSearchSchema<TParentRoute>, TSearchSchema>
+  TSearchValidator extends AnySearchValidator,
+> = unknown extends TParentRoute
+  ? ResolveSearchSchema<TSearchValidator>
+  : Assign<
+      InferFullSearchSchema<TParentRoute>,
+      ResolveSearchSchema<TSearchValidator>
+    >
 
 export type ResolveFullSearchSchemaInput<
   TParentRoute extends AnyRoute,
-  TSearchSchemaUsed,
-> = Assign<InferFullSearchSchemaInput<TParentRoute>, TSearchSchemaUsed>
+  TSearchValidator extends AnySearchValidator,
+> = Assign<
+  InferFullSearchSchemaInput<TParentRoute>,
+  ResolveSearchSchemaInput<TSearchValidator>
+>
 
 export type ResolveRouteContext<TRouteContextReturn> = [
   TRouteContextReturn,
@@ -423,10 +523,6 @@ export interface AnyRoute
     any,
     any,
     any,
-    any,
-    any,
-    any,
-    any,
     any
   > {}
 
@@ -443,12 +539,8 @@ export type AnyRouteWithContext<TContext> = Route<
   any,
   any,
   any,
-  any,
-  any,
   TContext,
   any,
-  any,
-  any,
   any
 >
 
@@ -581,20 +673,7 @@ export class Route<
     TCustomId,
     TPath
   >,
-  in out TSearchSchemaInput = Record<string, unknown>,
-  in out TSearchSchema = {},
-  in out TSearchSchemaUsed = ResolveSearchSchemaUsed<
-    TSearchSchemaInput,
-    TSearchSchema
-  >,
-  in out TFullSearchSchemaInput = ResolveFullSearchSchemaInput<
-    TParentRoute,
-    TSearchSchemaUsed
-  >,
-  in out TFullSearchSchema = ResolveFullSearchSchema<
-    TParentRoute,
-    TSearchSchema
-  >,
+  in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   in out TParams = Record<ParsePathParams<TPath>, string>,
   in out TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
   TRouteContextReturn = RouteContext,
@@ -610,9 +689,7 @@ export class Route<
     TParentRoute,
     TCustomId,
     TPath,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -648,9 +725,7 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
-      TSearchSchemaInput,
-      TSearchSchema,
-      TFullSearchSchema,
+      TSearchValidator,
       TParams,
       TAllParams,
       TRouteContextReturn,
@@ -679,11 +754,14 @@ export class Route<
     fullPath: TFullPath
     customId: TCustomId
     id: TId
-    searchSchema: TSearchSchema
-    searchSchemaInput: TSearchSchemaInput
-    searchSchemaUsed: TSearchSchemaUsed
-    fullSearchSchema: TFullSearchSchema
-    fullSearchSchemaInput: TFullSearchSchemaInput
+    searchSchema: ResolveSearchSchema<TSearchValidator>
+    searchSchemaInput: ResolveSearchSchemaInput<TSearchValidator>
+    searchValidator: TSearchValidator
+    fullSearchSchema: ResolveFullSearchSchema<TParentRoute, TSearchValidator>
+    fullSearchSchemaInput: ResolveFullSearchSchemaInput<
+      TParentRoute,
+      TSearchValidator
+    >
     params: TParams
     allParams: TAllParams
     routeContext: TRouteContext
@@ -701,9 +779,7 @@ export class Route<
           TParentRoute,
           TCustomId,
           TPath,
-          TSearchSchemaInput,
-          TSearchSchema,
-          TFullSearchSchema,
+          TSearchValidator,
           TParams,
           TAllParams,
           TRouteContextReturn,
@@ -778,11 +854,7 @@ export class Route<
     TFullPath,
     TCustomId,
     TId,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TSearchSchemaUsed,
-    TFullSearchSchemaInput,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -809,11 +881,7 @@ export class Route<
       TFullPath,
       TCustomId,
       TId,
-      TSearchSchemaInput,
-      TSearchSchema,
-      TSearchSchemaUsed,
-      TFullSearchSchemaInput,
-      TFullSearchSchema,
+      TSearchValidator,
       TParams,
       TAllParams,
       TRouteContextReturn,
@@ -827,9 +895,10 @@ export class Route<
 
   update = (
     options: UpdatableRouteOptions<
+      TParentRoute,
       TCustomId,
       TAllParams,
-      TFullSearchSchema,
+      TSearchValidator,
       TLoaderData,
       TAllContext,
       TRouteContext,
@@ -866,8 +935,12 @@ export class Route<
     })
   }
 
-  useSearch = <TSelected = Expand<TFullSearchSchema>>(opts?: {
-    select?: (search: Expand<TFullSearchSchema>) => TSelected
+  useSearch = <
+    TSelected = Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>,
+  >(opts?: {
+    select?: (
+      search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>,
+    ) => TSelected
   }): TSelected => {
     return useSearch({ ...opts, from: this.id })
   }
@@ -908,17 +981,7 @@ export function createRoute<
     TCustomId,
     TPath
   >,
-  TSearchSchemaInput = Record<string, unknown>,
-  TSearchSchema = {},
-  TSearchSchemaUsed = ResolveSearchSchemaUsed<
-    TSearchSchemaInput,
-    TSearchSchema
-  >,
-  TFullSearchSchemaInput = ResolveFullSearchSchemaInput<
-    TParentRoute,
-    TSearchSchemaUsed
-  >,
-  TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
+  TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TParams = Record<ParsePathParams<TPath>, string>,
   TAllParams = ResolveAllParamsFromParent<TParentRoute, TParams>,
   TRouteContextReturn = RouteContext,
@@ -933,9 +996,7 @@ export function createRoute<
     TParentRoute,
     TCustomId,
     TPath,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -953,11 +1014,7 @@ export function createRoute<
     TFullPath,
     TCustomId,
     TId,
-    TSearchSchemaInput,
-    TSearchSchema,
-    TSearchSchemaUsed,
-    TFullSearchSchemaInput,
-    TFullSearchSchema,
+    TSearchValidator,
     TParams,
     TAllParams,
     TRouteContextReturn,
@@ -973,8 +1030,7 @@ export function createRoute<
 export type AnyRootRoute = RootRoute<any, any, any, any, any, any, any, any>
 
 export type RootRouteOptions<
-  TSearchSchemaInput = {},
-  TSearchSchema = {},
+  TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TRouteContextReturn = RouteContext,
   TRouteContext = ResolveRouteContext<TRouteContextReturn>,
   TRouterContext = {},
@@ -986,9 +1042,7 @@ export type RootRouteOptions<
     any, // TParentRoute
     RootRouteId, // TCustomId
     '', // TPath
-    TSearchSchemaInput, // TSearchSchemaInput
-    TSearchSchema, // TSearchSchema
-    TSearchSchema, // TFullSearchSchema
+    TSearchValidator,
     {}, // TParams
     {}, // TAllParams
     TRouteContextReturn, // TRouteContextReturn
@@ -1010,12 +1064,7 @@ export type RootRouteOptions<
 
 export function createRootRouteWithContext<TRouterContext extends {}>() {
   return <
-    TSearchSchemaInput = {},
-    TSearchSchema = {},
-    TSearchSchemaUsed = ResolveSearchSchemaUsed<
-      TSearchSchemaInput,
-      TSearchSchema
-    >,
+    TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
     TRouteContextReturn extends RouteContext = RouteContext,
     TRouteContext extends
       RouteContext = ResolveRouteContext<TRouteContextReturn>,
@@ -1024,8 +1073,7 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
     TLoaderData = ResolveLoaderData<TLoaderDataReturn>,
   >(
     options?: RootRouteOptions<
-      TSearchSchemaInput,
-      TSearchSchema,
+      TSearchValidator,
       TRouteContextReturn,
       TRouteContext,
       TRouterContext,
@@ -1035,9 +1083,7 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
     >,
   ) => {
     return createRootRoute<
-      TSearchSchemaInput,
-      TSearchSchema,
-      TSearchSchemaUsed,
+      TSearchValidator,
       TRouteContextReturn,
       TRouteContext,
       TRouterContext,
@@ -1053,9 +1099,7 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-  in out TSearchSchemaInput = {},
-  in out TSearchSchema = {},
-  in out TSearchSchemaUsed = {},
+  in out TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TRouteContextReturn = RouteContext,
   in out TRouteContext = ResolveRouteContext<TRouteContextReturn>,
   in out TRouterContext = {},
@@ -1069,11 +1113,7 @@ export class RootRoute<
   '/', // TFullPath
   string, // TCustomId
   RootRouteId, // TId
-  TSearchSchemaInput, // TSearchSchemaInput
-  TSearchSchema, // TSearchSchema
-  TSearchSchemaUsed,
-  TSearchSchemaUsed, // TFullSearchSchemaInput
-  TSearchSchema, // TFullSearchSchema
+  TSearchValidator, // TSearchValidator
   {}, // TParams
   {}, // TAllParams
   TRouteContextReturn, // TRouteContextReturn
@@ -1089,8 +1129,7 @@ export class RootRoute<
    */
   constructor(
     options?: RootRouteOptions<
-      TSearchSchemaInput,
-      TSearchSchema,
+      TSearchValidator,
       TRouteContextReturn,
       TRouteContext,
       TRouterContext,
@@ -1109,9 +1148,7 @@ export class RootRoute<
   >(
     children: TNewChildren,
   ): RootRoute<
-    TSearchSchemaInput,
-    TSearchSchema,
-    TSearchSchemaUsed,
+    TSearchValidator,
     TRouteContextReturn,
     TRouteContext,
     TRouterContext,
@@ -1125,12 +1162,7 @@ export class RootRoute<
 }
 
 export function createRootRoute<
-  TSearchSchemaInput = {},
-  TSearchSchema = {},
-  TSearchSchemaUsed = ResolveSearchSchemaUsed<
-    TSearchSchemaInput,
-    TSearchSchema
-  >,
+  TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TRouteContextReturn = RouteContext,
   TRouteContext = ResolveRouteContext<TRouteContextReturn>,
   TRouterContext = {},
@@ -1138,37 +1170,18 @@ export function createRootRoute<
   TLoaderDataReturn = {},
   TLoaderData = ResolveLoaderData<TLoaderDataReturn>,
 >(
-  options?: Omit<
-    RouteOptions<
-      any, // TParentRoute
-      RootRouteId, // TCustomId
-      '', // TPath
-      TSearchSchemaInput, // TSearchSchemaInput
-      TSearchSchema, // TSearchSchema
-      TSearchSchema,
-      {}, // TParams
-      {}, // TAllParams
-      TRouteContextReturn, // TRouteContextReturn
-      TRouteContext, // TRouteContext
-      TRouterContext,
-      Assign<TRouterContext, TRouteContext>, // TAllContext
-      TLoaderDeps,
-      TLoaderDataReturn,
-      TLoaderData
-    >,
-    | 'path'
-    | 'id'
-    | 'getParentRoute'
-    | 'caseSensitive'
-    | 'parseParams'
-    | 'stringifyParams'
-    | 'params'
+  options?: RootRouteOptions<
+    TSearchValidator,
+    TRouteContextReturn,
+    TRouteContext,
+    TRouterContext,
+    TLoaderDeps,
+    TLoaderDataReturn,
+    TLoaderData
   >,
 ) {
   return new RootRoute<
-    TSearchSchemaInput,
-    TSearchSchema,
-    TSearchSchemaUsed,
+    TSearchValidator,
     TRouteContextReturn,
     TRouteContext,
     TRouterContext,
@@ -1276,14 +1289,7 @@ export type NotFoundRouteComponent = SyncRouteComponent<NotFoundRouteProps>
 
 export class NotFoundRoute<
   TParentRoute extends AnyRootRoute,
-  TSearchSchemaInput = Record<string, unknown>,
-  TSearchSchema = {},
-  TSearchSchemaUsed = {},
-  TFullSearchSchemaInput = ResolveFullSearchSchemaInput<
-    TParentRoute,
-    TSearchSchemaUsed
-  >,
-  TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
+  TSearchValidator extends AnySearchValidator = DefaultSearchValidator,
   TRouteContextReturn = AnyContext,
   TRouteContext = RouteContext,
   TAllContext = ResolveAllContext<TParentRoute, TRouteContext>,
@@ -1297,11 +1303,7 @@ export class NotFoundRoute<
   '/404',
   '404',
   '404',
-  TSearchSchemaInput,
-  TSearchSchema,
-  TSearchSchemaUsed,
-  TFullSearchSchemaInput,
-  TFullSearchSchema,
+  TSearchValidator,
   {},
   {},
   TRouteContextReturn,
@@ -1318,9 +1320,7 @@ export class NotFoundRoute<
         TParentRoute,
         string,
         string,
-        TSearchSchemaInput,
-        TSearchSchema,
-        TFullSearchSchema,
+        TSearchValidator,
         {},
         {},
         TRouteContextReturn,