@tanstack/solid-router 1.109.2 → 1.111.3

package/src/route.ts

@@ -12,36 +12,43 @@ import type {
   AnyPathParams,
   AnySchema,
   AnyValidator,
-  Assign,
+  BeforeLoadContextParameter,
+  BuildLocationFn,
   Constrain,
   ConstrainLiteral,
-  ContextAsyncReturnType,
-  ContextReturnType,
+  RootRoute as CoreRootRoute,
+  Route as CoreRoute,
   DefaultValidator,
   ErrorComponentProps,
   Expand,
-  InferAllContext,
-  InferAllParams,
-  InferFullSearchSchema,
-  InferFullSearchSchemaInput,
-  IntersectAssign,
+  FullSearchSchemaOption,
+  NavigateFn,
+  NavigateOptions,
   NoInfer,
   NotFoundRouteProps,
   ParamsOptions,
   ParsedLocation,
+  RemountDepsOptions,
+  ResolveAllContext,
+  ResolveAllParamsFromParent,
+  ResolveFullSearchSchema,
+  ResolveFullSearchSchemaInput,
   ResolveId,
   ResolveLoaderData,
   ResolveParams,
-  ResolveRouteContext,
-  ResolveSearchValidatorInput,
-  ResolveValidatorOutput,
   RootRouteId,
+  RouteById,
   RouteContext,
+  RouteContextParameter,
+  RouteIds,
   RoutePathOptions,
   RoutePathOptionsIntersection,
+  RoutePaths,
   RoutePrefix,
+  RouteTypes,
   SearchFilter,
   SearchMiddleware,
+  ToMaskOptions,
   TrimPathRight,
   UpdatableStaticRouteOption,
 } from '@tanstack/router-core'
@@ -58,10 +65,7 @@ import type {
   MakeRouteMatchUnion,
   RouteMatch,
 } from './Matches'
-import type { NavigateOptions, ToMaskOptions } from './link'
-import type { ParseRoute, RouteById, RouteIds, RoutePaths } from './routeInfo'
 import type { AnyRouter, RegisteredRouter, Router } from './router'
-import type { BuildLocationFn, NavigateFn } from './RouterProvider'
 import type { NotFoundError } from './not-found'
 import type { LazyRoute } from './fileRoute'
 
@@ -106,13 +110,6 @@ export type RouteOptions<
     NoInfer<TBeforeLoadFn>
   >
 
-export interface FullSearchSchemaOption<
-  in out TParentRoute extends AnyRoute,
-  in out TSearchValidator,
-> {
-  search: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
-}
-
 export type RouteContextFn<
   in out TParentRoute extends AnyRoute,
   in out TSearchValidator,
@@ -288,30 +285,6 @@ export interface RouteContextOptions<
   context: Expand<RouteContextParameter<TParentRoute, TRouterContext>>
 }
 
-export interface RemountDepsOptions<
-  in out TRouteId,
-  in out TFullSearchSchema,
-  in out TAllParams,
-  in out TLoaderDeps,
-> {
-  routeId: TRouteId
-  search: TFullSearchSchema
-  params: TAllParams
-  loaderDeps: TLoaderDeps
-}
-
-export type MakeRemountDepsOptionsUnion<
-  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TRoute extends AnyRoute = ParseRoute<TRouteTree>,
-> = TRoute extends any
-  ? RemountDepsOptions<
-      TRoute['id'],
-      TRoute['types']['fullSearchSchema'],
-      TRoute['types']['allParams'],
-      TRoute['types']['loaderDeps']
-    >
-  : never
-
 export interface BeforeLoadContextOptions<
   in out TParentRoute extends AnyRoute,
   in out TSearchValidator,
@@ -571,50 +544,6 @@ export interface LoaderFnContext<
   route: Route
 }
 
-export type ResolveFullSearchSchema<
-  TParentRoute extends AnyRoute,
-  TSearchValidator,
-> = unknown extends TParentRoute
-  ? ResolveValidatorOutput<TSearchValidator>
-  : IntersectAssign<
-      InferFullSearchSchema<TParentRoute>,
-      ResolveValidatorOutput<TSearchValidator>
-    >
-
-export type ResolveFullSearchSchemaInput<
-  TParentRoute extends AnyRoute,
-  TSearchValidator,
-> = IntersectAssign<
-  InferFullSearchSchemaInput<TParentRoute>,
-  ResolveSearchValidatorInput<TSearchValidator>
->
-
-export type RouteContextParameter<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-> = unknown extends TParentRoute
-  ? TRouterContext
-  : Assign<TRouterContext, InferAllContext<TParentRoute>>
-
-export type BeforeLoadContextParameter<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-  TRouteContextFn,
-> = Assign<
-  RouteContextParameter<TParentRoute, TRouterContext>,
-  ContextReturnType<TRouteContextFn>
->
-
-export type ResolveAllContext<
-  TParentRoute extends AnyRoute,
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-> = Assign<
-  BeforeLoadContextParameter<TParentRoute, TRouterContext, TRouteContextFn>,
-  ContextAsyncReturnType<TBeforeLoadFn>
->
-
 export interface AnyRoute
   extends Route<
     any,
@@ -629,6 +558,7 @@ export interface AnyRoute
     any,
     any,
     any,
+    any,
     any
   > {}
 
@@ -636,11 +566,6 @@ export type AnyRouteWithContext<TContext> = AnyRoute & {
   types: { allContext: TContext }
 }
 
-export type ResolveAllParamsFromParent<
-  TParentRoute extends AnyRoute,
-  TParams,
-> = Assign<InferAllParams<TParentRoute>, TParams>
-
 export type RouteConstraints = {
   TParentRoute: AnyRoute
   TPath: string
@@ -749,7 +674,25 @@ export class Route<
   in out TLoaderDeps extends Record<string, any> = {},
   in out TLoaderFn = undefined,
   in out TChildren = unknown,
-> {
+  in out TFileRouteTypes = unknown,
+> implements
+    CoreRoute<
+      TParentRoute,
+      TPath,
+      TFullPath,
+      TCustomId,
+      TId,
+      TSearchValidator,
+      TParams,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   isRoot: TParentRoute extends Route<any> ? true : false
   options: RouteOptions<
     TParentRoute,
@@ -847,37 +790,22 @@ export class Route<
     )
   }
 
-  types!: {
-    parentRoute: TParentRoute
-    path: TPath
-    to: TrimPathRight<TFullPath>
-    fullPath: TFullPath
-    customId: TCustomId
-    id: TId
-    searchSchema: ResolveValidatorOutput<TSearchValidator>
-    searchSchemaInput: ResolveSearchValidatorInput<TSearchValidator>
-    searchValidator: TSearchValidator
-    fullSearchSchema: ResolveFullSearchSchema<TParentRoute, TSearchValidator>
-    fullSearchSchemaInput: ResolveFullSearchSchemaInput<
-      TParentRoute,
-      TSearchValidator
-    >
-    params: TParams
-    allParams: ResolveAllParamsFromParent<TParentRoute, TParams>
-    routerContext: TRouterContext
-    routeContext: ResolveRouteContext<TRouteContextFn, TBeforeLoadFn>
-    routeContextFn: TRouteContextFn
-    beforeLoadFn: TBeforeLoadFn
-    allContext: ResolveAllContext<
-      TParentRoute,
-      TRouterContext,
-      TRouteContextFn,
-      TBeforeLoadFn
-    >
-    children: TChildren
-    loaderData: ResolveLoaderData<TLoaderFn>
-    loaderDeps: TLoaderDeps
-  }
+  types!: RouteTypes<
+    TParentRoute,
+    TPath,
+    TFullPath,
+    TCustomId,
+    TId,
+    TSearchValidator,
+    TParams,
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren,
+    TFileRouteTypes
+  >
 
   init = (opts: { originalIndex: number; defaultSsr?: boolean }): void => {
     this.originalIndex = opts.originalIndex
@@ -967,7 +895,8 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren
+    TNewChildren,
+    TFileRouteTypes
   > {
     return this._addFileChildren(children) as Route<
       TParentRoute,
@@ -982,7 +911,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TNewChildren
+      TNewChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1001,7 +931,8 @@ export class Route<
     TBeforeLoadFn,
     TLoaderDeps,
     TLoaderFn,
-    TNewChildren
+    TNewChildren,
+    TFileRouteTypes
   > {
     if (Array.isArray(children)) {
       this.children = children as TChildren
@@ -1024,7 +955,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TLoaderFn,
-      TNewChildren
+      TNewChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1056,7 +988,8 @@ export class Route<
       TBeforeLoadFn,
       TLoaderDeps,
       TNewLoaderFn,
-      TChildren
+      TChildren,
+      TFileRouteTypes
     >
   }
 
@@ -1245,29 +1178,43 @@ export function createRootRouteWithContext<TRouterContext extends {}>() {
 export const rootRouteWithContext = createRootRouteWithContext
 
 export class RootRoute<
-  in out TSearchValidator = undefined,
-  in out TRouterContext = {},
-  in out TRouteContextFn = AnyContext,
-  in out TBeforeLoadFn = AnyContext,
-  in out TLoaderDeps extends Record<string, any> = {},
-  in out TLoaderFn = undefined,
-  in out TChildren = unknown,
-  in out TFileRouteTypes = unknown,
-> extends Route<
-  any, // TParentRoute
-  '/', // TPath
-  '/', // TFullPath
-  string, // TCustomId
-  RootRouteId, // TId
-  TSearchValidator, // TSearchValidator
-  {}, // TParams
-  TRouterContext,
-  TRouteContextFn,
-  TBeforeLoadFn,
-  TLoaderDeps,
-  TLoaderFn,
-  TChildren // TChildren
-> {
+    in out TSearchValidator = undefined,
+    in out TRouterContext = {},
+    in out TRouteContextFn = AnyContext,
+    in out TBeforeLoadFn = AnyContext,
+    in out TLoaderDeps extends Record<string, any> = {},
+    in out TLoaderFn = undefined,
+    in out TChildren = unknown,
+    in out TFileRouteTypes = unknown,
+  >
+  extends Route<
+    any, // TParentRoute
+    '/', // TPath
+    '/', // TFullPath
+    string, // TCustomId
+    RootRouteId, // TId
+    TSearchValidator, // TSearchValidator
+    {}, // TParams
+    TRouterContext,
+    TRouteContextFn,
+    TBeforeLoadFn,
+    TLoaderDeps,
+    TLoaderFn,
+    TChildren, // TChildren
+    TFileRouteTypes
+  >
+  implements
+    CoreRootRoute<
+      TSearchValidator,
+      TRouterContext,
+      TRouteContextFn,
+      TBeforeLoadFn,
+      TLoaderDeps,
+      TLoaderFn,
+      TChildren,
+      TFileRouteTypes
+    >
+{
   /**
    * @deprecated `RootRoute` is now an internal implementation detail. Use `createRootRoute()` instead.
    */

package/src/router.ts

@@ -42,42 +42,43 @@ import type {
   AnyContext,
   AnySchema,
   AnyValidator,
+  BuildLocationFn,
   CommitLocationOptions,
   ControlledPromise,
+  FullSearchSchema,
+  MakeRemountDepsOptionsUnion,
   Manifest,
+  NavigateFn,
+  NavigateOptions,
   NonNullableUpdater,
   ParsedLocation,
   PickAsRequired,
+  Register,
   ResolveRelativePath,
+  RouteById,
+  RoutePaths,
+  RoutesById,
+  RoutesByPath,
   SearchMiddleware,
   SearchParser,
   SearchSerializer,
   StartSerializer,
+  ToOptions,
   TrailingSlashOption,
   Updater,
   ViewTransitionOptions,
 } from '@tanstack/router-core'
 import type {
   AnyRoute,
-  AnyRouteWithContext,
   BeforeLoadContextOptions,
   ErrorRouteComponent,
   LoaderFnContext,
-  MakeRemountDepsOptionsUnion,
   NotFoundRouteComponent,
   RootRoute,
   RouteComponent,
   RouteContextOptions,
   RouteMask,
 } from './route'
-
-import type {
-  FullSearchSchema,
-  RouteById,
-  RoutePaths,
-  RoutesById,
-  RoutesByPath,
-} from './routeInfo'
 import type {
   AnyRouteMatch,
   MakeRouteMatch,
@@ -85,11 +86,8 @@ import type {
   MatchRouteOptions,
 } from './Matches'
 
-import type { BuildLocationFn, NavigateFn } from './RouterProvider'
-
 import type { AnyRedirect, ResolvedRedirect } from './redirects'
 import type { NotFoundError } from './not-found'
-import type { NavigateOptions, ToOptions } from './link'
 
 declare global {
   interface Window {
@@ -97,20 +95,8 @@ declare global {
   }
 }
 
-export interface Register {
-  // router: Router
-}
-
 export type AnyRouter = Router<any, any, any, any, any>
 
-export type AnyRouterWithContext<TContext> = Router<
-  AnyRouteWithContext<TContext>,
-  any,
-  any,
-  any,
-  any
->
-
 export type RegisteredRouter = Register extends {
   router: infer TRouter extends AnyRouter
 }

package/src/typePrimitives.ts

@@ -1,48 +1,53 @@
+import type { LinkComponentProps } from './link'
+import type { Redirect } from './redirects'
+import type { AnyRouter, RegisteredRouter } from './router'
+import type { UseParamsOptions, UseParamsResult } from './useParams'
+import type { UseSearchOptions, UseSearchResult } from './useSearch'
 import type {
+  Constrain,
+  ConstrainLiteral,
   FromPathOption,
-  LinkComponentProps,
   NavigateOptions,
   PathParamOptions,
+  RouteIds,
   SearchParamOptions,
   ToPathOption,
-} from './link'
-import type { RouteIds } from './routeInfo'
-import type { AnyRouter, RegisteredRouter } from './router'
-import type { UseParamsOptions, UseParamsResult } from './useParams'
-import type { UseSearchOptions, UseSearchResult } from './useSearch'
-import type { Constrain, ConstrainLiteral } from '@tanstack/router-core'
+} from '@tanstack/router-core'
 
 export type ValidateFromPath<
-  TFrom,
   TRouter extends AnyRouter = RegisteredRouter,
+  TFrom = string,
 > = FromPathOption<TRouter, TFrom>
 
 export type ValidateToPath<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = ToPathOption<TRouter, TFrom, TTo>
 
 export type ValidateSearch<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = SearchParamOptions<TRouter, TFrom, TTo>
 
 export type ValidateParams<
-  TTo extends string | undefined,
-  TFrom extends string = string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TTo extends string | undefined = undefined,
+  TFrom extends string = string,
 > = PathParamOptions<TRouter, TFrom, TTo>
 
 /**
  * @internal
  */
-export type InferFrom<TOptions> = TOptions extends {
+export type InferFrom<
+  TOptions,
+  TDefaultFrom extends string = string,
+> = TOptions extends {
   from: infer TFrom extends string
 }
   ? TFrom
-  : string
+  : TDefaultFrom
 
 /**
  * @internal
@@ -69,13 +74,14 @@ export type InferMaskFrom<TOptions> = TOptions extends {
   : string
 
 export type ValidateNavigateOptions<
-  TOptions,
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
 > = Constrain<
   TOptions,
   NavigateOptions<
     TRouter,
-    InferFrom<TOptions>,
+    InferFrom<TOptions, TDefaultFrom>,
     InferTo<TOptions>,
     InferMaskFrom<TOptions>,
     InferMaskTo<TOptions>
@@ -83,20 +89,54 @@ export type ValidateNavigateOptions<
 >
 
 export type ValidateNavigateOptionsArray<
-  TOptions extends ReadonlyArray<any>,
   TRouter extends AnyRouter = RegisteredRouter,
-> = { [K in keyof TOptions]: ValidateNavigateOptions<TOptions[K], TRouter> }
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+> = {
+  [K in keyof TOptions]: ValidateNavigateOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom
+  >
+}
+export type ValidateRedirectOptions<
+  TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
+> = Constrain<
+  TOptions,
+  Redirect<
+    TRouter,
+    InferFrom<TOptions, TDefaultFrom>,
+    InferTo<TOptions>,
+    InferMaskFrom<TOptions>,
+    InferMaskTo<TOptions>
+  >
+>
+
+export type ValidateRedirectOptionsArray<
+  TRouter extends AnyRouter = RegisteredRouter,
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+> = {
+  [K in keyof TOptions]: ValidateRedirectOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom
+  >
+}
 
 export type ValidateLinkOptions<
-  TOptions,
-  TComp = 'a',
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions = unknown,
+  TDefaultFrom extends string = string,
+  TComp = 'a',
 > = Constrain<
   TOptions,
   LinkComponentProps<
     TComp,
     TRouter,
-    InferFrom<TOptions>,
+    InferFrom<TOptions, TDefaultFrom>,
     InferTo<TOptions>,
     InferMaskFrom<TOptions>,
     InferMaskTo<TOptions>
@@ -104,16 +144,22 @@ export type ValidateLinkOptions<
 >
 
 export type ValidateLinkOptionsArray<
-  TOptions extends ReadonlyArray<any>,
-  TComp = 'a',
   TRouter extends AnyRouter = RegisteredRouter,
+  TOptions extends ReadonlyArray<any> = ReadonlyArray<unknown>,
+  TDefaultFrom extends string = string,
+  TComp = 'a',
 > = {
-  [K in keyof TOptions]: ValidateLinkOptions<TOptions[K], TComp, TRouter>
+  [K in keyof TOptions]: ValidateLinkOptions<
+    TRouter,
+    TOptions[K],
+    TDefaultFrom,
+    TComp
+  >
 }
 
 export type ValidateId<
-  TId extends string,
   TRouter extends AnyRouter = RegisteredRouter,
+  TId extends string = string,
 > = ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>
 
 /**

package/src/useBlocker.tsx

@@ -6,7 +6,7 @@ import type {
   HistoryLocation,
 } from '@tanstack/history'
 import type { AnyRoute, SolidNode } from './route'
-import type { ParseRoute } from './routeInfo'
+import type { ParseRoute } from '@tanstack/router-core'
 import type { AnyRouter, RegisteredRouter } from './router'
 
 interface ShouldBlockFnLocation<

package/src/useLoaderData.tsx

@@ -1,9 +1,8 @@
 import { useMatch } from './useMatch'
 import type { Accessor } from 'solid-js'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { AllLoaderData, RouteById } from './routeInfo'
 import type { StrictOrFrom } from './utils'
-import type { Expand } from '@tanstack/router-core'
+import type { AllLoaderData, Expand, RouteById } from '@tanstack/router-core'
 
 export interface UseLoaderDataBaseOptions<
   TRouter extends AnyRouter,

package/src/useLoaderDeps.tsx

@@ -1,8 +1,7 @@
 import { useMatch } from './useMatch'
 import type { AnyRouter, RegisteredRouter } from './router'
-import type { RouteById } from './routeInfo'
 import type { StrictOrFrom } from './utils'
-import type { Expand } from '@tanstack/router-core'
+import type { Expand, RouteById } from '@tanstack/router-core'
 
 export interface UseLoaderDepsBaseOptions<
   TRouter extends AnyRouter,

package/src/useNavigate.tsx

@@ -1,6 +1,6 @@
 import * as Solid from 'solid-js'
 import { useRouter } from './useRouter'
-import type { FromPathOption, NavigateOptions } from './link'
+import type { FromPathOption, NavigateOptions } from '@tanstack/router-core'
 import type { AnyRouter, RegisteredRouter } from './router'
 
 export type UseNavigateResult<TDefaultFrom extends string> = <

package/src/useParams.tsx

@@ -1,10 +1,14 @@
 import { useMatch } from './useMatch'
 import type { ThrowConstraint } from './useMatch'
 import type { Accessor } from 'solid-js'
-import type { AllParams, RouteById } from './routeInfo'
 import type { AnyRouter, RegisteredRouter } from './router'
 import type { StrictOrFrom } from './utils'
-import type { Expand, ThrowOrOptional } from '@tanstack/router-core'
+import type {
+  AllParams,
+  Expand,
+  RouteById,
+  ThrowOrOptional,
+} from '@tanstack/router-core'
 
 export interface UseParamsBaseOptions<
   TRouter extends AnyRouter,