@tanstack/router-core 0.0.1-beta.2 → 0.0.1-beta.201

package/src/router.ts

@@ -1,211 +1,238 @@
+import { Store } from '@tanstack/store'
+import invariant from 'tiny-invariant'
 import {
-  BrowserHistory,
   createBrowserHistory,
   createMemoryHistory,
-  HashHistory,
-  History,
-  MemoryHistory,
-} from 'history'
-import invariant from 'tiny-invariant'
-import { GetFrameworkGeneric } from './frameworks'
+  HistoryLocation,
+  HistoryState,
+  RouterHistory,
+} from '@tanstack/history'
+
+//
 
 import {
   LinkInfo,
   LinkOptions,
-  NavigateOptionsAbsolute,
+  NavigateOptions,
   ToOptions,
-  ValidFromPath,
+  ResolveRelativePath,
 } from './link'
 import {
   cleanPath,
   interpolatePath,
   joinPaths,
   matchPathname,
+  parsePathname,
   resolvePath,
+  trimPath,
+  trimPathRight,
 } from './path'
-import { AnyRoute, cascadeLoaderData, createRoute, Route } from './route'
 import {
-  AnyLoaderData,
-  AnyPathParams,
-  AnyRouteConfig,
+  Route,
   AnySearchSchema,
-  LoaderContext,
-  RouteConfig,
-  SearchFilter,
-} from './routeConfig'
+  AnyRoute,
+  AnyContext,
+  AnyPathParams,
+  RegisteredRouteComponent,
+  RegisteredErrorRouteComponent,
+  RegisteredPendingRouteComponent,
+  RouteMask,
+} from './route'
 import {
-  AllRouteInfo,
-  AnyAllRouteInfo,
-  AnyRouteInfo,
-  RouteInfo,
   RoutesById,
+  RoutesByPath,
+  ParseRoute,
+  FullSearchSchema,
+  RouteById,
+  RoutePaths,
+  RouteIds,
 } from './routeInfo'
-import { createRouteMatch, RouteMatch } from './routeMatch'
 import { defaultParseSearch, defaultStringifySearch } from './searchParams'
 import {
   functionalUpdate,
   last,
+  NoInfer,
+  pick,
   PickAsRequired,
-  PickRequired,
-  replaceEqualDeep,
   Timeout,
   Updater,
+  replaceEqualDeep,
+  partialDeepEqual,
+  NonNullableUpdater,
 } from './utils'
 
+//
+
+declare global {
+  interface Window {
+    __TSR_DEHYDRATED__?: HydrationCtx
+  }
+}
+
+declare module '@tanstack/history' {
+  interface HistoryState {
+    __tempLocation?: HistoryLocation
+    __tempKey?: string
+  }
+}
+
+export interface Register {
+  // router: Router
+}
+
 export interface LocationState {}
 
-export interface Location<
-  TSearchObj extends AnySearchSchema = {},
-  TState extends LocationState = LocationState,
-> {
+export type AnyRouter = Router<any, any>
+
+export type RegisteredRouter = Register extends {
+  router: infer TRouter extends AnyRouter
+}
+  ? TRouter
+  : AnyRouter
+
+export interface ParsedLocation<TSearchObj extends AnySearchSchema = {}> {
   href: string
   pathname: string
   search: TSearchObj
   searchStr: string
-  state: TState
+  state: HistoryState
   hash: string
-  key?: string
+  maskedLocation?: ParsedLocation<TSearchObj>
+  unmaskOnReload?: boolean
 }
 
 export interface FromLocation {
   pathname: string
   search?: unknown
-  key?: string
   hash?: string
 }
 
 export type SearchSerializer = (searchObj: Record<string, any>) => string
 export type SearchParser = (searchStr: string) => Record<string, any>
-export type FilterRoutesFn = <TRoute extends Route<any, RouteInfo>>(
-  routeConfigs: TRoute[],
-) => TRoute[]
 
-export interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
-  history?: BrowserHistory | MemoryHistory | HashHistory
-  stringifySearch?: SearchSerializer
-  parseSearch?: SearchParser
-  filterRoutes?: FilterRoutesFn
-  defaultPreload?: false | 'intent'
-  defaultPreloadMaxAge?: number
-  defaultPreloadGcMaxAge?: number
-  defaultPreloadDelay?: number
-  useErrorBoundary?: boolean
-  defaultElement?: GetFrameworkGeneric<'Element'>
-  defaultErrorElement?: GetFrameworkGeneric<'Element'>
-  defaultCatchElement?: GetFrameworkGeneric<'Element'>
-  defaultPendingElement?: GetFrameworkGeneric<'Element'>
-  defaultPendingMs?: number
-  defaultPendingMinMs?: number
-  defaultLoaderMaxAge?: number
-  defaultLoaderGcMaxAge?: number
-  caseSensitive?: boolean
-  routeConfig?: TRouteConfig
-  basepath?: string
-  createRouter?: (router: Router<any, any>) => void
-  createRoute?: (opts: { route: AnyRoute; router: Router<any, any> }) => void
-  createElement?: (
-    element: GetFrameworkGeneric<'SyncOrAsyncElement'>,
-  ) => Promise<GetFrameworkGeneric<'Element'>>
+export type HydrationCtx = {
+  router: DehydratedRouter
+  payload: Record<string, any>
 }
 
-export interface Action<
-  TPayload = unknown,
-  TResponse = unknown,
-  // TError = unknown,
+export interface RouteMatch<
+  TRouteTree extends AnyRoute = AnyRoute,
+  TRouteId extends RouteIds<TRouteTree> = ParseRoute<TRouteTree>['id'],
 > {
-  submit: (submission?: TPayload) => Promise<TResponse>
-  current?: ActionState<TPayload, TResponse>
-  latest?: ActionState<TPayload, TResponse>
-  pending: ActionState<TPayload, TResponse>[]
+  id: string
+  // loaderContext?: RouteById<TRouteTree, TRouteId>['types']['loaderContext']
+  loaderContext?: any
+  routeId: TRouteId
+  pathname: string
+  params: RouteById<TRouteTree, TRouteId>['types']['allParams']
+  status: 'pending' | 'success' | 'error'
+  isFetching: boolean
+  invalid: boolean
+  error: unknown
+  paramsError: unknown
+  searchError: unknown
+  updatedAt: number
+  maxAge: number
+  preloadMaxAge: number
+  loaderData: RouteById<TRouteTree, TRouteId>['types']['loader']
+  loadPromise?: Promise<void>
+  __resolveLoadPromise?: () => void
+  context: RouteById<TRouteTree, TRouteId>['types']['context']
+  routeSearch: RouteById<TRouteTree, TRouteId>['types']['searchSchema']
+  search: FullSearchSchema<TRouteTree> &
+    RouteById<TRouteTree, TRouteId>['types']['fullSearchSchema']
+  fetchedAt: number
+  abortController: AbortController
 }
 
-export interface ActionState<
-  TPayload = unknown,
-  TResponse = unknown,
-  // TError = unknown,
-> {
-  submittedAt: number
-  status: 'idle' | 'pending' | 'success' | 'error'
-  submission: TPayload
-  data?: TResponse
-  error?: unknown
-}
+export type AnyRouteMatch = RouteMatch<any>
 
-export interface Loader<
-  TFullSearchSchema extends AnySearchSchema = {},
-  TAllParams extends AnyPathParams = {},
-  TRouteLoaderData = AnyLoaderData,
-> {
-  fetch: keyof PickRequired<TFullSearchSchema> extends never
-    ? keyof TAllParams extends never
-      ? (loaderContext: { signal?: AbortSignal }) => Promise<TRouteLoaderData>
-      : (loaderContext: {
-          params: TAllParams
-          search?: TFullSearchSchema
-          signal?: AbortSignal
-        }) => Promise<TRouteLoaderData>
-    : keyof TAllParams extends never
-    ? (loaderContext: {
-        search: TFullSearchSchema
-        params: TAllParams
-        signal?: AbortSignal
-      }) => Promise<TRouteLoaderData>
-    : (loaderContext: {
-        search: TFullSearchSchema
-        signal?: AbortSignal
-      }) => Promise<TRouteLoaderData>
-  current?: LoaderState<TFullSearchSchema, TAllParams>
-  latest?: LoaderState<TFullSearchSchema, TAllParams>
-  pending: LoaderState<TFullSearchSchema, TAllParams>[]
-}
+export type RouterContextOptions<TRouteTree extends AnyRoute> =
+  AnyContext extends TRouteTree['types']['routerContext']
+    ? {
+        context?: TRouteTree['types']['routerContext']
+      }
+    : {
+        context: TRouteTree['types']['routerContext']
+      }
 
-export interface LoaderState<
-  TFullSearchSchema = unknown,
-  TAllParams = unknown,
+export interface RouterOptions<
+  TRouteTree extends AnyRoute,
+  TDehydrated extends Record<string, any>,
 > {
-  loadedAt: number
-  loaderContext: LoaderContext<TFullSearchSchema, TAllParams>
+  history?: RouterHistory
+  stringifySearch?: SearchSerializer
+  parseSearch?: SearchParser
+  defaultPreload?: false | 'intent'
+  defaultPreloadDelay?: number
+  reloadOnWindowFocus?: boolean
+  defaultComponent?: RegisteredRouteComponent<
+    unknown,
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext
+  >
+  defaultErrorComponent?: RegisteredErrorRouteComponent<
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext
+  >
+  defaultPendingComponent?: RegisteredPendingRouteComponent<
+    AnySearchSchema,
+    AnyPathParams,
+    AnyContext
+  >
+  defaultMaxAge?: number
+  defaultGcMaxAge?: number
+  defaultPreloadMaxAge?: number
+  caseSensitive?: boolean
+  routeTree?: TRouteTree
+  basepath?: string
+  createRoute?: (opts: { route: AnyRoute; router: AnyRouter }) => void
+  context?: TRouteTree['types']['routerContext']
+  dehydrate?: () => TDehydrated
+  hydrate?: (dehydrated: TDehydrated) => void
+  routeMasks?: RouteMask<TRouteTree>[]
+  unmaskOnReload?: boolean
 }
 
-export interface RouterState {
-  status: 'idle' | 'loading'
-  location: Location
-  matches: RouteMatch[]
-  lastUpdated: number
-  loaderData: unknown
-  currentAction?: ActionState
-  latestAction?: ActionState
-  actions: Record<string, Action>
-  loaders: Record<string, Loader>
-  pending?: PendingState
+export interface RouterState<TRouteTree extends AnyRoute = AnyRoute> {
+  status: 'idle' | 'pending'
   isFetching: boolean
-  isPreloading: boolean
-}
-
-export interface PendingState {
-  location: Location
-  matches: RouteMatch[]
+  matchesById: Record<string, RouteMatch<TRouteTree>>
+  matchIds: string[]
+  pendingMatchIds: string[]
+  matches: RouteMatch<TRouteTree>[]
+  pendingMatches: RouteMatch<TRouteTree>[]
+  renderedMatchIds: string[]
+  renderedMatches: RouteMatch<TRouteTree>[]
+  location: ParsedLocation<FullSearchSchema<TRouteTree>>
+  resolvedLocation: ParsedLocation<FullSearchSchema<TRouteTree>>
+  lastUpdated: number
 }
 
-type Listener = (router: Router<any, any>) => void
-
-export type ListenerFn = () => void
+export type ListenerFn<TEvent extends RouterEvent> = (event: TEvent) => void
 
 export interface BuildNextOptions {
   to?: string | number | null
-  params?: true | Updater<Record<string, any>>
+  params?: true | Updater<unknown>
   search?: true | Updater<unknown>
   hash?: true | Updater<string>
-  key?: string
+  state?: true | NonNullableUpdater<LocationState>
+  mask?: {
+    to?: string | number | null
+    params?: true | Updater<unknown>
+    search?: true | Updater<unknown>
+    hash?: true | Updater<string>
+    state?: true | NonNullableUpdater<LocationState>
+    unmaskOnReload?: boolean
+  }
   from?: string
-  fromCurrent?: boolean
-  __preSearchFilters?: SearchFilter<any>[]
-  __postSearchFilters?: SearchFilter<any>[]
 }
 
-export type MatchCacheEntry = {
-  gc: number
-  match: RouteMatch
+export interface CommitLocationOptions {
+  replace?: boolean
+  resetScroll?: boolean
 }
 
 export interface MatchLocation {
@@ -213,1016 +240,1855 @@ export interface MatchLocation {
   fuzzy?: boolean
   caseSensitive?: boolean
   from?: string
-  fromCurrent?: boolean
 }
 
 export interface MatchRouteOptions {
-  pending: boolean
+  pending?: boolean
   caseSensitive?: boolean
+  includeSearch?: boolean
+  fuzzy?: boolean
 }
 
 type LinkCurrentTargetElement = {
   preloadTimeout?: null | ReturnType<typeof setTimeout>
 }
 
-export interface Router<
-  TRouteConfig extends AnyRouteConfig = RouteConfig,
-  TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
+export interface DehydratedRouterState {
+  matchIds: string[]
+  dehydratedMatches: DehydratedRouteMatch[]
+}
+
+export type DehydratedRouteMatch = Pick<
+  RouteMatch,
+  | 'fetchedAt'
+  | 'invalid'
+  | 'maxAge'
+  | 'preloadMaxAge'
+  | 'id'
+  | 'loaderData'
+  | 'status'
+  | 'updatedAt'
+>
+
+export interface DehydratedRouter {
+  state: DehydratedRouterState
+}
+
+export type RouterConstructorOptions<
+  TRouteTree extends AnyRoute,
+  TDehydrated extends Record<string, any>,
+> = Omit<RouterOptions<TRouteTree, TDehydrated>, 'context'> &
+  RouterContextOptions<TRouteTree>
+
+export const componentTypes = [
+  'component',
+  'errorComponent',
+  'pendingComponent',
+] as const
+
+export type RouterEvents = {
+  onBeforeLoad: {
+    type: 'onBeforeLoad'
+    from: ParsedLocation
+    to: ParsedLocation
+    pathChanged: boolean
+  }
+  onLoad: {
+    type: 'onLoad'
+    from: ParsedLocation
+    to: ParsedLocation
+    pathChanged: boolean
+  }
+}
+
+export type RouterEvent = RouterEvents[keyof RouterEvents]
+
+export type RouterListener<TRouterEvent extends RouterEvent> = {
+  eventType: TRouterEvent['type']
+  fn: ListenerFn<TRouterEvent>
+}
+
+const visibilityChangeEvent = 'visibilitychange'
+const focusEvent = 'focus'
+const preloadWarning = 'Error preloading route! ☝️'
+
+export class Router<
+  TRouteTree extends AnyRoute = AnyRoute,
+  TDehydrated extends Record<string, any> = Record<string, any>,
 > {
-  history: BrowserHistory | MemoryHistory | HashHistory
+  types!: {
+    RootRoute: TRouteTree
+  }
+
   options: PickAsRequired<
-    RouterOptions<TRouteConfig>,
-    'stringifySearch' | 'parseSearch'
+    RouterOptions<TRouteTree, TDehydrated>,
+    'stringifySearch' | 'parseSearch' | 'context'
   >
-  // Computed in this.update()
-  basepath: string
-  // Internal:
-  allRouteInfo: TAllRouteInfo
-  listeners: Listener[]
-  location: Location
-  navigateTimeout?: Timeout
-  nextAction?: 'push' | 'replace'
-  state: RouterState
-  routeTree: Route<TAllRouteInfo, RouteInfo>
-  routesById: RoutesById<TAllRouteInfo>
-  navigationPromise: Promise<void>
-  removeActionQueue: { action: Action; actionState: ActionState }[]
-  startedLoadingAt: number
-  resolveNavigation: () => void
-  subscribe: (listener: Listener) => () => void
-  notify: () => void
-  mount: () => () => void
-  onFocus: () => void
-  update: <TRouteConfig extends RouteConfig = RouteConfig>(
-    opts?: RouterOptions<TRouteConfig>,
-  ) => Router<TRouteConfig>
-
-  buildNext: (opts: BuildNextOptions) => Location
-  cancelMatches: () => void
-  loadLocation: (next?: Location) => Promise<void>
-  matchCache: Record<string, MatchCacheEntry>
-  cleanMatchCache: () => void
-  getRoute: <TId extends keyof TAllRouteInfo['routeInfoById']>(
-    id: TId,
-  ) => Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]>
-  loadRoute: (navigateOpts: BuildNextOptions) => Promise<RouteMatch[]>
-  preloadRoute: (
-    navigateOpts: BuildNextOptions,
-    loaderOpts: { maxAge?: number; gcMaxAge?: number },
-  ) => Promise<RouteMatch[]>
-  matchRoutes: (
-    pathname: string,
-    opts?: { strictParseParams?: boolean },
-  ) => RouteMatch[]
-  loadMatches: (
-    resolvedMatches: RouteMatch[],
-    loaderOpts?: { withPending?: boolean } & (
-      | { preload: true; maxAge: number; gcMaxAge: number }
-      | { preload?: false; maxAge?: never; gcMaxAge?: never }
-    ),
-  ) => Promise<void>
-  invalidateRoute: (opts: MatchLocation) => void
-  reload: () => Promise<void>
-  resolvePath: (from: string, path: string) => string
-  navigate: <
-    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
-    TTo extends string = '.',
-  >(
-    opts: NavigateOptionsAbsolute<TAllRouteInfo, TFrom, TTo>,
-  ) => Promise<void>
-  matchRoute: <
-    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
-    TTo extends string = '.',
-  >(
-    matchLocation: ToOptions<TAllRouteInfo, TFrom, TTo>,
-    opts?: MatchRouteOptions,
-  ) => boolean
-  buildLink: <
-    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
-    TTo extends string = '.',
-  >(
-    opts: LinkOptions<TAllRouteInfo, TFrom, TTo>,
-  ) => LinkInfo
-  __: {
-    buildRouteTree: (
-      routeConfig: RouteConfig,
-    ) => Route<TAllRouteInfo, AnyRouteInfo>
-    parseLocation: (
-      location: History['location'],
-      previousLocation?: Location,
-    ) => Location
-    buildLocation: (dest: BuildNextOptions) => Location
-    commitLocation: (next: Location, replace?: boolean) => Promise<void>
-    navigate: (
-      location: BuildNextOptions & { replace?: boolean },
-    ) => Promise<void>
+  history!: RouterHistory
+  #unsubHistory?: () => void
+  basepath!: string
+  routeTree!: TRouteTree
+  routesById!: RoutesById<TRouteTree>
+  routesByPath!: RoutesByPath<TRouteTree>
+  flatRoutes!: ParseRoute<TRouteTree>[]
+  navigateTimeout: undefined | Timeout
+  nextAction: undefined | 'push' | 'replace'
+  navigationPromise: undefined | Promise<void>
+
+  __store: Store<RouterState<TRouteTree>>
+  state: RouterState<TRouteTree>
+  dehydratedData?: TDehydrated
+  resetNextScroll = false
+  tempLocationKey = `${Math.round(Math.random() * 10000000)}`
+  // nextTemporaryLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>
+
+  constructor(options: RouterConstructorOptions<TRouteTree, TDehydrated>) {
+    this.options = {
+      defaultPreloadDelay: 50,
+      context: undefined!,
+      ...options,
+      stringifySearch: options?.stringifySearch ?? defaultStringifySearch,
+      parseSearch: options?.parseSearch ?? defaultParseSearch,
+      // fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn,
+    }
+
+    this.__store = new Store<RouterState<TRouteTree>>(getInitialRouterState(), {
+      onUpdate: () => {
+        const prev = this.state
+
+        const next = this.__store.state
+
+        const matchesByIdChanged = prev.matchesById !== next.matchesById
+        let matchesChanged
+        let pendingMatchesChanged
+
+        if (!matchesByIdChanged) {
+          matchesChanged =
+            prev.matchIds.length !== next.matchIds.length ||
+            prev.matchIds.some((d, i) => d !== next.matchIds[i])
+
+          pendingMatchesChanged =
+            prev.pendingMatchIds.length !== next.pendingMatchIds.length ||
+            prev.pendingMatchIds.some((d, i) => d !== next.pendingMatchIds[i])
+        }
+
+        if (matchesByIdChanged || matchesChanged) {
+          next.matches = next.matchIds.map((id) => {
+            return next.matchesById[id] as any
+          })
+        }
+
+        if (matchesByIdChanged || pendingMatchesChanged) {
+          next.pendingMatches = next.pendingMatchIds.map((id) => {
+            return next.matchesById[id] as any
+          })
+        }
+
+        if (matchesByIdChanged || matchesChanged || pendingMatchesChanged) {
+          const hasPendingComponent = next.pendingMatches.some((d) => {
+            const route = this.getRoute(d.routeId as any)
+            return !!route?.options.pendingComponent
+          })
+
+          next.renderedMatchIds = hasPendingComponent
+            ? next.pendingMatchIds
+            : next.matchIds
+
+          next.renderedMatches = next.renderedMatchIds.map((id) => {
+            return next.matchesById[id] as any
+          })
+        }
+
+        next.isFetching = [...next.matches, ...next.pendingMatches].some(
+          (d) => d.isFetching,
+        )
+
+        this.state = next
+      },
+      defaultPriority: 'low',
+    })
+
+    this.state = this.__store.state
+
+    this.update(options)
+
+    const nextLocation = this.buildLocation({
+      search: true,
+      params: true,
+      hash: true,
+      state: true,
+    })
+
+    if (this.state.location.href !== nextLocation.href) {
+      this.#commitLocation({ ...nextLocation, replace: true })
+    }
   }
-}
 
-// Detect if we're in the DOM
-const isServer = Boolean(
-  typeof window === 'undefined' || !window.document?.createElement,
-)
-
-// This is the default history object if none is defined
-const createDefaultHistory = () =>
-  !isServer ? createBrowserHistory() : createMemoryHistory()
-
-export function createRouter<
-  TRouteConfig extends AnyRouteConfig = RouteConfig,
-  TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
->(
-  userOptions?: RouterOptions<TRouteConfig>,
-): Router<TRouteConfig, TAllRouteInfo> {
-  const history = userOptions?.history || createDefaultHistory()
-
-  const originalOptions = {
-    defaultLoaderGcMaxAge: 5 * 60 * 1000,
-    defaultLoaderMaxAge: 0,
-    defaultPreloadMaxAge: 2000,
-    defaultPreloadDelay: 50,
-    ...userOptions,
-    stringifySearch: userOptions?.stringifySearch ?? defaultStringifySearch,
-    parseSearch: userOptions?.parseSearch ?? defaultParseSearch,
+  subscribers = new Set<RouterListener<RouterEvent>>()
+
+  subscribe = <TType extends keyof RouterEvents>(
+    eventType: TType,
+    fn: ListenerFn<RouterEvents[TType]>,
+  ) => {
+    const listener: RouterListener<any> = {
+      eventType,
+      fn,
+    }
+
+    this.subscribers.add(listener)
+
+    return () => {
+      this.subscribers.delete(listener)
+    }
   }
 
-  let router: Router<TRouteConfig, TAllRouteInfo> = {
-    history,
-    options: originalOptions,
-    listeners: [],
-    removeActionQueue: [],
-    // Resolved after construction
-    basepath: '',
-    routeTree: undefined!,
-    routesById: {} as any,
-    location: undefined!,
-    allRouteInfo: undefined!,
-    //
-    navigationPromise: Promise.resolve(),
-    resolveNavigation: () => {},
-    matchCache: {},
-    state: {
-      status: 'idle',
-      location: null!,
-      matches: [],
-      actions: {},
-      loaders: {},
-      loaderData: {} as any,
-      lastUpdated: Date.now(),
-      isFetching: false,
-      isPreloading: false,
-    },
-    startedLoadingAt: Date.now(),
-    subscribe: (listener: Listener): (() => void) => {
-      router.listeners.push(listener as Listener)
-      return () => {
-        router.listeners = router.listeners.filter((x) => x !== listener)
-      }
-    },
-    getRoute: (id) => {
-      return router.routesById[id]
-    },
-    notify: (): void => {
-      router.state = {
-        ...router.state,
-        isFetching:
-          router.state.status === 'loading' ||
-          router.state.matches.some((d) => d.isFetching),
-        isPreloading: Object.values(router.matchCache).some(
-          (d) =>
-            d.match.isFetching &&
-            !router.state.matches.find((dd) => dd.matchId === d.match.matchId),
-        ),
+  #emit = (routerEvent: RouterEvent) => {
+    this.subscribers.forEach((listener) => {
+      if (listener.eventType === routerEvent.type) {
+        listener.fn(routerEvent)
       }
+    })
+  }
 
-      cascadeLoaderData(router.state.matches)
-      router.listeners.forEach((listener) => listener(router))
-    },
+  reset = () => {
+    this.__store.setState((s) => Object.assign(s, getInitialRouterState()))
+  }
 
-    mount: () => {
-      const next = router.__.buildLocation({
-        to: '.',
-        search: true,
-        hash: true,
+  mount = () => {
+    // addEventListener does not exist in React Native, but window does
+    // In the future, we might need to invert control here for more adapters
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (typeof window !== 'undefined' && window.addEventListener) {
+      window.addEventListener(visibilityChangeEvent, this.#onFocus, false)
+      window.addEventListener(focusEvent, this.#onFocus, false)
+    }
+
+    this.safeLoad()
+
+    return () => {
+      if (typeof window !== 'undefined' && window.removeEventListener) {
+        window.removeEventListener(visibilityChangeEvent, this.#onFocus)
+        window.removeEventListener(focusEvent, this.#onFocus)
+      }
+    }
+  }
+
+  #onFocus = () => {
+    if (this.options.reloadOnWindowFocus ?? true) {
+      this.invalidate({
+        __fromFocus: true,
       })
+    }
+  }
 
-      // If the current location isn't updated, trigger a navigation
-      // to the current location. Otherwise, load the current location.
-      if (next.href !== router.location.href) {
-        router.__.commitLocation(next, true)
-      } else {
-        router.loadLocation()
+  update = (opts?: RouterOptions<any, any>): this => {
+    this.options = {
+      ...this.options,
+      ...opts,
+      context: {
+        ...this.options.context,
+        ...opts?.context,
+      },
+    }
+
+    if (
+      !this.history ||
+      (this.options.history && this.options.history !== this.history)
+    ) {
+      if (this.#unsubHistory) {
+        this.#unsubHistory()
       }
 
-      const unsub = history.listen((event) => {
-        router.loadLocation(
-          router.__.parseLocation(event.location, router.location),
-        )
+      this.history =
+        this.options.history ??
+        (isServer ? createMemoryHistory() : createBrowserHistory()!)
+
+      const parsedLocation = this.#parseLocation()
+
+      this.__store.setState((s) => ({
+        ...s,
+        resolvedLocation: parsedLocation as any,
+        location: parsedLocation as any,
+      }))
+
+      this.#unsubHistory = this.history.subscribe(() => {
+        this.safeLoad({
+          next: this.#parseLocation(this.state.location),
+        })
       })
+    }
 
-      // addEventListener does not exist in React Native, but window does
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      if (!isServer && window.addEventListener) {
-        // Listen to visibillitychange and focus
-        window.addEventListener('visibilitychange', router.onFocus, false)
-        window.addEventListener('focus', router.onFocus, false)
-      }
+    const { basepath, routeTree } = this.options
 
-      return () => {
-        unsub()
-        // Be sure to unsubscribe if a new handler is set
-        window.removeEventListener('visibilitychange', router.onFocus)
-        window.removeEventListener('focus', router.onFocus)
-      }
-    },
+    this.basepath = `/${trimPath(basepath ?? '') ?? ''}`
 
-    onFocus: () => {
-      router.loadLocation()
-    },
+    if (routeTree && routeTree !== this.routeTree) {
+      this.#processRoutes(routeTree)
+    }
 
-    update: (opts) => {
-      Object.assign(router.options, opts)
+    return this
+  }
 
-      const { basepath, routeConfig } = router.options
+  cancelMatches = () => {
+    this.state.matches.forEach((match) => {
+      this.cancelMatch(match.id)
+    })
+  }
+
+  cancelMatch = (id: string) => {
+    this.getRouteMatch(id)?.abortController?.abort()
+  }
+
+  safeLoad = async (opts?: { next?: ParsedLocation }) => {
+    try {
+      return this.load(opts)
+    } catch (err) {
+      // Don't do anything
+    }
+  }
+
+  latestLoadPromise: Promise<void> = Promise.resolve()
+
+  load = async (opts?: {
+    next?: ParsedLocation
+    throwOnError?: boolean
+    __dehydratedMatches?: DehydratedRouteMatch[]
+  }) => {
+    const promise = new Promise<void>(async (resolve, reject) => {
+      const prevLocation = this.state.resolvedLocation
+      const pathDidChange = !!(
+        opts?.next && prevLocation!.href !== opts.next.href
+      )
 
-      router.basepath = cleanPath(`/${basepath ?? ''}`)
+      let latestPromise: Promise<void> | undefined | null
 
-      if (routeConfig) {
-        router.routesById = {} as any
-        router.routeTree = router.__.buildRouteTree(routeConfig)
+      const checkLatest = (): undefined | Promise<void> | null => {
+        return this.latestLoadPromise !== promise
+          ? this.latestLoadPromise
+          : undefined
       }
 
-      return router as any
-    },
+      // Cancel any pending matches
+
+      let pendingMatches!: RouteMatch<any, any>[]
 
-    cancelMatches: () => {
-      ;[
-        ...router.state.matches,
-        ...(router.state.pending?.matches ?? []),
-      ].forEach((match) => {
-        match.cancel()
+      this.#emit({
+        type: 'onBeforeLoad',
+        from: prevLocation,
+        to: opts?.next ?? this.state.location,
+        pathChanged: pathDidChange,
       })
-    },
 
-    loadLocation: async (next?: Location) => {
-      const id = Math.random()
-      router.startedLoadingAt = id
+      this.__store.batch(() => {
+        if (opts?.next) {
+          // Ingest the new location
+          this.__store.setState((s) => ({
+            ...s,
+            location: opts.next! as any,
+          }))
+        }
 
-      if (next) {
-        // Ingest the new location
-        router.location = next
-      }
+        // Match the routes
+        pendingMatches = this.matchRoutes(
+          this.state.location.pathname,
+          this.state.location.search,
+          {
+            throwOnError: opts?.throwOnError,
+            debug: true,
+          },
+        )
+
+        this.__store.setState((s) => ({
+          ...s,
+          status: 'pending',
+          pendingMatchIds: pendingMatches.map((d) => d.id),
+          matchesById: this.#mergeMatches(s.matchesById, pendingMatches),
+        }))
+      })
 
-      // Clear out old actions
-      router.removeActionQueue.forEach(({ action, actionState }) => {
-        if (router.state.currentAction === actionState) {
-          router.state.currentAction = undefined
+      try {
+        // Load the matches
+        try {
+          await this.loadMatches(pendingMatches.map((d) => d.id))
+        } catch (err) {
+          // swallow this error, since we'll display the
+          // errors on the route components
         }
-        if (action.current === actionState) {
-          action.current = undefined
+
+        // Only apply the latest transition
+        if ((latestPromise = checkLatest())) {
+          return latestPromise
         }
-      })
-      router.removeActionQueue = []
 
-      // Cancel any pending matches
-      router.cancelMatches()
+        const exitingMatchIds = this.state.matchIds.filter(
+          (id) => !this.state.pendingMatchIds.includes(id),
+        )
 
-      // Match the routes
-      const matches = router.matchRoutes(location.pathname, {
-        strictParseParams: true,
-      })
+        const enteringMatchIds = this.state.pendingMatchIds.filter(
+          (id) => !this.state.matchIds.includes(id),
+        )
 
-      router.state = {
-        ...router.state,
-        pending: {
-          matches: matches,
-          location: router.location,
-        },
-        status: 'loading',
+        const stayingMatchIds = this.state.matchIds.filter((id) =>
+          this.state.pendingMatchIds.includes(id),
+        )
+
+        this.__store.setState((s) => ({
+          ...s,
+          status: 'idle',
+          resolvedLocation: s.location,
+          matchIds: s.pendingMatchIds,
+          pendingMatchIds: [],
+        }))
+        ;(
+          [
+            [exitingMatchIds, 'onLeave'],
+            [enteringMatchIds, 'onEnter'],
+            [stayingMatchIds, 'onTransition'],
+          ] as const
+        ).forEach(([matchIds, hook]) => {
+          matchIds.forEach((id) => {
+            const match = this.getRouteMatch(id)!
+            const route = this.getRoute(match.routeId)
+            route.options[hook]?.(match)
+          })
+        })
+
+        this.#emit({
+          type: 'onLoad',
+          from: prevLocation,
+          to: this.state.location,
+          pathChanged: pathDidChange,
+        })
+
+        resolve()
+      } catch (err) {
+        // Only apply the latest transition
+        if ((latestPromise = checkLatest())) {
+          return latestPromise
+        }
+
+        reject(err)
       }
+    })
 
-      router.notify()
+    this.latestLoadPromise = promise
 
-      // Load the matches
-      await router.loadMatches(matches, {
-        withPending: true,
-      })
+    this.latestLoadPromise.then(() => {
+      this.cleanMatches()
+    })
 
-      if (router.startedLoadingAt !== id) {
-        // Ignore side-effects of match loading
-        return router.navigationPromise
+    return this.latestLoadPromise
+  }
+
+  #mergeMatches = (
+    prevMatchesById: Record<string, RouteMatch<TRouteTree>>,
+    nextMatches: AnyRouteMatch[],
+  ): Record<string, RouteMatch<TRouteTree>> => {
+    let matchesById = { ...prevMatchesById }
+
+    nextMatches.forEach((match) => {
+      if (!matchesById[match.id]) {
+        matchesById[match.id] = match
       }
 
-      const previousMatches = router.state.matches
+      matchesById[match.id] = {
+        ...matchesById[match.id],
+        ...match,
+      }
+    })
 
-      const exiting: RouteMatch[] = [],
-        staying: RouteMatch[] = []
+    return matchesById
+  }
 
-      previousMatches.forEach((d) => {
-        if (matches.find((dd) => dd.matchId === d.matchId)) {
-          staying.push(d)
-        } else {
-          exiting.push(d)
-        }
-      })
+  getRoute = (id: string): Route => {
+    const route = (this.routesById as any)[id]
 
-      const now = Date.now()
+    invariant(route, `Route with id "${id as string}" not found`)
 
-      exiting.forEach((d) => {
-        d.__.onExit?.({
-          params: d.params,
-          search: d.routeSearch,
-        })
-        // Clear idle error states when match leaves
-        if (d.status === 'error' && !d.isFetching) {
-          d.status = 'idle'
-          d.error = undefined
-        }
-        const gc = Math.max(
-          d.options.loaderGcMaxAge ?? router.options.defaultLoaderGcMaxAge ?? 0,
-          d.options.loaderMaxAge ?? router.options.defaultLoaderMaxAge ?? 0,
+    return route as any
+  }
+
+  preloadRoute = async (
+    navigateOpts: BuildNextOptions & {
+      maxAge?: number
+    } = this.state.location,
+  ) => {
+    let next = this.buildLocation(navigateOpts)
+
+    const matches = this.matchRoutes(next.pathname, next.search, {
+      throwOnError: true,
+    })
+
+    this.__store.setState((s) => {
+      return {
+        ...s,
+        matchesById: this.#mergeMatches(s.matchesById, matches),
+      }
+    })
+
+    await this.loadMatches(
+      matches.map((d) => d.id),
+      {
+        preload: true,
+        maxAge: navigateOpts.maxAge,
+      },
+    )
+
+    return [last(matches)!, matches] as const
+  }
+
+  cleanMatches = () => {
+    const now = Date.now()
+
+    const outdatedMatchIds = Object.values(this.state.matchesById)
+      .filter((match) => {
+        const route = this.getRoute(match.routeId)
+
+        return (
+          !this.state.matchIds.includes(match.id) &&
+          !this.state.pendingMatchIds.includes(match.id) &&
+          (match.preloadMaxAge > -1
+            ? match.updatedAt + match.preloadMaxAge < now
+            : true) &&
+          (route.options.gcMaxAge
+            ? match.updatedAt + route.options.gcMaxAge < now
+            : true)
         )
-        if (gc > 0) {
-          router.matchCache[d.matchId] = {
-            gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
-            match: d,
-          }
-        }
       })
+      .map((d) => d.id)
 
-      staying.forEach((d) => {
-        d.options.onTransition?.({
-          params: d.params,
-          search: d.routeSearch,
+    if (outdatedMatchIds.length) {
+      this.__store.setState((s) => {
+        const matchesById = { ...s.matchesById }
+        outdatedMatchIds.forEach((id) => {
+          delete matchesById[id]
         })
+        return {
+          ...s,
+          matchesById,
+        }
       })
+    }
+  }
 
-      const entering = matches.filter((d) => {
-        return !previousMatches.find((dd) => dd.matchId === d.matchId)
-      })
+  matchRoutes = (
+    pathname: string,
+    locationSearch: AnySearchSchema,
+    opts?: { throwOnError?: boolean; debug?: boolean },
+  ): RouteMatch<TRouteTree>[] => {
+    let routeParams: AnyPathParams = {}
+
+    let foundRoute = this.flatRoutes.find((route) => {
+      const matchedParams = matchPathname(
+        this.basepath,
+        trimPathRight(pathname),
+        {
+          to: route.fullPath,
+          caseSensitive:
+            route.options.caseSensitive ?? this.options.caseSensitive,
+        },
+      )
 
-      entering.forEach((d) => {
-        d.__.onExit = d.options.onMatch?.({
-          params: d.params,
-          search: d.search,
-        })
-        delete router.matchCache[d.matchId]
-      })
+      if (matchedParams) {
+        routeParams = matchedParams
+        return true
+      }
 
-      if (matches.some((d) => d.status === 'loading')) {
-        router.notify()
-        await Promise.all(
-          matches.map((d) => d.__.loaderPromise || Promise.resolve()),
-        )
+      return false
+    })
+
+    let routeCursor: AnyRoute =
+      foundRoute || (this.routesById as any)['__root__']
+
+    let matchedRoutes: AnyRoute[] = [routeCursor]
+    // let includingLayouts = true
+    while (routeCursor?.parentRoute) {
+      routeCursor = routeCursor.parentRoute
+      if (routeCursor) matchedRoutes.unshift(routeCursor)
+    }
+
+    // Existing matches are matches that are already loaded along with
+    // pending matches that are still loading
+
+    const parseErrors = matchedRoutes.map((route) => {
+      let parsedParamsError
+
+      if (route.options.parseParams) {
+        try {
+          const parsedParams = route.options.parseParams(routeParams)
+          // Add the parsed params to the accumulated params bag
+          Object.assign(routeParams, parsedParams)
+        } catch (err: any) {
+          parsedParamsError = new PathParamError(err.message, {
+            cause: err,
+          })
+
+          if (opts?.throwOnError) {
+            throw parsedParamsError
+          }
+
+          return parsedParamsError
+        }
       }
-      if (router.startedLoadingAt !== id) {
-        // Ignore side-effects of match loading
-        return
+
+      return
+    })
+
+    const matches = matchedRoutes.map((route, index) => {
+      const interpolatedPath = interpolatePath(route.path, routeParams)
+      const loaderContext = route.options.loaderContext
+        ? route.options.loaderContext({
+            search: locationSearch,
+          })
+        : undefined
+
+      const matchId = JSON.stringify(
+        [interpolatePath(route.id, routeParams, true), loaderContext].filter(
+          (d) => d !== undefined,
+        ),
+        (key, value) => {
+          if (typeof value === 'function') {
+            console.info(route)
+            invariant(
+              false,
+              `Cannot return functions and other non-serializable values from routeOptions.loaderContext! Please use routeOptions.beforeLoad to do this. Route info is logged above 👆`,
+            )
+          }
+          if (typeof value === 'object' && value !== null) {
+            return Object.fromEntries(
+              Object.keys(value)
+                .sort()
+                .map((key) => [key, value[key]]),
+            )
+          }
+          return value
+        },
+      )
+
+      // Waste not, want not. If we already have a match for this route,
+      // reuse it. This is important for layout routes, which might stick
+      // around between navigation actions that only change leaf routes.
+      const existingMatch = this.getRouteMatch(matchId)
+
+      if (existingMatch) {
+        return { ...existingMatch }
       }
 
-      router.state = {
-        ...router.state,
-        location: router.location,
-        matches,
-        pending: undefined,
-        status: 'idle',
+      // Create a fresh route match
+      const hasLoaders = !!(
+        route.options.loader ||
+        componentTypes.some((d) => (route.options[d] as any)?.preload)
+      )
+
+      const routeMatch: AnyRouteMatch = {
+        id: matchId,
+        loaderContext,
+        routeId: route.id,
+        params: routeParams,
+        pathname: joinPaths([this.basepath, interpolatedPath]),
+        updatedAt: Date.now(),
+        maxAge: -1,
+        preloadMaxAge: -1,
+        routeSearch: {},
+        search: {} as any,
+        status: hasLoaders ? 'pending' : 'success',
+        isFetching: false,
+        invalid: false,
+        error: undefined,
+        paramsError: parseErrors[index],
+        searchError: undefined,
+        loaderData: undefined,
+        loadPromise: Promise.resolve(),
+        context: undefined!,
+        abortController: new AbortController(),
+        fetchedAt: 0,
       }
 
-      router.notify()
-      router.resolveNavigation()
-    },
+      return routeMatch
+    })
+
+    // Take each match and resolve its search params and context
+    // This has to happen after the matches are created or found
+    // so that we can use the parent match's search params and context
+    matches.forEach((match, i): any => {
+      const parentMatch = matches[i - 1]
+      const route = this.getRoute(match.routeId)
+
+      const searchInfo = (() => {
+        // Validate the search params and stabilize them
+        const parentSearchInfo = {
+          search: parentMatch?.search ?? locationSearch,
+          routeSearch: parentMatch?.routeSearch ?? locationSearch,
+        }
 
-    cleanMatchCache: () => {
-      const now = Date.now()
+        try {
+          const validator =
+            typeof route.options.validateSearch === 'object'
+              ? route.options.validateSearch.parse
+              : route.options.validateSearch
 
-      Object.keys(router.matchCache).forEach((matchId) => {
-        const entry = router.matchCache[matchId]!
+          let routeSearch = validator?.(parentSearchInfo.search) ?? {}
 
-        // Don't remove loading matches
-        if (entry.match.status === 'loading') {
-          return
-        }
+          let search = {
+            ...parentSearchInfo.search,
+            ...routeSearch,
+          }
 
-        // Do not remove successful matches that are still valid
-        if (entry.gc > 0 && entry.gc > now) {
-          return
+          routeSearch = replaceEqualDeep(match.routeSearch, routeSearch)
+          search = replaceEqualDeep(match.search, search)
+
+          return {
+            routeSearch,
+            search,
+            searchDidChange: match.routeSearch !== routeSearch,
+          }
+        } catch (err: any) {
+          match.searchError = new SearchParamError(err.message, {
+            cause: err,
+          })
+
+          if (opts?.throwOnError) {
+            throw match.searchError
+          }
+
+          return parentSearchInfo
         }
+      })()
 
-        // Everything else gets removed
-        delete router.matchCache[matchId]
-      })
-    },
+      Object.assign(match, searchInfo)
+    })
 
-    loadRoute: async (navigateOpts = router.location) => {
-      const next = router.buildNext(navigateOpts)
-      const matches = router.matchRoutes(next.pathname, {
-        strictParseParams: true,
-      })
-      await router.loadMatches(matches)
-      return matches
-    },
+    return matches as any
+  }
 
-    preloadRoute: async (navigateOpts = router.location, loaderOpts) => {
-      const next = router.buildNext(navigateOpts)
-      const matches = router.matchRoutes(next.pathname, {
-        strictParseParams: true,
-      })
-      await router.loadMatches(matches, {
-        preload: true,
-        maxAge:
-          loaderOpts.maxAge ??
-          router.options.defaultPreloadMaxAge ??
-          router.options.defaultLoaderMaxAge ??
-          0,
-        gcMaxAge:
-          loaderOpts.gcMaxAge ??
-          router.options.defaultPreloadGcMaxAge ??
-          router.options.defaultLoaderGcMaxAge ??
-          0,
-      })
-      return matches
+  loadMatches = async (
+    matchIds: string[],
+    opts?: {
+      preload?: boolean
+      maxAge?: number
     },
+  ) => {
+    const getFreshMatches = () => matchIds.map((d) => this.getRouteMatch(d)!)
+
+    if (!opts?.preload) {
+      getFreshMatches().forEach((match) => {
+        // Update each match with its latest route data
+        this.setRouteMatch(match.id, (s) => ({
+          ...s,
+          routeSearch: match.routeSearch,
+          search: match.search,
+          context: match.context,
+          error: match.error,
+          paramsError: match.paramsError,
+          searchError: match.searchError,
+          params: match.params,
+          preloadMaxAge: 0,
+        }))
+      })
+    }
 
-    matchRoutes: (pathname, opts) => {
-      router.cleanMatchCache()
+    let firstBadMatchIndex: number | undefined
 
-      const matches: RouteMatch[] = []
+    // Check each match middleware to see if the route can be accessed
+    try {
+      for (const [index, match] of getFreshMatches().entries()) {
+        const parentMatch = getFreshMatches()[index - 1]
+        const route = this.getRoute(match.routeId)
 
-      if (!router.routeTree) {
-        return matches
-      }
+        const handleError = (err: any, code: string) => {
+          err.routerCode = code
+          firstBadMatchIndex = firstBadMatchIndex ?? index
 
-      const existingMatches = [
-        ...router.state.matches,
-        ...(router.state.pending?.matches ?? []),
-      ]
+          if (isRedirect(err)) {
+            throw err
+          }
 
-      const recurse = async (routes: Route<any, any>[]): Promise<void> => {
-        const parentMatch = last(matches)
-        let params = parentMatch?.params ?? {}
+          try {
+            route.options.onError?.(err)
+          } catch (errorHandlerErr) {
+            err = errorHandlerErr
 
-        const filteredRoutes = router.options.filterRoutes?.(routes) ?? routes
+            if (isRedirect(errorHandlerErr)) {
+              throw errorHandlerErr
+            }
+          }
 
-        let foundRoutes: Route[] = []
+          this.setRouteMatch(match.id, (s) => ({
+            ...s,
+            error: err,
+            status: 'error',
+            updatedAt: Date.now(),
+          }))
+        }
 
-        const findMatchInRoutes = (parentRoutes: Route[], routes: Route[]) => {
-          routes.some((route) => {
-            if (!route.routePath && route.childRoutes?.length) {
-              return findMatchInRoutes(
-                [...foundRoutes, route],
-                route.childRoutes,
-              )
+        if (match.paramsError) {
+          handleError(match.paramsError, 'PARSE_PARAMS')
+        }
+
+        if (match.searchError) {
+          handleError(match.searchError, 'VALIDATE_SEARCH')
+        }
+
+        let didError = false
+
+        const parentContext =
+          parentMatch?.context ?? this?.options.context ?? {}
+
+        try {
+          const beforeLoadContext =
+            (await route.options.beforeLoad?.({
+              abortController: match.abortController,
+              params: match.params,
+              preload: !!opts?.preload,
+              context: {
+                ...parentContext,
+                ...match.loaderContext,
+              },
+            })) ?? ({} as any)
+
+          const context = {
+            ...parentContext,
+            ...match.loaderContext,
+            ...beforeLoadContext,
+          }
+
+          this.setRouteMatch(match.id, (s) => ({
+            ...s,
+            context: replaceEqualDeep(s.context, context),
+          }))
+        } catch (err) {
+          handleError(err, 'BEFORE_LOAD')
+          didError = true
+        }
+
+        // If we errored, do not run the next matches' middleware
+        if (didError) {
+          break
+        }
+      }
+    } catch (err) {
+      if (isRedirect(err)) {
+        if (!opts?.preload) this.navigate(err as any)
+        return
+      }
+
+      throw err
+    }
+
+    const validResolvedMatches = getFreshMatches().slice(0, firstBadMatchIndex)
+    const matchPromises: Promise<any>[] = []
+
+    validResolvedMatches.forEach((match, index) => {
+      matchPromises.push(
+        (async () => {
+          const parentMatchPromise = matchPromises[index - 1]
+          const route = this.getRoute(match.routeId)
+
+          if (
+            match.isFetching ||
+            (match.status === 'success' &&
+              !isMatchInvalid(match, {
+                preload: opts?.preload,
+              }))
+          ) {
+            return this.getRouteMatch(match.id)?.loadPromise
+          }
+
+          const fetchedAt = Date.now()
+          const checkLatest = () => {
+            const latest = this.getRouteMatch(match.id)
+            return latest && latest.fetchedAt !== fetchedAt
+              ? latest.loadPromise
+              : undefined
+          }
+
+          const handleIfRedirect = (err: any) => {
+            if (isRedirect(err)) {
+              if (!opts?.preload) {
+                this.navigate(err as any)
+              }
+              return true
             }
+            return false
+          }
 
-            const fuzzy = !!(
-              route.routePath !== '/' || route.childRoutes?.length
-            )
+          const load = async () => {
+            let latestPromise
 
-            const matchParams = matchPathname(pathname, {
-              to: route.fullPath,
-              fuzzy,
-              caseSensitive:
-                route.options.caseSensitive ?? router.options.caseSensitive,
-            })
+            try {
+              const componentsPromise = Promise.all(
+                componentTypes.map(async (type) => {
+                  const component = route.options[type]
+
+                  if ((component as any)?.preload) {
+                    await (component as any).preload()
+                  }
+                }),
+              )
 
-            if (matchParams) {
-              let parsedParams
+              const loaderPromise = route.options.loader?.({
+                params: match.params,
+                preload: !!opts?.preload,
+                parentMatchPromise,
+                abortController: match.abortController,
+                context: match.context,
+              })
+
+              const [_, loader] = await Promise.all([
+                componentsPromise,
+                loaderPromise,
+              ])
+              if ((latestPromise = checkLatest())) return await latestPromise
+
+              this.setRouteMatchData(match.id, () => loader, opts)
+            } catch (error) {
+              if ((latestPromise = checkLatest())) return await latestPromise
+              if (handleIfRedirect(error)) return
 
               try {
-                parsedParams =
-                  route.options.parseParams?.(matchParams!) ?? matchParams
-              } catch (err) {
-                if (opts?.strictParseParams) {
-                  throw err
-                }
+                route.options.onError?.(error)
+              } catch (onErrorError) {
+                error = onErrorError
+                if (handleIfRedirect(onErrorError)) return
               }
 
-              params = {
-                ...params,
-                ...parsedParams,
-              }
+              this.setRouteMatch(match.id, (s) => ({
+                ...s,
+                error,
+                status: 'error',
+                isFetching: false,
+                updatedAt: Date.now(),
+              }))
             }
+          }
 
-            if (!!matchParams) {
-              foundRoutes = [...parentRoutes, route]
-            }
+          let loadPromise: Promise<void> | undefined
+
+          this.__store.batch(() => {
+            this.setRouteMatch(match.id, (s) => ({
+              ...s,
+              // status: s.status !== 'success' ? 'pending' : s.status,
+              isFetching: true,
+              fetchedAt,
+              invalid: false,
+            }))
 
-            return !!foundRoutes.length
+            loadPromise = load()
+
+            this.setRouteMatch(match.id, (s) => ({
+              ...s,
+              loadPromise,
+            }))
           })
 
-          return !!foundRoutes.length
-        }
+          await loadPromise
+        })(),
+      )
+    })
 
-        findMatchInRoutes([], filteredRoutes)
+    await Promise.all(matchPromises)
+  }
 
-        if (!foundRoutes.length) {
-          return
-        }
+  resolvePath = (from: string, path: string) => {
+    return resolvePath(this.basepath!, from, cleanPath(path))
+  }
 
-        foundRoutes.forEach((foundRoute) => {
-          const interpolatedPath = interpolatePath(foundRoute.routePath, params)
-          const matchId = interpolatePath(foundRoute.routeId, params, true)
+  navigate = async <
+    TFrom extends RoutePaths<TRouteTree> = '/',
+    TTo extends string = '',
+    TMaskFrom extends RoutePaths<TRouteTree> = TFrom,
+    TMaskTo extends string = '',
+  >({
+    from,
+    to = '' as any,
+    ...rest
+  }: NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo>) => {
+    // If this link simply reloads the current route,
+    // make sure it has a new key so it will trigger a data refresh
+
+    // If this `to` is a valid external URL, return
+    // null for LinkUtils
+    const toString = String(to)
+    const fromString = typeof from === 'undefined' ? from : String(from)
+    let isExternal
+
+    try {
+      new URL(`${toString}`)
+      isExternal = true
+    } catch (e) {}
+
+    invariant(
+      !isExternal,
+      'Attempting to navigate to external url with this.navigate!',
+    )
+
+    return this.#buildAndCommitLocation({
+      ...rest,
+      from: fromString,
+      to: toString,
+    })
+  }
+
+  matchRoute = <
+    TRouteTree extends AnyRoute = AnyRoute,
+    TFrom extends RoutePaths<TRouteTree> = '/',
+    TTo extends string = '',
+    TResolved = ResolveRelativePath<TFrom, NoInfer<TTo>>,
+  >(
+    location: ToOptions<TRouteTree, TFrom, TTo>,
+    opts?: MatchRouteOptions,
+  ): false | RouteById<TRouteTree, TResolved>['types']['allParams'] => {
+    location = {
+      ...location,
+      to: location.to
+        ? this.resolvePath(location.from ?? '', location.to)
+        : undefined,
+    } as any
+
+    const next = this.buildLocation(location)
+    if (opts?.pending && this.state.status !== 'pending') {
+      return false
+    }
+
+    const baseLocation = opts?.pending
+      ? this.state.location
+      : this.state.resolvedLocation
+
+    if (!baseLocation) {
+      return false
+    }
+
+    const match = matchPathname(this.basepath, baseLocation.pathname, {
+      ...opts,
+      to: next.pathname,
+    }) as any
+
+    if (!match) {
+      return false
+    }
+
+    if (opts?.includeSearch ?? true) {
+      return partialDeepEqual(baseLocation.search, next.search) ? match : false
+    }
+
+    return match
+  }
+
+  buildLink = <
+    TFrom extends RoutePaths<TRouteTree> = '/',
+    TTo extends string = '',
+  >(
+    dest: LinkOptions<TRouteTree, TFrom, TTo>,
+  ): LinkInfo => {
+    // If this link simply reloads the current route,
+    // make sure it has a new key so it will trigger a data refresh
 
-          const match =
-            existingMatches.find((d) => d.matchId === matchId) ||
-            router.matchCache[matchId]?.match ||
-            createRouteMatch(router, foundRoute, {
-              matchId,
-              params,
-              pathname: joinPaths([pathname, interpolatedPath]),
-            })
+    // If this `to` is a valid external URL, return
+    // null for LinkUtils
 
-          matches.push(match)
+    const {
+      to,
+      preload: userPreload,
+      preloadDelay: userPreloadDelay,
+      activeOptions,
+      disabled,
+      target,
+      replace,
+      resetScroll,
+    } = dest
+
+    try {
+      new URL(`${to}`)
+      return {
+        type: 'external',
+        href: to as any,
+      }
+    } catch (e) {}
+
+    const nextOpts = dest
+
+    const next = this.buildLocation(nextOpts)
+
+    const preload = userPreload ?? this.options.defaultPreload
+    const preloadDelay =
+      userPreloadDelay ?? this.options.defaultPreloadDelay ?? 0
+
+    // Compare path/hash for matches
+    const currentPathSplit = this.state.location.pathname.split('/')
+    const nextPathSplit = next.pathname.split('/')
+    const pathIsFuzzyEqual = nextPathSplit.every(
+      (d, i) => d === currentPathSplit[i],
+    )
+    // Combine the matches based on user options
+    const pathTest = activeOptions?.exact
+      ? this.state.location.pathname === next.pathname
+      : pathIsFuzzyEqual
+    const hashTest = activeOptions?.includeHash
+      ? this.state.location.hash === next.hash
+      : true
+    const searchTest =
+      activeOptions?.includeSearch ?? true
+        ? partialDeepEqual(this.state.location.search, next.search)
+        : true
+
+    // The final "active" test
+    const isActive = pathTest && hashTest && searchTest
+
+    // The click handler
+    const handleClick = (e: MouseEvent) => {
+      if (
+        !disabled &&
+        !isCtrlEvent(e) &&
+        !e.defaultPrevented &&
+        (!target || target === '_self') &&
+        e.button === 0
+      ) {
+        e.preventDefault()
+
+        // All is well? Navigate!
+        this.#commitLocation({ ...next, replace, resetScroll })
+      }
+    }
+
+    // The click handler
+    const handleFocus = (e: MouseEvent) => {
+      if (preload) {
+        this.preloadRoute(nextOpts).catch((err) => {
+          console.warn(err)
+          console.warn(preloadWarning)
         })
+      }
+    }
+
+    const handleTouchStart = (e: TouchEvent) => {
+      this.preloadRoute(nextOpts).catch((err) => {
+        console.warn(err)
+        console.warn(preloadWarning)
+      })
+    }
 
-        const foundRoute = last(foundRoutes)!
+    const handleEnter = (e: MouseEvent) => {
+      const target = (e.target || {}) as LinkCurrentTargetElement
 
-        if (foundRoute.childRoutes?.length) {
-          recurse(foundRoute.childRoutes)
+      if (preload) {
+        if (target.preloadTimeout) {
+          return
         }
+
+        target.preloadTimeout = setTimeout(() => {
+          target.preloadTimeout = null
+          this.preloadRoute(nextOpts).catch((err) => {
+            console.warn(err)
+            console.warn(preloadWarning)
+          })
+        }, preloadDelay)
       }
+    }
 
-      recurse([router.routeTree])
+    const handleLeave = (e: MouseEvent) => {
+      const target = (e.target || {}) as LinkCurrentTargetElement
 
-      cascadeLoaderData(matches)
+      if (target.preloadTimeout) {
+        clearTimeout(target.preloadTimeout)
+        target.preloadTimeout = null
+      }
+    }
+
+    return {
+      type: 'internal',
+      next,
+      handleFocus,
+      handleClick,
+      handleEnter,
+      handleLeave,
+      handleTouchStart,
+      isActive,
+      disabled,
+    }
+  }
 
-      return matches
-    },
+  dehydrate = (): DehydratedRouter => {
+    return {
+      state: {
+        matchIds: this.state.matchIds,
+        dehydratedMatches: this.state.matches.map((d) =>
+          pick(d, [
+            'fetchedAt',
+            'invalid',
+            'preloadMaxAge',
+            'maxAge',
+            'id',
+            'loaderData',
+            'status',
+            'updatedAt',
+          ]),
+        ),
+      },
+    }
+  }
 
-    loadMatches: async (resolvedMatches, loaderOpts) => {
-      const matchPromises = resolvedMatches.map(async (match) => {
-        // Validate the match (loads search params etc)
-        match.__.validate()
-        match.load(loaderOpts)
+  hydrate = async (__do_not_use_server_ctx?: HydrationCtx) => {
+    let _ctx = __do_not_use_server_ctx
+    // Client hydrates from window
+    if (typeof document !== 'undefined') {
+      _ctx = window.__TSR_DEHYDRATED__
+    }
+
+    invariant(
+      _ctx,
+      'Expected to find a __TSR_DEHYDRATED__ property on window... but we did not. Did you forget to render <DehydrateRouter /> in your app?',
+    )
+
+    const ctx = _ctx
+    this.dehydratedData = ctx.payload as any
+    this.options.hydrate?.(ctx.payload as any)
+    const dehydratedState = ctx.router.state
+
+    let matches = this.matchRoutes(
+      this.state.location.pathname,
+      this.state.location.search,
+    ).map((match) => {
+      const dehydratedMatch = dehydratedState.dehydratedMatches.find(
+        (d) => d.id === match.id,
+      )
 
-        if (match.status === 'loading') {
-          // If requested, start the pending timers
-          if (loaderOpts?.withPending) match.__.startPending()
+      invariant(
+        dehydratedMatch,
+        `Could not find a client-side match for dehydrated match with id: ${match.id}!`,
+      )
 
-          // Wait for the first sign of activity from the match
-          // This might be completion, error, or a pending state
-          await match.__.loadPromise
+      if (dehydratedMatch) {
+        return {
+          ...match,
+          ...dehydratedMatch,
         }
-      })
+      }
+      return match
+    })
 
-      router.notify()
+    this.__store.setState((s) => {
+      return {
+        ...s,
+        matchIds: dehydratedState.matchIds,
+        matches,
+        matchesById: this.#mergeMatches(s.matchesById, matches),
+      }
+    })
+  }
 
-      await Promise.all(matchPromises)
-    },
+  injectedHtml: (string | (() => Promise<string> | string))[] = []
 
-    invalidateRoute: (opts: MatchLocation) => {
-      const next = router.buildNext(opts)
-      const unloadedMatchIds = router
-        .matchRoutes(next.pathname)
-        .map((d) => d.matchId)
-      ;[
-        ...router.state.matches,
-        ...(router.state.pending?.matches ?? []),
-      ].forEach((match) => {
-        if (unloadedMatchIds.includes(match.matchId)) {
-          match.invalidate()
-        }
-      })
-    },
+  injectHtml = async (html: string | (() => Promise<string> | string)) => {
+    this.injectedHtml.push(html)
+  }
 
-    reload: () =>
-      router.__.navigate({
-        fromCurrent: true,
-        replace: true,
-        search: true,
-      }),
+  dehydrateData = <T>(key: any, getData: T | (() => Promise<T> | T)) => {
+    if (typeof document === 'undefined') {
+      const strKey = typeof key === 'string' ? key : JSON.stringify(key)
+
+      this.injectHtml(async () => {
+        const id = `__TSR_DEHYDRATED__${strKey}`
+        const data =
+          typeof getData === 'function' ? await (getData as any)() : getData
+        return `<script id='${id}' suppressHydrationWarning>window["__TSR_DEHYDRATED__${escapeJSON(
+          strKey,
+        )}"] = ${JSON.stringify(data)}
+        ;(() => {
+          var el = document.getElementById('${id}')
+          el.parentElement.removeChild(el)
+        })()
+        </script>`
+      })
 
-    resolvePath: (from: string, path: string) => {
-      return resolvePath(router.basepath!, from, cleanPath(path))
-    },
+      return () => this.hydrateData<T>(key)
+    }
 
-    matchRoute: (location, opts) => {
-      // const location = router.buildNext(opts)
+    return () => undefined
+  }
 
-      location = {
-        ...location,
-        to: location.to
-          ? router.resolvePath(location.from ?? '', location.to)
-          : undefined,
-      }
+  hydrateData = <T = unknown>(key: any) => {
+    if (typeof document !== 'undefined') {
+      const strKey = typeof key === 'string' ? key : JSON.stringify(key)
 
-      const next = router.buildNext(location)
+      return window[`__TSR_DEHYDRATED__${strKey}` as any] as T
+    }
 
-      if (opts?.pending) {
-        if (!router.state.pending?.location) {
-          return false
-        }
-        return !!matchPathname(router.state.pending.location.pathname, {
-          ...opts,
-          to: next.pathname,
-        })
-      }
+    return undefined
+  }
 
-      return !!matchPathname(router.state.location.pathname, {
-        ...opts,
-        to: next.pathname,
-      })
-    },
+  // resolveMatchPromise = (matchId: string, key: string, value: any) => {
+  //   this.state.matches
+  //     .find((d) => d.id === matchId)
+  //     ?.__promisesByKey[key]?.resolve(value)
+  // }
 
-    navigate: async ({ from, to = '.', search, hash, replace, params }) => {
-      // If this link simply reloads the current route,
-      // make sure it has a new key so it will trigger a data refresh
+  #processRoutes = (routeTree: TRouteTree) => {
+    this.routeTree = routeTree as any
+    this.routesById = {} as any
+    this.routesByPath = {} as any
+    this.flatRoutes = [] as any
 
-      // If this `to` is a valid external URL, return
-      // null for LinkUtils
-      const toString = String(to)
-      const fromString = String(from)
+    const recurseRoutes = (routes: AnyRoute[]) => {
+      routes.forEach((route, i) => {
+        route.init({ originalIndex: i, router: this })
 
-      let isExternal
+        const existingRoute = (this.routesById as any)[route.id]
 
-      try {
-        new URL(`${toString}`)
-        isExternal = true
-      } catch (e) {}
+        invariant(
+          !existingRoute,
+          `Duplicate routes found with id: ${String(route.id)}`,
+        )
+        ;(this.routesById as any)[route.id] = route
+
+        if (!route.isRoot && route.path) {
+          const trimmedFullPath = trimPathRight(route.fullPath)
+          if (
+            !(this.routesByPath as any)[trimmedFullPath] ||
+            route.fullPath.endsWith('/')
+          ) {
+            ;(this.routesByPath as any)[trimmedFullPath] = route
+          }
+        }
 
-      invariant(
-        !isExternal,
-        'Attempting to navigate to external url with router.navigate!',
-      )
+        const children = route.children as Route[]
 
-      return router.__.navigate({
-        from: fromString,
-        to: toString,
-        search,
-        hash,
-        replace,
-        params,
+        if (children?.length) {
+          recurseRoutes(children)
+        }
       })
-    },
+    }
 
-    buildLink: ({
-      from,
-      to = '.',
-      search,
-      params,
-      hash,
-      target,
-      replace,
-      activeOptions,
-      preload,
-      preloadMaxAge: userPreloadMaxAge,
-      preloadGcMaxAge: userPreloadGcMaxAge,
-      preloadDelay: userPreloadDelay,
-      disabled,
-    }) => {
-      // If this link simply reloads the current route,
-      // make sure it has a new key so it will trigger a data refresh
+    recurseRoutes([routeTree])
 
-      // If this `to` is a valid external URL, return
-      // null for LinkUtils
+    this.flatRoutes = (Object.values(this.routesByPath) as AnyRoute[])
+      .map((d, i) => {
+        const trimmed = trimPath(d.fullPath)
+        const parsed = parsePathname(trimmed)
 
-      try {
-        new URL(`${to}`)
-        return {
-          type: 'external',
-          href: to,
+        while (parsed.length > 1 && parsed[0]?.value === '/') {
+          parsed.shift()
         }
-      } catch (e) {}
 
-      const nextOpts = {
-        from,
-        to,
-        search,
-        params,
-        hash,
-        replace,
-      }
+        const score = parsed.map((d) => {
+          if (d.type === 'param') {
+            return 0.5
+          }
 
-      const next = router.buildNext(nextOpts)
+          if (d.type === 'wildcard') {
+            return 0.25
+          }
 
-      preload = preload ?? router.options.defaultPreload
-      const preloadDelay =
-        userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0
+          return 1
+        })
 
-      // Compare path/hash for matches
-      const pathIsEqual = router.state.location.pathname === next.pathname
-      const currentPathSplit = router.state.location.pathname.split('/')
-      const nextPathSplit = next.pathname.split('/')
-      const pathIsFuzzyEqual = nextPathSplit.every(
-        (d, i) => d === currentPathSplit[i],
-      )
-      const hashIsEqual = router.state.location.hash === next.hash
-      // Combine the matches based on user options
-      const pathTest = activeOptions?.exact ? pathIsEqual : pathIsFuzzyEqual
-      const hashTest = activeOptions?.includeHash ? hashIsEqual : true
-
-      // The final "active" test
-      const isActive = pathTest && hashTest
-
-      // The click handler
-      const handleClick = (e: MouseEvent) => {
-        if (
-          !disabled &&
-          !isCtrlEvent(e) &&
-          !e.defaultPrevented &&
-          (!target || target === '_self') &&
-          e.button === 0
-        ) {
-          e.preventDefault()
-          if (pathIsEqual && !search && !hash) {
-            router.invalidateRoute(nextOpts)
-          }
+        return { child: d, trimmed, parsed, index: i, score }
+      })
+      .sort((a, b) => {
+        let isIndex = a.trimmed === '/' ? 1 : b.trimmed === '/' ? -1 : 0
 
-          // All is well? Navigate!)
-          router.__.navigate(nextOpts)
-        }
-      }
+        if (isIndex !== 0) return isIndex
 
-      // The click handler
-      const handleFocus = (e: MouseEvent) => {
-        if (preload) {
-          router.preloadRoute(nextOpts, {
-            maxAge: userPreloadMaxAge,
-            gcMaxAge: userPreloadGcMaxAge,
-          })
+        const length = Math.min(a.score.length, b.score.length)
+
+        // Sort by length of score
+        if (a.score.length !== b.score.length) {
+          return b.score.length - a.score.length
         }
-      }
 
-      const handleEnter = (e: MouseEvent) => {
-        const target = (e.target || {}) as LinkCurrentTargetElement
+        // Sort by min available score
+        for (let i = 0; i < length; i++) {
+          if (a.score[i] !== b.score[i]) {
+            return b.score[i]! - a.score[i]!
+          }
+        }
 
-        if (preload) {
-          if (target.preloadTimeout) {
-            return
+        // Sort by min available parsed value
+        for (let i = 0; i < length; i++) {
+          if (a.parsed[i]!.value !== b.parsed[i]!.value) {
+            return a.parsed[i]!.value! > b.parsed[i]!.value! ? 1 : -1
           }
+        }
 
-          target.preloadTimeout = setTimeout(() => {
-            target.preloadTimeout = null
-            router.preloadRoute(nextOpts, {
-              maxAge: userPreloadMaxAge,
-              gcMaxAge: userPreloadGcMaxAge,
-            })
-          }, preloadDelay)
+        // Sort by length of trimmed full path
+        if (a.trimmed !== b.trimmed) {
+          return a.trimmed > b.trimmed ? 1 : -1
         }
-      }
 
-      const handleLeave = (e: MouseEvent) => {
-        const target = (e.target || {}) as LinkCurrentTargetElement
+        // Sort by original index
+        return a.index - b.index
+      })
+      .map((d, i) => {
+        d.child.rank = i
+        return d.child
+      }) as any
+  }
 
-        if (target.preloadTimeout) {
-          clearTimeout(target.preloadTimeout)
-          target.preloadTimeout = null
-        }
-      }
+  #parseLocation = (
+    previousLocation?: ParsedLocation,
+  ): ParsedLocation<FullSearchSchema<TRouteTree>> => {
+    const parse = ({
+      pathname,
+      search,
+      hash,
+      state,
+    }: HistoryLocation): ParsedLocation<FullSearchSchema<TRouteTree>> => {
+      const parsedSearch = this.options.parseSearch(search)
 
       return {
-        type: 'internal',
-        next,
-        handleFocus,
-        handleClick,
-        handleEnter,
-        handleLeave,
-        isActive,
-        disabled,
+        pathname: pathname,
+        searchStr: search,
+        search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
+        hash: hash.split('#').reverse()[0] ?? '',
+        href: `${pathname}${search}${hash}`,
+        state: replaceEqualDeep(previousLocation?.state, state) as HistoryState,
       }
-    },
-    buildNext: (opts: BuildNextOptions) => {
-      const next = router.__.buildLocation(opts)
+    }
 
-      const matches = router.matchRoutes(next.pathname)
+    const location = parse(this.history.location)
 
-      const __preSearchFilters = matches
-        .map((match) => match.options.preSearchFilters ?? [])
-        .flat()
-        .filter(Boolean)
+    let { __tempLocation, __tempKey } = location.state
 
-      const __postSearchFilters = matches
-        .map((match) => match.options.postSearchFilters ?? [])
-        .flat()
-        .filter(Boolean)
+    if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
+      // Sync up the location keys
+      const parsedTempLocation = parse(__tempLocation) as any
+      parsedTempLocation.state.key = location.state.key
 
-      return router.__.buildLocation({
-        ...opts,
-        __preSearchFilters,
-        __postSearchFilters,
-      })
-    },
+      delete parsedTempLocation.state.__tempLocation
 
-    __: {
-      buildRouteTree: (rootRouteConfig: RouteConfig) => {
-        const recurseRoutes = (
-          routeConfigs: RouteConfig[],
-          parent?: Route<TAllRouteInfo, any>,
-        ): Route<TAllRouteInfo, any>[] => {
-          return routeConfigs.map((routeConfig) => {
-            const routeOptions = routeConfig.options
-            const route = createRoute(routeConfig, routeOptions, parent, router)
-
-            // {
-            //   pendingMs: routeOptions.pendingMs ?? router.defaultPendingMs,
-            //   pendingMinMs: routeOptions.pendingMinMs ?? router.defaultPendingMinMs,
-            // }
-
-            const existingRoute = (router.routesById as any)[route.routeId]
-
-            if (existingRoute) {
-              if (process.env.NODE_ENV !== 'production') {
-                console.warn(
-                  `Duplicate routes found with id: ${String(route.routeId)}`,
-                  router.routesById,
-                  route,
-                )
-              }
-              throw new Error()
-            }
+      return {
+        ...parsedTempLocation,
+        maskedLocation: location,
+      }
+    }
 
-            ;(router.routesById as any)[route.routeId] = route
+    return location
+  }
 
-            const children = routeConfig.children as RouteConfig[]
+  buildLocation = (opts: BuildNextOptions = {}): ParsedLocation => {
+    const build = (
+      dest: BuildNextOptions & {
+        unmaskOnReload?: boolean
+      } = {},
+      matches?: AnyRouteMatch[],
+    ): ParsedLocation => {
+      const from = this.state.location
+
+      const fromPathname = dest.from ?? from.pathname
+
+      let pathname = resolvePath(
+        this.basepath ?? '/',
+        fromPathname,
+        `${dest.to ?? ''}`,
+      )
 
-            route.childRoutes = children?.length
-              ? recurseRoutes(children, route)
-              : undefined
+      const fromMatches = this.matchRoutes(fromPathname, from.search)
 
-            return route
-          })
-        }
+      const prevParams = { ...last(fromMatches)?.params }
 
-        const routes = recurseRoutes([rootRouteConfig])
+      let nextParams =
+        (dest.params ?? true) === true
+          ? prevParams
+          : functionalUpdate(dest.params!, prevParams)
 
-        return routes[0]!
-      },
+      if (nextParams) {
+        matches
+          ?.map((d) => this.getRoute(d.routeId).options.stringifyParams)
+          .filter(Boolean)
+          .forEach((fn) => {
+            nextParams = { ...nextParams!, ...fn!(nextParams!) }
+          })
+      }
 
-      parseLocation: (
-        location: History['location'],
-        previousLocation?: Location,
-      ): Location => {
-        const parsedSearch = router.options.parseSearch(location.search)
+      pathname = interpolatePath(pathname, nextParams ?? {})
 
-        return {
-          pathname: location.pathname,
-          searchStr: location.search,
-          search: replaceEqualDeep(previousLocation?.search, parsedSearch),
-          hash: location.hash.split('#').reverse()[0] ?? '',
-          href: `${location.pathname}${location.search}${location.hash}`,
-          state: location.state as LocationState,
-          key: location.key,
-        }
-      },
+      const preSearchFilters =
+        matches
+          ?.map(
+            (match) =>
+              this.getRoute(match.routeId).options.preSearchFilters ?? [],
+          )
+          .flat()
+          .filter(Boolean) ?? []
+
+      const postSearchFilters =
+        matches
+          ?.map(
+            (match) =>
+              this.getRoute(match.routeId).options.postSearchFilters ?? [],
+          )
+          .flat()
+          .filter(Boolean) ?? []
+
+      // Pre filters first
+      const preFilteredSearch = preSearchFilters?.length
+        ? preSearchFilters?.reduce(
+            (prev, next) => next(prev) as any,
+            from.search,
+          )
+        : from.search
 
-      navigate: (location: BuildNextOptions & { replace?: boolean }) => {
-        const next = router.buildNext(location)
-        return router.__.commitLocation(next, location.replace)
-      },
+      // Then the link/navigate function
+      const destSearch =
+        dest.search === true
+          ? preFilteredSearch // Preserve resolvedFrom true
+          : dest.search
+          ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
+          : preSearchFilters?.length
+          ? preFilteredSearch // Preserve resolvedFrom filters
+          : {}
 
-      buildLocation: (dest: BuildNextOptions = {}): Location => {
-        // const resolvedFrom: Location = {
-        //   ...router.location,
-        const fromPathname = dest.fromCurrent
-          ? router.location.pathname
-          : dest.from ?? router.location.pathname
-
-        let pathname = resolvePath(
-          router.basepath ?? '/',
-          fromPathname,
-          `${dest.to ?? '.'}`,
-        )
+      // Then post filters
+      const postFilteredSearch = postSearchFilters?.length
+        ? postSearchFilters.reduce((prev, next) => next(prev), destSearch)
+        : destSearch
 
-        const fromMatches = router.matchRoutes(router.location.pathname, {
-          strictParseParams: true,
-        })
+      const search = replaceEqualDeep(from.search, postFilteredSearch)
 
-        const toMatches = router.matchRoutes(pathname)
+      const searchStr = this.options.stringifySearch(search)
 
-        const prevParams = { ...last(fromMatches)?.params }
+      const hash =
+        dest.hash === true
+          ? from.hash
+          : dest.hash
+          ? functionalUpdate(dest.hash!, from.hash)
+          : from.hash
 
-        let nextParams =
-          (dest.params ?? true) === true
-            ? prevParams
-            : functionalUpdate(dest.params!, prevParams)
+      const hashStr = hash ? `#${hash}` : ''
 
-        if (nextParams) {
-          toMatches
-            .map((d) => d.options.stringifyParams)
-            .filter(Boolean)
-            .forEach((fn) => {
-              Object.assign({}, nextParams!, fn!(nextParams!))
-            })
-        }
+      let nextState =
+        dest.state === true
+          ? from.state
+          : dest.state
+          ? functionalUpdate(dest.state, from.state)
+          : from.state
 
-        pathname = interpolatePath(pathname, nextParams ?? {})
+      nextState = replaceEqualDeep(from.state, nextState)
 
-        // Pre filters first
-        const preFilteredSearch = dest.__preSearchFilters?.length
-          ? dest.__preSearchFilters.reduce(
-              (prev, next) => next(prev),
-              router.location.search,
-            )
-          : router.location.search
-
-        // Then the link/navigate function
-        const destSearch =
-          dest.search === true
-            ? preFilteredSearch // Preserve resolvedFrom true
-            : dest.search
-            ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
-            : dest.__preSearchFilters?.length
-            ? preFilteredSearch // Preserve resolvedFrom filters
-            : {}
-
-        // Then post filters
-        const postFilteredSearch = dest.__postSearchFilters?.length
-          ? dest.__postSearchFilters.reduce(
-              (prev, next) => next(prev),
-              destSearch,
-            )
-          : destSearch
+      return {
+        pathname,
+        search,
+        searchStr,
+        state: nextState as any,
+        hash,
+        href: this.history.createHref(`${pathname}${searchStr}${hashStr}`),
+        unmaskOnReload: dest.unmaskOnReload,
+      }
+    }
+
+    const buildWithMatches = (
+      dest: BuildNextOptions = {},
+      maskedDest?: BuildNextOptions,
+    ) => {
+      let next = build(dest)
+      let maskedNext = maskedDest ? build(maskedDest) : undefined
+
+      if (!maskedNext) {
+        let params = {}
+
+        let foundMask = this.options.routeMasks?.find((d) => {
+          const match = matchPathname(this.basepath, next.pathname, {
+            to: d.from,
+            fuzzy: false,
+          })
 
-        const search = replaceEqualDeep(
-          router.location.search,
-          postFilteredSearch,
-        )
+          if (match) {
+            params = match
+            return true
+          }
 
-        const searchStr = router.options.stringifySearch(search)
-        let hash =
-          dest.hash === true
-            ? router.location.hash
-            : functionalUpdate(dest.hash!, router.location.hash)
-        hash = hash ? `#${hash}` : ''
+          return false
+        })
 
-        return {
-          pathname,
-          search,
-          searchStr,
-          state: router.location.state,
-          hash,
-          href: `${pathname}${searchStr}${hash}`,
-          key: dest.key,
+        if (foundMask) {
+          foundMask = {
+            ...foundMask,
+            from: interpolatePath(foundMask.from, params) as any,
+          }
+          maskedDest = foundMask
+          maskedNext = build(maskedDest)
         }
-      },
+      }
 
-      commitLocation: (next: Location, replace?: boolean): Promise<void> => {
-        const id = '' + Date.now() + Math.random()
+      const nextMatches = this.matchRoutes(next.pathname, next.search)
+      const maskedMatches = maskedNext
+        ? this.matchRoutes(maskedNext.pathname, maskedNext.search)
+        : undefined
+      const maskedFinal = maskedNext
+        ? build(maskedDest, maskedMatches)
+        : undefined
 
-        if (router.navigateTimeout) clearTimeout(router.navigateTimeout)
+      const final = build(dest, nextMatches)
 
-        let nextAction: 'push' | 'replace' = 'replace'
+      if (maskedFinal) {
+        final.maskedLocation = maskedFinal
+      }
 
-        if (!replace) {
-          nextAction = 'push'
-        }
+      return final
+    }
 
-        const isSameUrl =
-          router.__.parseLocation(history.location).href === next.href
+    if (opts.mask) {
+      return buildWithMatches(opts, {
+        ...pick(opts, ['from']),
+        ...opts.mask,
+      })
+    }
 
-        if (isSameUrl && !next.key) {
-          nextAction = 'replace'
-        }
+    return buildWithMatches(opts)
+  }
 
-        if (nextAction === 'replace') {
-          history.replace(
-            {
-              pathname: next.pathname,
-              hash: next.hash,
-              search: next.searchStr,
-            },
-            {
-              id,
-            },
-          )
-        } else {
-          history.push(
-            {
-              pathname: next.pathname,
-              hash: next.hash,
-              search: next.searchStr,
-            },
-            {
-              id,
+  #buildAndCommitLocation = ({
+    replace,
+    resetScroll,
+    ...rest
+  }: BuildNextOptions & CommitLocationOptions = {}) => {
+    const location = this.buildLocation(rest)
+    return this.#commitLocation({
+      ...location,
+      replace,
+      resetScroll,
+    })
+  }
+
+  #commitLocation = async (next: ParsedLocation & CommitLocationOptions) => {
+    if (this.navigateTimeout) clearTimeout(this.navigateTimeout)
+
+    const isSameUrl = this.state.location.href === next.href
+
+    // If the next urls are the same and we're not replacing,
+    // do nothing
+    if (isSameUrl && !next.replace) {
+      return
+    }
+
+    let { maskedLocation, ...nextHistory } = next
+
+    if (maskedLocation) {
+      nextHistory = {
+        ...maskedLocation,
+        state: {
+          ...maskedLocation.state,
+          __tempKey: undefined,
+          __tempLocation: {
+            ...nextHistory,
+            search: nextHistory.searchStr,
+            state: {
+              ...nextHistory.state,
+              __tempKey: undefined!,
+              __tempLocation: undefined!,
+              key: undefined!,
             },
-          )
-        }
+          },
+        },
+      }
 
-        router.navigationPromise = new Promise((resolve) => {
-          const previousNavigationResolve = router.resolveNavigation
+      if (nextHistory.unmaskOnReload ?? this.options.unmaskOnReload ?? false) {
+        nextHistory.state.__tempKey = this.tempLocationKey
+      }
+    }
 
-          router.resolveNavigation = () => {
-            previousNavigationResolve()
-            resolve()
-          }
-        })
+    this.history[next.replace ? 'replace' : 'push'](
+      nextHistory.href,
+      nextHistory.state,
+    )
 
-        return router.navigationPromise
-      },
+    this.resetNextScroll = next.resetScroll ?? true
+
+    return this.latestLoadPromise
+  }
+
+  getRouteMatch = (id: string): undefined | RouteMatch<TRouteTree> => {
+    return this.state.matchesById[id]
+  }
+
+  setRouteMatch = (
+    id: string,
+    updater: (prev: RouteMatch<TRouteTree>) => RouteMatch<TRouteTree>,
+  ) => {
+    this.__store.setState((prev) => {
+      if (!prev.matchesById[id]) {
+        return prev
+      }
+
+      return {
+        ...prev,
+        matchesById: {
+          ...prev.matchesById,
+          [id]: updater(prev.matchesById[id] as any),
+        },
+      }
+    })
+  }
+
+  setRouteMatchData = (
+    id: string,
+    updater: (prev: any) => any,
+    opts?: {
+      updatedAt?: number
+      maxAge?: number
     },
+  ) => {
+    const match = this.getRouteMatch(id)
+
+    if (!match) return
+
+    const route = this.getRoute(match.routeId)
+    const updatedAt = opts?.updatedAt ?? Date.now()
+
+    const preloadMaxAge =
+      opts?.maxAge ??
+      route.options.preloadMaxAge ??
+      this.options.defaultPreloadMaxAge ??
+      5000
+
+    const maxAge =
+      opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? -1
+
+    this.setRouteMatch(id, (s) => ({
+      ...s,
+      error: undefined,
+      status: 'success',
+      isFetching: false,
+      updatedAt: updatedAt,
+      loaderData: functionalUpdate(updater, s.loaderData),
+      preloadMaxAge,
+      maxAge,
+    }))
   }
 
-  router.location = router.__.parseLocation(history.location)
-  router.state.location = router.location
+  invalidate = async (opts?: {
+    matchId?: string
+    reload?: boolean
+    __fromFocus?: boolean
+  }): Promise<void> => {
+    if (opts?.matchId) {
+      this.setRouteMatch(opts.matchId, (s) => ({
+        ...s,
+        invalid: true,
+      }))
+
+      const matchIndex = this.state.matches.findIndex(
+        (d) => d.id === opts.matchId,
+      )
+      const childMatch = this.state.matches[matchIndex + 1]
 
-  router.update(userOptions)
+      if (childMatch) {
+        return this.invalidate({
+          matchId: childMatch.id,
+          reload: false,
+          __fromFocus: opts.__fromFocus,
+        })
+      }
+    } else {
+      this.__store.batch(() => {
+        Object.values(this.state.matchesById).forEach((match) => {
+          const route = this.getRoute(match.routeId)
+          const shouldInvalidate = opts?.__fromFocus
+            ? route.options.reloadOnWindowFocus ?? true
+            : true
+
+          if (shouldInvalidate) {
+            this.setRouteMatch(match.id, (s) => ({
+              ...s,
+              invalid: true,
+            }))
+          }
+        })
+      })
+    }
 
-  // Allow frameworks to hook into the router creation
-  router.options.createRouter?.(router)
+    if (opts?.reload ?? true) {
+      return this.load()
+    }
+  }
+}
 
-  return router
+// Detect if we're in the DOM
+const isServer = typeof window === 'undefined' || !window.document.createElement
+
+function getInitialRouterState(): RouterState<any> {
+  return {
+    status: 'idle',
+    isFetching: false,
+    resolvedLocation: null!,
+    location: null!,
+    matchesById: {},
+    matchIds: [],
+    pendingMatchIds: [],
+    matches: [],
+    pendingMatches: [],
+    renderedMatchIds: [],
+    renderedMatches: [],
+    lastUpdated: Date.now(),
+  }
 }
 
 function isCtrlEvent(e: MouseEvent) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)
 }
+
+export type AnyRedirect = Redirect<any, any, any>
+
+export type Redirect<
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
+  TFrom extends RoutePaths<TRouteTree> = '/',
+  TTo extends string = '',
+  TMaskFrom extends RoutePaths<TRouteTree> = TFrom,
+  TMaskTo extends string = '',
+> = NavigateOptions<TRouteTree, TFrom, TTo, TMaskFrom, TMaskTo> & {
+  code?: number
+}
+
+export function redirect<
+  TRouteTree extends AnyRoute = RegisteredRouter['routeTree'],
+  TFrom extends RoutePaths<TRouteTree> = '/',
+  TTo extends string = '',
+>(opts: Redirect<TRouteTree, TFrom, TTo>): Redirect<TRouteTree, TFrom, TTo> {
+  ;(opts as any).isRedirect = true
+  return opts
+}
+
+export function isRedirect(obj: any): obj is AnyRedirect {
+  return !!obj?.isRedirect
+}
+
+export class SearchParamError extends Error {}
+export class PathParamError extends Error {}
+
+function escapeJSON(jsonString: string) {
+  return jsonString
+    .replace(/\\/g, '\\\\') // Escape backslashes
+    .replace(/'/g, "\\'") // Escape single quotes
+    .replace(/"/g, '\\"') // Escape double quotes
+}
+
+// A function that takes an import() argument which is a function and returns a new function that will
+// proxy arguments from the caller to the imported function, retaining all type
+// information along the way
+export function lazyFn<
+  T extends Record<string, (...args: any[]) => any>,
+  TKey extends keyof T = 'default',
+>(fn: () => Promise<T>, key?: TKey) {
+  return async (...args: Parameters<T[TKey]>): Promise<ReturnType<T[TKey]>> => {
+    const imported = await fn()
+    return imported[key || 'default'](...args)
+  }
+}
+
+export function isMatchInvalid(
+  match: AnyRouteMatch,
+  opts?: { preload?: boolean },
+) {
+  const now = Date.now()
+
+  if (match.invalid) {
+    return true
+  }
+
+  if (opts?.preload) {
+    return match.preloadMaxAge < 0
+      ? false
+      : match.updatedAt + match.preloadMaxAge < now
+  }
+
+  return match.maxAge < 0 ? false : match.updatedAt + match.maxAge < now
+}