@tanstack/react-router 0.0.1-beta.4 → 0.0.1-beta.41

package/src/index.tsx

@@ -1,16 +1,19 @@
 import * as React from 'react'
 
 import { useSyncExternalStore } from 'use-sync-external-store/shim'
+// @ts-ignore
+// import { useSyncExternalStore } from './uSES/useSyncExternalStoreShim'
+import { createEffect, createRoot, untrack, unwrap } from '@solidjs/reactivity'
+import { createStore } from '@solidjs/reactivity'
 
 import {
-  AnyRoute,
-  CheckId,
-  rootRouteId,
-  Router,
-  RouterState,
-  ToIdOption,
-} from '@tanstack/router-core'
-import {
+  Route,
+  RegisteredAllRouteInfo,
+  RegisteredRouter,
+  RouterStore,
+  last,
+  sharedClone,
+  Action,
   warning,
   RouterOptions,
   RouteMatch,
@@ -21,9 +24,7 @@ import {
   DefaultAllRouteInfo,
   functionalUpdate,
   createRouter,
-  AnyRouteInfo,
   AllRouteInfo,
-  RouteInfo,
   ValidFromPath,
   LinkOptions,
   RouteInfoByPath,
@@ -31,111 +32,43 @@ import {
   NoInfer,
   ToOptions,
   invariant,
+  Router,
+  Expand,
 } from '@tanstack/router-core'
 
 export * from '@tanstack/router-core'
 
-declare module '@tanstack/router-core' {
-  interface FrameworkGenerics {
-    Element: React.ReactNode
-    // Any is required here so import() will work without having to do import().then(d => d.default)
-    SyncOrAsyncElement: React.ReactNode | (() => Promise<any>)
-  }
+export * from '@solidjs/reactivity'
 
-  interface Router<
-    TRouteConfig extends AnyRouteConfig = RouteConfig,
-    TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
-  > {
-    useState: () => RouterState
-    useRoute: <TId extends keyof TAllRouteInfo['routeInfoById']>(
-      routeId: TId,
-    ) => Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]>
-    useMatch: <TId extends keyof TAllRouteInfo['routeInfoById']>(
-      routeId: TId,
-    ) => RouteMatch<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TId]>
-    linkProps: <TTo extends string = '.'>(
-      props: LinkPropsOptions<TAllRouteInfo, '/', TTo> &
-        React.AnchorHTMLAttributes<HTMLAnchorElement>,
-    ) => React.AnchorHTMLAttributes<HTMLAnchorElement>
-    Link: <TTo extends string = '.'>(
-      props: LinkPropsOptions<TAllRouteInfo, '/', TTo> &
-        React.AnchorHTMLAttributes<HTMLAnchorElement> &
-        Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
-          // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-          children?:
-            | React.ReactNode
-            | ((state: { isActive: boolean }) => React.ReactNode)
-        },
-    ) => JSX.Element
-    MatchRoute: <TTo extends string = '.'>(
-      props: ToOptions<TAllRouteInfo, '/', TTo> &
-        MatchRouteOptions & {
-          // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-          children?:
-            | React.ReactNode
-            | ((
-                params: RouteInfoByPath<
-                  TAllRouteInfo,
-                  ResolveRelativePath<'/', NoInfer<TTo>>
-                >['allParams'],
-              ) => React.ReactNode)
-        },
-    ) => JSX.Element
-  }
+type ReactNode = any
+
+export type SyncRouteComponent<TProps = {}> = (props: TProps) => ReactNode
+
+export type RouteComponent<TProps = {}> = SyncRouteComponent<TProps> & {
+  preload?: () => Promise<void>
+}
+
+export function lazy(
+  importer: () => Promise<{ default: SyncRouteComponent }>,
+): RouteComponent {
+  const lazyComp = React.lazy(importer as any)
+  let preloaded: Promise<SyncRouteComponent>
+
+  const finalComp = lazyComp as unknown as RouteComponent
 
-  interface Route<
-    TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,
-    TRouteInfo extends AnyRouteInfo = RouteInfo,
-  > {
-    useRoute: <
-      TTo extends string = '.',
-      TResolved extends string = ResolveRelativePath<
-        TRouteInfo['id'],
-        NoInfer<TTo>
-      >,
-    >(
-      routeId: CheckId<
-        TAllRouteInfo,
-        TResolved,
-        ToIdOption<TAllRouteInfo, TRouteInfo['id'], TTo>
-      >,
-    ) => Route<TAllRouteInfo, TAllRouteInfo['routeInfoById'][TResolved]>
-    linkProps: <TTo extends string = '.'>(
-      props: LinkPropsOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo> &
-        React.AnchorHTMLAttributes<HTMLAnchorElement>,
-    ) => React.AnchorHTMLAttributes<HTMLAnchorElement>
-    Link: <TTo extends string = '.'>(
-      props: LinkPropsOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo> &
-        React.AnchorHTMLAttributes<HTMLAnchorElement> &
-        Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
-          // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-          children?:
-            | React.ReactNode
-            | ((state: { isActive: boolean }) => React.ReactNode)
-        },
-    ) => JSX.Element
-    MatchRoute: <TTo extends string = '.'>(
-      props: ToOptions<TAllRouteInfo, TRouteInfo['fullPath'], TTo> &
-        MatchRouteOptions & {
-          // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-          children?:
-            | React.ReactNode
-            | ((
-                params: RouteInfoByPath<
-                  TAllRouteInfo,
-                  ResolveRelativePath<TRouteInfo['fullPath'], NoInfer<TTo>>
-                >['allParams'],
-              ) => React.ReactNode)
-        },
-    ) => JSX.Element
+  finalComp.preload = async () => {
+    if (!preloaded) {
+      await importer()
+    }
   }
+
+  return finalComp
 }
 
-type LinkPropsOptions<
-  TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,
-  TFrom extends ValidFromPath<TAllRouteInfo> = '/',
+export type LinkPropsOptions<
+  TFrom extends RegisteredAllRouteInfo['routePaths'] = '/',
   TTo extends string = '.',
-> = LinkOptions<TAllRouteInfo, TFrom, TTo> & {
+> = LinkOptions<RegisteredAllRouteInfo, TFrom, TTo> & {
   // A function that returns additional props for the `active` state of this link. These props override other props passed to the link (`style`'s are merged, `className`'s are concatenated)
   activeProps?:
     | React.AnchorHTMLAttributes<HTMLAnchorElement>
@@ -146,268 +79,297 @@ type LinkPropsOptions<
     | (() => React.AnchorHTMLAttributes<HTMLAnchorElement>)
 }
 
+export type MakeUseMatchRouteOptions<
+  TFrom extends RegisteredAllRouteInfo['routePaths'] = '/',
+  TTo extends string = '.',
+> = ToOptions<RegisteredAllRouteInfo, TFrom, TTo> & MatchRouteOptions
+
+export type MakeMatchRouteOptions<
+  TFrom extends RegisteredAllRouteInfo['routePaths'] = '/',
+  TTo extends string = '.',
+> = ToOptions<RegisteredAllRouteInfo, TFrom, TTo> &
+  MatchRouteOptions & {
+    // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
+    children?:
+      | ReactNode
+      | ((
+          params: RouteInfoByPath<
+            RegisteredAllRouteInfo,
+            ResolveRelativePath<TFrom, NoInfer<TTo>>
+          >['allParams'],
+        ) => ReactNode)
+  }
+
+export type MakeLinkPropsOptions<
+  TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/',
+  TTo extends string = '.',
+> = LinkPropsOptions<TFrom, TTo> & React.AnchorHTMLAttributes<HTMLAnchorElement>
+
+export type MakeLinkOptions<
+  TFrom extends RegisteredAllRouteInfo['routePaths'] = '/',
+  TTo extends string = '.',
+> = LinkPropsOptions<TFrom, TTo> &
+  React.AnchorHTMLAttributes<HTMLAnchorElement> &
+  Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'children'> & {
+    // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
+    children?: ReactNode | ((state: { isActive: boolean }) => ReactNode)
+  }
+
+declare module '@tanstack/router-core' {
+  interface FrameworkGenerics {
+    Component: RouteComponent
+    ErrorComponent: RouteComponent<{
+      error: unknown
+      info: { componentStack: string }
+    }>
+  }
+
+  interface RouterOptions<TRouteConfig, TRouterContext> {
+    // ssrFooter?: () => JSX.Element | Node
+  }
+}
+
 export type PromptProps = {
   message: string
   when?: boolean | any
-  children?: React.ReactNode
+  children?: ReactNode
 }
 
 //
 
-const matchesContext = React.createContext<RouteMatch[]>(null!)
-const routerContext = React.createContext<{ router: Router<any, any> }>(null!)
+export function useLinkProps<
+  TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/',
+  TTo extends string = '.',
+>(
+  options: MakeLinkPropsOptions<TFrom, TTo>,
+): React.AnchorHTMLAttributes<HTMLAnchorElement> {
+  const router = useRouter()
 
-// Detect if we're in the DOM
-const isDOM = Boolean(
-  typeof window !== 'undefined' &&
-    window.document &&
-    window.document.createElement,
-)
+  const {
+    // custom props
+    type,
+    children,
+    target,
+    activeProps = () => ({ className: 'active' }),
+    inactiveProps = () => ({}),
+    activeOptions,
+    disabled,
+    // fromCurrent,
+    hash,
+    search,
+    params,
+    to,
+    preload,
+    preloadDelay,
+    preloadMaxAge,
+    replace,
+    // element props
+    style,
+    className,
+    onClick,
+    onFocus,
+    onMouseEnter,
+    onMouseLeave,
+    onTouchStart,
+    onTouchEnd,
+    ...rest
+  } = options
+
+  const linkInfo = router.buildLink(options as any)
+
+  if (linkInfo.type === 'external') {
+    const { href } = linkInfo
+    return { href }
+  }
 
-const useLayoutEffect = isDOM ? React.useLayoutEffect : React.useEffect
+  const { handleClick, handleFocus, handleEnter, handleLeave, isActive, next } =
+    linkInfo
+
+  const reactHandleClick = (e: Event) => {
+    if (React.startTransition) {
+      // This is a hack for react < 18
+      React.startTransition(() => {
+        handleClick(e)
+      })
+    } else {
+      handleClick(e)
+    }
+  }
 
-export type MatchesProviderProps = {
-  value: RouteMatch[]
-  children: React.ReactNode
+  const composeHandlers =
+    (handlers: (undefined | ((e: any) => void))[]) =>
+    (e: React.SyntheticEvent) => {
+      if (e.persist) e.persist()
+      handlers.filter(Boolean).forEach((handler) => {
+        if (e.defaultPrevented) return
+        handler!(e)
+      })
+    }
+
+  // Get the active props
+  const resolvedActiveProps: React.HTMLAttributes<HTMLAnchorElement> = isActive
+    ? functionalUpdate(activeProps, {}) ?? {}
+    : {}
+
+  // Get the inactive props
+  const resolvedInactiveProps: React.HTMLAttributes<HTMLAnchorElement> =
+    isActive ? {} : functionalUpdate(inactiveProps, {}) ?? {}
+
+  return {
+    ...resolvedActiveProps,
+    ...resolvedInactiveProps,
+    ...rest,
+    href: disabled ? undefined : next.href,
+    onClick: composeHandlers([onClick, reactHandleClick]),
+    onFocus: composeHandlers([onFocus, handleFocus]),
+    onMouseEnter: composeHandlers([onMouseEnter, handleEnter]),
+    onMouseLeave: composeHandlers([onMouseLeave, handleLeave]),
+    target,
+    style: {
+      ...style,
+      ...resolvedActiveProps.style,
+      ...resolvedInactiveProps.style,
+    },
+    className:
+      [
+        className,
+        resolvedActiveProps.className,
+        resolvedInactiveProps.className,
+      ]
+        .filter(Boolean)
+        .join(' ') || undefined,
+    ...(disabled
+      ? {
+          role: 'link',
+          'aria-disabled': true,
+        }
+      : undefined),
+    ['data-status']: isActive ? 'active' : undefined,
+  }
 }
 
-export function MatchesProvider(props: MatchesProviderProps) {
-  return <matchesContext.Provider {...props} />
+export interface LinkFn<
+  TDefaultFrom extends RegisteredAllRouteInfo['routePaths'] = '/',
+  TDefaultTo extends string = '.',
+> {
+  <
+    TFrom extends RegisteredAllRouteInfo['routePaths'] = TDefaultFrom,
+    TTo extends string = TDefaultTo,
+  >(
+    props: MakeLinkOptions<TFrom, TTo>,
+  ): ReactNode
 }
 
-const useRouterSubscription = (router: Router<any, any>) => {
-  useSyncExternalStore(
-    (cb) => router.subscribe(() => cb()),
-    () => router.state,
-    () => router.state,
+export const Link: LinkFn = React.forwardRef((props: any, ref) => {
+  const linkProps = useLinkProps(props)
+
+  return (
+    <a
+      {...{
+        ref: ref as any,
+        ...linkProps,
+        children:
+          typeof props.children === 'function'
+            ? props.children({
+                isActive: (linkProps as any)['data-status'] === 'active',
+              })
+            : props.children,
+      }}
+    />
   )
-}
+}) as any
 
-export function createReactRouter<
-  TRouteConfig extends AnyRouteConfig = RouteConfig,
->(opts: RouterOptions<TRouteConfig>): Router<TRouteConfig> {
-  const makeRouteExt = (
-    route: AnyRoute,
-    router: Router<any, any>,
-  ): Pick<AnyRoute, 'useRoute' | 'linkProps' | 'Link' | 'MatchRoute'> => {
-    return {
-      useRoute: (subRouteId = '.' as any) => {
-        const resolvedRouteId = router.resolvePath(
-          route.routeId,
-          subRouteId as string,
-        )
-        const resolvedRoute = router.getRoute(resolvedRouteId)
-        useRouterSubscription(router)
-        invariant(
-          resolvedRoute,
-          `Could not find a route for route "${
-            resolvedRouteId as string
-          }"! Did you forget to add it to your route config?`,
-        )
-        return resolvedRoute
-      },
-      linkProps: (options) => {
-        const {
-          // custom props
-          type,
-          children,
-          target,
-          activeProps = () => ({ className: 'active' }),
-          inactiveProps = () => ({}),
-          activeOptions,
-          disabled,
-          // fromCurrent,
-          hash,
-          search,
-          params,
-          to,
-          preload,
-          preloadDelay,
-          preloadMaxAge,
-          replace,
-          // element props
-          style,
-          className,
-          onClick,
-          onFocus,
-          onMouseEnter,
-          onMouseLeave,
-          onTouchStart,
-          onTouchEnd,
-          ...rest
-        } = options
-
-        const linkInfo = route.buildLink(options)
-
-        if (linkInfo.type === 'external') {
-          const { href } = linkInfo
-          return { href }
-        }
+type MatchesContextValue = RouteMatch[]
 
-        const {
-          handleClick,
-          handleFocus,
-          handleEnter,
-          handleLeave,
-          isActive,
-          next,
-        } = linkInfo
-
-        const composeHandlers =
-          (handlers: (undefined | ((e: any) => void))[]) =>
-          (e: React.SyntheticEvent) => {
-            e.persist()
-            handlers.forEach((handler) => {
-              if (handler) handler(e)
-            })
-          }
+export const matchesContext = React.createContext<MatchesContextValue>(null!)
+export const routerContext = React.createContext<{ router: RegisteredRouter }>(
+  null!,
+)
 
-        // Get the active props
-        const resolvedActiveProps: React.HTMLAttributes<HTMLAnchorElement> =
-          isActive ? functionalUpdate(activeProps, {}) ?? {} : {}
-
-        // Get the inactive props
-        const resolvedInactiveProps: React.HTMLAttributes<HTMLAnchorElement> =
-          isActive ? {} : functionalUpdate(inactiveProps, {}) ?? {}
-
-        return {
-          ...resolvedActiveProps,
-          ...resolvedInactiveProps,
-          ...rest,
-          href: disabled ? undefined : next.href,
-          onClick: composeHandlers([handleClick, onClick]),
-          onFocus: composeHandlers([handleFocus, onFocus]),
-          onMouseEnter: composeHandlers([handleEnter, onMouseEnter]),
-          onMouseLeave: composeHandlers([handleLeave, onMouseLeave]),
-          target,
-          style: {
-            ...style,
-            ...resolvedActiveProps.style,
-            ...resolvedInactiveProps.style,
-          },
-          className:
-            [
-              className,
-              resolvedActiveProps.className,
-              resolvedInactiveProps.className,
-            ]
-              .filter(Boolean)
-              .join(' ') || undefined,
-          ...(disabled
-            ? {
-                role: 'link',
-                'aria-disabled': true,
-              }
-            : undefined),
-          ['data-status']: isActive ? 'active' : undefined,
-        }
-      },
-      Link: React.forwardRef((props: any, ref) => {
-        const linkProps = route.linkProps(props)
-
-        useRouterSubscription(router)
-
-        return (
-          <a
-            {...{
-              ref: ref as any,
-              ...linkProps,
-              children:
-                typeof props.children === 'function'
-                  ? props.children({
-                      isActive: (linkProps as any)['data-status'] === 'active',
-                    })
-                  : props.children,
-            }}
-          />
-        )
-      }) as any,
-      MatchRoute: (opts) => {
-        const { pending, caseSensitive, children, ...rest } = opts
+export type MatchesProviderProps = {
+  value: MatchesContextValue
+  children: ReactNode
+}
 
-        const params = route.matchRoute(rest as any, {
-          pending,
-          caseSensitive,
-        })
+const EMPTY = {}
 
-        if (!params) {
-          return null
-        }
+export const __useStoreValue = <TSeed, TReturn>(
+  seed: () => TSeed,
+  selector?: (seed: TSeed) => TReturn,
+): TReturn => {
+  const valueRef = React.useRef<TReturn>(EMPTY as any)
 
-        return typeof opts.children === 'function'
-          ? opts.children(params as any)
-          : (opts.children as any)
-      },
-    }
+  // If there is no selector, track the seed
+  // If there is a selector, do not track the seed
+  const getValue = () =>
+    (!selector ? seed() : selector(untrack(() => seed()))) as TReturn
+
+  // If empty, initialize the value
+  if (valueRef.current === EMPTY) {
+    valueRef.current = sharedClone(undefined, getValue())
   }
 
-  const coreRouter = createRouter<TRouteConfig>({
-    ...opts,
-    createRouter: (router) => {
-      const routerExt: Pick<Router<any, any>, 'useMatch' | 'useState'> = {
-        useState: () => {
-          useRouterSubscription(router)
-          return router.state
-        },
-        useMatch: (routeId) => {
-          useRouterSubscription(router)
-
-          invariant(
-            routeId !== rootRouteId,
-            `"${rootRouteId}" cannot be used with useMatch! Did you mean to useRoute("${rootRouteId}")?`,
-          )
-
-          const runtimeMatch = useMatch()
-          const match = router.state.matches.find((d) => d.routeId === routeId)
-
-          invariant(
-            match,
-            `Could not find a match for route "${
-              routeId as string
-            }" being rendered in this component!`,
-          )
-
-          invariant(
-            runtimeMatch.routeId == match?.routeId,
-            `useMatch('${
-              match?.routeId as string
-            }') is being called in a component that is meant to render the '${
-              runtimeMatch.routeId
-            }' route. Did you mean to 'useRoute(${
-              match?.routeId as string
-            })' instead?`,
-          )
-
-          if (!match) {
-            invariant('Match not found!')
-          }
+  // Snapshot should just return the current cached value
+  const getSnapshot = React.useCallback(() => valueRef.current, [])
+
+  const getStore = React.useCallback((cb: () => void) => {
+    // A root is necessary to track effects
+    return createRoot(() => {
+      createEffect(() => {
+        // Read and update the value
+        // getValue will handle which values are accessed and
+        // thus tracked.
+        // sharedClone will both recursively track the end result
+        // and ensure that the previous value is structurally shared
+        // into the new version.
+        valueRef.current = unwrap(
+          // Unwrap the value to get rid of any proxy structures
+          sharedClone(valueRef.current, getValue()),
+        )
+        cb()
+      })
+    })
+  }, [])
 
-          return match
-        },
-      }
+  return useSyncExternalStore(getStore, getSnapshot, getSnapshot)
+}
 
-      const routeExt = makeRouteExt(router.getRoute('/'), router)
+const [store, setStore] = createStore({ foo: 'foo', bar: { baz: 'baz' } })
 
-      Object.assign(router, routerExt, routeExt)
-    },
-    createRoute: ({ router, route }) => {
-      const routeExt = makeRouteExt(route, router)
+createRoot(() => {
+  let prev: any
 
-      Object.assign(route, routeExt)
-    },
-    createElement: async (element) => {
-      if (typeof element === 'function') {
-        const res = (await element()) as any
-
-        // Support direct import() calls
-        if (typeof res === 'object' && res.default) {
-          return React.createElement(res.default)
-        } else {
-          return res
-        }
+  createEffect(() => {
+    console.log('effect')
+    const next = sharedClone(prev, store)
+    console.log(next)
+    prev = untrack(() => next)
+  })
+})
+
+setStore((s) => {
+  s.foo = '1'
+})
+
+setStore((s) => {
+  s.bar.baz = '2'
+})
+
+export function createReactRouter<
+  TRouteConfig extends AnyRouteConfig = RouteConfig,
+  TAllRouteInfo extends AnyAllRouteInfo = AllRouteInfo<TRouteConfig>,
+  TRouterContext = unknown,
+>(
+  opts: RouterOptions<TRouteConfig, TRouterContext>,
+): Router<TRouteConfig, TAllRouteInfo, TRouterContext> {
+  const coreRouter = createRouter<TRouteConfig>({
+    ...opts,
+    loadComponent: async (component) => {
+      if (component.preload) {
+        await component.preload()
       }
 
-      return element
+      return component as any
     },
   })
 
@@ -417,125 +379,314 @@ export function createReactRouter<
 export type RouterProps<
   TRouteConfig extends AnyRouteConfig = RouteConfig,
   TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,
-> = RouterOptions<TRouteConfig> & {
-  router: Router<TRouteConfig, TAllRouteInfo>
-  // Children will default to `<Outlet />` if not provided
-  children?: React.ReactNode
+  TRouterContext = unknown,
+> = RouterOptions<TRouteConfig, TRouterContext> & {
+  router: Router<TRouteConfig, TAllRouteInfo, TRouterContext>
 }
 
 export function RouterProvider<
   TRouteConfig extends AnyRouteConfig = RouteConfig,
   TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRouteInfo,
->({ children, router, ...rest }: RouterProps<TRouteConfig, TAllRouteInfo>) {
+  TRouterContext = unknown,
+>({
+  router,
+  ...rest
+}: RouterProps<TRouteConfig, TAllRouteInfo, TRouterContext>) {
   router.update(rest)
 
-  useRouterSubscription(router)
+  const [, , currentMatches] = __useStoreValue(
+    () => router.store,
+    (s) => [s.status, s.pendingMatches, s.currentMatches],
+  )
+
+  React.useEffect(router.mount, [router])
 
-  useLayoutEffect(() => {
-    return router.mount()
-  }, [router])
+  console.log('current', currentMatches)
 
   return (
-    <routerContext.Provider value={{ router }}>
-      <MatchesProvider value={router.state.matches}>
-        {children ?? <Outlet />}
-      </MatchesProvider>
-    </routerContext.Provider>
+    <>
+      <routerContext.Provider value={{ router: router as any }}>
+        <matchesContext.Provider value={[undefined!, ...currentMatches]}>
+          <Outlet />
+        </matchesContext.Provider>
+      </routerContext.Provider>
+    </>
   )
 }
 
-function useRouter(): Router {
+export function useRouter(): RegisteredRouter {
   const value = React.useContext(routerContext)
   warning(!value, 'useRouter must be used inside a <Router> component!')
+  return value.router
+}
 
-  useRouterSubscription(value.router)
-
-  return value.router as Router
+export function useRouterStore<T = RouterStore>(
+  selector?: (state: Router['store']) => T,
+): T {
+  const router = useRouter()
+  return __useStoreValue(() => router.store, selector)
 }
 
-function useMatches(): RouteMatch[] {
+export function useMatches(): RouteMatch[] {
   return React.useContext(matchesContext)
 }
 
-// function useParentMatches(): RouteMatch[] {
-//   const router = useRouter()
-//   const match = useMatch()
-//   const matches = router.state.matches
-//   return matches.slice(
-//     0,
-//     matches.findIndex((d) => d.matchId === match.matchId) - 1,
-//   )
-// }
+export function useMatch<
+  TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'],
+  TStrict extends boolean = true,
+  TRouteMatch = RouteMatch<
+    RegisteredAllRouteInfo,
+    RegisteredAllRouteInfo['routeInfoById'][TFrom]
+  >,
+  // TSelected = TRouteMatch,
+>(opts?: {
+  from: TFrom
+  strict?: TStrict
+  // select?: (match: TRouteMatch) => TSelected
+}): TStrict extends true ? TRouteMatch : TRouteMatch | undefined {
+  const router = useRouter()
+  const nearestMatch = useMatches()[0]!
+  const match = opts?.from
+    ? router.store.currentMatches.find((d) => d.routeId === opts?.from)
+    : nearestMatch
+
+  invariant(
+    match,
+    `Could not find ${
+      opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'
+    }`,
+  )
+
+  if (opts?.strict ?? true) {
+    invariant(
+      nearestMatch.routeId == match?.routeId,
+      `useMatch("${
+        match?.routeId as string
+      }") is being called in a component that is meant to render the '${
+        nearestMatch.routeId
+      }' route. Did you mean to 'useMatch("${
+        match?.routeId as string
+      }", { strict: false })' or 'useRoute("${
+        match?.routeId as string
+      }")' instead?`,
+    )
+  }
+
+  __useStoreValue(() => match!.store)
 
-function useMatch<T>(): RouteMatch {
-  return useMatches()?.[0] as RouteMatch
+  return match as any
 }
 
-export function Outlet() {
+export function useRoute<
+  TId extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/',
+>(
+  routeId: TId,
+): Route<RegisteredAllRouteInfo, RegisteredAllRouteInfo['routeInfoById'][TId]> {
   const router = useRouter()
-  const [, ...matches] = useMatches()
+  const resolvedRoute = router.getRoute(routeId as any)
 
-  const childMatch = matches[0]
+  invariant(
+    resolvedRoute,
+    `Could not find a route for route "${
+      routeId as string
+    }"! Did you forget to add it to your route config?`,
+  )
 
-  if (!childMatch) return null
+  return resolvedRoute as any
+}
 
-  const element = ((): React.ReactNode => {
-    if (!childMatch) {
-      return null
-    }
+export function useLoaderData<
+  TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/',
+  TStrict extends boolean = true,
+  TLoaderData = RegisteredAllRouteInfo['routeInfoById'][TFrom]['loaderData'],
+  TSelected = TLoaderData,
+>(opts?: {
+  from: TFrom
+  strict?: TStrict
+  select?: (loaderData: TLoaderData) => TSelected
+}): TStrict extends true ? TSelected : TSelected | undefined {
+  const match = useMatch(opts) as any
+  return __useStoreValue(() => match?.store.loaderData, opts?.select)
+}
 
-    const errorElement =
-      childMatch.__.errorElement ?? router.options.defaultErrorElement
+export function useSearch<
+  TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'],
+  TStrict extends boolean = true,
+  TSearch = RegisteredAllRouteInfo['routeInfoById'][TFrom]['fullSearchSchema'],
+  TSelected = TSearch,
+>(opts?: {
+  from: TFrom
+  strict?: TStrict
+  select?: (search: TSearch) => TSelected
+}): TStrict extends true ? TSelected : TSelected | undefined {
+  const match = useMatch(opts)
+  return __useStoreValue(() => match?.store.search, opts?.select) as any
+}
 
-    if (childMatch.status === 'error') {
-      if (errorElement) {
-        return errorElement as any
-      }
+export function useParams<
+  TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/',
+  TDefaultSelected = Expand<
+    RegisteredAllRouteInfo['allParams'] &
+      RegisteredAllRouteInfo['routeInfoById'][TFrom]['allParams']
+  >,
+  TSelected = TDefaultSelected,
+>(opts?: {
+  from: TFrom
+  select?: (search: TDefaultSelected) => TSelected
+}): TSelected {
+  const router = useRouter()
+  return __useStoreValue(
+    () => last(router.store.currentMatches)?.params as any,
+    opts?.select,
+  )
+}
 
-      if (
-        childMatch.options.useErrorBoundary ||
-        router.options.useErrorBoundary
-      ) {
-        throw childMatch.error
-      }
+export function useNavigate<
+  TDefaultFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/',
+>(defaultOpts: { from?: TDefaultFrom }) {
+  return <
+    TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = TDefaultFrom,
+    TTo extends string = '.',
+  >(
+    opts: MakeLinkOptions<TFrom, TTo>,
+  ) => {
+    const router = useRouter()
+    return router.navigate({ ...defaultOpts, ...(opts as any) })
+  }
+}
 
-      return <DefaultErrorBoundary error={childMatch.error} />
-    }
+export function useAction<
+  TFrom extends keyof RegisteredAllRouteInfo['routeInfoById'] = '/',
+  TFromRoute extends RegisteredAllRouteInfo['routeInfoById'][TFrom] = RegisteredAllRouteInfo['routeInfoById'][TFrom],
+>(opts: {
+  from: TFrom
+}): Action<TFromRoute['actionPayload'], TFromRoute['actionResponse']> {
+  const route = useRoute(opts.from)
+  const action = route.action
+  __useStoreValue(() => action)
+  return action as any
+}
 
-    if (childMatch.status === 'loading' || childMatch.status === 'idle') {
-      if (childMatch.isPending) {
-        const pendingElement =
-          childMatch.__.pendingElement ?? router.options.defaultPendingElement
+export function useMatchRoute() {
+  const router = useRouter()
 
-        if (childMatch.options.pendingMs || pendingElement) {
-          return (pendingElement as any) ?? null
-        }
-      }
+  return <
+    TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/',
+    TTo extends string = '.',
+  >(
+    opts: MakeUseMatchRouteOptions<TFrom, TTo>,
+  ) => {
+    const { pending, caseSensitive, ...rest } = opts
+
+    return router.matchRoute(rest as any, {
+      pending,
+      caseSensitive,
+    })
+  }
+}
+
+export function MatchRoute<
+  TFrom extends ValidFromPath<RegisteredAllRouteInfo> = '/',
+  TTo extends string = '.',
+>(props: MakeMatchRouteOptions<TFrom, TTo>): any {
+  const matchRoute = useMatchRoute()
+  const params = matchRoute(props)
 
-      return null
+  if (!params) {
+    return null
+  }
+
+  return React.createElement(
+    typeof props.children === 'function'
+      ? (props.children as any)(params)
+      : props.children,
+    props as any,
+  )
+}
+
+export function Outlet() {
+  const router = useRouter()
+  const matches = useMatches().slice(1)
+  const match = matches[0]
+
+  const defaultPending = React.useCallback(() => null, [])
+
+  __useStoreValue(() => match?.store)
+
+  const Inner = React.useCallback((props: { match: RouteMatch }): any => {
+    if (props.match.store.status === 'error') {
+      throw props.match.store.error
     }
 
-    return (childMatch.__.element as any) ?? router.options.defaultElement
-  })() as JSX.Element
+    if (props.match.store.status === 'success') {
+      return React.createElement(
+        (props.match.__.component as any) ??
+          router.options.defaultComponent ??
+          Outlet,
+      )
+    }
 
-  const catchElement =
-    childMatch?.options.catchElement ?? router.options.defaultCatchElement
+    if (props.match.store.status === 'loading') {
+      throw props.match.__.loadPromise
+    }
+
+    invariant(
+      false,
+      'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',
+    )
+  }, [])
+
+  if (!match) {
+    return null
+  }
+
+  const PendingComponent = (match.__.pendingComponent ??
+    router.options.defaultPendingComponent ??
+    defaultPending) as any
+
+  const errorComponent =
+    match.__.errorComponent ?? router.options.defaultErrorComponent
 
   return (
-    <MatchesProvider value={matches} key={childMatch.matchId}>
-      <CatchBoundary catchElement={catchElement}>{element}</CatchBoundary>
-    </MatchesProvider>
+    <matchesContext.Provider value={matches}>
+      <React.Suspense fallback={<PendingComponent />}>
+        <CatchBoundary
+          key={match.routeId}
+          errorComponent={errorComponent}
+          match={match as any}
+        >
+          <Inner match={match} />
+        </CatchBoundary>
+      </React.Suspense>
+      {/* Provide a suffix suspense boundary to make sure the router is
+  ready to be dehydrated on the server */}
+      {/* {router.options.ssrFooter && match.matchId === rootRouteId ? (
+        <React.Suspense fallback={null}>
+          {(() => {
+            if (router.store.pending) {
+              throw router.navigationPromise
+            }
+
+            return router.options.ssrFooter()
+          })()}
+        </React.Suspense>
+      ) : null} */}
+    </matchesContext.Provider>
   )
 }
 
 class CatchBoundary extends React.Component<{
   children: any
-  catchElement: any
+  errorComponent: any
+  match: RouteMatch
 }> {
   state = {
     error: false,
+    info: undefined,
   }
+
   componentDidCatch(error: any, info: any) {
+    console.error(`Error in route match: ${this.props.match.matchId}`)
     console.error(error)
 
     this.setState({
@@ -543,23 +694,61 @@ class CatchBoundary extends React.Component<{
       info,
     })
   }
-  reset = () => {
-    this.setState({
-      error: false,
-      info: false,
-    })
-  }
+
   render() {
-    const catchElement = this.props.catchElement ?? DefaultErrorBoundary
+    return (
+      <CatchBoundaryInner
+        {...this.props}
+        errorState={this.state}
+        reset={() => this.setState({})}
+      />
+    )
+  }
+}
+
+// This is the messiest thing ever... I'm either seriously tired (likely) or
+// there has to be a better way to reset error boundaries when the
+// router's location key changes.
+function CatchBoundaryInner(props: {
+  children: any
+  errorComponent: any
+  errorState: { error: unknown; info: any }
+  reset: () => void
+}) {
+  const [activeErrorState, setActiveErrorState] = React.useState(
+    props.errorState,
+  )
+  const router = useRouter()
+  const errorComponent = props.errorComponent ?? DefaultErrorBoundary
 
-    if (this.state.error) {
-      return typeof catchElement === 'function'
-        ? catchElement(this.state)
-        : catchElement
+  React.useEffect(() => {
+    if (activeErrorState) {
+      let prevKey = router.store.currentLocation.key
+      return createRoot(() =>
+        createEffect(() => {
+          if (router.store.currentLocation.key !== prevKey) {
+            prevKey = router.store.currentLocation.key
+            setActiveErrorState({} as any)
+          }
+        }),
+      )
     }
 
-    return this.props.children
+    return
+  }, [activeErrorState])
+
+  React.useEffect(() => {
+    if (props.errorState.error) {
+      setActiveErrorState(props.errorState)
+    }
+    props.reset()
+  }, [props.errorState.error])
+
+  if (props.errorState.error) {
+    return React.createElement(errorComponent, activeErrorState)
   }
+
+  return props.children
 }
 
 export function DefaultErrorBoundary({ error }: { error: any }) {
@@ -584,19 +773,6 @@ export function DefaultErrorBoundary({ error }: { error: any }) {
           ) : null}
         </pre>
       </div>
-      <div style={{ height: '1rem' }} />
-      <div
-        style={{
-          fontSize: '.8em',
-          borderLeft: '3px solid rgba(127, 127, 127, 1)',
-          paddingLeft: '.5rem',
-          opacity: 0.5,
-        }}
-      >
-        If you are the owner of this website, it's highly recommended that you
-        configure your own custom Catch/Error boundaries for the router. You can
-        optionally configure a boundary for each route.
-      </div>
     </div>
   )
 }
@@ -612,15 +788,32 @@ export function usePrompt(message: string, when: boolean | any): void {
         unblock()
         transition.retry()
       } else {
-        router.location.pathname = window.location.pathname
+        router.store.currentLocation.pathname = window.location.pathname
       }
     })
 
     return unblock
-  }, [when, location, message])
+  }, [when, message])
 }
 
 export function Prompt({ message, when, children }: PromptProps) {
   usePrompt(message, when ?? true)
-  return (children ?? null) as React.ReactNode
+  return (children ?? null) as ReactNode
 }
+
+// function circularStringify(obj: any) {
+//   const seen = new Set()
+
+//   return (
+//     JSON.stringify(obj, (_, value) => {
+//       if (typeof value === 'function') {
+//         return undefined
+//       }
+//       if (typeof value === 'object' && value !== null) {
+//         if (seen.has(value)) return
+//         seen.add(value)
+//       }
+//       return value
+//     }) || ''
+//   )
+// }