@tanstack/react-router 1.26.10 → 1.26.12

package/src/fileRoute.ts

@@ -40,9 +40,10 @@ type Replace<
   TValue extends string,
   TFrom extends string,
   TTo extends string,
+  TAcc extends string = '',
 > = TValue extends `${infer Start}${TFrom}${infer Rest}`
-  ? `${Start}${TTo}${Replace<Rest, TFrom, TTo>}`
-  : TValue
+  ? Replace<Rest, TFrom, TTo, `${TAcc}${Start}${TTo}`>
+  : `${TAcc}${TValue}`
 
 export type TrimLeft<
   TValue extends string,
@@ -97,12 +98,12 @@ export type ResolveFilePath<
 export type FileRoutePath<
   TParentRoute extends AnyRoute,
   TFilePath extends string,
-> =
-  ResolveFilePath<TParentRoute, TFilePath> extends `_${infer _}`
+  TResolvedFilePath = ResolveFilePath<TParentRoute, TFilePath>,
+> = TResolvedFilePath extends `_${infer _}`
+  ? ''
+  : TResolvedFilePath extends `/_${infer _}`
     ? ''
-    : ResolveFilePath<TParentRoute, TFilePath> extends `/_${infer _}`
-      ? ''
-      : ResolveFilePath<TParentRoute, TFilePath>
+    : TResolvedFilePath
 
 export function createFileRoute<
   TFilePath extends keyof FileRoutesByPath,
@@ -164,11 +165,7 @@ export class FileRoute<
       TParentRoute,
       TSearchSchemaUsed
     >,
-    TFullSearchSchema extends
-      RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
-      TParentRoute,
-      TSearchSchema
-    >,
+    TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
     TParams extends RouteConstraints['TParams'] = Expand<
       Record<ParsePathParams<TPath>, string>
     >,
@@ -183,9 +180,7 @@ export class FileRoute<
     ] extends [never]
       ? RouteContext
       : TRouteContextReturn,
-    TAllContext extends Expand<
-      Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
-    > = Expand<
+    TAllContext = Expand<
       Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
     >,
     TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,

package/src/route.ts

@@ -61,13 +61,13 @@ export type RouteOptions<
   TSearchSchema extends Record<string, any> = {},
   TSearchSchemaUsed extends Record<string, any> = {},
   TFullSearchSchemaInput extends Record<string, any> = TSearchSchemaUsed,
-  TFullSearchSchema extends Record<string, any> = TSearchSchema,
+  TFullSearchSchema = TSearchSchema,
   TParams extends AnyPathParams = AnyPathParams,
   TAllParams extends AnyPathParams = TParams,
   TRouteContextReturn extends RouteContext = RouteContext,
   TRouteContext extends RouteContext = RouteContext,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
-  TAllContext extends Record<string, any> = AnyContext,
+  TAllContext = AnyContext,
   TLoaderDeps extends Record<string, any> = {},
   TLoaderDataReturn = unknown,
   TLoaderData = [TLoaderDataReturn] extends [never]
@@ -107,13 +107,13 @@ export type FileBaseRouteOptions<
   TPath extends string = string,
   TSearchSchemaInput extends Record<string, any> = {},
   TSearchSchema extends Record<string, any> = {},
-  TFullSearchSchema extends Record<string, any> = TSearchSchema,
+  TFullSearchSchema = TSearchSchema,
   TParams extends AnyPathParams = {},
   TAllParams = ParamsFallback<TPath, TParams>,
   TRouteContextReturn extends RouteContext = RouteContext,
   TRouteContext extends RouteContext = RouteContext,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
-  TAllContext extends Record<string, any> = AnyContext,
+  TAllContext = AnyContext,
   TLoaderDeps extends Record<string, any> = {},
   TLoaderDataReturn = unknown,
 > = {
@@ -173,13 +173,13 @@ export type BaseRouteOptions<
   TSearchSchema extends Record<string, any> = {},
   TSearchSchemaUsed extends Record<string, any> = {},
   TFullSearchSchemaInput extends Record<string, any> = TSearchSchemaUsed,
-  TFullSearchSchema extends Record<string, any> = TSearchSchema,
+  TFullSearchSchema = TSearchSchema,
   TParams extends AnyPathParams = {},
   TAllParams = ParamsFallback<TPath, TParams>,
   TRouteContextReturn extends RouteContext = RouteContext,
   TRouteContext extends RouteContext = RouteContext,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
-  TAllContext extends Record<string, any> = AnyContext,
+  TAllContext = AnyContext,
   TLoaderDeps extends Record<string, any> = {},
   TLoaderDataReturn = unknown,
 > = RoutePathOptions<TCustomId, TPath> &
@@ -202,7 +202,7 @@ export type BaseRouteOptions<
   }
 
 type BeforeLoadFn<
-  TFullSearchSchema extends Record<string, any>,
+  TFullSearchSchema,
   TParentRoute extends AnyRoute,
   TAllParams,
   TRouteContextReturn extends RouteContext,
@@ -222,7 +222,7 @@ type BeforeLoadFn<
 
 export type UpdatableRouteOptions<
   TAllParams extends Record<string, any>,
-  TFullSearchSchema extends Record<string, any>,
+  TFullSearchSchema,
   TLoaderData,
 > = {
   // test?: (args: TAllContext) => void
@@ -325,7 +325,7 @@ export type SearchSchemaValidatorFn<TInput, TReturn> = (
 export type RouteLoaderFn<
   TAllParams = {},
   TLoaderDeps extends Record<string, any> = {},
-  TAllContext extends Record<string, any> = AnyContext,
+  TAllContext = AnyContext,
   TRouteContext extends Record<string, any> = AnyContext,
   TLoaderData = unknown,
 > = (
@@ -334,8 +334,8 @@ export type RouteLoaderFn<
 
 export interface LoaderFnContext<
   TAllParams = {},
-  TLoaderDeps extends Record<string, any> = {},
-  TAllContext extends Record<string, any> = AnyContext,
+  TLoaderDeps = {},
+  TAllContext = AnyContext,
   TRouteContext extends Record<string, any> = AnyContext,
 > {
   abortController: AbortController
@@ -376,20 +376,27 @@ export type InferFullSearchSchemaInput<TRoute> = TRoute extends {
   ? TFullSearchSchemaInput
   : {}
 
-export type ResolveFullSearchSchema<TParentRoute, TSearchSchema> = Expand<
-  Assign<
-    Omit<InferFullSearchSchema<TParentRoute>, keyof RootSearchSchema>,
-    TSearchSchema
-  >
+export type ResolveFullSearchSchema<
+  TParentRoute extends AnyRoute,
+  TSearchSchema,
+> = Assign<
+  TParentRoute['isRoot'] extends true
+    ? TParentRoute['types']['searchSchema']
+    : TParentRoute['types']['fullSearchSchema'],
+  TSearchSchema,
+  keyof RootSearchSchema
 >
 
-export type ResolveFullSearchSchemaInput<TParentRoute, TSearchSchemaUsed> =
-  Expand<
-    Assign<
-      Omit<InferFullSearchSchemaInput<TParentRoute>, keyof RootSearchSchema>,
-      TSearchSchemaUsed
-    >
-  >
+export type ResolveFullSearchSchemaInput<
+  TParentRoute extends AnyRoute,
+  TSearchSchemaUsed,
+> = Assign<
+  TParentRoute['isRoot'] extends true
+    ? TParentRoute['types']['searchSchemaInput']
+    : TParentRoute['types']['fullSearchSchemaInput'],
+  TSearchSchemaUsed,
+  keyof RootSearchSchema
+>
 
 export interface AnyRoute
   extends Route<
@@ -450,12 +457,9 @@ export type RouteConstraints = {
 export function getRouteApi<
   TId extends RouteIds<RegisteredRouter['routeTree']>,
   TRoute extends AnyRoute = RouteById<RegisteredRouter['routeTree'], TId>,
-  TFullSearchSchema extends Record<
-    string,
-    any
-  > = TRoute['types']['fullSearchSchema'],
+  TFullSearchSchema = TRoute['types']['fullSearchSchema'],
   TAllParams extends AnyPathParams = TRoute['types']['allParams'],
-  TAllContext extends Record<string, any> = TRoute['types']['allContext'],
+  TAllContext = TRoute['types']['allContext'],
   TLoaderDeps extends Record<string, any> = TRoute['types']['loaderDeps'],
   TLoaderData = TRoute['types']['loaderData'],
 >(id: TId) {
@@ -473,12 +477,9 @@ export function getRouteApi<
 export class RouteApi<
   TId extends RouteIds<RegisteredRouter['routeTree']>,
   TRoute extends AnyRoute = RouteById<RegisteredRouter['routeTree'], TId>,
-  TFullSearchSchema extends Record<
-    string,
-    any
-  > = TRoute['types']['fullSearchSchema'],
+  TFullSearchSchema = TRoute['types']['fullSearchSchema'],
   TAllParams extends AnyPathParams = TRoute['types']['allParams'],
-  TAllContext extends Record<string, any> = TRoute['types']['allContext'],
+  TAllContext = TRoute['types']['allContext'],
   TLoaderDeps extends Record<string, any> = TRoute['types']['loaderDeps'],
   TLoaderData = TRoute['types']['loaderData'],
 > {
@@ -568,11 +569,7 @@ export class Route<
     string,
     any
   > = ResolveFullSearchSchemaInput<TParentRoute, TSearchSchemaUsed>,
-  TFullSearchSchema extends
-    RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
-    TParentRoute,
-    TSearchSchema
-  >,
+  TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
   TParams extends RouteConstraints['TParams'] = Expand<
     Record<ParsePathParams<TPath>, string>
   >,
@@ -586,9 +583,7 @@ export class Route<
   ] extends [never]
     ? RouteContext
     : TRouteContextReturn,
-  in out TAllContext extends Expand<
-    Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
-  > = Expand<
+  in out TAllContext = Expand<
     Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
   >,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
@@ -918,11 +913,7 @@ export function createRoute<
     string,
     any
   > = ResolveFullSearchSchemaInput<TParentRoute, TSearchSchemaUsed>,
-  TFullSearchSchema extends
-    RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
-    TParentRoute,
-    TSearchSchema
-  >,
+  TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
   TParams extends RouteConstraints['TParams'] = Expand<
     Record<ParsePathParams<TPath>, string>
   >,
@@ -936,9 +927,7 @@ export function createRoute<
   ] extends [never]
     ? RouteContext
     : TRouteContextReturn,
-  TAllContext extends Expand<
-    Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
-  > = Expand<
+  TAllContext = Expand<
     Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
   >,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,
@@ -1091,7 +1080,7 @@ export class RootRoute<
   {}, // TAllParams
   TRouteContextReturn, // TRouteContextReturn
   TRouteContext, // TRouteContext
-  Expand<Assign<TRouterContext, TRouteContext>>, // TAllContext
+  Assign<TRouterContext, TRouteContext>, // TAllContext
   TRouterContext, // TRouterContext
   TLoaderDeps,
   TLoaderDataReturn,
@@ -1298,16 +1287,10 @@ export class NotFoundRoute<
     TParentRoute,
     TSearchSchemaUsed
   >,
-  TFullSearchSchema extends
-    RouteConstraints['TFullSearchSchema'] = ResolveFullSearchSchema<
-    TParentRoute,
-    TSearchSchema
-  >,
+  TFullSearchSchema = ResolveFullSearchSchema<TParentRoute, TSearchSchema>,
   TRouteContextReturn extends RouteConstraints['TRouteContext'] = AnyContext,
   TRouteContext extends RouteConstraints['TRouteContext'] = RouteContext,
-  TAllContext extends Expand<
-    Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
-  > = Expand<
+  TAllContext = Expand<
     Assign<IsAny<TParentRoute['types']['allContext'], {}>, TRouteContext>
   >,
   TRouterContext extends RouteConstraints['TRouterContext'] = AnyContext,

package/src/utils.ts

@@ -49,68 +49,13 @@ export type IsUnion<T, U extends T = T> = (
   ? false
   : true
 
-// type Compute<T> = { [K in keyof T]: T[K] } | never
-
-// type AllKeys<T> = T extends any ? keyof T : never
-
-// export type MergeUnion<T, Keys extends keyof T = keyof T> = Compute<
-//   {
-//     [K in Keys]: T[Keys]
-//   } & {
-//     [K in AllKeys<T>]?: T extends any
-//       ? K extends keyof T
-//         ? T[K]
-//         : never
-//       : never
-//   }
-// >
-
-export type Assign<TLeft, TRight> = Omit<TLeft, keyof TRight> & TRight
-
-export type AssignAll<T extends Array<any>> = T extends [
-  infer Left,
-  ...infer Right,
-]
-  ? Right extends Array<any>
-    ? Assign<Left, AssignAll<Right>>
-    : Left
-  : {}
-
-// // Sample types to merge
-// type TypeA = {
-//   shared: string
-//   onlyInA: string
-//   nested: {
-//     shared: string
-//     aProp: string
-//   }
-//   array: string[]
-// }
-
-// type TypeB = {
-//   shared: number
-//   onlyInB: number
-//   nested: {
-//     shared: number
-//     bProp: number
-//   }
-//   array: number[]
-// }
-
-// type TypeC = {
-//   shared: boolean
-//   onlyInC: boolean
-//   nested: {
-//     shared: boolean
-//     cProp: boolean
-//   }
-//   array: boolean[]
-// }
-
-// type Test = Expand<Assign<TypeA, TypeB>>
-
-// // Using DeepMerge to merge TypeA and TypeB
-// type MergedType = Expand<AssignAll<[TypeA, TypeB, TypeC]>>
+export type Assign<TLeft, TRight, TExclude = never> = {
+  [K in Exclude<keyof TLeft | keyof TRight, TExclude>]: K extends keyof TRight
+    ? TRight[K]
+    : K extends keyof TLeft
+      ? TLeft[K]
+      : never
+}
 
 export type Timeout = ReturnType<typeof setTimeout>