i sure hope an abstraction doesn't break things again

Author: brhx

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

@@ -32,7 +32,7 @@ export interface CreateSerializationAdapterOptions<TInput, TOutput> {
 
 export type ValidateSerializable<T, TSerializable> =
   T extends ReadonlyArray<unknown>
-    ? ValidateSerializableArray<T, TSerializable>
+    ? ResolveArrayShape<T, TSerializable, 'input'>
     : T extends TSerializable
       ? T
       : T extends (...args: Array<any>) => any
@@ -45,9 +45,7 @@ export type ValidateSerializable<T, TSerializable> =
               ? ValidateSerializableSet<T, TSerializable>
               : T extends Map<any, any>
                 ? ValidateSerializableMap<T, TSerializable>
-                : {
-                    [K in keyof T]: ValidateSerializable<T[K], TSerializable>
-                  }
+                : { [K in keyof T]: ValidateSerializable<T[K], TSerializable> }
 
 export type ValidateSerializablePromise<T, TSerializable> =
   T extends Promise<infer TAwaited>
@@ -72,28 +70,6 @@ export type ValidateSerializableMap<T, TSerializable> =
       >
     : never
 
-type ValidateSerializableArray<
-  T extends ReadonlyArray<unknown>,
-  TSerializable,
-> = number extends T['length']
-  ? T extends Array<infer U>
-    ? Array<ValidateSerializable<U, TSerializable>>
-    : ReadonlyArray<ValidateSerializable<T[number], TSerializable>>
-  : ValidateSerializableTuple<T, TSerializable>
-
-type ValidateSerializableTuple<
-  T extends ReadonlyArray<unknown>,
-  TSerializable,
-> = T extends readonly [infer THead, ...infer TTail]
-  ? readonly [
-      ValidateSerializable<THead, TSerializable>,
-      ...ValidateSerializableTuple<
-        TTail extends ReadonlyArray<unknown> ? TTail : [],
-        TSerializable
-      >,
-    ]
-  : T
-
 export type RegisteredReadableStream =
   unknown extends SerializerExtensions['ReadableStream']
     ? never
@@ -199,7 +175,7 @@ export type ValidateSerializableInputResult<TRegister, T> =
 
 export type ValidateSerializableResult<T, TSerializable> =
   T extends ReadonlyArray<unknown>
-    ? ValidateSerializableResultArray<T, TSerializable>
+    ? ResolveArrayShape<T, TSerializable, 'result'>
     : T extends TSerializable
       ? T
       : unknown extends SerializerExtensions['ReadableStream']
@@ -208,28 +184,6 @@ export type ValidateSerializableResult<T, TSerializable> =
           ? ReadableStream
           : { [K in keyof T]: ValidateSerializableResult<T[K], TSerializable> }
 
-type ValidateSerializableResultArray<
-  T extends ReadonlyArray<unknown>,
-  TSerializable,
-> = number extends T['length']
-  ? T extends Array<infer U>
-    ? Array<ValidateSerializableResult<U, TSerializable>>
-    : ReadonlyArray<ValidateSerializableResult<T[number], TSerializable>>
-  : ValidateSerializableResultTuple<T, TSerializable>
-
-type ValidateSerializableResultTuple<
-  T extends ReadonlyArray<unknown>,
-  TSerializable,
-> = T extends readonly [infer THead, ...infer TTail]
-  ? readonly [
-      ValidateSerializableResult<THead, TSerializable>,
-      ...ValidateSerializableResultTuple<
-        TTail extends ReadonlyArray<unknown> ? TTail : [],
-        TSerializable
-      >,
-    ]
-  : T
-
 export type RegisteredSSROption<TRegister> =
   unknown extends RegisteredConfigType<TRegister, 'defaultSsr'>
     ? SSROption
@@ -262,3 +216,36 @@ export type ValidateSerializableLifecycleResultSSR<
     : RegisteredSSROption<TRegister> extends false
       ? any
       : ValidateSerializableInput<TRegister, LooseReturnType<TFn>>
+
+type ResolveArrayShape<
+  T extends ReadonlyArray<unknown>,
+  TSerializable,
+  TMode extends 'input' | 'result',
+> = number extends T['length']
+  ? T extends Array<infer U>
+    ? Array<ResolveArrayElement<U, TSerializable, TMode>>
+    : ReadonlyArray<ResolveArrayElement<T[number], TSerializable, TMode>>
+  : ResolveTupleShape<T, TSerializable, TMode>
+
+type ResolveTupleShape<
+  T extends ReadonlyArray<unknown>,
+  TSerializable,
+  TMode extends 'input' | 'result',
+> = T extends readonly [infer THead, ...infer TTail]
+  ? readonly [
+      ResolveArrayElement<THead, TSerializable, TMode>,
+      ...ResolveTupleShape<
+        TTail extends ReadonlyArray<unknown> ? TTail : [],
+        TSerializable,
+        TMode
+      >,
+    ]
+  : T
+
+type ResolveArrayElement<
+  TValue,
+  TSerializable,
+  TMode extends 'input' | 'result',
+> = TMode extends 'input'
+  ? ValidateSerializable<TValue, TSerializable>
+  : ValidateSerializableResult<TValue, TSerializable>