@tanstack/router-core 1.119.0 → 1.120.4-alpha.1

package/src/typePrimitives.ts

@@ -5,7 +5,7 @@ import type {
   SearchParamOptions,
   ToPathOption,
 } from './link'
-import type { Redirect } from './redirect'
+import type { RedirectOptions } from './redirect'
 import type { RouteIds } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { UseParamsResult } from './useParams'
@@ -104,7 +104,7 @@ export type ValidateRedirectOptions<
   TDefaultFrom extends string = string,
 > = Constrain<
   TOptions,
-  Redirect<
+  RedirectOptions<
     TRouter,
     InferFrom<TOptions, TDefaultFrom>,
     InferTo<TOptions>,

package/src/utils.ts

@@ -37,12 +37,12 @@ export type DeepPartial<T> = T extends object
     }
   : T
 
-export type MakeDifferenceOptional<TLeft, TRight> = Omit<
-  TRight,
-  keyof TLeft
-> & {
-  [K in keyof TLeft & keyof TRight]?: TRight[K]
-}
+export type MakeDifferenceOptional<TLeft, TRight> = keyof TLeft &
+  keyof TRight extends never
+  ? TRight
+  : Omit<TRight, keyof TLeft & keyof TRight> & {
+      [K in keyof TLeft & keyof TRight]?: TRight[K]
+    }
 
 // from https://stackoverflow.com/a/53955431
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -169,6 +169,20 @@ export type ValidateJSON<T> = ((...args: Array<any>) => any) extends T
     : 'Function is not serializable'
   : { [K in keyof T]: ValidateJSON<T[K]> }
 
+export type LooseReturnType<T> = T extends (
+  ...args: Array<any>
+) => infer TReturn
+  ? TReturn
+  : never
+
+export type LooseAsyncReturnType<T> = T extends (
+  ...args: Array<any>
+) => infer TReturn
+  ? TReturn extends Promise<infer TReturn>
+    ? TReturn
+    : TReturn
+  : never
+
 export function last<T>(arr: Array<T>) {
   return arr[arr.length - 1]
 }