@tanstack/solid-router 1.111.4 → 1.111.7

package/dist/source/useParams.d.ts

@@ -2,13 +2,11 @@ import type { ThrowConstraint } from './useMatch';
 import type { Accessor } from 'solid-js';
 import type { AnyRouter, RegisteredRouter } from './router';
 import type { StrictOrFrom } from './utils';
-import type { AllParams, Expand, RouteById, ThrowOrOptional } from '@tanstack/router-core';
+import type { ResolveUseParams, ThrowOrOptional, UseParamsResult } from '@tanstack/router-core';
 export interface UseParamsBaseOptions<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TThrow extends boolean, TSelected> {
-    select?: (params: ResolveParams<TRouter, TFrom, TStrict>) => TSelected;
+    select?: (params: ResolveUseParams<TRouter, TFrom, TStrict>) => TSelected;
     shouldThrow?: TThrow;
 }
 export type UseParamsOptions<TRouter extends AnyRouter, TFrom extends string | undefined, TStrict extends boolean, TThrow extends boolean, TSelected> = StrictOrFrom<TRouter, TFrom, TStrict> & UseParamsBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>;
-export type ResolveParams<TRouter extends AnyRouter, TFrom, TStrict extends boolean> = TStrict extends false ? AllParams<TRouter['routeTree']> : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['allParams']>;
-export type UseParamsResult<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TSelected> = unknown extends TSelected ? ResolveParams<TRouter, TFrom, TStrict> : TSelected;
 export type UseParamsRoute<out TFrom> = <TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseParamsBaseOptions<TRouter, TFrom, true, true, TSelected>) => Accessor<UseParamsResult<TRouter, TFrom, true, TSelected>>;
 export declare function useParams<TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string | undefined = undefined, TStrict extends boolean = true, TThrow extends boolean = true, TSelected = unknown>(opts: UseParamsOptions<TRouter, TFrom, TStrict, ThrowConstraint<TStrict, TThrow>, TSelected>): Accessor<ThrowOrOptional<UseParamsResult<TRouter, TFrom, TStrict, TSelected>, TThrow>>;

package/dist/source/useParams.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useParams.jsx","sourceRoot":"","sources":["../../src/useParams.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA6DrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACK,CAAQ,CAAA;AAClB,CAAC"}
+{"version":3,"file":"useParams.jsx","sourceRoot":"","sources":["../../src/useParams.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA4CrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACK,CAAQ,CAAA;AAClB,CAAC"}

package/dist/source/useRouteContext.d.ts

@@ -1,12 +1,5 @@
 import type { Accessor } from 'solid-js';
 import type { AnyRouter, RegisteredRouter } from './router';
-import type { StrictOrFrom } from './utils';
-import type { AllContext, Expand, RouteById } from '@tanstack/router-core';
-export interface UseRouteContextBaseOptions<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TSelected> {
-    select?: (search: ResolveRouteContext<TRouter, TFrom, TStrict>) => TSelected;
-}
-export type UseRouteContextOptions<TRouter extends AnyRouter, TFrom extends string | undefined, TStrict extends boolean, TSelected> = StrictOrFrom<TRouter, TFrom, TStrict> & UseRouteContextBaseOptions<TRouter, TFrom, TStrict, TSelected>;
-export type ResolveRouteContext<TRouter extends AnyRouter, TFrom, TStrict extends boolean> = TStrict extends false ? AllContext<TRouter['routeTree']> : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['allContext']>;
-export type UseRouteContextResult<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TSelected> = unknown extends TSelected ? ResolveRouteContext<TRouter, TFrom, TStrict> : TSelected;
+import type { UseRouteContextBaseOptions, UseRouteContextOptions, UseRouteContextResult } from '@tanstack/router-core';
 export type UseRouteContextRoute<out TFrom> = <TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseRouteContextBaseOptions<TRouter, TFrom, true, TSelected>) => Accessor<UseRouteContextResult<TRouter, TFrom, true, TSelected>>;
 export declare function useRouteContext<TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string | undefined = undefined, TStrict extends boolean = true, TSelected = unknown>(opts: UseRouteContextOptions<TRouter, TFrom, TStrict, TSelected>): Accessor<UseRouteContextResult<TRouter, TFrom, TStrict, TSelected>>;

package/dist/source/useRouteContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRouteContext.js","sourceRoot":"","sources":["../../src/useRouteContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAgDrC,MAAM,UAAU,eAAe,CAM7B,IAAgE;IAEhE,OAAO,QAAQ,CAAC;QACd,GAAI,IAAY;QAChB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAChB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO;KAC3D,CAAQ,CAAA;AACX,CAAC"}
+{"version":3,"file":"useRouteContext.js","sourceRoot":"","sources":["../../src/useRouteContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAiBrC,MAAM,UAAU,eAAe,CAM7B,IAAgE;IAEhE,OAAO,QAAQ,CAAC;QACd,GAAI,IAAY;QAChB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAChB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO;KAC3D,CAAQ,CAAA;AACX,CAAC"}

package/dist/source/useSearch.d.ts

@@ -2,13 +2,11 @@ import type { ThrowConstraint } from './useMatch';
 import type { Accessor } from 'solid-js';
 import type { AnyRouter, RegisteredRouter } from './router';
 import type { StrictOrFrom } from './utils';
-import type { Expand, FullSearchSchema, RouteById, ThrowOrOptional } from '@tanstack/router-core';
+import type { ResolveUseSearch, ThrowOrOptional, UseSearchResult } from '@tanstack/router-core';
 export interface UseSearchBaseOptions<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TThrow extends boolean, TSelected> {
-    select?: (state: ResolveSearch<TRouter, TFrom, TStrict>) => TSelected;
+    select?: (state: ResolveUseSearch<TRouter, TFrom, TStrict>) => TSelected;
     shouldThrow?: TThrow;
 }
 export type UseSearchOptions<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TThrow extends boolean, TSelected> = StrictOrFrom<TRouter, TFrom, TStrict> & UseSearchBaseOptions<TRouter, TFrom, TStrict, TThrow, TSelected>;
-export type UseSearchResult<TRouter extends AnyRouter, TFrom, TStrict extends boolean, TSelected> = unknown extends TSelected ? ResolveSearch<TRouter, TFrom, TStrict> : TSelected;
-export type ResolveSearch<TRouter extends AnyRouter, TFrom, TStrict extends boolean> = TStrict extends false ? FullSearchSchema<TRouter['routeTree']> : Expand<RouteById<TRouter['routeTree'], TFrom>['types']['fullSearchSchema']>;
 export type UseSearchRoute<out TFrom> = <TRouter extends AnyRouter = RegisteredRouter, TSelected = unknown>(opts?: UseSearchBaseOptions<TRouter, TFrom, true, true, TSelected>) => Accessor<UseSearchResult<TRouter, TFrom, true, TSelected>>;
 export declare function useSearch<TRouter extends AnyRouter = RegisteredRouter, const TFrom extends string | undefined = undefined, TStrict extends boolean = true, TThrow extends boolean = true, TSelected = unknown>(opts: UseSearchOptions<TRouter, TFrom, TStrict, ThrowConstraint<TStrict, TThrow>, TSelected>): Accessor<ThrowOrOptional<UseSearchResult<TRouter, TFrom, TStrict, TSelected>, TThrow>>;

package/dist/source/useSearch.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"useSearch.jsx","sourceRoot":"","sources":["../../src/useSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA8DrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACF,CAAQ,CAAA;AACX,CAAC"}
+{"version":3,"file":"useSearch.jsx","sourceRoot":"","sources":["../../src/useSearch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AA4CrC,MAAM,UAAU,SAAS,CAOvB,IAMC;IAID,OAAO,QAAQ,CAAC;QACd,IAAI,EAAE,IAAI,CAAC,IAAK;QAChB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,CAAC,KAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;QAC/D,CAAC;KACF,CAAQ,CAAA;AACX,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.111.4",
+  "version": "1.111.7",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
     "@tanstack/history": "1.99.13",
-    "@tanstack/router-core": "1.111.3"
+    "@tanstack/router-core": "1.111.7"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/Matches.tsx

@@ -7,111 +7,29 @@ import { Transitioner } from './Transitioner'
 import { matchContext } from './matchContext'
 import { Match } from './Match'
 import { SafeFragment } from './SafeFragment'
-import type { AnyRoute } from './route'
 import type {
-  AllContext,
-  AllLoaderData,
-  AllParams,
-  ControlledPromise,
   DeepPartial,
-  FullSearchSchema,
   MakeOptionalPathParams,
   MakeOptionalSearchParams,
+  MakeRouteMatchUnion,
   MaskOptions,
   NoInfer,
-  ParseRoute,
   ResolveRelativePath,
   ResolveRoute,
-  RouteById,
   RouteByPath,
-  RouteIds,
-  StaticDataRouteOption,
   ToSubOptionsProps,
 } from '@tanstack/router-core'
 import type { AnyRouter, RegisteredRouter, RouterState } from './router'
 
-export type MakeRouteMatchFromRoute<TRoute extends AnyRoute> = RouteMatch<
-  TRoute['types']['id'],
-  TRoute['types']['fullPath'],
-  TRoute['types']['allParams'],
-  TRoute['types']['fullSearchSchema'],
-  TRoute['types']['loaderData'],
-  TRoute['types']['allContext'],
-  TRoute['types']['loaderDeps']
->
-
-export interface RouteMatch<
-  out TRouteId,
-  out TFullPath,
-  out TAllParams,
-  out TFullSearchSchema,
-  out TLoaderData,
-  out TAllContext,
-  out TLoaderDeps,
-> {
-  id: string
-  routeId: TRouteId
-  fullPath: TFullPath
-  index: number
-  pathname: string
-  params: TAllParams
-  _strictParams: TAllParams
-  status: 'pending' | 'success' | 'error' | 'redirected' | 'notFound'
-  isFetching: false | 'beforeLoad' | 'loader'
-  error: unknown
-  paramsError: unknown
-  searchError: unknown
-  updatedAt: number
-  loadPromise?: ControlledPromise<void>
-  beforeLoadPromise?: ControlledPromise<void>
-  loaderPromise?: ControlledPromise<void>
-  loaderData?: TLoaderData
-  __routeContext: Record<string, unknown>
-  __beforeLoadContext: Record<string, unknown>
-  context: TAllContext
-  search: TFullSearchSchema
-  _strictSearch: TFullSearchSchema
-  fetchCount: number
-  abortController: AbortController
-  cause: 'preload' | 'enter' | 'stay'
-  loaderDeps: TLoaderDeps
-  preload: boolean
-  invalid: boolean
-  meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>
-  links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>
-  scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>
-  headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>
-  headers?: Record<string, string>
-  globalNotFound?: boolean
-  staticData: StaticDataRouteOption
-  minPendingPromise?: ControlledPromise<void>
-  pendingTimeout?: ReturnType<typeof setTimeout>
+declare module '@tanstack/router-core' {
+  export interface RouteMatchExtensions {
+    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>
+    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>
+    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>
+    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>
+  }
 }
 
-export type MakeRouteMatch<
-  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
-  TRouteId = RouteIds<TRouteTree>,
-  TStrict extends boolean = true,
-> = RouteMatch<
-  TRouteId,
-  RouteById<TRouteTree, TRouteId>['types']['fullPath'],
-  TStrict extends false
-    ? AllParams<TRouteTree>
-    : RouteById<TRouteTree, TRouteId>['types']['allParams'],
-  TStrict extends false
-    ? FullSearchSchema<TRouteTree>
-    : RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema'],
-  TStrict extends false
-    ? AllLoaderData<TRouteTree>
-    : RouteById<TRouteTree, TRouteId>['types']['loaderData'],
-  TStrict extends false
-    ? AllContext<TRouteTree>
-    : RouteById<TRouteTree, TRouteId>['types']['allContext'],
-  RouteById<TRouteTree, TRouteId>['types']['loaderDeps']
->
-
-export type AnyRouteMatch = RouteMatch<any, any, any, any, any, any, any>
-
 export function Matches() {
   const router = useRouter()
 
@@ -266,21 +184,6 @@ export function MatchRoute<
   )
 }
 
-export type MakeRouteMatchUnion<
-  TRouter extends AnyRouter = RegisteredRouter,
-  TRoute extends AnyRoute = ParseRoute<TRouter['routeTree']>,
-> = TRoute extends any
-  ? RouteMatch<
-      TRoute['id'],
-      TRoute['fullPath'],
-      TRoute['types']['allParams'],
-      TRoute['types']['fullSearchSchema'],
-      TRoute['types']['loaderData'],
-      TRoute['types']['allContext'],
-      TRoute['types']['loaderDeps']
-    >
-  : never
-
 export interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {
   select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected
 }

package/src/fileRoute.ts

@@ -12,23 +12,22 @@ import type { UseMatchRoute } from './useMatch'
 import type { UseSearchRoute } from './useSearch'
 import type {
   AnyContext,
+  AnyRoute as AnyCoreRoute,
   AnyPathParams,
+  AnyRouter,
   AnyValidator,
   Constrain,
+  ConstrainLiteral,
+  FileBaseRouteOptions,
   FileRoutesByPath,
   ResolveParams,
   RouteById,
   RouteIds,
-} from '@tanstack/router-core'
-
-import type {
-  AnyRoute,
-  FileBaseRouteOptions,
-  Route,
-  RouteConstraints,
   RouteLoaderFn,
   UpdatableRouteOptions,
-} from './route'
+} from '@tanstack/router-core'
+
+import type { AnyRoute, Route, RouteConstraints } from './route'
 import type { RegisteredRouter } from './router'
 import type { UseLoaderDepsRoute } from './useLoaderDeps'
 import type { UseLoaderDataRoute } from './useLoaderData'
@@ -175,7 +174,7 @@ export type LazyRouteOptions = Pick<
   'component' | 'errorComponent' | 'pendingComponent' | 'notFoundComponent'
 >
 
-export class LazyRoute<TRoute extends AnyRoute> {
+export class LazyRoute<TRoute extends AnyCoreRoute> {
   options: {
     id: string
   } & LazyRouteOptions
@@ -230,14 +229,17 @@ export class LazyRoute<TRoute extends AnyRoute> {
 }
 
 export function createLazyRoute<
-  TId extends RouteIds<RegisteredRouter['routeTree']>,
-  TRoute extends AnyRoute = RouteById<RegisteredRouter['routeTree'], TId>,
->(id: TId) {
+  TRouter extends AnyRouter = RegisteredRouter,
+  TId extends string = string,
+  TRoute extends AnyCoreRoute = RouteById<TRouter['routeTree'], TId>,
+>(id: ConstrainLiteral<TId, RouteIds<TRouter['routeTree']>>) {
   return (opts: LazyRouteOptions) => {
-    return new LazyRoute<TRoute>({ id: id as any, ...opts })
+    return new LazyRoute<TRoute>({
+      id: id,
+      ...opts,
+    })
   }
 }
-
 export function createLazyFileRoute<
   TFilePath extends keyof FileRoutesByPath,
   TRoute extends FileRoutesByPath[TFilePath]['preLoaderRoute'],

package/src/index.tsx

@@ -165,6 +165,22 @@ export type {
   RemountDepsOptions,
   FileRouteTypes,
   FileRoutesByPath,
+  UseNavigateResult,
+  AnyRedirect,
+  Redirect,
+  ResolvedRedirect,
+  RouteOptions,
+  FileBaseRouteOptions,
+  BaseRouteOptions,
+  UpdatableRouteOptions,
+  RouteLoaderFn,
+  LoaderFnContext,
+  RouteContextFn,
+  RouteContextOptions,
+  BeforeLoadFn,
+  BeforeLoadContextOptions,
+  ContextOptions,
+  RootRouteOptions,
 } from '@tanstack/router-core'
 
 export {
@@ -221,13 +237,9 @@ export {
 } from './Matches'
 
 export type {
-  RouteMatch,
-  AnyRouteMatch,
   MatchRouteOptions,
   UseMatchRouteOptions,
   MakeMatchRouteOptions,
-  MakeRouteMatch,
-  MakeRouteMatchUnion,
 } from './Matches'
 
 export { matchContext } from './matchContext'
@@ -238,7 +250,6 @@ export { useLoaderDeps } from './useLoaderDeps'
 export { useLoaderData } from './useLoaderData'
 
 export { redirect, isRedirect } from './redirects'
-export type { AnyRedirect, Redirect, ResolvedRedirect } from './redirects'
 
 export {
   RouteApi,
@@ -253,12 +264,6 @@ export {
   NotFoundRoute,
 } from './route'
 export type {
-  RouteOptions,
-  FileBaseRouteOptions,
-  BaseRouteOptions,
-  UpdatableRouteOptions,
-  RouteLoaderFn,
-  LoaderFnContext,
   AnyRoute,
   RouteConstraints,
   AnyRootRoute,
@@ -270,13 +275,7 @@ export type {
   RouteComponent,
   ErrorRouteComponent,
   NotFoundRouteComponent,
-  RootRouteOptions,
   AnyRouteWithContext,
-  RouteContextFn,
-  RouteContextOptions,
-  BeforeLoadFn,
-  BeforeLoadContextOptions,
-  ContextOptions,
 } from './route'
 
 export {
@@ -318,7 +317,6 @@ export type { UseBlockerOpts, ShouldBlockFn } from './useBlocker'
 export { useBlocker, Block } from './useBlocker'
 
 export { useNavigate, Navigate } from './useNavigate'
-export type { UseNavigateResult } from './useNavigate'
 
 export { useParams } from './useParams'
 export { useSearch } from './useSearch'

package/src/redirects.ts

@@ -1,42 +1,10 @@
-import type { AnyRouter, RegisteredRouter } from './router'
+import type { RegisteredRouter } from './router'
 import type {
-  NavigateOptions,
-  PickAsRequired,
-  RoutePaths,
+  AnyRedirect,
+  Redirect,
+  ResolvedRedirect,
 } from '@tanstack/router-core'
 
-export type AnyRedirect = Redirect<any, any, any, any, any>
-
-export type Redirect<
-  TRouter extends AnyRouter = RegisteredRouter,
-  TFrom extends RoutePaths<TRouter['routeTree']> | string = '/',
-  TTo extends string | undefined = '.',
-  TMaskFrom extends RoutePaths<TRouter['routeTree']> | string = TFrom,
-  TMaskTo extends string = '.',
-> = {
-  href?: string
-  /**
-   * @deprecated Use `statusCode` instead
-   **/
-  code?: number
-  statusCode?: number
-  throw?: any
-  headers?: HeadersInit
-} & NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>
-
-export type ResolvedRedirect<
-  TRouter extends AnyRouter = RegisteredRouter,
-  TFrom extends RoutePaths<TRouter['routeTree']> = '/',
-  TTo extends string = '',
-  TMaskFrom extends RoutePaths<TRouter['routeTree']> = TFrom,
-  TMaskTo extends string = '',
-> = PickAsRequired<
-  Redirect<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,
-  'code' | 'statusCode' | 'headers'
-> & {
-  href: string
-}
-
 export function redirect<
   TRouter extends RegisteredRouter,
   const TTo extends string | undefined,