@tanstack/react-router 0.0.1-beta.283 → 0.0.1-beta.285

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/react-router",
   "author": "Tanner Linsley",
-  "version": "0.0.1-beta.283",
+  "version": "0.0.1-beta.285",
   "license": "MIT",
   "repository": "tanstack/router",
   "homepage": "https://tanstack.com/router",
@@ -44,7 +44,7 @@
     "@tanstack/store": "^0.1.3",
     "tiny-invariant": "^1.3.1",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "0.0.1-beta.283"
+    "@tanstack/history": "0.0.1-beta.285"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"

package/src/link.tsx

@@ -172,13 +172,14 @@ export type SearchParamOptions<
   TFromSearchEnsured = '/' extends TFrom
     ? FullSearchSchema<TRouteTree>
     : Expand<
-        UnionToIntersection<
           PickRequired<
             RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']
           >
-        >
       >,
-  TFromSearchOptional = Omit<FullSearchSchema<TRouteTree>, keyof TFromSearchEnsured>,
+  TFromSearchOptional = Omit<
+    FullSearchSchema<TRouteTree>,
+    keyof TFromSearchEnsured
+  >,
   TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>,
   TToSearch = '' extends TTo
     ? FullSearchSchema<TRouteTree>
@@ -207,15 +208,19 @@ export type PathParamOptions<
   TFromParamsOptional = Omit<AllParams<TRouteTree>, keyof TFromParamsEnsured>,
   TFromParams = Expand<TFromParamsOptional & TFromParamsEnsured>,
   TToParams = Expand<RouteByPath<TRouteTree, TTo>['types']['allParams']>,
-> = keyof PickRequired<TToParams> extends never
+> = never extends TToParams
   ? {
-      params?: true | ParamsReducer<TFromParams, TToParams>
-    }
-  : {
-      params: TFromParamsEnsured extends PickRequired<TToParams>
-        ? true | ParamsReducer<TFromParams, TToParams>
-        : ParamsReducer<TFromParams, TToParams>
+      params?: true | ParamsReducer<Partial<TFromParams>, Partial<TFromParams>>
     }
+  : keyof PickRequired<TToParams> extends never
+    ? {
+        params?: true | ParamsReducer<TFromParams, TToParams>
+      }
+    : {
+        params: TFromParamsEnsured extends PickRequired<TToParams>
+          ? true | ParamsReducer<TFromParams, TToParams>
+          : ParamsReducer<TFromParams, TToParams>
+      }
 
 type ParamsReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo)
 

package/src/routeInfo.ts

@@ -1,5 +1,5 @@
 import { AnyRoute, Route } from './route'
-import { Expand, UnionToIntersection } from './utils'
+import { Expand, UnionToIntersection, UnionToTuple } from './utils'
 
 export type ParseRoute<TRouteTree extends AnyRoute> =
   | TRouteTree
@@ -59,9 +59,23 @@ export type RoutePaths<TRouteTree extends AnyRoute> =
   | ParseRoute<TRouteTree>['fullPath']
   | '/'
 
+type UnionizeCollisions<T, U> = {
+  [P in keyof T & keyof U]: T[P] extends U[P] ? T[P] : T[P] | U[P]
+}
+type Reducer<T, U, C = UnionizeCollisions<T, U>> = C &
+  Omit<T, keyof C> &
+  Omit<U, keyof C>
+
+type Reduce<T extends any[], Result = unknown> = T extends [
+  infer First,
+  ...infer Rest,
+]
+  ? Reduce<Rest, Reducer<Result, First>>
+  : Result
+
 export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<
   Expand<
-    UnionToIntersection<ParseRoute<TRouteTree>['types']['fullSearchSchema']>
+    Reduce<UnionToTuple<ParseRoute<TRouteTree>['types']['fullSearchSchema']>>
   >
 >
 

package/src/utils.ts

@@ -133,6 +133,16 @@ export type PickExclude<T, U> = {
   [K in keyof T as T[K] extends U ? never : K]: T[K]
 }
 
+// from https://github.com/type-challenges/type-challenges/issues/737
+type LastInUnion<U> = UnionToIntersection<
+  U extends unknown ? (x: U) => 0 : never
+> extends (x: infer L) => 0
+  ? L
+  : never
+export type UnionToTuple<U, Last = LastInUnion<U>> = [U] extends [never]
+  ? []
+  : [...UnionToTuple<Exclude<U, Last>>, Last]
+
 //
 
 export const isServer = typeof document === 'undefined'