allow reponse/formdata

Author: chorobin

packages/router-core/src/ssr/serializer/transformer.ts

@@ -34,17 +34,19 @@ export type ValidateSerializable<T, TSerializable> = T extends TSerializable
   ? T
   : T extends (...args: Array<any>) => any
     ? 'Function is not serializable'
-    : T extends Promise<any>
-      ? ValidateSerializablePromise<T, TSerializable>
-      : T extends ReadableStream<any>
-        ? ValidateReadableStream<T, TSerializable>
-        : T extends Set<any>
-          ? ValidateSerializableSet<T, TSerializable>
-          : T extends Map<any, any>
-            ? ValidateSerializableMap<T, TSerializable>
-            : {
-                [K in keyof T]: ValidateSerializable<T[K], TSerializable>
-              }
+    : unknown extends T
+      ? 'Unknown might not be serializable'
+      : T extends Promise<any>
+        ? ValidateSerializablePromise<T, TSerializable>
+        : T extends ReadableStream<any>
+          ? ValidateReadableStream<T, TSerializable>
+          : T extends Set<any>
+            ? ValidateSerializableSet<T, TSerializable>
+            : T extends Map<any, any>
+              ? ValidateSerializableMap<T, TSerializable>
+              : {
+                  [K in keyof T]: ValidateSerializable<T[K], TSerializable>
+                }
 
 export type ValidateSerializablePromise<T, TSerializable> =
   T extends Promise<infer TAwaited>

packages/start-client-core/src/createServerFn.ts

@@ -9,9 +9,7 @@ import type {
   Constrain,
   Expand,
   Register,
-  RegisteredSerializableInput,
   ResolveValidatorInput,
-  ValidateSerializable,
   ValidateSerializableInput,
   ValidateSerializableInputResult,
   Validator,
@@ -330,8 +328,12 @@ export interface FullFetcherData<
   context: AssignAllClientSendContext<TMiddlewares>
 }
 
-export type FetcherData<TRegister extends Register, TResponse> =
-  TResponse extends JsonResponse<any>
+export type FetcherData<
+  TRegister extends Register,
+  TResponse,
+> = TResponse extends Response
+  ? Response
+  : TResponse extends JsonResponse<any>
     ? ValidateSerializableInputResult<TRegister, ReturnType<TResponse['json']>>
     : ValidateSerializableInputResult<TRegister, TResponse>
 
@@ -351,9 +353,11 @@ export type ServerFnReturnType<
   TResponse,
 > = TServerFnResponseType extends 'raw'
   ? RawResponse | Promise<RawResponse>
-  :
-      | Promise<ValidateSerializableInput<TRegister, TResponse>>
-      | ValidateSerializableInput<TRegister, TResponse>
+  : TResponse extends Response
+    ? TResponse
+    :
+        | Promise<ValidateSerializableInput<TRegister, TResponse>>
+        | ValidateSerializableInput<TRegister, TResponse>
 
 export type ServerFn<
   TRegister extends Register,
@@ -416,13 +420,10 @@ export type ServerFnBaseOptions<
   functionId: string
 }
 
-export type ValidateValidatorInput<
-  TRegister extends Register,
-  TValidator,
-> = ValidateSerializable<
-  ResolveValidatorInput<TValidator>,
-  RegisteredSerializableInput<TRegister> | FormData
->
+export type ValidateValidatorInput<TRegister extends Register, TValidator> =
+  ResolveValidatorInput<TValidator> extends FormData
+    ? ResolveValidatorInput<TValidator>
+    : ValidateSerializableInput<TRegister, ResolveValidatorInput<TValidator>>
 
 export type ValidateValidator<TRegister extends Register, TValidator> =
   ValidateValidatorInput<TRegister, TValidator> extends infer TInput