@tanstack/react-router 1.81.3 → 1.81.5

package/package.json

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

package/src/route.ts

@@ -515,9 +515,13 @@ export interface SearchValidatorAdapter<TInput, TOutput> {
 
 export type AnySearchValidatorAdapter = SearchValidatorAdapter<any, any>
 
+export interface StandardSchemaValidatorProps<TInput, TOutput> {
+  readonly types?: StandardSchemaValidatorTypes<TInput, TOutput> | undefined
+  readonly validate: AnyStandardSchemaValidate
+}
+
 export interface StandardSchemaValidator<TInput, TOutput> {
-  readonly '~types'?: StandardSchemaValidatorTypes<TInput, TOutput> | undefined
-  readonly '~validate': AnyStandardSchemaValidate
+  readonly '~standard': StandardSchemaValidatorProps<TInput, TOutput>
 }
 
 export type AnyStandardSchemaValidator = StandardSchemaValidator<any, any>
@@ -529,6 +533,7 @@ export interface StandardSchemaValidatorTypes<TInput, TOutput> {
 
 export interface AnyStandardSchemaValidateSuccess {
   readonly value: any
+  readonly issues?: undefined
 }
 
 export interface AnyStandardSchemaValidateFailure {
@@ -539,13 +544,11 @@ export interface AnyStandardSchemaValidateIssue {
   readonly message: string
 }
 
-export interface AnyStandardSchemaValidateInput {
-  readonly value: any
-}
-
 export type AnyStandardSchemaValidate = (
-  input: AnyStandardSchemaValidateInput,
-) => AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure
+  value: unknown,
+) =>
+  | (AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure)
+  | Promise<AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure>
 
 export type AnySearchValidatorFn = SearchValidatorFn<any, any>
 
@@ -681,7 +684,7 @@ export type ResolveSearchSchemaFnInput<TSearchValidator> =
 
 export type ResolveSearchSchemaInput<TSearchValidator> =
   TSearchValidator extends AnyStandardSchemaValidator
-    ? NonNullable<TSearchValidator['~types']>['input']
+    ? NonNullable<TSearchValidator['~standard']['types']>['input']
     : TSearchValidator extends AnySearchValidatorAdapter
       ? TSearchValidator['types']['input']
       : TSearchValidator extends AnySearchValidatorObj
@@ -698,7 +701,7 @@ export type ResolveSearchSchema<TSearchValidator> =
   unknown extends TSearchValidator
     ? TSearchValidator
     : TSearchValidator extends AnyStandardSchemaValidator
-      ? NonNullable<TSearchValidator['~types']>['output']
+      ? NonNullable<TSearchValidator['~standard']['types']>['output']
       : TSearchValidator extends AnySearchValidatorAdapter
         ? TSearchValidator['types']['output']
         : TSearchValidator extends AnySearchValidatorObj

package/src/router.ts

@@ -585,11 +585,14 @@ function validateSearch(
 ): unknown {
   if (validateSearch == null) return {}
 
-  if ('~validate' in validateSearch) {
-    const result = validateSearch['~validate']({ value: input })
+  if ('~standard' in validateSearch) {
+    const result = validateSearch['~standard'].validate(input)
 
     if ('value' in result) return result.value
 
+    if (result instanceof Promise)
+      throw new SearchParamError('Async validation not supported')
+
     throw new SearchParamError(JSON.stringify(result.issues, undefined, 2))
   }
 
@@ -1511,8 +1514,8 @@ export class Router<
       })
 
       let search = fromSearch
-      if (opts._includeValidateSearch) {
-        let validatedSearch = this.options.search?.strict ? {} : search
+      if (opts._includeValidateSearch && this.options.search?.strict) {
+        let validatedSearch = {}
         matchedRoutesResult?.matchedRoutes.forEach((route) => {
           try {
             if (route.options.validateSearch) {
@@ -1535,10 +1538,10 @@ export class Router<
         const allMiddlewares =
           matchedRoutesResult?.matchedRoutes.reduce(
             (acc, route) => {
-              let middlewares: Array<SearchMiddleware<any>> = []
+              const middlewares: Array<SearchMiddleware<any>> = []
               if ('search' in route.options) {
                 if (route.options.search?.middlewares) {
-                  middlewares = route.options.search.middlewares
+                  middlewares.push(...route.options.search.middlewares)
                 }
               }
               // TODO remove preSearchFilters and postSearchFilters in v2
@@ -1572,7 +1575,25 @@ export class Router<
                   }
                   return result
                 }
-                middlewares = [legacyMiddleware]
+                middlewares.push(legacyMiddleware)
+              }
+              if (opts._includeValidateSearch && route.options.validateSearch) {
+                const validate: SearchMiddleware<any> = ({ search, next }) => {
+                  try {
+                    const result = next(search)
+                    const validatedSearch = {
+                      ...result,
+                      ...(validateSearch(
+                        route.options.validateSearch,
+                        result,
+                      ) ?? {}),
+                    }
+                    return validatedSearch
+                  } catch (e) {
+                    // ignore errors here because they are already handled in matchRoutes
+                  }
+                }
+                middlewares.push(validate)
               }
               return acc.concat(middlewares)
             },