fix(start): infer input of validator functions (#2808)

packages/react-router/src/index.tsx

@@ -351,6 +351,8 @@ export type {
   AnyValidatorObj,
   ResolveValidatorInputFn,
   ResolveValidatorOutputFn,
+  ResolveSearchValidatorInput,
+  ResolveSearchValidatorInputFn,
   Validator,
   ValidatorAdapter,
   ValidatorObj,

packages/react-router/src/route.ts

@@ -37,7 +37,7 @@ import type {
   AnyValidatorAdapter,
   AnyValidatorObj,
   DefaultValidator,
-  ResolveValidatorInput,
+  ResolveSearchValidatorInput,
   ResolveValidatorOutput,
   StandardSchemaValidator,
   ValidatorAdapter,
@@ -679,7 +679,7 @@ export type ResolveFullSearchSchemaInput<
   TSearchValidator,
 > = Assign<
   InferFullSearchSchemaInput<TParentRoute>,
-  ResolveValidatorInput<TSearchValidator>
+  ResolveSearchValidatorInput<TSearchValidator>
 >
 
 export type LooseReturnType<T> = T extends (
@@ -988,7 +988,7 @@ export class Route<
     customId: TCustomId
     id: TId
     searchSchema: ResolveValidatorOutput<TSearchValidator>
-    searchSchemaInput: ResolveValidatorInput<TSearchValidator>
+    searchSchemaInput: ResolveSearchValidatorInput<TSearchValidator>
     searchValidator: TSearchValidator
     fullSearchSchema: ResolveFullSearchSchema<TParentRoute, TSearchValidator>
     fullSearchSchemaInput: ResolveFullSearchSchemaInput<

packages/react-router/src/validators.ts

@@ -72,14 +72,29 @@ export type AnySchema = {}
 
 export type DefaultValidator = Validator<Record<string, unknown>, AnySchema>
 
-export type ResolveValidatorInputFn<TValidator> = TValidator extends (
+export type ResolveSearchValidatorInputFn<TValidator> = TValidator extends (
   input: infer TSchemaInput,
 ) => any
   ? TSchemaInput extends SearchSchemaInput
     ? Omit<TSchemaInput, keyof SearchSchemaInput>
     : ResolveValidatorOutputFn<TValidator>
   : AnySchema
 
+export type ResolveSearchValidatorInput<TValidator> =
+  TValidator extends AnyStandardSchemaValidator
+    ? NonNullable<TValidator['~standard']['types']>['input']
+    : TValidator extends AnyValidatorAdapter
+      ? TValidator['types']['input']
+      : TValidator extends AnyValidatorObj
+        ? ResolveSearchValidatorInputFn<TValidator['parse']>
+        : ResolveSearchValidatorInputFn<TValidator>
+
+export type ResolveValidatorInputFn<TValidator> = TValidator extends (
+  input: infer TInput,
+) => any
+  ? TInput
+  : undefined
+
 export type ResolveValidatorInput<TValidator> =
   TValidator extends AnyStandardSchemaValidator
     ? NonNullable<TValidator['~standard']['types']>['input']

packages/start/src/client/createMiddleware.ts

@@ -240,7 +240,7 @@ export type AnyMiddleware = MiddlewareTypes<any, any, any, any, any, any>
 export interface MiddlewareTypes<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -266,12 +266,12 @@ export interface MiddlewareTypes<
 export interface MiddlewareValidator<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
 > {
-  validator: <TNewValidator extends AnyValidator>(
+  validator: <TNewValidator>(
     input: TNewValidator,
   ) => MiddlewareAfterMiddleware<
     TId,
@@ -286,7 +286,7 @@ export interface MiddlewareValidator<
 export interface MiddlewareClientAfter<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -312,7 +312,7 @@ export interface MiddlewareClientAfter<
 export interface MiddlewareAfterServer<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -336,7 +336,7 @@ export interface MiddlewareAfterServer<
 export interface MiddlewareServer<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -362,7 +362,7 @@ export interface MiddlewareServer<
 export interface MiddlewareAfterClient<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -386,7 +386,7 @@ export interface MiddlewareAfterClient<
 export interface MiddlewareClient<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -411,7 +411,7 @@ export interface MiddlewareClient<
 export interface MiddlewareAfterMiddleware<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -451,7 +451,7 @@ export interface MiddlewareAfterMiddleware<
 export interface Middleware<
   TId,
   TMiddlewares,
-  TValidator extends AnyValidator,
+  TValidator,
   TServerContext,
   TClientContext,
   TClientAfterContext,
@@ -478,7 +478,7 @@ export interface Middleware<
 export function createMiddleware<
   const TId,
   const TMiddlewares,
-  TValidator extends AnyValidator = undefined,
+  TValidator = undefined,
   TServerContext = undefined,
   TClientContext = undefined,
   TClientAfterContext = undefined,

packages/start/src/client/tests/createServerFn.test-d.ts

@@ -13,9 +13,9 @@ test('createServerFn without middleware', () => {
 })
 
 test('createServerFn with validator', () => {
-  createServerFn({ method: 'GET' })
-    .validator(() => ({
-      a: 'a',
+  const fn = createServerFn({ method: 'GET' })
+    .validator((input: { input: string }) => ({
+      a: input.input,
     }))
     .handler((options) => {
       expectTypeOf(options).toEqualTypeOf<{
@@ -26,6 +26,11 @@ test('createServerFn with validator', () => {
         }
       }>()
     })
+
+  expectTypeOf(fn).parameter(0).toEqualTypeOf<{
+    data: { input: string }
+    headers?: HeadersInit
+  }>()
 })
 
 test('createServerFn with middleware and context', () => {
@@ -75,16 +80,16 @@ test('createServerFn with middleware and context', () => {
 
 test('createServerFn with middleware and validator', () => {
   const middleware1 = createMiddleware().validator(
-    () =>
+    (input: { readonly inputA: 'inputA' }) =>
       ({
-        a: 'a',
+        outputA: 'outputA',
       }) as const,
   )
 
   const middleware2 = createMiddleware().validator(
-    () =>
+    (input: { readonly inputB: 'inputB' }) =>
       ({
-        b: 'b',
+        outputB: 'outputB',
       }) as const,
   )
 
@@ -93,19 +98,19 @@ test('createServerFn with middleware and validator', () => {
   const fn = createServerFn({ method: 'GET' })
     .middleware([middleware3])
     .validator(
-      () =>
+      (input: { readonly inputC: 'inputC' }) =>
         ({
-          c: 'c',
+          outputC: 'outputC',
         }) as const,
     )
     .handler((options) => {
       expectTypeOf(options).toEqualTypeOf<{
         method: 'GET'
         context: undefined
         data: {
-          readonly a: 'a'
-          readonly b: 'b'
-          readonly c: 'c'
+          readonly outputA: 'outputA'
+          readonly outputB: 'outputB'
+          readonly outputC: 'outputC'
         }
       }>()
 
@@ -114,9 +119,9 @@ test('createServerFn with middleware and validator', () => {
 
   expectTypeOf(fn).parameter(0).toEqualTypeOf<{
     data: {
-      readonly a: 'a'
-      readonly b: 'b'
-      readonly c: 'c'
+      readonly inputA: 'inputA'
+      readonly inputB: 'inputB'
+      readonly inputC: 'inputC'
     }
     headers?: HeadersInit
   }>()
@@ -138,7 +143,7 @@ test('createServerFn where validator is a primitive', () => {
 
 test('createServerFn where validator is optional if object is optional', () => {
   const fn = createServerFn({ method: 'GET' })
-    .validator(() => 'c' as 'c' | undefined)
+    .validator((input: 'c' | undefined) => input)
     .handler((options) => {
       expectTypeOf(options).toEqualTypeOf<{
         method: 'GET'