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

package/build/types/link.d.ts

@@ -43,13 +43,15 @@ export type ToSubOptions<TRouteTree extends AnyRoute = RegisteredRouter['routeTr
     state?: true | NonNullableUpdater<HistoryState>;
     from?: TFrom;
 } & CheckPath<TRouteTree, NoInfer<TResolved>, {}> & SearchParamOptions<TRouteTree, TFrom, TTo, TResolved> & PathParamOptions<TRouteTree, TFrom, TResolved>;
-export type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>, TFromSearchEnsured = '/' extends TFrom ? FullSearchSchema<TRouteTree> : Expand<UnionToIntersection<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>>>, TFromSearchOptional = Omit<FullSearchSchema<TRouteTree>, keyof TFromSearchEnsured>, TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>, TToSearch = '' extends TTo ? FullSearchSchema<TRouteTree> : Expand<RouteByPath<TRouteTree, TResolved>['types']['fullSearchSchema']>> = keyof PickRequired<TToSearch> extends never ? {
+export type SearchParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>, TFromSearchEnsured = '/' extends TFrom ? FullSearchSchema<TRouteTree> : Expand<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['fullSearchSchema']>>, TFromSearchOptional = Omit<FullSearchSchema<TRouteTree>, keyof TFromSearchEnsured>, TFromSearch = Expand<TFromSearchEnsured & TFromSearchOptional>, TToSearch = '' extends TTo ? FullSearchSchema<TRouteTree> : Expand<RouteByPath<TRouteTree, TResolved>['types']['fullSearchSchema']>> = keyof PickRequired<TToSearch> extends never ? {
     search?: true | SearchReducer<TFromSearch, TToSearch>;
 } : {
     search: TFromSearchEnsured extends PickRequired<TToSearch> ? true | SearchReducer<TFromSearch, TToSearch> : SearchReducer<TFromSearch, TToSearch>;
 };
 type SearchReducer<TFrom, TTo> = TTo | ((current: TFrom) => TTo);
-export type PathParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromParamsEnsured = Expand<UnionToIntersection<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['allParams']>>>, TFromParamsOptional = Omit<AllParams<TRouteTree>, keyof TFromParamsEnsured>, TFromParams = Expand<TFromParamsOptional & TFromParamsEnsured>, TToParams = Expand<RouteByPath<TRouteTree, TTo>['types']['allParams']>> = keyof PickRequired<TToParams> extends never ? {
+export type PathParamOptions<TRouteTree extends AnyRoute, TFrom, TTo, TFromParamsEnsured = Expand<UnionToIntersection<PickRequired<RouteByPath<TRouteTree, TFrom>['types']['allParams']>>>, TFromParamsOptional = Omit<AllParams<TRouteTree>, keyof TFromParamsEnsured>, TFromParams = Expand<TFromParamsOptional & TFromParamsEnsured>, TToParams = Expand<RouteByPath<TRouteTree, TTo>['types']['allParams']>> = never extends 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>;

package/build/types/routeInfo.d.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 | ParseRouteChildren<TRouteTree>;
 export type ParseRouteChildren<TRouteTree extends AnyRoute> = TRouteTree extends Route<any, any, any, any, any, any, any, any, any, any, any, any, any, any, infer TChildren, any> ? unknown extends TChildren ? never : TChildren extends AnyRoute[] ? {
     [TId in TChildren[number]['id'] as string]: ParseRoute<TChildren[number]>;
@@ -18,5 +18,14 @@ export type RouteByPath<TRouteTree extends AnyRoute, TPath> = Extract<ParseRoute
     fullPath: TPath;
 }>;
 export type RoutePaths<TRouteTree extends AnyRoute> = ParseRoute<TRouteTree>['fullPath'] | '/';
-export type FullSearchSchema<TRouteTree extends AnyRoute> = Partial<Expand<UnionToIntersection<ParseRoute<TRouteTree>['types']['fullSearchSchema']>>>;
+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<Reduce<UnionToTuple<ParseRoute<TRouteTree>['types']['fullSearchSchema']>>>>;
 export type AllParams<TRouteTree extends AnyRoute> = Expand<UnionToIntersection<ParseRoute<TRouteTree>['types']['allParams']>>;
+export {};

package/build/types/utils.d.ts

@@ -36,6 +36,8 @@ export type PickExtract<T, U> = {
 export type PickExclude<T, U> = {
     [K in keyof T as T[K] extends U ? never : K]: T[K];
 };
+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 declare const isServer: boolean;
 export declare function last<T>(arr: T[]): T | undefined;
 export declare function functionalUpdate<TResult>(updater: Updater<TResult> | NonNullableUpdater<TResult>, previous: TResult): TResult;
@@ -64,3 +66,4 @@ export declare function useRouteContext<TRouteTree extends AnyRoute = Registered
 }): TStrict extends true ? TSelected : TSelected | undefined;
 export declare const useLayoutEffect: typeof React.useLayoutEffect;
 export declare function escapeJSON(jsonString: string): string;
+export {};

package/build/umd/index.development.js

@@ -771,6 +771,8 @@
   // // Using DeepMerge to merge TypeA and TypeB
   // type MergedType = Expand<AssignAll<[TypeA, TypeB, TypeC]>>
 
+  // from https://github.com/type-challenges/type-challenges/issues/737
+
   //
 
   const isServer = typeof document === 'undefined';