@tanstack/react-router 1.74.5 → 1.75.0

package/package.json

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

package/src/route.ts

@@ -498,6 +498,38 @@ export interface SearchValidatorAdapter<TInput, TOutput> {
 
 export type AnySearchValidatorAdapter = SearchValidatorAdapter<any, any>
 
+export interface StandardSchemaValidator<TInput, TOutput> {
+  readonly '~types'?: StandardSchemaValidatorTypes<TInput, TOutput> | undefined
+  readonly '~validate': AnyStandardSchemaValidate
+}
+
+export type AnyStandardSchemaValidator = StandardSchemaValidator<any, any>
+
+export interface StandardSchemaValidatorTypes<TInput, TOutput> {
+  readonly input: TInput
+  readonly output: TOutput
+}
+
+export interface AnyStandardSchemaValidateSuccess {
+  readonly value: any
+}
+
+export interface AnyStandardSchemaValidateFailure {
+  readonly issues: ReadonlyArray<AnyStandardSchemaValidateIssue>
+}
+
+export interface AnyStandardSchemaValidateIssue {
+  readonly message: string
+}
+
+export interface AnyStandardSchemaValidateInput {
+  readonly value: any
+}
+
+export type AnyStandardSchemaValidate = (
+  input: AnyStandardSchemaValidateInput,
+) => AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure
+
 export type AnySearchValidatorFn = SearchValidatorFn<any, any>
 
 export type SearchValidatorFn<TInput, TOutput> = (input: TInput) => TOutput
@@ -506,6 +538,7 @@ export type SearchValidator<TInput, TOutput> =
   | SearchValidatorObj<TInput, TOutput>
   | SearchValidatorFn<TInput, TOutput>
   | SearchValidatorAdapter<TInput, TOutput>
+  | StandardSchemaValidator<TInput, TOutput>
   | undefined
 
 export type AnySearchValidator = SearchValidator<any, any>
@@ -624,11 +657,13 @@ export type ResolveSearchSchemaFnInput<TSearchValidator> =
     : AnySearchSchema
 
 export type ResolveSearchSchemaInput<TSearchValidator> =
-  TSearchValidator extends AnySearchValidatorAdapter
-    ? TSearchValidator['types']['input']
-    : TSearchValidator extends AnySearchValidatorObj
-      ? ResolveSearchSchemaFnInput<TSearchValidator['parse']>
-      : ResolveSearchSchemaFnInput<TSearchValidator>
+  TSearchValidator extends AnyStandardSchemaValidator
+    ? NonNullable<TSearchValidator['~types']>['input']
+    : TSearchValidator extends AnySearchValidatorAdapter
+      ? TSearchValidator['types']['input']
+      : TSearchValidator extends AnySearchValidatorObj
+        ? ResolveSearchSchemaFnInput<TSearchValidator['parse']>
+        : ResolveSearchSchemaFnInput<TSearchValidator>
 
 export type ResolveSearchSchemaFn<TSearchValidator> = TSearchValidator extends (
   ...args: any
@@ -639,11 +674,13 @@ export type ResolveSearchSchemaFn<TSearchValidator> = TSearchValidator extends (
 export type ResolveSearchSchema<TSearchValidator> =
   unknown extends TSearchValidator
     ? TSearchValidator
-    : TSearchValidator extends AnySearchValidatorAdapter
-      ? TSearchValidator['types']['output']
-      : TSearchValidator extends AnySearchValidatorObj
-        ? ResolveSearchSchemaFn<TSearchValidator['parse']>
-        : ResolveSearchSchemaFn<TSearchValidator>
+    : TSearchValidator extends AnyStandardSchemaValidator
+      ? NonNullable<TSearchValidator['~types']>['output']
+      : TSearchValidator extends AnySearchValidatorAdapter
+        ? TSearchValidator['types']['output']
+        : TSearchValidator extends AnySearchValidatorObj
+          ? ResolveSearchSchemaFn<TSearchValidator['parse']>
+          : ResolveSearchSchemaFn<TSearchValidator>
 
 export type ResolveFullSearchSchema<
   TParentRoute extends AnyRoute,

package/src/router.ts

@@ -43,6 +43,7 @@ import type {
   AnyRoute,
   AnyRouteWithContext,
   AnySearchSchema,
+  AnySearchValidator,
   BeforeLoadContextOptions,
   ErrorRouteComponent,
   LoaderFnContext,
@@ -557,6 +558,31 @@ function routeNeedsPreload(route: AnyRoute) {
   return false
 }
 
+function validateSearch(
+  validateSearch: AnySearchValidator,
+  input: unknown,
+): unknown {
+  if (validateSearch == null) return {}
+
+  if ('~validate' in validateSearch) {
+    const result = validateSearch['~validate']({ value: input })
+
+    if ('value' in result) return result.value
+
+    throw new SearchParamError(JSON.stringify(result.issues, undefined, 2))
+  }
+
+  if ('parse' in validateSearch) {
+    return validateSearch.parse(input)
+  }
+
+  if (typeof validateSearch === 'function') {
+    return validateSearch(input)
+  }
+
+  return {}
+}
+
 export type RouterEvents = {
   onBeforeNavigate: {
     type: 'onBeforeNavigate'
@@ -1114,12 +1140,8 @@ export class Router<
         const parentSearch = parentMatch?.search ?? next.search
 
         try {
-          const validator =
-            typeof route.options.validateSearch === 'object'
-              ? route.options.validateSearch.parse
-              : route.options.validateSearch
-
-          const search = validator?.(parentSearch) ?? {}
+          const search =
+            validateSearch(route.options.validateSearch, parentSearch) ?? {}
 
           return [
             {
@@ -1444,13 +1466,12 @@ export class Router<
         matchedRoutesResult?.matchedRoutes.forEach((route) => {
           try {
             if (route.options.validateSearch) {
-              const validator =
-                typeof route.options.validateSearch === 'object'
-                  ? route.options.validateSearch.parse
-                  : route.options.validateSearch
               validatedSearch = {
                 ...validatedSearch,
-                ...validator({ ...validatedSearch, ...search }),
+                ...(validateSearch(route.options.validateSearch, {
+                  ...validatedSearch,
+                  ...search,
+                }) ?? {}),
               }
             }
           } catch (e) {
@@ -2088,6 +2109,7 @@ export class Router<
 
               updateMatch(matchId, (prev) => {
                 prev.beforeLoadPromise?.resolve()
+                prev.loadPromise?.resolve()
 
                 return {
                   ...prev,