@tanstack/router-core 0.0.1-beta.5 → 0.0.1-beta.51

package/src/router.ts

@@ -1,20 +1,13 @@
-import {
-  BrowserHistory,
-  createBrowserHistory,
-  createMemoryHistory,
-  HashHistory,
-  History,
-  MemoryHistory,
-} from 'history'
 import invariant from 'tiny-invariant'
 import { GetFrameworkGeneric } from './frameworks'
 
 import {
   LinkInfo,
   LinkOptions,
-  NavigateOptionsAbsolute,
+  NavigateOptions,
   ToOptions,
   ValidFromPath,
+  ResolveRelativePath,
 } from './link'
 import {
   cleanPath,
@@ -22,8 +15,9 @@ import {
   joinPaths,
   matchPathname,
   resolvePath,
+  trimPath,
 } from './path'
-import { AnyRoute, cascadeLoaderData, createRoute, Route } from './route'
+import { AnyRoute, Route } from './route'
 import {
   AnyLoaderData,
   AnyPathParams,
@@ -36,25 +30,51 @@ import {
 import {
   AllRouteInfo,
   AnyAllRouteInfo,
-  AnyRouteInfo,
   RouteInfo,
   RoutesById,
 } from './routeInfo'
-import { createRouteMatch, RouteMatch } from './routeMatch'
+import { RouteMatch, RouteMatchStore } from './routeMatch'
 import { defaultParseSearch, defaultStringifySearch } from './searchParams'
+import { createStore, batch, Store } from './store'
 import {
   functionalUpdate,
   last,
+  NoInfer,
+  pick,
   PickAsRequired,
   PickRequired,
-  replaceEqualDeep,
   Timeout,
   Updater,
 } from './utils'
+import { replaceEqualDeep } from './interop'
+import {
+  createBrowserHistory,
+  createMemoryHistory,
+  RouterHistory,
+} from './history'
+import { createMemo } from '@solidjs/reactivity'
+
+export interface RegisterRouter {
+  // router: Router
+}
+
+export type AnyRouter = Router<any, any, any>
+
+export type RegisteredRouter = RegisterRouter extends {
+  router: Router<infer TRouteConfig, infer TAllRouteInfo, infer TRouterContext>
+}
+  ? Router<TRouteConfig, TAllRouteInfo, TRouterContext>
+  : Router
+
+export type RegisteredAllRouteInfo = RegisterRouter extends {
+  router: Router<infer TRouteConfig, infer TAllRouteInfo, infer TRouterContext>
+}
+  ? TAllRouteInfo
+  : AnyAllRouteInfo
 
 export interface LocationState {}
 
-export interface Location<
+export interface ParsedLocation<
   TSearchObj extends AnySearchSchema = {},
   TState extends LocationState = LocationState,
 > {
@@ -80,8 +100,11 @@ export type FilterRoutesFn = <TRoute extends Route<any, RouteInfo>>(
   routeConfigs: TRoute[],
 ) => TRoute[]
 
-export interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
-  history?: BrowserHistory | MemoryHistory | HashHistory
+export interface RouterOptions<
+  TRouteConfig extends AnyRouteConfig,
+  TRouterContext,
+> {
+  history?: RouterHistory
   stringifySearch?: SearchSerializer
   parseSearch?: SearchParser
   filterRoutes?: FilterRoutesFn
@@ -89,47 +112,29 @@ export interface RouterOptions<TRouteConfig extends AnyRouteConfig> {
   defaultPreloadMaxAge?: number
   defaultPreloadGcMaxAge?: number
   defaultPreloadDelay?: number
-  useErrorBoundary?: boolean
-  defaultElement?: GetFrameworkGeneric<'Element'>
-  defaultErrorElement?: GetFrameworkGeneric<'Element'>
-  defaultCatchElement?: GetFrameworkGeneric<'Element'>
-  defaultPendingElement?: GetFrameworkGeneric<'Element'>
-  defaultPendingMs?: number
-  defaultPendingMinMs?: number
+  defaultComponent?: GetFrameworkGeneric<'Component'>
+  defaultErrorComponent?: GetFrameworkGeneric<'ErrorComponent'>
+  defaultPendingComponent?: GetFrameworkGeneric<'Component'>
   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'>>
+  useServerData?: boolean
+  Router?: (router: AnyRouter) => void
+  createRoute?: (opts: { route: AnyRoute; router: AnyRouter }) => void
+  context?: TRouterContext
+  loadComponent?: (
+    component: GetFrameworkGeneric<'Component'>,
+  ) => Promise<GetFrameworkGeneric<'Component'>>
+  onRouteChange?: () => void
+  fetchServerDataFn?: FetchServerDataFn
 }
 
-export interface Action<
-  TPayload = unknown,
-  TResponse = unknown,
-  // TError = unknown,
-> {
-  submit: (submission?: TPayload) => Promise<TResponse>
-  current?: ActionState<TPayload, TResponse>
-  latest?: ActionState<TPayload, TResponse>
-  pending: ActionState<TPayload, TResponse>[]
-}
-
-export interface ActionState<
-  TPayload = unknown,
-  TResponse = unknown,
-  // TError = unknown,
-> {
-  submittedAt: number
-  status: 'idle' | 'pending' | 'success' | 'error'
-  submission: TPayload
-  data?: TResponse
-  error?: unknown
-}
+type FetchServerDataFn = (ctx: {
+  router: AnyRouter
+  routeMatch: RouteMatch
+}) => Promise<any>
 
 export interface Loader<
   TFullSearchSchema extends AnySearchSchema = {},
@@ -160,41 +165,38 @@ export interface Loader<
 }
 
 export interface LoaderState<
-  TFullSearchSchema = unknown,
-  TAllParams = unknown,
+  TFullSearchSchema extends AnySearchSchema = {},
+  TAllParams extends AnyPathParams = {},
 > {
   loadedAt: number
   loaderContext: LoaderContext<TFullSearchSchema, TAllParams>
 }
 
-export interface RouterState {
+export interface RouterStore<
+  TSearchObj extends AnySearchSchema = {},
+  TState extends LocationState = LocationState,
+> {
   status: 'idle' | 'loading'
-  location: Location
-  matches: RouteMatch[]
+  latestLocation: ParsedLocation<TSearchObj, TState>
+  currentMatches: RouteMatch[]
+  currentLocation: ParsedLocation<TSearchObj, TState>
+  pendingMatches?: RouteMatch[]
+  pendingLocation?: ParsedLocation<TSearchObj, TState>
   lastUpdated: number
-  currentAction?: ActionState
-  latestAction?: ActionState
-  actions: Record<string, Action>
   loaders: Record<string, Loader>
-  pending?: PendingState
   isFetching: boolean
   isPreloading: boolean
+  matchCache: Record<string, MatchCacheEntry>
 }
 
-export interface PendingState {
-  location: Location
-  matches: RouteMatch[]
-}
-
-type Listener = (router: Router<any, any>) => void
-
 export type ListenerFn = () => 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>
+  state?: LocationState
   key?: string
   from?: string
   fromCurrent?: boolean
@@ -216,397 +218,361 @@ export interface MatchLocation {
 }
 
 export interface MatchRouteOptions {
-  pending: boolean
+  pending?: boolean
   caseSensitive?: boolean
+  fuzzy?: boolean
 }
 
 type LinkCurrentTargetElement = {
   preloadTimeout?: null | ReturnType<typeof setTimeout>
 }
 
-export interface Router<
-  TRouteConfig extends AnyRouteConfig = RouteConfig,
-  TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
-> {
-  history: BrowserHistory | MemoryHistory | HashHistory
-  options: PickAsRequired<
-    RouterOptions<TRouteConfig>,
-    'stringifySearch' | 'parseSearch'
+export interface DehydratedRouterState
+  extends Pick<
+    RouterStore,
+    'status' | 'latestLocation' | 'currentLocation' | 'lastUpdated'
+  > {
+  currentMatches: DehydratedRouteMatch[]
+}
+
+export interface DehydratedRouter<TRouterContext = unknown> {
+  // location: Router['__location']
+  state: DehydratedRouterState
+  context: TRouterContext
+}
+
+export type MatchCache = Record<string, MatchCacheEntry>
+
+interface DehydratedRouteMatch {
+  id: string
+  state: Pick<
+    RouteMatchStore<any, any>,
+    'status' | 'routeLoaderData' | 'invalid' | 'invalidAt'
   >
-  // 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>
-  }
 }
 
-// Detect if we're in the DOM
-const isServer =
-  typeof window === 'undefined' || !window.document?.createElement
+export interface RouterContext {}
+
+export const defaultFetchServerDataFn: FetchServerDataFn = async ({
+  router,
+  routeMatch,
+}) => {
+  const next = router.buildNext({
+    to: '.',
+    search: (d: any) => ({
+      ...(d ?? {}),
+      __data: {
+        matchId: routeMatch.id,
+      },
+    }),
+  })
+
+  const res = await fetch(next.href, {
+    method: 'GET',
+    signal: routeMatch.abortController.signal,
+  })
 
-// This is the default history object if none is defined
-const createDefaultHistory = () =>
-  isServer ? createMemoryHistory() : createBrowserHistory()
+  if (res.ok) {
+    return res.json()
+  }
+
+  throw new Error('Failed to fetch match data')
+}
 
-export function createRouter<
+export class Router<
   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,
+  TRouterContext = unknown,
+> {
+  types!: {
+    // Super secret internal stuff
+    RouteConfig: TRouteConfig
+    AllRouteInfo: TAllRouteInfo
   }
 
-  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: {},
-      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),
-        ),
-      }
-
-      cascadeLoaderData(router.state.matches)
-      router.listeners.forEach((listener) => listener(router))
-    },
+  options: PickAsRequired<
+    RouterOptions<TRouteConfig, TRouterContext>,
+    'stringifySearch' | 'parseSearch' | 'context'
+  >
+  history!: RouterHistory
+  basepath: string
+  // __location: Location<TAllRouteInfo['fullSearchSchema']>
+  routeTree!: Route<TAllRouteInfo, RouteInfo>
+  routesById!: RoutesById<TAllRouteInfo>
+  navigateTimeout: undefined | Timeout
+  nextAction: undefined | 'push' | 'replace'
+  navigationPromise: undefined | Promise<void>
+
+  store: Store<RouterStore<TAllRouteInfo['fullSearchSchema']>>
+  startedLoadingAt = Date.now()
+  resolveNavigation = () => {}
+
+  constructor(options?: RouterOptions<TRouteConfig, TRouterContext>) {
+    this.options = {
+      defaultLoaderGcMaxAge: 5 * 60 * 1000,
+      defaultLoaderMaxAge: 0,
+      defaultPreloadMaxAge: 2000,
+      defaultPreloadDelay: 50,
+      context: undefined!,
+      ...options,
+      stringifySearch: options?.stringifySearch ?? defaultStringifySearch,
+      parseSearch: options?.parseSearch ?? defaultParseSearch,
+      fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn,
+    }
+
+    this.store = createStore(getInitialRouterState())
+    this.basepath = ''
+
+    this.update(options)
+
+    // Allow frameworks to hook into the router creation
+    this.options.Router?.(this)
+  }
 
-    mount: () => {
-      const next = router.__.buildLocation({
-        to: '.',
-        search: true,
-        hash: true,
-      })
+  reset = () => {
+    this.store.setState((s) => Object.assign(s, getInitialRouterState()))
+  }
 
-      // 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)
+  mount = () => {
+    // Mount only does anything on the client
+    if (!isServer) {
+      // If the router matches are empty, load the matches
+      if (!this.store.state.currentMatches.length) {
+        this.load()
       }
 
-      router.loadLocation()
-
-      const unsub = router.history.listen((event) => {
-        console.log(event.location)
-        router.loadLocation(
-          router.__.parseLocation(event.location, router.location),
-        )
+      const unsubHistory = this.history.listen(() => {
+        this.load(this.#parseLocation(this.store.state.latestLocation))
       })
 
+      const visibilityChangeEvent = 'visibilitychange'
+      const focusEvent = 'focus'
+
       // 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 (!isServer && window.addEventListener) {
-        // Listen to visibillitychange and focus
-        window.addEventListener('visibilitychange', router.onFocus, false)
-        window.addEventListener('focus', router.onFocus, false)
+      if (window.addEventListener) {
+        // Listen to visibilitychange and focus
+        window.addEventListener(visibilityChangeEvent, this.#onFocus, false)
+        window.addEventListener(focusEvent, this.#onFocus, false)
       }
 
       return () => {
-        unsub()
-        // Be sure to unsubscribe if a new handler is set
-        window.removeEventListener('visibilitychange', router.onFocus)
-        window.removeEventListener('focus', router.onFocus)
-      }
-    },
+        unsubHistory()
+        if (window.removeEventListener) {
+          // Be sure to unsubscribe if a new handler is set
 
-    onFocus: () => {
-      router.loadLocation()
-    },
-
-    update: (opts) => {
-      const newHistory = opts?.history !== router.history
-      if (!router.location || newHistory) {
-        if (opts?.history) {
-          router.history = opts.history
+          window.removeEventListener(visibilityChangeEvent, this.#onFocus)
+          window.removeEventListener(focusEvent, this.#onFocus)
         }
-        router.location = router.__.parseLocation(router.history.location)
-        router.state.location = router.location
       }
+    }
 
-      Object.assign(router.options, opts)
+    return () => {}
+  }
 
-      const { basepath, routeConfig } = router.options
+  update = <
+    TRouteConfig extends RouteConfig = RouteConfig,
+    TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
+    TRouterContext = unknown,
+  >(
+    opts?: RouterOptions<TRouteConfig, TRouterContext>,
+  ): Router<TRouteConfig, TAllRouteInfo, TRouterContext> => {
+    Object.assign(this.options, opts)
+
+    if (
+      !this.history ||
+      (this.options.history && this.options.history !== this.history)
+    ) {
+      this.history =
+        this.options?.history ?? isServer
+          ? createMemoryHistory()
+          : createBrowserHistory()!
+
+      this.store.setState((s) => {
+        s.latestLocation = this.#parseLocation()
+        s.currentLocation = s.latestLocation
+      })
+    }
 
-      router.basepath = cleanPath(`/${basepath ?? ''}`)
+    const { basepath, routeConfig } = this.options
 
-      if (routeConfig) {
-        router.routesById = {} as any
-        router.routeTree = router.__.buildRouteTree(routeConfig)
-      }
+    this.basepath = `/${trimPath(basepath ?? '') ?? ''}`
 
-      return router as any
-    },
+    if (routeConfig) {
+      this.routesById = {} as any
+      this.routeTree = this.#buildRouteTree(routeConfig)
+    }
 
-    cancelMatches: () => {
-      ;[
-        ...router.state.matches,
-        ...(router.state.pending?.matches ?? []),
-      ].forEach((match) => {
-        match.cancel()
-      })
-    },
+    return this as any
+  }
+
+  buildNext = (opts: BuildNextOptions) => {
+    const next = this.#buildLocation(opts)
+
+    const matches = this.matchRoutes(next.pathname)
+
+    const __preSearchFilters = matches
+      .map((match) => match.route.options.preSearchFilters ?? [])
+      .flat()
+      .filter(Boolean)
+
+    const __postSearchFilters = matches
+      .map((match) => match.route.options.postSearchFilters ?? [])
+      .flat()
+      .filter(Boolean)
+
+    return this.#buildLocation({
+      ...opts,
+      __preSearchFilters,
+      __postSearchFilters,
+    })
+  }
+
+  cancelMatches = () => {
+    ;[
+      ...this.store.state.currentMatches,
+      ...(this.store.state.pendingMatches || []),
+    ].forEach((match) => {
+      match.cancel()
+    })
+  }
+
+  load = async (next?: ParsedLocation) => {
+    let now = Date.now()
+    const startedAt = now
+    this.startedLoadingAt = startedAt
+
+    // Cancel any pending matches
+    this.cancelMatches()
 
-    loadLocation: async (next?: Location) => {
-      const id = Math.random()
-      router.startedLoadingAt = id
+    let matches!: RouteMatch<any, any>[]
 
+    batch(() => {
       if (next) {
         // Ingest the new location
-        router.location = next
+        this.store.setState((s) => {
+          s.latestLocation = next
+        })
       }
 
-      // Clear out old actions
-      router.removeActionQueue.forEach(({ action, actionState }) => {
-        if (router.state.currentAction === actionState) {
-          router.state.currentAction = undefined
-        }
-        if (action.current === actionState) {
-          action.current = undefined
-        }
-      })
-      router.removeActionQueue = []
-
-      // Cancel any pending matches
-      router.cancelMatches()
-
       // Match the routes
-      const matches = router.matchRoutes(router.location.pathname, {
+      matches = this.matchRoutes(this.store.state.latestLocation.pathname, {
         strictParseParams: true,
       })
 
-      router.state = {
-        ...router.state,
-        pending: {
-          matches: matches,
-          location: router.location,
-        },
-        status: 'loading',
-      }
+      this.store.setState((s) => {
+        s.status = 'loading'
+        s.pendingMatches = matches
+        s.pendingLocation = this.store.state.latestLocation
+      })
+    })
+
+    // Load the matches
+    try {
+      await this.loadMatches(matches)
+    } catch (err: any) {
+      console.warn(err)
+      invariant(
+        false,
+        'Matches failed to load due to error above ☝️. Navigation cancelled!',
+      )
+    }
 
-      router.notify()
+    if (this.startedLoadingAt !== startedAt) {
+      // Ignore side-effects of outdated side-effects
+      return this.navigationPromise
+    }
 
-      // Load the matches
-      await router.loadMatches(matches, {
-        withPending: true,
-      })
+    const previousMatches = this.store.state.currentMatches
+
+    const exiting: RouteMatch[] = [],
+      staying: RouteMatch[] = []
 
-      if (router.startedLoadingAt !== id) {
-        // Ignore side-effects of match loading
-        return router.navigationPromise
+    previousMatches.forEach((d) => {
+      if (matches.find((dd) => dd.id === d.id)) {
+        staying.push(d)
+      } else {
+        exiting.push(d)
       }
+    })
 
-      const previousMatches = router.state.matches
+    const entering = matches.filter((d) => {
+      return !previousMatches.find((dd) => dd.id === d.id)
+    })
 
-      const exiting: RouteMatch[] = [],
-        staying: RouteMatch[] = []
+    now = Date.now()
 
-      previousMatches.forEach((d) => {
-        if (matches.find((dd) => dd.matchId === d.matchId)) {
-          staying.push(d)
-        } else {
-          exiting.push(d)
-        }
+    exiting.forEach((d) => {
+      d.__onExit?.({
+        params: d.params,
+        search: d.store.state.routeSearch,
       })
 
-      const now = Date.now()
-
-      exiting.forEach((d) => {
-        d.__.onExit?.({
-          params: d.params,
-          search: d.routeSearch,
+      // Clear non-loading error states when match leaves
+      if (d.store.state.status === 'error' && !d.store.state.isFetching) {
+        d.store.setState((s) => {
+          s.status = 'idle'
+          s.error = undefined
         })
-        // 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,
-        )
-        if (gc > 0) {
-          router.matchCache[d.matchId] = {
+      }
+
+      const gc = Math.max(
+        d.route.options.loaderGcMaxAge ??
+          this.options.defaultLoaderGcMaxAge ??
+          0,
+        d.route.options.loaderMaxAge ?? this.options.defaultLoaderMaxAge ?? 0,
+      )
+
+      if (gc > 0) {
+        this.store.setState((s) => {
+          s.matchCache[d.id] = {
             gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
             match: d,
           }
-        }
-      })
-
-      staying.forEach((d) => {
-        d.options.onTransition?.({
-          params: d.params,
-          search: d.routeSearch,
         })
-      })
+      }
+    })
 
-      const entering = matches.filter((d) => {
-        return !previousMatches.find((dd) => dd.matchId === d.matchId)
+    staying.forEach((d) => {
+      d.route.options.onTransition?.({
+        params: d.params,
+        search: d.store.state.routeSearch,
       })
+    })
 
-      entering.forEach((d) => {
-        d.__.onExit = d.options.onMatch?.({
-          params: d.params,
-          search: d.search,
-        })
-        delete router.matchCache[d.matchId]
+    entering.forEach((d) => {
+      d.__onExit = d.route.options.onLoaded?.({
+        params: d.params,
+        search: d.store.state.search,
       })
+      delete this.store.state.matchCache[d.id]
+    })
 
-      if (matches.some((d) => d.status === 'loading')) {
-        router.notify()
-        await Promise.all(
-          matches.map((d) => d.__.loaderPromise || Promise.resolve()),
-        )
-      }
-      if (router.startedLoadingAt !== id) {
-        // Ignore side-effects of match loading
-        return
-      }
-
-      router.state = {
-        ...router.state,
-        location: router.location,
-        matches,
-        pending: undefined,
+    this.store.setState((s) => {
+      Object.assign(s, {
         status: 'idle',
-      }
+        currentLocation: this.store.state.latestLocation,
+        currentMatches: matches,
+        pendingLocation: undefined,
+        pendingMatches: undefined,
+      })
+    })
 
-      router.notify()
-      router.resolveNavigation()
-    },
+    this.options.onRouteChange?.()
+
+    this.resolveNavigation()
+  }
 
-    cleanMatchCache: () => {
-      const now = Date.now()
+  cleanMatchCache = () => {
+    const now = Date.now()
 
-      Object.keys(router.matchCache).forEach((matchId) => {
-        const entry = router.matchCache[matchId]!
+    this.store.setState((s) => {
+      Object.keys(s.matchCache).forEach((matchId) => {
+        const entry = s.matchCache[matchId]!
 
         // Don't remove loading matches
-        if (entry.match.status === 'loading') {
+        if (entry.match.store.state.status === 'loading') {
           return
         }
 
@@ -616,617 +582,827 @@ export function createRouter<
         }
 
         // Everything else gets removed
-        delete router.matchCache[matchId]
+        delete s.matchCache[matchId]
       })
-    },
+    })
+  }
 
-    loadRoute: async (navigateOpts = router.location) => {
-      const next = router.buildNext(navigateOpts)
-      const matches = router.matchRoutes(next.pathname, {
-        strictParseParams: true,
-      })
-      await router.loadMatches(matches)
-      return matches
-    },
+  getRoute = <TId extends keyof TAllRouteInfo['routeInfoById']>(
+    id: TId,
+  ): Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]> => {
+    const route = this.routesById[id]
 
-    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
-    },
+    invariant(route, `Route with id "${id as string}" not found`)
 
-    matchRoutes: (pathname, opts) => {
-      router.cleanMatchCache()
+    return route
+  }
 
-      const matches: RouteMatch[] = []
+  loadRoute = async (
+    navigateOpts: BuildNextOptions = this.store.state.latestLocation,
+  ): Promise<RouteMatch[]> => {
+    const next = this.buildNext(navigateOpts)
+    const matches = this.matchRoutes(next.pathname, {
+      strictParseParams: true,
+    })
+    await this.loadMatches(matches)
+    return matches
+  }
 
-      if (!router.routeTree) {
-        return matches
-      }
+  preloadRoute = async (
+    navigateOpts: BuildNextOptions = this.store.state.latestLocation,
+    loaderOpts: { maxAge?: number; gcMaxAge?: number },
+  ) => {
+    const next = this.buildNext(navigateOpts)
+    const matches = this.matchRoutes(next.pathname, {
+      strictParseParams: true,
+    })
+
+    await this.loadMatches(matches, {
+      preload: true,
+      maxAge:
+        loaderOpts.maxAge ??
+        this.options.defaultPreloadMaxAge ??
+        this.options.defaultLoaderMaxAge ??
+        0,
+      gcMaxAge:
+        loaderOpts.gcMaxAge ??
+        this.options.defaultPreloadGcMaxAge ??
+        this.options.defaultLoaderGcMaxAge ??
+        0,
+    })
+    return matches
+  }
 
-      const existingMatches = [
-        ...router.state.matches,
-        ...(router.state.pending?.matches ?? []),
-      ]
+  matchRoutes = (pathname: string, opts?: { strictParseParams?: boolean }) => {
+    const matches: RouteMatch[] = []
 
-      const recurse = async (routes: Route<any, any>[]): Promise<void> => {
-        const parentMatch = last(matches)
-        let params = parentMatch?.params ?? {}
+    if (!this.routeTree) {
+      return matches
+    }
 
-        const filteredRoutes = router.options.filterRoutes?.(routes) ?? routes
+    const existingMatches = [
+      ...this.store.state.currentMatches,
+      ...(this.store.state.pendingMatches ?? []),
+    ]
 
-        let foundRoutes: Route[] = []
+    const recurse = async (routes: Route<any, any>[]): Promise<void> => {
+      const parentMatch = last(matches)
+      let params = parentMatch?.params ?? {}
 
-        const findMatchInRoutes = (parentRoutes: Route[], routes: Route[]) => {
-          routes.some((route) => {
-            if (!route.routePath && route.childRoutes?.length) {
-              return findMatchInRoutes(
-                [...foundRoutes, route],
-                route.childRoutes,
-              )
-            }
+      const filteredRoutes = this.options.filterRoutes?.(routes) ?? routes
 
-            const fuzzy = !!(
-              route.routePath !== '/' || route.childRoutes?.length
-            )
+      let foundRoutes: Route[] = []
 
-            const matchParams = matchPathname(pathname, {
-              to: route.fullPath,
-              fuzzy,
-              caseSensitive:
-                route.options.caseSensitive ?? router.options.caseSensitive,
-            })
+      const findMatchInRoutes = (parentRoutes: Route[], routes: Route[]) => {
+        routes.some((route) => {
+          if (!route.path && route.childRoutes?.length) {
+            return findMatchInRoutes([...foundRoutes, route], route.childRoutes)
+          }
 
-            if (matchParams) {
-              let parsedParams
+          const fuzzy = !!(route.path !== '/' || route.childRoutes?.length)
 
-              try {
-                parsedParams =
-                  route.options.parseParams?.(matchParams!) ?? matchParams
-              } catch (err) {
-                if (opts?.strictParseParams) {
-                  throw err
-                }
-              }
+          const matchParams = matchPathname(this.basepath, pathname, {
+            to: route.fullPath,
+            fuzzy,
+            caseSensitive:
+              route.options.caseSensitive ?? this.options.caseSensitive,
+          })
+
+          if (matchParams) {
+            let parsedParams
 
-              params = {
-                ...params,
-                ...parsedParams,
+            try {
+              parsedParams =
+                route.options.parseParams?.(matchParams!) ?? matchParams
+            } catch (err) {
+              if (opts?.strictParseParams) {
+                throw err
               }
             }
 
-            if (!!matchParams) {
-              foundRoutes = [...parentRoutes, route]
+            params = {
+              ...params,
+              ...parsedParams,
             }
+          }
 
-            return !!foundRoutes.length
-          })
+          if (!!matchParams) {
+            foundRoutes = [...parentRoutes, route]
+          }
 
           return !!foundRoutes.length
-        }
+        })
 
-        findMatchInRoutes([], filteredRoutes)
+        return !!foundRoutes.length
+      }
 
-        if (!foundRoutes.length) {
-          return
-        }
+      findMatchInRoutes([], filteredRoutes)
 
-        foundRoutes.forEach((foundRoute) => {
-          const interpolatedPath = interpolatePath(foundRoute.routePath, params)
-          const matchId = interpolatePath(foundRoute.routeId, params, true)
+      if (!foundRoutes.length) {
+        return
+      }
 
-          const match =
-            existingMatches.find((d) => d.matchId === matchId) ||
-            router.matchCache[matchId]?.match ||
-            createRouteMatch(router, foundRoute, {
-              matchId,
-              params,
-              pathname: joinPaths([pathname, interpolatedPath]),
-            })
+      foundRoutes.forEach((foundRoute) => {
+        const interpolatedPath = interpolatePath(foundRoute.path, params)
+        const matchId = interpolatePath(foundRoute.id, params, true)
+
+        const match =
+          existingMatches.find((d) => d.id === matchId) ||
+          this.store.state.matchCache[matchId]?.match ||
+          new RouteMatch(this, foundRoute, {
+            id: matchId,
+            params,
+            pathname: joinPaths([this.basepath, interpolatedPath]),
+          })
 
-          matches.push(match)
-        })
+        matches.push(match)
+      })
 
-        const foundRoute = last(foundRoutes)!
+      const foundRoute = last(foundRoutes)!
 
-        if (foundRoute.childRoutes?.length) {
-          recurse(foundRoute.childRoutes)
-        }
+      if (foundRoute.childRoutes?.length) {
+        recurse(foundRoute.childRoutes)
       }
+    }
 
-      recurse([router.routeTree])
+    recurse([this.routeTree])
 
-      cascadeLoaderData(matches)
+    linkMatches(matches)
 
-      return matches
-    },
-
-    loadMatches: async (resolvedMatches, loaderOpts) => {
-      const matchPromises = resolvedMatches.map(async (match) => {
-        // Validate the match (loads search params etc)
-        match.__.validate()
-        match.load(loaderOpts)
+    return matches
+  }
 
-        if (match.status === 'loading') {
-          // If requested, start the pending timers
-          if (loaderOpts?.withPending) match.__.startPending()
+  loadMatches = async (
+    resolvedMatches: RouteMatch[],
+    loaderOpts?:
+      | { preload: true; maxAge: number; gcMaxAge: number }
+      | { preload?: false; maxAge?: never; gcMaxAge?: never },
+  ) => {
+    this.cleanMatchCache()
+    resolvedMatches.forEach(async (match) => {
+      // Validate the match (loads search params etc)
+      match.__validate()
+    })
+
+    // Check each match middleware to see if the route can be accessed
+    await Promise.all(
+      resolvedMatches.map(async (match) => {
+        try {
+          await match.route.options.beforeLoad?.({
+            router: this as any,
+            match,
+          })
+        } catch (err) {
+          if (!loaderOpts?.preload) {
+            match.route.options.onLoadError?.(err)
+          }
 
-          // Wait for the first sign of activity from the match
-          // This might be completion, error, or a pending state
-          await match.__.loadPromise
+          throw err
         }
-      })
+      }),
+    )
 
-      router.notify()
+    const matchPromises = resolvedMatches.map(async (match, index) => {
+      const prevMatch = resolvedMatches[(index = 1)]
+      const search = match.store.state.search as { __data?: any }
 
-      await Promise.all(matchPromises)
-    },
+      if (search.__data?.matchId && search.__data.matchId !== match.id) {
+        return
+      }
 
-    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()
-        }
-      })
-    },
+      match.load(loaderOpts)
 
-    reload: () =>
-      router.__.navigate({
-        fromCurrent: true,
-        replace: true,
-        search: true,
-      }),
+      if (match.store.state.status !== 'success' && match.__loadPromise) {
+        // Wait for the first sign of activity from the match
+        await match.__loadPromise
+      }
 
-    resolvePath: (from: string, path: string) => {
-      return resolvePath(router.basepath!, from, cleanPath(path))
-    },
+      if (prevMatch) {
+        await prevMatch.__loadPromise
+      }
+    })
 
-    matchRoute: (location, opts) => {
-      // const location = router.buildNext(opts)
+    await Promise.all(matchPromises)
+  }
 
-      location = {
-        ...location,
-        to: location.to
-          ? router.resolvePath(location.from ?? '', location.to)
-          : undefined,
-      }
+  loadMatchData = async (
+    routeMatch: RouteMatch<any, any>,
+  ): Promise<Record<string, unknown>> => {
+    if (isServer || !this.options.useServerData) {
+      return (
+        (await routeMatch.route.options.loader?.({
+          // parentLoaderPromise: routeMatch.parentMatch.dataPromise,
+          params: routeMatch.params,
+          search: routeMatch.store.state.routeSearch,
+          signal: routeMatch.abortController.signal,
+        })) || {}
+      )
+    } else {
+      // Refresh:
+      // '/dashboard'
+      // '/dashboard/invoices/'
+      // '/dashboard/invoices/123'
 
-      const next = router.buildNext(location)
+      // New:
+      // '/dashboard/invoices/456'
 
-      if (opts?.pending) {
-        if (!router.state.pending?.location) {
-          return false
-        }
-        return !!matchPathname(router.state.pending.location.pathname, {
-          ...opts,
-          to: next.pathname,
-        })
-      }
+      // TODO: batch requests when possible
 
-      return !!matchPathname(router.state.location.pathname, {
-        ...opts,
-        to: next.pathname,
+      const res = await this.options.fetchServerDataFn!({
+        router: this,
+        routeMatch,
       })
-    },
 
-    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
+      return res
+    }
+  }
 
-      // If this `to` is a valid external URL, return
-      // null for LinkUtils
-      const toString = String(to)
-      const fromString = String(from)
+  invalidateRoute = async (opts: MatchLocation) => {
+    const next = this.buildNext(opts)
+    const unloadedMatchIds = this.matchRoutes(next.pathname).map((d) => d.id)
+
+    await Promise.allSettled(
+      [
+        ...this.store.state.currentMatches,
+        ...(this.store.state.pendingMatches ?? []),
+      ].map(async (match) => {
+        if (unloadedMatchIds.includes(match.id)) {
+          return match.invalidate()
+        }
+      }),
+    )
+  }
 
-      let isExternal
+  reload = () => {
+    this.navigate({
+      fromCurrent: true,
+      replace: true,
+      search: true,
+    } as any)
+  }
 
-      try {
-        new URL(`${toString}`)
-        isExternal = true
-      } catch (e) {}
+  resolvePath = (from: string, path: string) => {
+    return resolvePath(this.basepath!, from, cleanPath(path))
+  }
 
-      invariant(
-        !isExternal,
-        'Attempting to navigate to external url with router.navigate!',
-      )
+  navigate = async <
+    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
+    TTo extends string = '.',
+  >({
+    from,
+    to = '.' as any,
+    search,
+    hash,
+    replace,
+    params,
+  }: NavigateOptions<TAllRouteInfo, TFrom, TTo>) => {
+    // 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 = 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.#commitLocation({
+      from: fromString,
+      to: toString,
+      search,
+      hash,
+      replace,
+      params,
+    })
+  }
 
-      return router.__.navigate({
-        from: fromString,
-        to: toString,
-        search,
-        hash,
-        replace,
-        params,
-      })
-    },
+  matchRoute = <
+    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
+    TTo extends string = '.',
+  >(
+    location: ToOptions<TAllRouteInfo, TFrom, TTo>,
+    opts?: MatchRouteOptions,
+  ):
+    | false
+    | TAllRouteInfo['routeInfoById'][ResolveRelativePath<
+        TFrom,
+        NoInfer<TTo>
+      >]['allParams'] => {
+    location = {
+      ...location,
+      to: location.to
+        ? this.resolvePath(location.from ?? '', location.to)
+        : undefined,
+    }
+
+    const next = this.buildNext(location)
+
+    if (opts?.pending) {
+      if (!this.store.state.pendingLocation) {
+        return false
+      }
 
-    buildLink: ({
+      return matchPathname(
+        this.basepath,
+        this.store.state.pendingLocation!.pathname,
+        {
+          ...opts,
+          to: next.pathname,
+        },
+      ) as any
+    }
+
+    return matchPathname(
+      this.basepath,
+      this.store.state.currentLocation.pathname,
+      {
+        ...opts,
+        to: next.pathname,
+      },
+    ) as any
+  }
+
+  buildLink = <
+    TFrom extends ValidFromPath<TAllRouteInfo> = '/',
+    TTo extends string = '.',
+  >({
+    from,
+    to = '.' as any,
+    search,
+    params,
+    hash,
+    target,
+    replace,
+    activeOptions,
+    preload,
+    preloadMaxAge: userPreloadMaxAge,
+    preloadGcMaxAge: userPreloadGcMaxAge,
+    preloadDelay: userPreloadDelay,
+    disabled,
+  }: LinkOptions<TAllRouteInfo, 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
+
+    // If this `to` is a valid external URL, return
+    // null for LinkUtils
+
+    try {
+      new URL(`${to}`)
+      return {
+        type: 'external',
+        href: to,
+      }
+    } catch (e) {}
+
+    const nextOpts = {
       from,
-      to = '.',
+      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
-
-      // If this `to` is a valid external URL, return
-      // null for LinkUtils
-
-      try {
-        new URL(`${to}`)
-        return {
-          type: 'external',
-          href: to,
+    }
+
+    const next = this.buildNext(nextOpts)
+
+    preload = preload ?? this.options.defaultPreload
+    const preloadDelay =
+      userPreloadDelay ?? this.options.defaultPreloadDelay ?? 0
+
+    // Compare path/hash for matches
+    const pathIsEqual =
+      this.store.state.currentLocation.pathname === next.pathname
+    const currentPathSplit =
+      this.store.state.currentLocation.pathname.split('/')
+    const nextPathSplit = next.pathname.split('/')
+    const pathIsFuzzyEqual = nextPathSplit.every(
+      (d, i) => d === currentPathSplit[i],
+    )
+    const hashIsEqual = this.store.state.currentLocation.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) {
+          this.invalidateRoute(nextOpts)
         }
-      } catch (e) {}
-
-      const nextOpts = {
-        from,
-        to,
-        search,
-        params,
-        hash,
-        replace,
-      }
-
-      const next = router.buildNext(nextOpts)
 
-      preload = preload ?? router.options.defaultPreload
-      const preloadDelay =
-        userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0
+        // All is well? Navigate!
+        this.#commitLocation(nextOpts as any)
+      }
+    }
+
+    // The click handler
+    const handleFocus = (e: MouseEvent) => {
+      if (preload) {
+        this.preloadRoute(nextOpts, {
+          maxAge: userPreloadMaxAge,
+          gcMaxAge: userPreloadGcMaxAge,
+        }).catch((err) => {
+          console.warn(err)
+          console.warn('Error preloading route! ☝️')
+        })
+      }
+    }
 
-      // 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)
-          }
+    const handleEnter = (e: MouseEvent) => {
+      const target = (e.target || {}) as LinkCurrentTargetElement
 
-          // All is well? Navigate!)
-          router.__.navigate(nextOpts)
+      if (preload) {
+        if (target.preloadTimeout) {
+          return
         }
-      }
 
-      // The click handler
-      const handleFocus = (e: MouseEvent) => {
-        if (preload) {
-          router.preloadRoute(nextOpts, {
+        target.preloadTimeout = setTimeout(() => {
+          target.preloadTimeout = null
+          this.preloadRoute(nextOpts, {
             maxAge: userPreloadMaxAge,
             gcMaxAge: userPreloadGcMaxAge,
+          }).catch((err) => {
+            console.warn(err)
+            console.warn('Error preloading route! ☝️')
           })
-        }
+        }, preloadDelay)
       }
+    }
 
-      const handleEnter = (e: MouseEvent) => {
-        const target = (e.target || {}) as LinkCurrentTargetElement
+    const handleLeave = (e: MouseEvent) => {
+      const target = (e.target || {}) as LinkCurrentTargetElement
 
-        if (preload) {
-          if (target.preloadTimeout) {
-            return
-          }
-
-          target.preloadTimeout = setTimeout(() => {
-            target.preloadTimeout = null
-            router.preloadRoute(nextOpts, {
-              maxAge: userPreloadMaxAge,
-              gcMaxAge: userPreloadGcMaxAge,
-            })
-          }, preloadDelay)
-        }
+      if (target.preloadTimeout) {
+        clearTimeout(target.preloadTimeout)
+        target.preloadTimeout = null
       }
+    }
+
+    return {
+      type: 'internal',
+      next,
+      handleFocus,
+      handleClick,
+      handleEnter,
+      handleLeave,
+      isActive,
+      disabled,
+    }
+  }
 
-      const handleLeave = (e: MouseEvent) => {
-        const target = (e.target || {}) as LinkCurrentTargetElement
-
-        if (target.preloadTimeout) {
-          clearTimeout(target.preloadTimeout)
-          target.preloadTimeout = null
-        }
-      }
+  dehydrate = (): DehydratedRouter<TRouterContext> => {
+    return {
+      state: {
+        ...pick(this.store.state, [
+          'latestLocation',
+          'currentLocation',
+          'status',
+          'lastUpdated',
+        ]),
+        currentMatches: this.store.state.currentMatches.map((match) => ({
+          id: match.id,
+          state: {
+            ...pick(match.store.state, [
+              'status',
+              'routeLoaderData',
+              'invalidAt',
+              'invalid',
+            ]),
+          },
+        })),
+      },
+      context: this.options.context as TRouterContext,
+    }
+  }
 
-      return {
-        type: 'internal',
-        next,
-        handleFocus,
-        handleClick,
-        handleEnter,
-        handleLeave,
-        isActive,
-        disabled,
-      }
-    },
-    buildNext: (opts: BuildNextOptions) => {
-      const next = router.__.buildLocation(opts)
+  hydrate = (dehydratedRouter: DehydratedRouter<TRouterContext>) => {
+    this.store.setState((s) => {
+      // Update the context TODO: make this part of state?
+      this.options.context = dehydratedRouter.context
 
-      const matches = router.matchRoutes(next.pathname)
+      // Match the routes
+      const currentMatches = this.matchRoutes(
+        dehydratedRouter.state.latestLocation.pathname,
+        {
+          strictParseParams: true,
+        },
+      )
 
-      const __preSearchFilters = matches
-        .map((match) => match.options.preSearchFilters ?? [])
-        .flat()
-        .filter(Boolean)
+      currentMatches.forEach((match, index) => {
+        const dehydratedMatch = dehydratedRouter.state.currentMatches[index]
+        invariant(
+          dehydratedMatch && dehydratedMatch.id === match.id,
+          'Oh no! There was a hydration mismatch when attempting to rethis.store the state of the router! 😬',
+        )
+        Object.assign(match, dehydratedMatch)
+      })
 
-      const __postSearchFilters = matches
-        .map((match) => match.options.postSearchFilters ?? [])
-        .flat()
-        .filter(Boolean)
+      currentMatches.forEach((match) => match.__validate())
 
-      return router.__.buildLocation({
-        ...opts,
-        __preSearchFilters,
-        __postSearchFilters,
-      })
-    },
+      Object.assign(s, { ...dehydratedRouter.state, currentMatches })
+    })
+  }
 
-    __: {
-      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,
-                )
+  getLoader = <TFrom extends keyof TAllRouteInfo['routeInfoById'] = '/'>(opts: {
+    from: TFrom
+  }): unknown extends TAllRouteInfo['routeInfoById'][TFrom]['routeLoaderData']
+    ?
+        | Loader<
+            LoaderContext<
+              TAllRouteInfo['routeInfoById'][TFrom]['fullSearchSchema'],
+              TAllRouteInfo['routeInfoById'][TFrom]['allParams']
+            >,
+            TAllRouteInfo['routeInfoById'][TFrom]['routeLoaderData']
+          >
+        | undefined
+    : Loader<
+        TAllRouteInfo['routeInfoById'][TFrom]['fullSearchSchema'],
+        TAllRouteInfo['routeInfoById'][TFrom]['allParams'],
+        TAllRouteInfo['routeInfoById'][TFrom]['routeLoaderData']
+      > => {
+    const id = opts.from || ('/' as any)
+
+    const route = this.getRoute(id)
+
+    if (!route) return undefined as any
+
+    let loader =
+      this.store.state.loaders[id] ||
+      (() => {
+        this.store.setState((s) => {
+          s.loaders[id] = {
+            pending: [],
+            fetch: (async (loaderContext: LoaderContext<any, any>) => {
+              if (!route) {
+                return
               }
-              throw new Error()
-            }
+              const loaderState: LoaderState<any, any> = {
+                loadedAt: Date.now(),
+                loaderContext,
+              }
+              this.store.setState((s) => {
+                s.loaders[id]!.current = loaderState
+                s.loaders[id]!.latest = loaderState
+                s.loaders[id]!.pending.push(loaderState)
+              })
+              try {
+                return await route.options.loader?.(loaderContext)
+              } finally {
+                this.store.setState((s) => {
+                  s.loaders[id]!.pending = s.loaders[id]!.pending.filter(
+                    (d) => d !== loaderState,
+                  )
+                })
+              }
+            }) as any,
+          }
+        })
+        return this.store.state.loaders[id]!
+      })()
 
-            ;(router.routesById as any)[route.routeId] = route
+    return loader as any
+  }
 
-            const children = routeConfig.children as RouteConfig[]
+  #buildRouteTree = (rootRouteConfig: RouteConfig) => {
+    const recurseRoutes = (
+      routeConfigs: RouteConfig[],
+      parent?: Route<TAllRouteInfo, any, any>,
+    ): Route<TAllRouteInfo, any, any>[] => {
+      return routeConfigs.map((routeConfig, i) => {
+        const routeOptions = routeConfig.options
+        const route = new Route(routeConfig, routeOptions, i, parent, this)
+        const existingRoute = (this.routesById as any)[route.id]
+
+        if (existingRoute) {
+          if (process.env.NODE_ENV !== 'production') {
+            console.warn(
+              `Duplicate routes found with id: ${String(route.id)}`,
+              this.routesById,
+              route,
+            )
+          }
+          throw new Error()
+        }
 
-            route.childRoutes = children?.length
-              ? recurseRoutes(children, route)
-              : undefined
+        ;(this.routesById as any)[route.id] = route
 
-            return route
-          })
-        }
+        const children = routeConfig.children as RouteConfig[]
 
-        const routes = recurseRoutes([rootRouteConfig])
+        route.childRoutes = children.length
+          ? recurseRoutes(children, route)
+          : undefined
 
-        return routes[0]!
-      },
+        return route
+      })
+    }
 
-      parseLocation: (
-        location: History['location'],
-        previousLocation?: Location,
-      ): Location => {
-        const parsedSearch = router.options.parseSearch(location.search)
-
-        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 routes = recurseRoutes([rootRouteConfig])
 
-      navigate: (location: BuildNextOptions & { replace?: boolean }) => {
-        const next = router.buildNext(location)
-        return router.__.commitLocation(next, location.replace)
-      },
+    return routes[0]!
+  }
 
-      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 ?? '.'}`,
-        )
+  #parseLocation = (previousLocation?: ParsedLocation): ParsedLocation => {
+    let { pathname, search, hash, state } = this.history.location
 
-        const fromMatches = router.matchRoutes(router.location.pathname, {
-          strictParseParams: true,
-        })
+    const parsedSearch = this.options.parseSearch(search)
 
-        const toMatches = router.matchRoutes(pathname)
+    return {
+      pathname: pathname,
+      searchStr: search,
+      search: replaceEqualDeep(previousLocation?.search, parsedSearch),
+      hash: hash.split('#').reverse()[0] ?? '',
+      href: `${pathname}${search}${hash}`,
+      state: state as LocationState,
+      key: state?.key || '__init__',
+    }
+  }
 
-        const prevParams = { ...last(fromMatches)?.params }
+  #onFocus = () => {
+    this.load()
+  }
 
-        let nextParams =
-          (dest.params ?? true) === true
-            ? prevParams
-            : functionalUpdate(dest.params!, prevParams)
+  #buildLocation = (dest: BuildNextOptions = {}): ParsedLocation => {
+    const fromPathname = dest.fromCurrent
+      ? this.store.state.latestLocation.pathname
+      : dest.from ?? this.store.state.latestLocation.pathname
 
-        if (nextParams) {
-          toMatches
-            .map((d) => d.options.stringifyParams)
-            .filter(Boolean)
-            .forEach((fn) => {
-              Object.assign({}, nextParams!, fn!(nextParams!))
-            })
-        }
+    let pathname = resolvePath(
+      this.basepath ?? '/',
+      fromPathname,
+      `${dest.to ?? '.'}`,
+    )
 
-        pathname = interpolatePath(pathname, nextParams ?? {})
+    const fromMatches = this.matchRoutes(
+      this.store.state.latestLocation.pathname,
+      {
+        strictParseParams: true,
+      },
+    )
 
-        // 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
+    const toMatches = this.matchRoutes(pathname)
 
-        const search = replaceEqualDeep(
-          router.location.search,
-          postFilteredSearch,
-        )
+    const prevParams = { ...last(fromMatches)?.params }
 
-        const searchStr = router.options.stringifySearch(search)
-        let hash =
-          dest.hash === true
-            ? router.location.hash
-            : functionalUpdate(dest.hash!, router.location.hash)
-        hash = hash ? `#${hash}` : ''
-
-        return {
-          pathname,
-          search,
-          searchStr,
-          state: router.location.state,
-          hash,
-          href: `${pathname}${searchStr}${hash}`,
-          key: dest.key,
-        }
-      },
+    let nextParams =
+      (dest.params ?? true) === true
+        ? prevParams
+        : functionalUpdate(dest.params!, prevParams)
 
-      commitLocation: (next: Location, replace?: boolean): Promise<void> => {
-        const id = '' + Date.now() + Math.random()
+    if (nextParams) {
+      toMatches
+        .map((d) => d.route.options.stringifyParams)
+        .filter(Boolean)
+        .forEach((fn) => {
+          Object.assign({}, nextParams!, fn!(nextParams!))
+        })
+    }
 
-        if (router.navigateTimeout) clearTimeout(router.navigateTimeout)
+    pathname = interpolatePath(pathname, nextParams ?? {})
 
-        let nextAction: 'push' | 'replace' = 'replace'
+    // Pre filters first
+    const preFilteredSearch = dest.__preSearchFilters?.length
+      ? dest.__preSearchFilters?.reduce(
+          (prev, next) => next(prev),
+          this.store.state.latestLocation.search,
+        )
+      : this.store.state.latestLocation.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
+
+    const search = replaceEqualDeep(
+      this.store.state.latestLocation.search,
+      postFilteredSearch,
+    )
+
+    const searchStr = this.options.stringifySearch(search)
+    let hash =
+      dest.hash === true
+        ? this.store.state.latestLocation.hash
+        : functionalUpdate(dest.hash!, this.store.state.latestLocation.hash)
+    hash = hash ? `#${hash}` : ''
+
+    return {
+      pathname,
+      search,
+      searchStr,
+      state: this.store.state.latestLocation.state,
+      hash,
+      href: `${pathname}${searchStr}${hash}`,
+      key: dest.key,
+    }
+  }
 
-        if (!replace) {
-          nextAction = 'push'
-        }
+  #commitLocation = (location: BuildNextOptions & { replace?: boolean }) => {
+    const next = this.buildNext(location)
+    const id = '' + Date.now() + Math.random()
 
-        const isSameUrl =
-          router.__.parseLocation(history.location).href === next.href
+    if (this.navigateTimeout) clearTimeout(this.navigateTimeout)
 
-        if (isSameUrl && !next.key) {
-          nextAction = 'replace'
-        }
+    let nextAction: 'push' | 'replace' = 'replace'
 
-        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,
-            },
-          )
-        }
+    if (!location.replace) {
+      nextAction = 'push'
+    }
 
-        router.navigationPromise = new Promise((resolve) => {
-          const previousNavigationResolve = router.resolveNavigation
+    const isSameUrl = this.store.state.latestLocation.href === next.href
 
-          router.resolveNavigation = () => {
-            previousNavigationResolve()
-            resolve()
-          }
-        })
+    if (isSameUrl && !next.key) {
+      nextAction = 'replace'
+    }
 
-        return router.navigationPromise
-      },
-    },
-  }
+    const href = `${next.pathname}${next.searchStr}${
+      next.hash ? `#${next.hash}` : ''
+    }`
 
-  router.update(userOptions)
+    this.history[nextAction === 'push' ? 'push' : 'replace'](href, {
+      id,
+      ...next.state,
+    })
 
-  // Allow frameworks to hook into the router creation
-  router.options.createRouter?.(router)
+    // this.load(this.#parseLocation(this.store.state.latestLocation))
 
-  return router
+    return (this.navigationPromise = new Promise((resolve) => {
+      const previousNavigationResolve = this.resolveNavigation
+
+      this.resolveNavigation = () => {
+        previousNavigationResolve()
+        resolve()
+      }
+    }))
+  }
+}
+
+// Detect if we're in the DOM
+const isServer = typeof window === 'undefined' || !window.document.createElement
+
+function getInitialRouterState(): RouterStore {
+  return {
+    status: 'idle',
+    latestLocation: null!,
+    currentLocation: null!,
+    currentMatches: [],
+    loaders: {},
+    lastUpdated: Date.now(),
+    matchCache: {},
+    get isFetching() {
+      return (
+        this.status === 'loading' ||
+        this.currentMatches.some((d) => d.store.state.isFetching)
+      )
+    },
+    get isPreloading() {
+      return Object.values(this.matchCache).some(
+        (d) =>
+          d.match.store.state.isFetching &&
+          !this.currentMatches.find((dd) => dd.id === d.match.id),
+      )
+    },
+  }
 }
 
 function isCtrlEvent(e: MouseEvent) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey)
 }
+
+function linkMatches(matches: RouteMatch<any, any>[]) {
+  matches.forEach((match, index) => {
+    const parent = matches[index - 1]
+
+    if (parent) {
+      match.__setParentMatch(parent)
+    }
+  })
+}