@tanstack/react-router 1.81.5 → 1.81.6

package/src/utils.ts

@@ -72,12 +72,12 @@ export type NonNullableUpdater<TPrevious, TResult = TPrevious> =
   | TResult
   | ((prev: TPrevious) => TResult)
 
-export type MergeUnionObjects<TUnion> = TUnion extends MergeUnionPrimitive
+export type ExtractObjects<TUnion> = TUnion extends MergeAllPrimitive
   ? never
   : TUnion
 
-export type MergeUnionObject<TUnion> =
-  MergeUnionObjects<TUnion> extends infer TObj
+export type PartialMergeAllObject<TUnion> =
+  ExtractObjects<TUnion> extends infer TObj
     ? {
         [TKey in TObj extends any ? keyof TObj : never]?: TObj extends any
           ? TKey extends keyof TObj
@@ -87,23 +87,53 @@ export type MergeUnionObject<TUnion> =
       }
     : never
 
-export type MergeUnionPrimitive =
+export type MergeAllPrimitive =
   | ReadonlyArray<any>
   | number
   | string
   | bigint
   | boolean
   | symbol
+  | undefined
+  | null
 
-export type MergeUnionPrimitives<TUnion> = TUnion extends MergeUnionPrimitive
+export type ExtractPrimitives<TUnion> = TUnion extends MergeAllPrimitive
   ? TUnion
   : TUnion extends object
     ? never
     : TUnion
 
-export type MergeUnion<TUnion> =
-  | MergeUnionPrimitives<TUnion>
-  | MergeUnionObject<TUnion>
+export type PartialMergeAll<TUnion> =
+  | ExtractPrimitives<TUnion>
+  | PartialMergeAllObject<TUnion>
+
+/**
+ * To be added to router types
+ */
+export type UnionToIntersection<T> = (
+  T extends any ? (arg: T) => any : never
+) extends (arg: infer T) => any
+  ? T
+  : never
+
+/**
+ * Merges everything in a union into one object.
+ * This mapped type is homomorphic which means it preserves stuff! :)
+ */
+export type MergeAllObjects<
+  TUnion,
+  TIntersected = UnionToIntersection<ExtractObjects<TUnion>>,
+> = [keyof TIntersected] extends [never]
+  ? never
+  : {
+      [TKey in keyof TIntersected]: TUnion extends any
+        ? TUnion[TKey & keyof TUnion]
+        : never
+    }
+
+export type MergeAll<TUnion> =
+  | MergeAllObjects<TUnion>
+  | ExtractPrimitives<TUnion>
 
 export type Constrain<T, TConstraint, TDefault = TConstraint> =
   | (T extends TConstraint ? T : never)

package/src/validators.ts

@@ -0,0 +1,106 @@
+import type { SearchSchemaInput } from './route'
+
+export interface StandardSchemaValidatorProps<TInput, TOutput> {
+  readonly types?: StandardSchemaValidatorTypes<TInput, TOutput> | undefined
+  readonly validate: AnyStandardSchemaValidate
+}
+
+export interface StandardSchemaValidator<TInput, TOutput> {
+  readonly '~standard': StandardSchemaValidatorProps<TInput, TOutput>
+}
+
+export type AnyStandardSchemaValidator = StandardSchemaValidator<any, any>
+
+export interface StandardSchemaValidatorTypes<TInput, TOutput> {
+  readonly input: TInput
+  readonly output: TOutput
+}
+
+export interface AnyStandardSchemaValidateSuccess {
+  readonly value: any
+  readonly issues?: undefined
+}
+
+export interface AnyStandardSchemaValidateFailure {
+  readonly issues: ReadonlyArray<AnyStandardSchemaValidateIssue>
+}
+
+export interface AnyStandardSchemaValidateIssue {
+  readonly message: string
+}
+
+export interface AnyStandardSchemaValidateInput {
+  readonly value: any
+}
+
+export type AnyStandardSchemaValidate = (
+  value: unknown,
+) =>
+  | (AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure)
+  | Promise<AnyStandardSchemaValidateSuccess | AnyStandardSchemaValidateFailure>
+
+export interface ValidatorObj<TInput, TOutput> {
+  parse: ValidatorFn<TInput, TOutput>
+}
+
+export type AnyValidatorObj = ValidatorObj<any, any>
+
+export interface ValidatorAdapter<TInput, TOutput> {
+  types: {
+    input: TInput
+    output: TOutput
+  }
+  parse: (input: unknown) => TOutput
+}
+
+export type AnyValidatorAdapter = ValidatorAdapter<any, any>
+
+export type AnyValidatorFn = ValidatorFn<any, any>
+
+export type ValidatorFn<TInput, TOutput> = (input: TInput) => TOutput
+
+export type Validator<TInput, TOutput> =
+  | ValidatorObj<TInput, TOutput>
+  | ValidatorFn<TInput, TOutput>
+  | ValidatorAdapter<TInput, TOutput>
+  | StandardSchemaValidator<TInput, TOutput>
+  | undefined
+
+export type AnyValidator = Validator<any, any>
+
+export type AnySchema = {}
+
+export type DefaultValidator = Validator<Record<string, unknown>, AnySchema>
+
+export type ResolveValidatorInputFn<TValidator> = TValidator extends (
+  input: infer TSchemaInput,
+) => any
+  ? TSchemaInput extends SearchSchemaInput
+    ? Omit<TSchemaInput, keyof SearchSchemaInput>
+    : ResolveValidatorOutputFn<TValidator>
+  : AnySchema
+
+export type ResolveValidatorInput<TValidator> =
+  TValidator extends AnyStandardSchemaValidator
+    ? NonNullable<TValidator['~standard']['types']>['input']
+    : TValidator extends AnyValidatorAdapter
+      ? TValidator['types']['input']
+      : TValidator extends AnyValidatorObj
+        ? ResolveValidatorInputFn<TValidator['parse']>
+        : ResolveValidatorInputFn<TValidator>
+
+export type ResolveValidatorOutputFn<TValidator> = TValidator extends (
+  ...args: any
+) => infer TSchema
+  ? TSchema
+  : AnySchema
+
+export type ResolveValidatorOutput<TValidator> = unknown extends TValidator
+  ? TValidator
+  : TValidator extends AnyStandardSchemaValidator
+    ? NonNullable<TValidator['~standard']['types']>['output']
+    : TValidator extends AnyValidatorAdapter
+      ? TValidator['types']['output']
+      : TValidator extends AnyValidatorObj
+        ? ResolveValidatorOutputFn<TValidator['parse']>
+        : ResolveValidatorOutputFn<TValidator>