fix(react-router): update standard schema (#2729)

Co-authored-by: Manuel Schiller <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

examples/react/search-validator-adapters/package.json

@@ -17,10 +17,10 @@
     "@tanstack/router-plugin": "^1.79.0",
     "@tanstack/router-valibot-adapter": "^1.81.3",
     "@tanstack/router-zod-adapter": "^1.81.3",
-    "arktype": "^2.0.0-rc.21",
+    "arktype": "2.0.0-rc.23",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "valibot": "1.0.0-beta.3",
+    "valibot": "1.0.0-beta.5",
     "zod": "^3.23.8"
   },
   "devDependencies": {

packages/react-router/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

packages/react-router/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))
   }
 

packages/router-valibot-adapter/package.json

@@ -67,10 +67,10 @@
     "@tanstack/react-router": "workspace:*",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.1",
-    "valibot": "1.0.0-beta.3"
+    "valibot": "1.0.0-beta.5"
   },
   "peerDependencies": {
     "@tanstack/react-router": ">=1.43.2",
-    "valibot": "^1.0.0 || ^1.0.0-beta || ^1.0.0-rc"
+    "valibot": "^1.0.0 || ^1.0.0-beta.5 || ^1.0.0-rc"
   }
 }