@tanstack/react-router 1.27.0 → 1.28.2

package/src/useParams.tsx

@@ -21,7 +21,7 @@ export function useParams<
   return useMatch({
     ...opts,
     select: (match) => {
-      return opts.select ? opts.select(match.params) : match.params
+      return opts.select ? opts.select(match.params as TParams) : match.params
     },
-  })
+  }) as TSelected
 }

package/src/utils.ts

@@ -15,12 +15,14 @@ export type PickRequired<T> = {
 }
 
 // from https://stackoverflow.com/a/76458160
-export type WithoutEmpty<T> = T extends T ? ({} extends T ? never : T) : never
+export type WithoutEmpty<T> = T extends any ? ({} extends T ? never : T) : never
 
 // export type Expand<T> = T
 export type Expand<T> = T extends object
   ? T extends infer O
-    ? { [K in keyof O]: O[K] }
+    ? O extends Function
+      ? O
+      : { [K in keyof O]: O[K] }
     : never
   : T
 
@@ -36,10 +38,12 @@ export type DeepPartial<T> = T extends object
     }
   : T
 
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export type MakeDifferenceOptional<T, U> = Omit<U, keyof T> &
-  Partial<Pick<U, keyof T & keyof U>> &
-  PickRequired<Omit<U, keyof PickRequired<T>>>
+export type MakeDifferenceOptional<TLeft, TRight> = Omit<
+  TRight,
+  keyof TLeft
+> & {
+  [K in keyof TLeft & keyof TRight]?: TRight[K]
+}
 
 // from https://stackoverflow.com/a/53955431
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -78,8 +82,6 @@ export type UnionToTuple<T, TLast = LastInUnion<T>> = [T] extends [never]
 
 //
 
-export const isServer = typeof document === 'undefined'
-
 export function last<T>(arr: Array<T>) {
   return arr[arr.length - 1]
 }
@@ -306,3 +308,34 @@ export function removeTrailingSlash(value: string): string {
 export function exactPathTest(pathName1: string, pathName2: string): boolean {
   return removeTrailingSlash(pathName1) === removeTrailingSlash(pathName2)
 }
+
+export type ControlledPromise<T> = Promise<T> & {
+  resolve: (value: T) => void
+  reject: (value: any) => void
+  status: 'pending' | 'resolved' | 'rejected'
+}
+
+export function createControlledPromise<T>(onResolve?: () => void) {
+  let resolveLoadPromise!: () => void
+  let rejectLoadPromise!: (value: any) => void
+
+  const controlledPromise = new Promise<void>((resolve, reject) => {
+    resolveLoadPromise = resolve
+    rejectLoadPromise = reject
+  }) as ControlledPromise<T>
+
+  controlledPromise.status = 'pending'
+
+  controlledPromise.resolve = () => {
+    controlledPromise.status = 'resolved'
+    resolveLoadPromise()
+    onResolve?.()
+  }
+
+  controlledPromise.reject = (e) => {
+    controlledPromise.status = 'rejected'
+    rejectLoadPromise(e)
+  }
+
+  return controlledPromise
+}