@tanstack/router-core 0.0.1-beta.19 → 0.0.1-beta.191

package/build/umd/index.development.js

@@ -1,5 +1,5 @@
 /**
- * router-core
+ * @tanstack/router-core/src/index.ts
  *
  * Copyright (c) TanStack
  *
@@ -9,2280 +9,1575 @@
  * @license MIT
  */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
-  typeof define === 'function' && define.amd ? define(['exports'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.RouterCore = {}));
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+    typeof define === 'function' && define.amd ? define(['exports'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.RouterCore = {}));
 })(this, (function (exports) { 'use strict';
 
-  function _extends$1() {
-    _extends$1 = Object.assign ? Object.assign.bind() : function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
+    var prefix = 'Invariant failed';
+    function invariant(condition, message) {
+        if (condition) {
+            return;
         }
-      }
-
-      return target;
-    };
-    return _extends$1.apply(this, arguments);
-  }
-
-  /**
-   * Actions represent the type of change to a location value.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#action
-   */
-  var Action;
-
-  (function (Action) {
-    /**
-     * A POP indicates a change to an arbitrary index in the history stack, such
-     * as a back or forward navigation. It does not describe the direction of the
-     * navigation, only that the current index changed.
-     *
-     * Note: This is the default action for newly created history objects.
-     */
-    Action["Pop"] = "POP";
-    /**
-     * A PUSH indicates a new entry being added to the history stack, such as when
-     * a link is clicked and a new page loads. When this happens, all subsequent
-     * entries in the stack are lost.
-     */
-
-    Action["Push"] = "PUSH";
-    /**
-     * A REPLACE indicates the entry at the current index in the history stack
-     * being replaced by a new one.
-     */
-
-    Action["Replace"] = "REPLACE";
-  })(Action || (Action = {}));
-
-  var readOnly = function (obj) {
-    return Object.freeze(obj);
-  } ;
-
-  function warning$1(cond, message) {
-    if (!cond) {
-      // eslint-disable-next-line no-console
-      if (typeof console !== 'undefined') console.warn(message);
-
-      try {
-        // Welcome to debugging history!
-        //
-        // This error is thrown as a convenience so you can more easily
-        // find the source for a warning that appears in the console by
-        // enabling "pause on exceptions" in your JavaScript debugger.
-        throw new Error(message); // eslint-disable-next-line no-empty
-      } catch (e) {}
-    }
-  }
-
-  var BeforeUnloadEventType = 'beforeunload';
-  var HashChangeEventType = 'hashchange';
-  var PopStateEventType = 'popstate';
-  /**
-   * Browser history stores the location in regular URLs. This is the standard for
-   * most web apps, but it requires some configuration on the server to ensure you
-   * serve the same app at multiple URLs.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#createbrowserhistory
-   */
-
-  function createBrowserHistory(options) {
-    if (options === void 0) {
-      options = {};
+        var provided = typeof message === 'function' ? message() : message;
+        var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
+        throw new Error(value);
     }
 
-    var _options = options,
-        _options$window = _options.window,
-        window = _options$window === void 0 ? document.defaultView : _options$window;
-    var globalHistory = window.history;
-
-    function getIndexAndLocation() {
-      var _window$location = window.location,
-          pathname = _window$location.pathname,
-          search = _window$location.search,
-          hash = _window$location.hash;
-      var state = globalHistory.state || {};
-      return [state.idx, readOnly({
-        pathname: pathname,
-        search: search,
-        hash: hash,
-        state: state.usr || null,
-        key: state.key || 'default'
-      })];
-    }
+    function warning(condition, message) {
+      {
+        if (condition) {
+          return;
+        }
 
-    var blockedPopTx = null;
+        var text = "Warning: " + message;
 
-    function handlePop() {
-      if (blockedPopTx) {
-        blockers.call(blockedPopTx);
-        blockedPopTx = null;
-      } else {
-        var nextAction = Action.Pop;
+        if (typeof console !== 'undefined') {
+          console.warn(text);
+        }
 
-        var _getIndexAndLocation = getIndexAndLocation(),
-            nextIndex = _getIndexAndLocation[0],
-            nextLocation = _getIndexAndLocation[1];
+        try {
+          throw Error(text);
+        } catch (x) {}
+      }
+    }
 
+    // While the public API was clearly inspired by the "history" npm package,
+    // This implementation attempts to be more lightweight by
+    // making assumptions about the way TanStack Router works
+
+    const pushStateEvent = 'pushstate';
+    const popStateEvent = 'popstate';
+    const beforeUnloadEvent = 'beforeunload';
+    const beforeUnloadListener = event => {
+      event.preventDefault();
+      // @ts-ignore
+      return event.returnValue = '';
+    };
+    const stopBlocking = () => {
+      removeEventListener(beforeUnloadEvent, beforeUnloadListener, {
+        capture: true
+      });
+    };
+    function createHistory(opts) {
+      let location = opts.getLocation();
+      let unsub = () => {};
+      let subscribers = new Set();
+      let blockers = [];
+      let queue = [];
+      const tryFlush = () => {
         if (blockers.length) {
-          if (nextIndex != null) {
-            var delta = index - nextIndex;
-
-            if (delta) {
-              // Revert the POP
-              blockedPopTx = {
-                action: nextAction,
-                location: nextLocation,
-                retry: function retry() {
-                  go(delta * -1);
-                }
-              };
-              go(delta);
+          blockers[0]?.(tryFlush, () => {
+            blockers = [];
+            stopBlocking();
+          });
+          return;
+        }
+        while (queue.length) {
+          queue.shift()?.();
+        }
+        if (!opts.subscriber) {
+          onUpdate();
+        }
+      };
+      const queueTask = task => {
+        queue.push(task);
+        tryFlush();
+      };
+      const onUpdate = () => {
+        location = opts.getLocation();
+        subscribers.forEach(subscriber => subscriber());
+      };
+      return {
+        get location() {
+          return location;
+        },
+        subscribe: cb => {
+          if (subscribers.size === 0) {
+            unsub = typeof opts.subscriber === 'function' ? opts.subscriber(onUpdate) : () => {};
+          }
+          subscribers.add(cb);
+          return () => {
+            subscribers.delete(cb);
+            if (subscribers.size === 0) {
+              unsub();
             }
-          } else {
-            // Trying to POP to a location with no index. We did not create
-            // this location, so we can't effectively block the navigation.
-            warning$1(false, // TODO: Write up a doc that explains our blocking strategy in
-            // detail and link to it here so people can understand better what
-            // is going on and how to avoid it.
-            "You are trying to block a POP navigation to a location that was not " + "created by the history library. The block will fail silently in " + "production, but in general you should do all navigation with the " + "history library (instead of using window.history.pushState directly) " + "to avoid this situation.") ;
+          };
+        },
+        push: (path, state) => {
+          assignKey(state);
+          queueTask(() => {
+            opts.pushState(path, state);
+          });
+        },
+        replace: (path, state) => {
+          assignKey(state);
+          queueTask(() => {
+            opts.replaceState(path, state);
+          });
+        },
+        go: index => {
+          queueTask(() => {
+            opts.go(index);
+          });
+        },
+        back: () => {
+          queueTask(() => {
+            opts.back();
+          });
+        },
+        forward: () => {
+          queueTask(() => {
+            opts.forward();
+          });
+        },
+        createHref: str => opts.createHref(str),
+        block: cb => {
+          blockers.push(cb);
+          if (blockers.length === 1) {
+            addEventListener(beforeUnloadEvent, beforeUnloadListener, {
+              capture: true
+            });
           }
-        } else {
-          applyTx(nextAction);
+          return () => {
+            blockers = blockers.filter(b => b !== cb);
+            if (!blockers.length) {
+              stopBlocking();
+            }
+          };
         }
-      }
-    }
-
-    window.addEventListener(PopStateEventType, handlePop);
-    var action = Action.Pop;
-
-    var _getIndexAndLocation2 = getIndexAndLocation(),
-        index = _getIndexAndLocation2[0],
-        location = _getIndexAndLocation2[1];
-
-    var listeners = createEvents();
-    var blockers = createEvents();
-
-    if (index == null) {
-      index = 0;
-      globalHistory.replaceState(_extends$1({}, globalHistory.state, {
-        idx: index
-      }), '');
+      };
     }
-
-    function createHref(to) {
-      return typeof to === 'string' ? to : createPath(to);
-    } // state defaults to `null` because `window.history.state` does
-
-
-    function getNextLocation(to, state) {
-      if (state === void 0) {
-        state = null;
-      }
-
-      return readOnly(_extends$1({
-        pathname: location.pathname,
-        hash: '',
-        search: ''
-      }, typeof to === 'string' ? parsePath(to) : to, {
-        state: state,
-        key: createKey()
-      }));
+    function assignKey(state) {
+      state.key = createRandomKey();
+      // if (state.__actualLocation) {
+      //   state.__actualLocation.state = {
+      //     ...state.__actualLocation.state,
+      //     key,
+      //   }
+      // }
     }
 
-    function getHistoryStateAndUrl(nextLocation, index) {
-      return [{
-        usr: nextLocation.state,
-        key: nextLocation.key,
-        idx: index
-      }, createHref(nextLocation)];
+    function createBrowserHistory(opts) {
+      const getHref = opts?.getHref ?? (() => `${window.location.pathname}${window.location.search}${window.location.hash}`);
+      const createHref = opts?.createHref ?? (path => path);
+      const getLocation = () => parseLocation(getHref(), window.history.state);
+      return createHistory({
+        getLocation,
+        subscriber: onUpdate => {
+          window.addEventListener(pushStateEvent, onUpdate);
+          window.addEventListener(popStateEvent, onUpdate);
+          var pushState = window.history.pushState;
+          window.history.pushState = function () {
+            let res = pushState.apply(history, arguments);
+            onUpdate();
+            return res;
+          };
+          var replaceState = window.history.replaceState;
+          window.history.replaceState = function () {
+            let res = replaceState.apply(history, arguments);
+            onUpdate();
+            return res;
+          };
+          return () => {
+            window.history.pushState = pushState;
+            window.history.replaceState = replaceState;
+            window.removeEventListener(pushStateEvent, onUpdate);
+            window.removeEventListener(popStateEvent, onUpdate);
+          };
+        },
+        pushState: (path, state) => {
+          window.history.pushState(state, '', createHref(path));
+        },
+        replaceState: (path, state) => {
+          window.history.replaceState(state, '', createHref(path));
+        },
+        back: () => window.history.back(),
+        forward: () => window.history.forward(),
+        go: n => window.history.go(n),
+        createHref: path => createHref(path)
+      });
     }
-
-    function allowTx(action, location, retry) {
-      return !blockers.length || (blockers.call({
-        action: action,
-        location: location,
-        retry: retry
-      }), false);
+    function createHashHistory() {
+      return createBrowserHistory({
+        getHref: () => window.location.hash.substring(1),
+        createHref: path => `#${path}`
+      });
     }
-
-    function applyTx(nextAction) {
-      action = nextAction;
-
-      var _getIndexAndLocation3 = getIndexAndLocation();
-
-      index = _getIndexAndLocation3[0];
-      location = _getIndexAndLocation3[1];
-      listeners.call({
-        action: action,
-        location: location
+    function createMemoryHistory(opts = {
+      initialEntries: ['/']
+    }) {
+      const entries = opts.initialEntries;
+      let index = opts.initialIndex ?? entries.length - 1;
+      let currentState = {
+        key: createRandomKey()
+      };
+      const getLocation = () => parseLocation(entries[index], currentState);
+      return createHistory({
+        getLocation,
+        subscriber: false,
+        pushState: (path, state) => {
+          currentState = state;
+          entries.push(path);
+          index++;
+        },
+        replaceState: (path, state) => {
+          currentState = state;
+          entries[index] = path;
+        },
+        back: () => {
+          index--;
+        },
+        forward: () => {
+          index = Math.min(index + 1, entries.length - 1);
+        },
+        go: n => window.history.go(n),
+        createHref: path => path
       });
     }
-
-    function push(to, state) {
-      var nextAction = Action.Push;
-      var nextLocation = getNextLocation(to, state);
-
-      function retry() {
-        push(to, state);
-      }
-
-      if (allowTx(nextAction, nextLocation, retry)) {
-        var _getHistoryStateAndUr = getHistoryStateAndUrl(nextLocation, index + 1),
-            historyState = _getHistoryStateAndUr[0],
-            url = _getHistoryStateAndUr[1]; // TODO: Support forced reloading
-        // try...catch because iOS limits us to 100 pushState calls :/
-
-
-        try {
-          globalHistory.pushState(historyState, '', url);
-        } catch (error) {
-          // They are going to lose state here, but there is no real
-          // way to warn them about it since the page will refresh...
-          window.location.assign(url);
-        }
-
-        applyTx(nextAction);
-      }
+    function parseLocation(href, state) {
+      let hashIndex = href.indexOf('#');
+      let searchIndex = href.indexOf('?');
+      return {
+        href,
+        pathname: href.substring(0, hashIndex > 0 ? searchIndex > 0 ? Math.min(hashIndex, searchIndex) : hashIndex : searchIndex > 0 ? searchIndex : href.length),
+        hash: hashIndex > -1 ? href.substring(hashIndex) : '',
+        search: searchIndex > -1 ? href.slice(searchIndex, hashIndex === -1 ? undefined : hashIndex) : '',
+        state: state || {}
+      };
     }
 
-    function replace(to, state) {
-      var nextAction = Action.Replace;
-      var nextLocation = getNextLocation(to, state);
-
-      function retry() {
-        replace(to, state);
-      }
-
-      if (allowTx(nextAction, nextLocation, retry)) {
-        var _getHistoryStateAndUr2 = getHistoryStateAndUrl(nextLocation, index),
-            historyState = _getHistoryStateAndUr2[0],
-            url = _getHistoryStateAndUr2[1]; // TODO: Support forced reloading
-
-
-        globalHistory.replaceState(historyState, '', url);
-        applyTx(nextAction);
-      }
+    // Thanks co-pilot!
+    function createRandomKey() {
+      return (Math.random() + 1).toString(36).substring(7);
     }
 
-    function go(delta) {
-      globalHistory.go(delta);
+    // type Compute<T> = { [K in keyof T]: T[K] } | never
+
+    // type AllKeys<T> = T extends any ? keyof T : never
+
+    // export type MergeUnion<T, Keys extends keyof T = keyof T> = Compute<
+    //   {
+    //     [K in Keys]: T[Keys]
+    //   } & {
+    //     [K in AllKeys<T>]?: T extends any
+    //       ? K extends keyof T
+    //         ? T[K]
+    //         : never
+    //       : never
+    //   }
+    // >
+    function last(arr) {
+      return arr[arr.length - 1];
     }
-
-    var history = {
-      get action() {
-        return action;
-      },
-
-      get location() {
-        return location;
-      },
-
-      createHref: createHref,
-      push: push,
-      replace: replace,
-      go: go,
-      back: function back() {
-        go(-1);
-      },
-      forward: function forward() {
-        go(1);
-      },
-      listen: function listen(listener) {
-        return listeners.push(listener);
-      },
-      block: function block(blocker) {
-        var unblock = blockers.push(blocker);
-
-        if (blockers.length === 1) {
-          window.addEventListener(BeforeUnloadEventType, promptBeforeUnload);
-        }
-
-        return function () {
-          unblock(); // Remove the beforeunload listener so the document may
-          // still be salvageable in the pagehide event.
-          // See https://html.spec.whatwg.org/#unloading-documents
-
-          if (!blockers.length) {
-            window.removeEventListener(BeforeUnloadEventType, promptBeforeUnload);
-          }
-        };
+    function isFunction(d) {
+      return typeof d === 'function';
+    }
+    function functionalUpdate(updater, previous) {
+      if (isFunction(updater)) {
+        return updater(previous);
       }
-    };
-    return history;
-  }
-  /**
-   * Hash history stores the location in window.location.hash. This makes it ideal
-   * for situations where you don't want to send the location to the server for
-   * some reason, either because you do cannot configure it or the URL space is
-   * reserved for something else.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#createhashhistory
-   */
-
-  function createHashHistory(options) {
-    if (options === void 0) {
-      options = {};
+      return updater;
     }
-
-    var _options2 = options,
-        _options2$window = _options2.window,
-        window = _options2$window === void 0 ? document.defaultView : _options2$window;
-    var globalHistory = window.history;
-
-    function getIndexAndLocation() {
-      var _parsePath = parsePath(window.location.hash.substr(1)),
-          _parsePath$pathname = _parsePath.pathname,
-          pathname = _parsePath$pathname === void 0 ? '/' : _parsePath$pathname,
-          _parsePath$search = _parsePath.search,
-          search = _parsePath$search === void 0 ? '' : _parsePath$search,
-          _parsePath$hash = _parsePath.hash,
-          hash = _parsePath$hash === void 0 ? '' : _parsePath$hash;
-
-      var state = globalHistory.state || {};
-      return [state.idx, readOnly({
-        pathname: pathname,
-        search: search,
-        hash: hash,
-        state: state.usr || null,
-        key: state.key || 'default'
-      })];
+    function pick(parent, keys) {
+      return keys.reduce((obj, key) => {
+        obj[key] = parent[key];
+        return obj;
+      }, {});
     }
 
-    var blockedPopTx = null;
-
-    function handlePop() {
-      if (blockedPopTx) {
-        blockers.call(blockedPopTx);
-        blockedPopTx = null;
-      } else {
-        var nextAction = Action.Pop;
-
-        var _getIndexAndLocation4 = getIndexAndLocation(),
-            nextIndex = _getIndexAndLocation4[0],
-            nextLocation = _getIndexAndLocation4[1];
-
-        if (blockers.length) {
-          if (nextIndex != null) {
-            var delta = index - nextIndex;
-
-            if (delta) {
-              // Revert the POP
-              blockedPopTx = {
-                action: nextAction,
-                location: nextLocation,
-                retry: function retry() {
-                  go(delta * -1);
-                }
-              };
-              go(delta);
-            }
-          } else {
-            // Trying to POP to a location with no index. We did not create
-            // this location, so we can't effectively block the navigation.
-            warning$1(false, // TODO: Write up a doc that explains our blocking strategy in
-            // detail and link to it here so people can understand better
-            // what is going on and how to avoid it.
-            "You are trying to block a POP navigation to a location that was not " + "created by the history library. The block will fail silently in " + "production, but in general you should do all navigation with the " + "history library (instead of using window.history.pushState directly) " + "to avoid this situation.") ;
+    /**
+     * This function returns `a` if `b` is deeply equal.
+     * If not, it will replace any deeply equal children of `b` with those of `a`.
+     * This can be used for structural sharing between immutable JSON values for example.
+     * Do not use this with signals
+     */
+    function replaceEqualDeep(prev, _next) {
+      if (prev === _next) {
+        return prev;
+      }
+      const next = _next;
+      const array = Array.isArray(prev) && Array.isArray(next);
+      if (array || isPlainObject(prev) && isPlainObject(next)) {
+        const prevSize = array ? prev.length : Object.keys(prev).length;
+        const nextItems = array ? next : Object.keys(next);
+        const nextSize = nextItems.length;
+        const copy = array ? [] : {};
+        let equalItems = 0;
+        for (let i = 0; i < nextSize; i++) {
+          const key = array ? i : nextItems[i];
+          copy[key] = replaceEqualDeep(prev[key], next[key]);
+          if (copy[key] === prev[key]) {
+            equalItems++;
           }
-        } else {
-          applyTx(nextAction);
         }
+        return prevSize === nextSize && equalItems === prevSize ? prev : copy;
       }
+      return next;
     }
 
-    window.addEventListener(PopStateEventType, handlePop); // popstate does not fire on hashchange in IE 11 and old (trident) Edge
-    // https://developer.mozilla.org/de/docs/Web/API/Window/popstate_event
-
-    window.addEventListener(HashChangeEventType, function () {
-      var _getIndexAndLocation5 = getIndexAndLocation(),
-          nextLocation = _getIndexAndLocation5[1]; // Ignore extraneous hashchange events.
-
-
-      if (createPath(nextLocation) !== createPath(location)) {
-        handlePop();
+    // Copied from: https://github.com/jonschlinkert/is-plain-object
+    function isPlainObject(o) {
+      if (!hasObjectPrototype(o)) {
+        return false;
       }
-    });
-    var action = Action.Pop;
-
-    var _getIndexAndLocation6 = getIndexAndLocation(),
-        index = _getIndexAndLocation6[0],
-        location = _getIndexAndLocation6[1];
 
-    var listeners = createEvents();
-    var blockers = createEvents();
-
-    if (index == null) {
-      index = 0;
-      globalHistory.replaceState(_extends$1({}, globalHistory.state, {
-        idx: index
-      }), '');
-    }
+      // If has modified constructor
+      const ctor = o.constructor;
+      if (typeof ctor === 'undefined') {
+        return true;
+      }
 
-    function getBaseHref() {
-      var base = document.querySelector('base');
-      var href = '';
+      // If has modified prototype
+      const prot = ctor.prototype;
+      if (!hasObjectPrototype(prot)) {
+        return false;
+      }
 
-      if (base && base.getAttribute('href')) {
-        var url = window.location.href;
-        var hashIndex = url.indexOf('#');
-        href = hashIndex === -1 ? url : url.slice(0, hashIndex);
+      // If constructor does not have an Object-specific method
+      if (!prot.hasOwnProperty('isPrototypeOf')) {
+        return false;
       }
 
-      return href;
+      // Most likely a plain Object
+      return true;
     }
-
-    function createHref(to) {
-      return getBaseHref() + '#' + (typeof to === 'string' ? to : createPath(to));
+    function hasObjectPrototype(o) {
+      return Object.prototype.toString.call(o) === '[object Object]';
     }
-
-    function getNextLocation(to, state) {
-      if (state === void 0) {
-        state = null;
+    function partialDeepEqual(a, b) {
+      if (a === b) {
+        return true;
       }
-
-      return readOnly(_extends$1({
-        pathname: location.pathname,
-        hash: '',
-        search: ''
-      }, typeof to === 'string' ? parsePath(to) : to, {
-        state: state,
-        key: createKey()
-      }));
+      if (typeof a !== typeof b) {
+        return false;
+      }
+      if (isPlainObject(a) && isPlainObject(b)) {
+        return !Object.keys(b).some(key => !partialDeepEqual(a[key], b[key]));
+      }
+      if (Array.isArray(a) && Array.isArray(b)) {
+        return a.length === b.length && a.every((item, index) => partialDeepEqual(item, b[index]));
+      }
+      return false;
     }
 
-    function getHistoryStateAndUrl(nextLocation, index) {
-      return [{
-        usr: nextLocation.state,
-        key: nextLocation.key,
-        idx: index
-      }, createHref(nextLocation)];
+    function joinPaths(paths) {
+      return cleanPath(paths.filter(Boolean).join('/'));
     }
-
-    function allowTx(action, location, retry) {
-      return !blockers.length || (blockers.call({
-        action: action,
-        location: location,
-        retry: retry
-      }), false);
+    function cleanPath(path) {
+      // remove double slashes
+      return path.replace(/\/{2,}/g, '/');
     }
-
-    function applyTx(nextAction) {
-      action = nextAction;
-
-      var _getIndexAndLocation7 = getIndexAndLocation();
-
-      index = _getIndexAndLocation7[0];
-      location = _getIndexAndLocation7[1];
-      listeners.call({
-        action: action,
-        location: location
+    function trimPathLeft(path) {
+      return path === '/' ? path : path.replace(/^\/{1,}/, '');
+    }
+    function trimPathRight(path) {
+      return path === '/' ? path : path.replace(/\/{1,}$/, '');
+    }
+    function trimPath(path) {
+      return trimPathRight(trimPathLeft(path));
+    }
+    function resolvePath(basepath, base, to) {
+      base = base.replace(new RegExp(`^${basepath}`), '/');
+      to = to.replace(new RegExp(`^${basepath}`), '/');
+      let baseSegments = parsePathname(base);
+      const toSegments = parsePathname(to);
+      toSegments.forEach((toSegment, index) => {
+        if (toSegment.value === '/') {
+          if (!index) {
+            // Leading slash
+            baseSegments = [toSegment];
+          } else if (index === toSegments.length - 1) {
+            // Trailing Slash
+            baseSegments.push(toSegment);
+          } else ;
+        } else if (toSegment.value === '..') {
+          // Extra trailing slash? pop it off
+          if (baseSegments.length > 1 && last(baseSegments)?.value === '/') {
+            baseSegments.pop();
+          }
+          baseSegments.pop();
+        } else if (toSegment.value === '.') {
+          return;
+        } else {
+          baseSegments.push(toSegment);
+        }
       });
+      const joined = joinPaths([basepath, ...baseSegments.map(d => d.value)]);
+      return cleanPath(joined);
     }
-
-    function push(to, state) {
-      var nextAction = Action.Push;
-      var nextLocation = getNextLocation(to, state);
-
-      function retry() {
-        push(to, state);
+    function parsePathname(pathname) {
+      if (!pathname) {
+        return [];
+      }
+      pathname = cleanPath(pathname);
+      const segments = [];
+      if (pathname.slice(0, 1) === '/') {
+        pathname = pathname.substring(1);
+        segments.push({
+          type: 'pathname',
+          value: '/'
+        });
+      }
+      if (!pathname) {
+        return segments;
       }
 
-      warning$1(nextLocation.pathname.charAt(0) === '/', "Relative pathnames are not supported in hash history.push(" + JSON.stringify(to) + ")") ;
-
-      if (allowTx(nextAction, nextLocation, retry)) {
-        var _getHistoryStateAndUr3 = getHistoryStateAndUrl(nextLocation, index + 1),
-            historyState = _getHistoryStateAndUr3[0],
-            url = _getHistoryStateAndUr3[1]; // TODO: Support forced reloading
-        // try...catch because iOS limits us to 100 pushState calls :/
-
-
-        try {
-          globalHistory.pushState(historyState, '', url);
-        } catch (error) {
-          // They are going to lose state here, but there is no real
-          // way to warn them about it since the page will refresh...
-          window.location.assign(url);
+      // Remove empty segments and '.' segments
+      const split = pathname.split('/').filter(Boolean);
+      segments.push(...split.map(part => {
+        if (part === '$' || part === '*') {
+          return {
+            type: 'wildcard',
+            value: part
+          };
         }
-
-        applyTx(nextAction);
+        if (part.charAt(0) === '$') {
+          return {
+            type: 'param',
+            value: part
+          };
+        }
+        return {
+          type: 'pathname',
+          value: part
+        };
+      }));
+      if (pathname.slice(-1) === '/') {
+        pathname = pathname.substring(1);
+        segments.push({
+          type: 'pathname',
+          value: '/'
+        });
       }
+      return segments;
     }
+    function interpolatePath(path, params, leaveWildcards = false) {
+      const interpolatedPathSegments = parsePathname(path);
+      return joinPaths(interpolatedPathSegments.map(segment => {
+        if (segment.type === 'wildcard') {
+          const value = params[segment.value];
+          if (leaveWildcards) return `${segment.value}${value ?? ''}`;
+          return value;
+        }
+        if (segment.type === 'param') {
+          return params[segment.value.substring(1)] ?? '';
+        }
+        return segment.value;
+      }));
+    }
+    function matchPathname(basepath, currentPathname, matchLocation) {
+      const pathParams = matchByPath(basepath, currentPathname, matchLocation);
+      // const searchMatched = matchBySearch(location.search, matchLocation)
 
-    function replace(to, state) {
-      var nextAction = Action.Replace;
-      var nextLocation = getNextLocation(to, state);
-
-      function retry() {
-        replace(to, state);
-      }
-
-      warning$1(nextLocation.pathname.charAt(0) === '/', "Relative pathnames are not supported in hash history.replace(" + JSON.stringify(to) + ")") ;
-
-      if (allowTx(nextAction, nextLocation, retry)) {
-        var _getHistoryStateAndUr4 = getHistoryStateAndUrl(nextLocation, index),
-            historyState = _getHistoryStateAndUr4[0],
-            url = _getHistoryStateAndUr4[1]; // TODO: Support forced reloading
-
-
-        globalHistory.replaceState(historyState, '', url);
-        applyTx(nextAction);
+      if (matchLocation.to && !pathParams) {
+        return;
       }
+      return pathParams ?? {};
     }
-
-    function go(delta) {
-      globalHistory.go(delta);
+    function matchByPath(basepath, from, matchLocation) {
+      // Remove the base path from the pathname
+      from = basepath != '/' ? from.substring(basepath.length) : from;
+      // Default to to $ (wildcard)
+      const to = `${matchLocation.to ?? '$'}`;
+      // Parse the from and to
+      const baseSegments = parsePathname(from);
+      const routeSegments = parsePathname(to);
+      if (!from.startsWith('/')) {
+        baseSegments.unshift({
+          type: 'pathname',
+          value: '/'
+        });
+      }
+      if (!to.startsWith('/')) {
+        routeSegments.unshift({
+          type: 'pathname',
+          value: '/'
+        });
+      }
+      const params = {};
+      let isMatch = (() => {
+        for (let i = 0; i < Math.max(baseSegments.length, routeSegments.length); i++) {
+          const baseSegment = baseSegments[i];
+          const routeSegment = routeSegments[i];
+          const isLastBaseSegment = i >= baseSegments.length - 1;
+          const isLastRouteSegment = i >= routeSegments.length - 1;
+          if (routeSegment) {
+            if (routeSegment.type === 'wildcard') {
+              if (baseSegment?.value) {
+                params['*'] = joinPaths(baseSegments.slice(i).map(d => d.value));
+                return true;
+              }
+              return false;
+            }
+            if (routeSegment.type === 'pathname') {
+              if (routeSegment.value === '/' && !baseSegment?.value) {
+                return true;
+              }
+              if (baseSegment) {
+                if (matchLocation.caseSensitive) {
+                  if (routeSegment.value !== baseSegment.value) {
+                    return false;
+                  }
+                } else if (routeSegment.value.toLowerCase() !== baseSegment.value.toLowerCase()) {
+                  return false;
+                }
+              }
+            }
+            if (!baseSegment) {
+              return false;
+            }
+            if (routeSegment.type === 'param') {
+              if (baseSegment?.value === '/') {
+                return false;
+              }
+              if (baseSegment.value.charAt(0) !== '$') {
+                params[routeSegment.value.substring(1)] = baseSegment.value;
+              }
+            }
+          }
+          if (!isLastBaseSegment && isLastRouteSegment) {
+            return !!matchLocation.fuzzy;
+          }
+        }
+        return true;
+      })();
+      return isMatch ? params : undefined;
     }
 
-    var history = {
-      get action() {
-        return action;
-      },
-
-      get location() {
-        return location;
-      },
-
-      createHref: createHref,
-      push: push,
-      replace: replace,
-      go: go,
-      back: function back() {
-        go(-1);
-      },
-      forward: function forward() {
-        go(1);
-      },
-      listen: function listen(listener) {
-        return listeners.push(listener);
-      },
-      block: function block(blocker) {
-        var unblock = blockers.push(blocker);
-
-        if (blockers.length === 1) {
-          window.addEventListener(BeforeUnloadEventType, promptBeforeUnload);
-        }
+    // @ts-nocheck
 
-        return function () {
-          unblock(); // Remove the beforeunload listener so the document may
-          // still be salvageable in the pagehide event.
-          // See https://html.spec.whatwg.org/#unloading-documents
+    // qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.
 
-          if (!blockers.length) {
-            window.removeEventListener(BeforeUnloadEventType, promptBeforeUnload);
+    function encode(obj, pfx) {
+      var k,
+        i,
+        tmp,
+        str = '';
+      for (k in obj) {
+        if ((tmp = obj[k]) !== void 0) {
+          if (Array.isArray(tmp)) {
+            for (i = 0; i < tmp.length; i++) {
+              str && (str += '&');
+              str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i]);
+            }
+          } else {
+            str && (str += '&');
+            str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp);
           }
-        };
+        }
       }
-    };
-    return history;
-  }
-  /**
-   * Memory history stores the current location in memory. It is designed for use
-   * in stateful non-browser environments like tests and React Native.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#creatememoryhistory
-   */
-
-  function createMemoryHistory(options) {
-    if (options === void 0) {
-      options = {};
+      return (pfx || '') + str;
     }
-
-    var _options3 = options,
-        _options3$initialEntr = _options3.initialEntries,
-        initialEntries = _options3$initialEntr === void 0 ? ['/'] : _options3$initialEntr,
-        initialIndex = _options3.initialIndex;
-    var entries = initialEntries.map(function (entry) {
-      var location = readOnly(_extends$1({
-        pathname: '/',
-        search: '',
-        hash: '',
-        state: null,
-        key: createKey()
-      }, typeof entry === 'string' ? parsePath(entry) : entry));
-      warning$1(location.pathname.charAt(0) === '/', "Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: " + JSON.stringify(entry) + ")") ;
-      return location;
-    });
-    var index = clamp(initialIndex == null ? entries.length - 1 : initialIndex, 0, entries.length - 1);
-    var action = Action.Pop;
-    var location = entries[index];
-    var listeners = createEvents();
-    var blockers = createEvents();
-
-    function createHref(to) {
-      return typeof to === 'string' ? to : createPath(to);
+    function toValue(mix) {
+      if (!mix) return '';
+      var str = decodeURIComponent(mix);
+      if (str === 'false') return false;
+      if (str === 'true') return true;
+      return +str * 0 === 0 && +str + '' === str ? +str : str;
     }
-
-    function getNextLocation(to, state) {
-      if (state === void 0) {
-        state = null;
+    function decode(str) {
+      var tmp,
+        k,
+        out = {},
+        arr = str.split('&');
+      while (tmp = arr.shift()) {
+        tmp = tmp.split('=');
+        k = tmp.shift();
+        if (out[k] !== void 0) {
+          out[k] = [].concat(out[k], toValue(tmp.shift()));
+        } else {
+          out[k] = toValue(tmp.shift());
+        }
       }
-
-      return readOnly(_extends$1({
-        pathname: location.pathname,
-        search: '',
-        hash: ''
-      }, typeof to === 'string' ? parsePath(to) : to, {
-        state: state,
-        key: createKey()
-      }));
-    }
-
-    function allowTx(action, location, retry) {
-      return !blockers.length || (blockers.call({
-        action: action,
-        location: location,
-        retry: retry
-      }), false);
+      return out;
     }
 
-    function applyTx(nextAction, nextLocation) {
-      action = nextAction;
-      location = nextLocation;
-      listeners.call({
-        action: action,
-        location: location
-      });
-    }
+    const rootRouteId = '__root__';
 
-    function push(to, state) {
-      var nextAction = Action.Push;
-      var nextLocation = getNextLocation(to, state);
+    // The parse type here allows a zod schema to be passed directly to the validator
 
-      function retry() {
-        push(to, state);
-      }
+    // T extends Record<PropertyKey, infer U>
+    //   ? {
+    //       [K in keyof T]: UseLoaderResultPromise<T[K]>
+    //     }
+    //   : UseLoaderResultPromise<T>
 
-      warning$1(location.pathname.charAt(0) === '/', "Relative pathnames are not supported in memory history.push(" + JSON.stringify(to) + ")") ;
+    // export type UseLoaderResultPromise<T> = T extends Promise<infer U>
+    //   ? StreamedPromise<U>
+    //   : T
+    class Route {
+      // Set up in this.init()
 
-      if (allowTx(nextAction, nextLocation, retry)) {
-        index += 1;
-        entries.splice(index, entries.length, nextLocation);
-        applyTx(nextAction, nextLocation);
-      }
-    }
+      // customId!: TCustomId
 
-    function replace(to, state) {
-      var nextAction = Action.Replace;
-      var nextLocation = getNextLocation(to, state);
+      // Optional
 
-      function retry() {
-        replace(to, state);
+      constructor(options) {
+        this.options = options || {};
+        this.isRoot = !options?.getParentRoute;
+        Route.__onInit(this);
       }
+      init = opts => {
+        this.originalIndex = opts.originalIndex;
+        this.router = opts.router;
+        const options = this.options;
+        const isRoot = !options?.path && !options?.id;
+        this.parentRoute = this.options?.getParentRoute?.();
+        if (isRoot) {
+          this.path = rootRouteId;
+        } else {
+          invariant(this.parentRoute, `Child Route instances must pass a 'getParentRoute: () => ParentRoute' option that returns a Route instance.`);
+        }
+        let path = isRoot ? rootRouteId : options.path;
 
-      warning$1(location.pathname.charAt(0) === '/', "Relative pathnames are not supported in memory history.replace(" + JSON.stringify(to) + ")") ;
+        // If the path is anything other than an index path, trim it up
+        if (path && path !== '/') {
+          path = trimPath(path);
+        }
+        const customId = options?.id || path;
 
-      if (allowTx(nextAction, nextLocation, retry)) {
-        entries[index] = nextLocation;
-        applyTx(nextAction, nextLocation);
-      }
+        // Strip the parentId prefix from the first level of children
+        let id = isRoot ? rootRouteId : joinPaths([this.parentRoute.id === rootRouteId ? '' : this.parentRoute.id, customId]);
+        if (path === rootRouteId) {
+          path = '/';
+        }
+        if (id !== rootRouteId) {
+          id = joinPaths(['/', id]);
+        }
+        const fullPath = id === rootRouteId ? '/' : joinPaths([this.parentRoute.fullPath, path]);
+        this.path = path;
+        this.id = id;
+        // this.customId = customId as TCustomId
+        this.fullPath = fullPath;
+        this.to = fullPath;
+      };
+      addChildren = children => {
+        this.children = children;
+        return this;
+      };
+      update = options => {
+        Object.assign(this.options, options);
+        return this;
+      };
+      static __onInit = route => {
+        // This is a dummy static method that should get
+        // replaced by a framework specific implementation if necessary
+      };
     }
-
-    function go(delta) {
-      var nextIndex = clamp(index + delta, 0, entries.length - 1);
-      var nextAction = Action.Pop;
-      var nextLocation = entries[nextIndex];
-
-      function retry() {
-        go(delta);
+    class RouterContext {
+      constructor() {}
+      createRootRoute = options => {
+        return new RootRoute(options);
+      };
+    }
+    class RootRoute extends Route {
+      constructor(options) {
+        super(options);
       }
+    }
+    function createRouteMask(opts) {
+      return opts;
+    }
 
-      if (allowTx(nextAction, nextLocation, retry)) {
-        index = nextIndex;
-        applyTx(nextAction, nextLocation);
+    class FileRoute {
+      constructor(path) {
+        this.path = path;
       }
+      createRoute = options => {
+        const route = new Route(options);
+        route.isRoot = false;
+        return route;
+      };
     }
 
-    var history = {
-      get index() {
-        return index;
-      },
-
-      get action() {
-        return action;
-      },
-
-      get location() {
-        return location;
-      },
-
-      createHref: createHref,
-      push: push,
-      replace: replace,
-      go: go,
-      back: function back() {
-        go(-1);
-      },
-      forward: function forward() {
-        go(1);
-      },
-      listen: function listen(listener) {
-        return listeners.push(listener);
-      },
-      block: function block(blocker) {
-        return blockers.push(blocker);
-      }
-    };
-    return history;
-  } ////////////////////////////////////////////////////////////////////////////////
-  // UTILS
-  ////////////////////////////////////////////////////////////////////////////////
-
-  function clamp(n, lowerBound, upperBound) {
-    return Math.min(Math.max(n, lowerBound), upperBound);
-  }
-
-  function promptBeforeUnload(event) {
-    // Cancel the event.
-    event.preventDefault(); // Chrome (and legacy IE) requires returnValue to be set.
-
-    event.returnValue = '';
-  }
-
-  function createEvents() {
-    var handlers = [];
-    return {
-      get length() {
-        return handlers.length;
-      },
-
-      push: function push(fn) {
-        handlers.push(fn);
-        return function () {
-          handlers = handlers.filter(function (handler) {
-            return handler !== fn;
-          });
-        };
-      },
-      call: function call(arg) {
-        handlers.forEach(function (fn) {
-          return fn && fn(arg);
-        });
-      }
-    };
-  }
-
-  function createKey() {
-    return Math.random().toString(36).substr(2, 8);
-  }
-  /**
-   * Creates a string URL path from the given pathname, search, and hash components.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#createpath
-   */
-
-
-  function createPath(_ref) {
-    var _ref$pathname = _ref.pathname,
-        pathname = _ref$pathname === void 0 ? '/' : _ref$pathname,
-        _ref$search = _ref.search,
-        search = _ref$search === void 0 ? '' : _ref$search,
-        _ref$hash = _ref.hash,
-        hash = _ref$hash === void 0 ? '' : _ref$hash;
-    if (search && search !== '?') pathname += search.charAt(0) === '?' ? search : '?' + search;
-    if (hash && hash !== '#') pathname += hash.charAt(0) === '#' ? hash : '#' + hash;
-    return pathname;
-  }
-  /**
-   * Parses a string URL path into its separate pathname, search, and hash components.
-   *
-   * @see https://github.com/remix-run/history/tree/main/docs/api-reference.md#parsepath
-   */
-
-  function parsePath(path) {
-    var parsedPath = {};
-
-    if (path) {
-      var hashIndex = path.indexOf('#');
-
-      if (hashIndex >= 0) {
-        parsedPath.hash = path.substr(hashIndex);
-        path = path.substr(0, hashIndex);
-      }
-
-      var searchIndex = path.indexOf('?');
-
-      if (searchIndex >= 0) {
-        parsedPath.search = path.substr(searchIndex);
-        path = path.substr(0, searchIndex);
-      }
-
-      if (path) {
-        parsedPath.pathname = path;
-      }
-    }
-
-    return parsedPath;
-  }
-
-  var prefix = 'Invariant failed';
-  function invariant(condition, message) {
-      if (condition) {
-          return;
-      }
-      var provided = typeof message === 'function' ? message() : message;
-      var value = provided ? "".concat(prefix, ": ").concat(provided) : prefix;
-      throw new Error(value);
-  }
-
-  // type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  //   k: infer I,
-  // ) => any
-  //   ? I
-  //   : never
-
-  /**
-   * This function returns `a` if `b` is deeply equal.
-   * If not, it will replace any deeply equal children of `b` with those of `a`.
-   * This can be used for structural sharing between JSON values for example.
-   */
-  function replaceEqualDeep(prev, next) {
-    if (prev === next) {
-      return prev;
-    }
-
-    const array = Array.isArray(prev) && Array.isArray(next);
-
-    if (array || isPlainObject(prev) && isPlainObject(next)) {
-      const aSize = array ? prev.length : Object.keys(prev).length;
-      const bItems = array ? next : Object.keys(next);
-      const bSize = bItems.length;
-      const copy = array ? [] : {};
-      let equalItems = 0;
-
-      for (let i = 0; i < bSize; i++) {
-        const key = array ? i : bItems[i];
-        copy[key] = replaceEqualDeep(prev[key], next[key]);
-
-        if (copy[key] === prev[key]) {
-          equalItems++;
-        }
-      }
-
-      return aSize === bSize && equalItems === aSize ? prev : copy;
-    }
-
-    return next;
-  } // Copied from: https://github.com/jonschlinkert/is-plain-object
-
-  function isPlainObject(o) {
-    if (!hasObjectPrototype(o)) {
-      return false;
-    } // If has modified constructor
-
-
-    const ctor = o.constructor;
-
-    if (typeof ctor === 'undefined') {
-      return true;
-    } // If has modified prototype
-
-
-    const prot = ctor.prototype;
-
-    if (!hasObjectPrototype(prot)) {
-      return false;
-    } // If constructor does not have an Object-specific method
-
-
-    if (!prot.hasOwnProperty('isPrototypeOf')) {
-      return false;
-    } // Most likely a plain Object
-
-
-    return true;
-  }
-
-  function hasObjectPrototype(o) {
-    return Object.prototype.toString.call(o) === '[object Object]';
-  }
-
-  function last(arr) {
-    return arr[arr.length - 1];
-  }
-  function warning(cond, message) {
-    if (cond) {
-      if (typeof console !== 'undefined') console.warn(message);
-
-      try {
-        throw new Error(message);
-      } catch (_unused) {}
-    }
-
-    return true;
-  }
-
-  function isFunction(d) {
-    return typeof d === 'function';
-  }
-
-  function functionalUpdate(updater, previous) {
-    if (isFunction(updater)) {
-      return updater(previous);
-    }
-
-    return updater;
-  }
-  function pick(parent, keys) {
-    return keys.reduce((obj, key) => {
-      obj[key] = parent[key];
-      return obj;
-    }, {});
-  }
-
-  function joinPaths(paths) {
-    return cleanPath(paths.filter(Boolean).join('/'));
-  }
-  function cleanPath(path) {
-    // remove double slashes
-    return path.replace(/\/{2,}/g, '/');
-  }
-  function trimPathLeft(path) {
-    return path === '/' ? path : path.replace(/^\/{1,}/, '');
-  }
-  function trimPathRight(path) {
-    return path === '/' ? path : path.replace(/\/{1,}$/, '');
-  }
-  function trimPath(path) {
-    return trimPathRight(trimPathLeft(path));
-  }
-  function resolvePath(basepath, base, to) {
-    base = base.replace(new RegExp("^" + basepath), '/');
-    to = to.replace(new RegExp("^" + basepath), '/');
-    let baseSegments = parsePathname(base);
-    const toSegments = parsePathname(to);
-    toSegments.forEach((toSegment, index) => {
-      if (toSegment.value === '/') {
-        if (!index) {
-          // Leading slash
-          baseSegments = [toSegment];
-        } else if (index === toSegments.length - 1) {
-          // Trailing Slash
-          baseSegments.push(toSegment);
-        } else ;
-      } else if (toSegment.value === '..') {
-        var _last;
-
-        // Extra trailing slash? pop it off
-        if (baseSegments.length > 1 && ((_last = last(baseSegments)) == null ? void 0 : _last.value) === '/') {
-          baseSegments.pop();
-        }
-
-        baseSegments.pop();
-      } else if (toSegment.value === '.') {
-        return;
-      } else {
-        baseSegments.push(toSegment);
-      }
-    });
-    const joined = joinPaths([basepath, ...baseSegments.map(d => d.value)]);
-    return cleanPath(joined);
-  }
-  function parsePathname(pathname) {
-    if (!pathname) {
-      return [];
-    }
-
-    pathname = cleanPath(pathname);
-    const segments = [];
-
-    if (pathname.slice(0, 1) === '/') {
-      pathname = pathname.substring(1);
-      segments.push({
-        type: 'pathname',
-        value: '/'
-      });
-    }
-
-    if (!pathname) {
-      return segments;
-    } // Remove empty segments and '.' segments
-
-
-    const split = pathname.split('/').filter(Boolean);
-    segments.push(...split.map(part => {
-      if (part.startsWith('*')) {
-        return {
-          type: 'wildcard',
-          value: part
-        };
+    /**
+     * @tanstack/store/src/index.ts
+     *
+     * Copyright (c) TanStack
+     *
+     * This source code is licensed under the MIT license found in the
+     * LICENSE.md file in the root directory of this source tree.
+     *
+     * @license MIT
+     */
+    class Store {
+      listeners = new Set();
+      _batching = false;
+      _flushing = 0;
+      _nextPriority = null;
+      constructor(initialState, options) {
+        this.state = initialState;
+        this.options = options;
       }
-
-      if (part.charAt(0) === ':') {
-        return {
-          type: 'param',
-          value: part
+      subscribe = listener => {
+        this.listeners.add(listener);
+        const unsub = this.options?.onSubscribe?.(listener, this);
+        return () => {
+          this.listeners.delete(listener);
+          unsub?.();
         };
-      }
-
-      return {
-        type: 'pathname',
-        value: part
       };
-    }));
-
-    if (pathname.slice(-1) === '/') {
-      pathname = pathname.substring(1);
-      segments.push({
-        type: 'pathname',
-        value: '/'
-      });
-    }
-
-    return segments;
-  }
-  function interpolatePath(path, params, leaveWildcard) {
-    const interpolatedPathSegments = parsePathname(path);
-    return joinPaths(interpolatedPathSegments.map(segment => {
-      if (segment.value === '*' && !leaveWildcard) {
-        return '';
-      }
-
-      if (segment.type === 'param') {
-        var _segment$value$substr;
-
-        return (_segment$value$substr = params[segment.value.substring(1)]) != null ? _segment$value$substr : '';
-      }
-
-      return segment.value;
-    }));
-  }
-  function matchPathname(currentPathname, matchLocation) {
-    const pathParams = matchByPath(currentPathname, matchLocation); // const searchMatched = matchBySearch(currentLocation.search, matchLocation)
-
-    if (matchLocation.to && !pathParams) {
-      return;
-    } // if (matchLocation.search && !searchMatched) {
-    //   return
-    // }
-
-
-    return pathParams != null ? pathParams : {};
-  }
-  function matchByPath(from, matchLocation) {
-    var _matchLocation$to;
-
-    const baseSegments = parsePathname(from);
-    const routeSegments = parsePathname("" + ((_matchLocation$to = matchLocation.to) != null ? _matchLocation$to : '*'));
-    const params = {};
-
-    let isMatch = (() => {
-      for (let i = 0; i < Math.max(baseSegments.length, routeSegments.length); i++) {
-        const baseSegment = baseSegments[i];
-        const routeSegment = routeSegments[i];
-        const isLastRouteSegment = i === routeSegments.length - 1;
-        const isLastBaseSegment = i === baseSegments.length - 1;
-
-        if (routeSegment) {
-          if (routeSegment.type === 'wildcard') {
-            if (baseSegment != null && baseSegment.value) {
-              params['*'] = joinPaths(baseSegments.slice(i).map(d => d.value));
-              return true;
-            }
-
-            return false;
-          }
-
-          if (routeSegment.type === 'pathname') {
-            if (routeSegment.value === '/' && !(baseSegment != null && baseSegment.value)) {
-              return true;
-            }
-
-            if (baseSegment) {
-              if (matchLocation.caseSensitive) {
-                if (routeSegment.value !== baseSegment.value) {
-                  return false;
-                }
-              } else if (routeSegment.value.toLowerCase() !== baseSegment.value.toLowerCase()) {
-                return false;
-              }
-            }
-          }
-
-          if (!baseSegment) {
-            return false;
-          }
-
-          if (routeSegment.type === 'param') {
-            if ((baseSegment == null ? void 0 : baseSegment.value) === '/') {
-              return false;
-            }
-
-            if (!baseSegment.value.startsWith(':')) {
-              params[routeSegment.value.substring(1)] = baseSegment.value;
-            }
-          }
-        }
-
-        if (isLastRouteSegment && !isLastBaseSegment) {
-          return !!matchLocation.fuzzy;
-        }
-      }
-
-      return true;
-    })();
-
-    return isMatch ? params : undefined;
-  }
-
-  // @ts-nocheck
-  // qss has been slightly modified and inlined here for our use cases (and compression's sake). We've included it as a hard dependency for MIT license attribution.
-  function encode(obj, pfx) {
-    var k,
-        i,
-        tmp,
-        str = '';
-
-    for (k in obj) {
-      if ((tmp = obj[k]) !== void 0) {
-        if (Array.isArray(tmp)) {
-          for (i = 0; i < tmp.length; i++) {
-            str && (str += '&');
-            str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp[i]);
-          }
+      setState = (updater, opts) => {
+        const previous = this.state;
+        this.state = this.options?.updateFn ? this.options.updateFn(previous)(updater) : updater(previous);
+        const priority = opts?.priority ?? this.options?.defaultPriority ?? 'high';
+        if (this._nextPriority === null) {
+          this._nextPriority = priority;
+        } else if (this._nextPriority === 'high') {
+          this._nextPriority = priority;
         } else {
-          str && (str += '&');
-          str += encodeURIComponent(k) + '=' + encodeURIComponent(tmp);
+          this._nextPriority = this.options?.defaultPriority ?? 'high';
         }
-      }
-    }
-
-    return (pfx || '') + str;
-  }
-
-  function toValue(mix) {
-    if (!mix) return '';
-    var str = decodeURIComponent(mix);
-    if (str === 'false') return false;
-    if (str === 'true') return true;
-    if (str.charAt(0) === '0') return str;
-    return +str * 0 === 0 ? +str : str;
-  }
 
-  function decode(str) {
-    var tmp,
-        k,
-        out = {},
-        arr = str.split('&');
-
-    while (tmp = arr.shift()) {
-      tmp = tmp.split('=');
-      k = tmp.shift();
+        // Always run onUpdate, regardless of batching
+        this.options?.onUpdate?.({
+          priority: this._nextPriority
+        });
 
-      if (out[k] !== void 0) {
-        out[k] = [].concat(out[k], toValue(tmp.shift()));
-      } else {
-        out[k] = toValue(tmp.shift());
-      }
+        // Attempt to flush
+        this._flush();
+      };
+      _flush = () => {
+        if (this._batching) return;
+        const flushId = ++this._flushing;
+        this.listeners.forEach(listener => {
+          if (this._flushing !== flushId) return;
+          listener({
+            priority: this._nextPriority ?? 'high'
+          });
+        });
+      };
+      batch = cb => {
+        if (this._batching) return cb();
+        this._batching = true;
+        cb();
+        this._batching = false;
+        this._flush();
+      };
     }
 
-    return out;
-  }
-
-  function _extends() {
-    _extends = Object.assign ? Object.assign.bind() : function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
+    const defaultParseSearch = parseSearchWith(JSON.parse);
+    const defaultStringifySearch = stringifySearchWith(JSON.stringify, JSON.parse);
+    function parseSearchWith(parser) {
+      return searchStr => {
+        if (searchStr.substring(0, 1) === '?') {
+          searchStr = searchStr.substring(1);
         }
-      }
-
-      return target;
-    };
-    return _extends.apply(this, arguments);
-  }
-
-  function createRoute(routeConfig, options, parent, router) {
-    const {
-      id,
-      routeId,
-      path: routePath,
-      fullPath
-    } = routeConfig;
-
-    const action = router.state.actions[id] || (() => {
-      router.state.actions[id] = {
-        submissions: [],
-        submit: async (submission, actionOpts) => {
-          var _actionOpts$invalidat;
-
-          if (!route) {
-            return;
-          }
-
-          const invalidate = (_actionOpts$invalidat = actionOpts == null ? void 0 : actionOpts.invalidate) != null ? _actionOpts$invalidat : true;
-
-          if (!(actionOpts != null && actionOpts.multi)) {
-            action.submissions = action.submissions.filter(d => d.isMulti);
-          }
-
-          const actionState = {
-            submittedAt: Date.now(),
-            status: 'pending',
-            submission,
-            isMulti: !!(actionOpts != null && actionOpts.multi)
-          };
-          action.current = actionState;
-          action.latest = actionState;
-          action.submissions.push(actionState);
-          router.notify();
+        let query = decode(searchStr);
 
-          try {
-            const res = await (route.options.action == null ? void 0 : route.options.action(submission));
-            actionState.data = res;
-
-            if (invalidate) {
-              router.invalidateRoute({
-                to: '.',
-                fromCurrent: true
-              });
-              await router.reload();
+        // Try to parse any query params that might be json
+        for (let key in query) {
+          const value = query[key];
+          if (typeof value === 'string') {
+            try {
+              query[key] = parser(value);
+            } catch (err) {
+              //
             }
-
-            actionState.status = 'success';
-            return res;
-          } catch (err) {
-            console.error(err);
-            actionState.error = err;
-            actionState.status = 'error';
-          } finally {
-            router.notify();
           }
         }
+        return query;
       };
-      return router.state.actions[id];
-    })();
-
-    const loader = router.state.loaders[id] || (() => {
-      router.state.loaders[id] = {
-        pending: [],
-        fetch: async loaderContext => {
-          if (!route) {
-            return;
-          }
-
-          const loaderState = {
-            loadedAt: Date.now(),
-            loaderContext
-          };
-          loader.current = loaderState;
-          loader.latest = loaderState;
-          loader.pending.push(loaderState); // router.state = {
-          //   ...router.state,
-          //   currentAction: loaderState,
-          //   latestAction: loaderState,
-          // }
-
-          router.notify();
-
-          try {
-            return await (route.options.loader == null ? void 0 : route.options.loader(loaderContext));
-          } finally {
-            loader.pending = loader.pending.filter(d => d !== loaderState); // router.removeActionQueue.push({ loader, loaderState })
-
-            router.notify();
-          }
-        }
-      };
-      return router.state.loaders[id];
-    })();
-
-    let route = {
-      routeId: id,
-      routeRouteId: routeId,
-      routePath,
-      fullPath,
-      options,
-      router,
-      childRoutes: undefined,
-      parentRoute: parent,
-      action,
-      loader: loader,
-      buildLink: options => {
-        return router.buildLink(_extends({}, options, {
-          from: fullPath
-        }));
-      },
-      navigate: options => {
-        return router.navigate(_extends({}, options, {
-          from: fullPath
-        }));
-      },
-      matchRoute: (matchLocation, opts) => {
-        return router.matchRoute(_extends({}, matchLocation, {
-          from: fullPath
-        }), opts);
-      }
-    };
-    router.options.createRoute == null ? void 0 : router.options.createRoute({
-      router,
-      route
-    });
-    return route;
-  }
-
-  const rootRouteId = '__root__';
-  const createRouteConfig = function createRouteConfig(options, children, isRoot, parentId, parentPath) {
-    if (options === void 0) {
-      options = {};
-    }
-
-    if (isRoot === void 0) {
-      isRoot = true;
-    }
-
-    if (isRoot) {
-      options.path = rootRouteId;
-    } // Strip the root from parentIds
-
-
-    if (parentId === rootRouteId) {
-      parentId = '';
-    }
-
-    let path = isRoot ? rootRouteId : options.path; // If the path is anything other than an index path, trim it up
-
-    if (path && path !== '/') {
-      path = trimPath(path);
-    }
-
-    const routeId = path || options.id;
-    let id = joinPaths([parentId, routeId]);
-
-    if (path === rootRouteId) {
-      path = '/';
-    }
-
-    if (id !== rootRouteId) {
-      id = joinPaths(['/', id]);
     }
-
-    const fullPath = id === rootRouteId ? '/' : trimPathRight(joinPaths([parentPath, path]));
-    return {
-      id: id,
-      routeId: routeId,
-      path: path,
-      fullPath: fullPath,
-      options: options,
-      children,
-      createChildren: cb => createRouteConfig(options, cb(childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath)), false, parentId, parentPath),
-      addChildren: children => createRouteConfig(options, children, false, parentId, parentPath),
-      createRoute: childOptions => createRouteConfig(childOptions, undefined, false, id, fullPath)
-    };
-  };
-
-  const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
-  function createRouteMatch(router, route, opts) {
-    const routeMatch = _extends({}, route, opts, {
-      router,
-      routeSearch: {},
-      search: {},
-      childMatches: [],
-      status: 'idle',
-      routeLoaderData: {},
-      loaderData: {},
-      isFetching: false,
-      isInvalid: false,
-      invalidAt: Infinity,
-      // pendingActions: [],
-      getIsInvalid: () => {
-        const now = Date.now();
-        return routeMatch.isInvalid || routeMatch.invalidAt < now;
-      },
-      __: {
-        abortController: new AbortController(),
-        latestId: '',
-        resolve: () => {},
-        notify: () => {
-          routeMatch.__.resolve();
-
-          routeMatch.router.notify();
-        },
-        validate: () => {
-          var _routeMatch$parentMat, _routeMatch$parentMat2;
-
-          // Validate the search params and stabilize them
-          const parentSearch = (_routeMatch$parentMat = (_routeMatch$parentMat2 = routeMatch.parentMatch) == null ? void 0 : _routeMatch$parentMat2.search) != null ? _routeMatch$parentMat : router.location.search;
-
+    function stringifySearchWith(stringify, parser) {
+      function stringifyValue(val) {
+        if (typeof val === 'object' && val !== null) {
           try {
-            var _validator;
-
-            const prevSearch = routeMatch.routeSearch;
-            const validator = typeof routeMatch.options.validateSearch === 'object' ? routeMatch.options.validateSearch.parse : routeMatch.options.validateSearch;
-            let nextSearch = replaceEqualDeep(prevSearch, (_validator = validator == null ? void 0 : validator(parentSearch)) != null ? _validator : {}); // Invalidate route matches when search param stability changes
-
-            if (prevSearch !== nextSearch) {
-              routeMatch.isInvalid = true;
-            }
-
-            routeMatch.routeSearch = nextSearch;
-            routeMatch.search = replaceEqualDeep(parentSearch, _extends({}, parentSearch, nextSearch));
-            componentTypes.map(async type => {
-              const component = routeMatch.options[type];
-
-              if (typeof routeMatch.__[type] !== 'function') {
-                routeMatch.__[type] = component;
-              }
-            });
+            return stringify(val);
           } catch (err) {
-            console.error(err);
-            const error = new Error('Invalid search params found', {
-              cause: err
-            });
-            error.code = 'INVALID_SEARCH_PARAMS';
-            routeMatch.status = 'error';
-            routeMatch.error = error; // Do not proceed with loading the route
-
-            return;
+            // silent
           }
-        }
-      },
-      cancel: () => {
-        var _routeMatch$__$abortC;
-
-        (_routeMatch$__$abortC = routeMatch.__.abortController) == null ? void 0 : _routeMatch$__$abortC.abort();
-      },
-      invalidate: () => {
-        routeMatch.isInvalid = true;
-      },
-      hasLoaders: () => {
-        return !!(route.options.loader || componentTypes.some(d => {
-          var _route$options$d;
-
-          return (_route$options$d = route.options[d]) == null ? void 0 : _route$options$d.preload;
-        }));
-      },
-      load: async loaderOpts => {
-        const now = Date.now();
-        const minMaxAge = loaderOpts != null && loaderOpts.preload ? Math.max(loaderOpts == null ? void 0 : loaderOpts.maxAge, loaderOpts == null ? void 0 : loaderOpts.gcMaxAge) : 0; // If this is a preload, add it to the preload cache
-
-        if (loaderOpts != null && loaderOpts.preload && minMaxAge > 0) {
-          // If the match is currently active, don't preload it
-          if (router.state.matches.find(d => d.matchId === routeMatch.matchId)) {
-            return;
+        } else if (typeof val === 'string' && typeof parser === 'function') {
+          try {
+            // Check if it's a valid parseable string.
+            // If it is, then stringify it again.
+            parser(val);
+            return stringify(val);
+          } catch (err) {
+            // silent
           }
-
-          router.matchCache[routeMatch.matchId] = {
-            gc: now + loaderOpts.gcMaxAge,
-            match: routeMatch
-          };
-        } // If the match is invalid, errored or idle, trigger it to load
-
-
-        if (routeMatch.status === 'success' && routeMatch.getIsInvalid() || routeMatch.status === 'error' || routeMatch.status === 'idle') {
-          const maxAge = loaderOpts != null && loaderOpts.preload ? loaderOpts == null ? void 0 : loaderOpts.maxAge : undefined;
-          await routeMatch.fetch({
-            maxAge
-          });
         }
-      },
-      fetch: async opts => {
-        const loadId = '' + Date.now() + Math.random();
-        routeMatch.__.latestId = loadId;
-
-        const checkLatest = async () => {
-          if (loadId !== routeMatch.__.latestId) {
-            // warning(true, 'Data loader is out of date!')
-            return new Promise(() => {});
-          }
-        }; // If the match was in an error state, set it
-        // to a loading state again. Otherwise, keep it
-        // as loading or resolved
-
-
-        if (routeMatch.status === 'idle') {
-          routeMatch.status = 'loading';
-        } // We started loading the route, so it's no longer invalid
-
-
-        routeMatch.isInvalid = false;
-        routeMatch.__.loadPromise = new Promise(async resolve => {
-          // We are now fetching, even if it's in the background of a
-          // resolved state
-          routeMatch.isFetching = true;
-          routeMatch.__.resolve = resolve;
-
-          routeMatch.__.componentsPromise = (async () => {
-            // then run all component and data loaders in parallel
-            // For each component type, potentially load it asynchronously
-            await Promise.all(componentTypes.map(async type => {
-              var _routeMatch$__$type;
-
-              const component = routeMatch.options[type];
-
-              if ((_routeMatch$__$type = routeMatch.__[type]) != null && _routeMatch$__$type.preload) {
-                routeMatch.__[type] = await router.options.loadComponent(component);
-              }
-            }));
-          })();
-
-          routeMatch.__.dataPromise = Promise.resolve().then(async () => {
-            try {
-              var _ref, _ref2, _opts$maxAge;
-
-              if (routeMatch.options.loader) {
-                const data = await router.loadMatchData(routeMatch);
-                await checkLatest();
-                routeMatch.routeLoaderData = replaceEqualDeep(routeMatch.routeLoaderData, data);
-              }
-
-              routeMatch.error = undefined;
-              routeMatch.status = 'success';
-              routeMatch.updatedAt = Date.now();
-              routeMatch.invalidAt = routeMatch.updatedAt + ((_ref = (_ref2 = (_opts$maxAge = opts == null ? void 0 : opts.maxAge) != null ? _opts$maxAge : routeMatch.options.loaderMaxAge) != null ? _ref2 : router.options.defaultLoaderMaxAge) != null ? _ref : 0);
-              return routeMatch.routeLoaderData;
-            } catch (err) {
-              await checkLatest();
-
-              {
-                console.error(err);
-              }
-
-              routeMatch.error = err;
-              routeMatch.status = 'error';
-              routeMatch.updatedAt = Date.now();
-              throw err;
+        return val;
+      }
+      return search => {
+        search = {
+          ...search
+        };
+        if (search) {
+          Object.keys(search).forEach(key => {
+            const val = search[key];
+            if (typeof val === 'undefined' || val === undefined) {
+              delete search[key];
+            } else {
+              search[key] = stringifyValue(val);
             }
           });
-
-          const after = async () => {
-            await checkLatest();
-            routeMatch.isFetching = false;
-            delete routeMatch.__.loadPromise;
-
-            routeMatch.__.notify();
-          };
-
-          try {
-            await Promise.all([routeMatch.__.componentsPromise, routeMatch.__.dataPromise.catch(() => {})]);
-            after();
-          } catch (_unused) {
-            after();
-          }
-        });
-        await routeMatch.__.loadPromise;
-        await checkLatest();
-      }
-    });
-
-    if (!routeMatch.hasLoaders()) {
-      routeMatch.status = 'success';
+        }
+        const searchStr = encode(search).toString();
+        return searchStr ? `?${searchStr}` : '';
+      };
     }
 
-    return routeMatch;
-  }
-
-  const defaultParseSearch = parseSearchWith(JSON.parse);
-  const defaultStringifySearch = stringifySearchWith(JSON.stringify);
-  function parseSearchWith(parser) {
-    return searchStr => {
-      if (searchStr.substring(0, 1) === '?') {
-        searchStr = searchStr.substring(1);
-      }
-
-      let query = decode(searchStr); // Try to parse any query params that might be json
-
-      for (let key in query) {
-        const value = query[key];
-
-        if (typeof value === 'string') {
-          try {
-            query[key] = parser(value);
-          } catch (err) {//
-          }
-        }
-      }
+    //
+
+    const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
+    const visibilityChangeEvent = 'visibilitychange';
+    const focusEvent = 'focus';
+    const preloadWarning = 'Error preloading route! ☝️';
+    class Router {
+      #unsubHistory;
+      resetNextScroll = false;
+      tempLocationKey = `${Math.round(Math.random() * 10000000)}`;
+      // nextTemporaryLocation?: ParsedLocation<FullSearchSchema<TRouteTree>>
+
+      constructor(options) {
+        this.options = {
+          defaultPreloadDelay: 50,
+          context: undefined,
+          ...options,
+          stringifySearch: options?.stringifySearch ?? defaultStringifySearch,
+          parseSearch: options?.parseSearch ?? defaultParseSearch
+          // fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn,
+        };
 
-      return query;
-    };
-  }
-  function stringifySearchWith(stringify) {
-    return search => {
-      search = _extends({}, search);
-
-      if (search) {
-        Object.keys(search).forEach(key => {
-          const val = search[key];
-
-          if (typeof val === 'undefined' || val === undefined) {
-            delete search[key];
-          } else if (val && typeof val === 'object' && val !== null) {
-            try {
-              search[key] = stringify(val);
-            } catch (err) {// silent
+        this.__store = new Store(getInitialRouterState(), {
+          onUpdate: () => {
+            const prev = this.state;
+            const next = this.__store.state;
+            const matchesByIdChanged = prev.matchesById !== next.matchesById;
+            let matchesChanged;
+            let pendingMatchesChanged;
+            if (!matchesByIdChanged) {
+              matchesChanged = prev.matchIds.length !== next.matchIds.length || prev.matchIds.some((d, i) => d !== next.matchIds[i]);
+              pendingMatchesChanged = prev.pendingMatchIds.length !== next.pendingMatchIds.length || prev.pendingMatchIds.some((d, i) => d !== next.pendingMatchIds[i]);
             }
-          }
+            if (matchesByIdChanged || matchesChanged) {
+              next.matches = next.matchIds.map(id => {
+                return next.matchesById[id];
+              });
+            }
+            if (matchesByIdChanged || pendingMatchesChanged) {
+              next.pendingMatches = next.pendingMatchIds.map(id => {
+                return next.matchesById[id];
+              });
+            }
+            if (matchesByIdChanged || matchesChanged || pendingMatchesChanged) {
+              const hasPendingComponent = next.pendingMatches.some(d => {
+                const route = this.getRoute(d.routeId);
+                return !!route?.options.pendingComponent;
+              });
+              next.renderedMatchIds = hasPendingComponent ? next.pendingMatchIds : next.matchIds;
+              next.renderedMatches = next.renderedMatchIds.map(id => {
+                return next.matchesById[id];
+              });
+            }
+            next.isFetching = [...next.matches, ...next.pendingMatches].some(d => d.isFetching);
+            this.state = next;
+          },
+          defaultPriority: 'low'
+        });
+        this.state = this.__store.state;
+        this.update(options);
+        const nextLocation = this.buildLocation({
+          search: true,
+          params: true,
+          hash: true,
+          state: true
         });
+        if (this.state.location.href !== nextLocation.href) {
+          this.#commitLocation({
+            ...nextLocation,
+            replace: true
+          });
+        }
       }
-
-      const searchStr = encode(search).toString();
-      return searchStr ? "?" + searchStr : '';
-    };
-  }
-
-  var _window$document;
-  // Detect if we're in the DOM
-  const isServer = typeof window === 'undefined' || !((_window$document = window.document) != null && _window$document.createElement); // This is the default history object if none is defined
-
-  const createDefaultHistory = () => isServer ? createMemoryHistory() : createBrowserHistory();
-
-  function getInitialRouterState() {
-    return {
-      status: 'idle',
-      location: null,
-      matches: [],
-      actions: {},
-      loaders: {},
-      lastUpdated: Date.now(),
-      isFetching: false,
-      isPreloading: false
-    };
-  }
-
-  function createRouter(userOptions) {
-    var _userOptions$stringif, _userOptions$parseSea;
-
-    const history = (userOptions == null ? void 0 : userOptions.history) || createDefaultHistory();
-
-    const originalOptions = _extends({
-      defaultLoaderGcMaxAge: 5 * 60 * 1000,
-      defaultLoaderMaxAge: 0,
-      defaultPreloadMaxAge: 2000,
-      defaultPreloadDelay: 50
-    }, userOptions, {
-      stringifySearch: (_userOptions$stringif = userOptions == null ? void 0 : userOptions.stringifySearch) != null ? _userOptions$stringif : defaultStringifySearch,
-      parseSearch: (_userOptions$parseSea = userOptions == null ? void 0 : userOptions.parseSearch) != null ? _userOptions$parseSea : defaultParseSearch
-    });
-
-    let router = {
-      types: undefined,
-      // public api
-      history,
-      options: originalOptions,
-      listeners: [],
-      // Resolved after construction
-      basepath: '',
-      routeTree: undefined,
-      routesById: {},
-      location: undefined,
-      //
-      navigationPromise: Promise.resolve(),
-      resolveNavigation: () => {},
-      matchCache: {},
-      state: getInitialRouterState(),
-      reset: () => {
-        router.state = getInitialRouterState();
-        router.notify();
-      },
-      startedLoadingAt: Date.now(),
-      subscribe: listener => {
-        router.listeners.push(listener);
+      subscribers = new Set();
+      subscribe = (eventType, fn) => {
+        const listener = {
+          eventType,
+          fn
+        };
+        this.subscribers.add(listener);
         return () => {
-          router.listeners = router.listeners.filter(x => x !== listener);
+          this.subscribers.delete(listener);
         };
-      },
-      getRoute: id => {
-        return router.routesById[id];
-      },
-      notify: () => {
-        const isFetching = router.state.status === 'loading' || router.state.matches.some(d => d.isFetching);
-        const isPreloading = Object.values(router.matchCache).some(d => d.match.isFetching && !router.state.matches.find(dd => dd.matchId === d.match.matchId));
-
-        if (router.state.isFetching !== isFetching || router.state.isPreloading !== isPreloading) {
-          router.state = _extends({}, router.state, {
-            isFetching,
-            isPreloading
-          });
-        }
-
-        cascadeLoaderData(router.state.matches);
-        router.listeners.forEach(listener => listener(router));
-      },
-      dehydrateState: () => {
-        return _extends({}, pick(router.state, ['status', 'location', 'lastUpdated']), {
-          matches: router.state.matches.map(match => pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
-        });
-      },
-      hydrateState: dehydratedState => {
-        // Match the routes
-        const matches = router.matchRoutes(router.location.pathname, {
-          strictParseParams: true
-        });
-        matches.forEach((match, index) => {
-          const dehydratedMatch = dehydratedState.matches[index];
-          invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
-          Object.assign(match, dehydratedMatch);
-        });
-        matches.forEach(match => match.__.validate());
-        router.state = _extends({}, router.state, dehydratedState, {
-          matches
+      };
+      #emit = routerEvent => {
+        this.subscribers.forEach(listener => {
+          if (listener.eventType === routerEvent.type) {
+            listener.fn(routerEvent);
+          }
         });
-      },
-      mount: () => {
-        const next = router.__.buildLocation({
-          to: '.',
-          search: true,
-          hash: true
-        }); // If the current location isn't updated, trigger a navigation
-        // to the current location. Otherwise, load the current location.
-
-
-        if (next.href !== router.location.href) {
-          router.__.commitLocation(next, true);
-        }
-
-        if (!router.state.matches.length) {
-          router.load();
-        }
-
-        const unsub = router.history.listen(event => {
-          router.load(router.__.parseLocation(event.location, router.location));
-        }); // addEventListener does not exist in React Native, but window does
+      };
+      reset = () => {
+        this.__store.setState(s => Object.assign(s, getInitialRouterState()));
+      };
+      mount = () => {
+        // addEventListener does not exist in React Native, but window does
+        // In the future, we might need to invert control here for more adapters
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-
-        if (!isServer && window.addEventListener) {
-          // Listen to visibillitychange and focus
-          window.addEventListener('visibilitychange', router.onFocus, false);
-          window.addEventListener('focus', router.onFocus, false);
+        if (typeof window !== 'undefined' && window.addEventListener) {
+          window.addEventListener(visibilityChangeEvent, this.#onFocus, false);
+          window.addEventListener(focusEvent, this.#onFocus, false);
         }
-
+        this.safeLoad();
         return () => {
-          unsub();
-
-          if (!isServer && window.removeEventListener) {
-            // Be sure to unsubscribe if a new handler is set
-            window.removeEventListener('visibilitychange', router.onFocus);
-            window.removeEventListener('focus', router.onFocus);
+          if (typeof window !== 'undefined' && window.removeEventListener) {
+            window.removeEventListener(visibilityChangeEvent, this.#onFocus);
+            window.removeEventListener(focusEvent, this.#onFocus);
           }
         };
-      },
-      onFocus: () => {
-        router.load();
-      },
-      update: opts => {
-        const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
-
-        if (!router.location || newHistory) {
-          if (opts != null && opts.history) {
-            router.history = opts.history;
+      };
+      #onFocus = () => {
+        if (this.options.reloadOnWindowFocus ?? true) {
+          this.invalidate({
+            __fromFocus: true
+          });
+        }
+      };
+      update = opts => {
+        this.options = {
+          ...this.options,
+          ...opts,
+          context: {
+            ...this.options.context,
+            ...opts?.context
           }
-
-          router.location = router.__.parseLocation(router.history.location);
-          router.state.location = router.location;
+        };
+        if (!this.history || this.options.history && this.options.history !== this.history) {
+          if (this.#unsubHistory) {
+            this.#unsubHistory();
+          }
+          this.history = this.options.history ?? (isServer ? createMemoryHistory() : createBrowserHistory());
+          const parsedLocation = this.#parseLocation();
+          this.__store.setState(s => ({
+            ...s,
+            resolvedLocation: parsedLocation,
+            location: parsedLocation
+          }));
+          this.#unsubHistory = this.history.subscribe(() => {
+            this.safeLoad({
+              next: this.#parseLocation(this.state.location)
+            });
+          });
         }
-
-        Object.assign(router.options, opts);
         const {
           basepath,
-          routeConfig
-        } = router.options;
-        router.basepath = cleanPath("/" + (basepath != null ? basepath : ''));
-
-        if (routeConfig) {
-          router.routesById = {};
-          router.routeTree = router.__.buildRouteTree(routeConfig);
+          routeTree
+        } = this.options;
+        this.basepath = `/${trimPath(basepath ?? '') ?? ''}`;
+        if (routeTree && routeTree !== this.routeTree) {
+          this.#processRoutes(routeTree);
         }
-
-        return router;
-      },
-      cancelMatches: () => {
-        var _router$state$pending, _router$state$pending2;
-        [...router.state.matches, ...((_router$state$pending = (_router$state$pending2 = router.state.pending) == null ? void 0 : _router$state$pending2.matches) != null ? _router$state$pending : [])].forEach(match => {
-          match.cancel();
-        });
-      },
-      load: async next => {
-        const id = Math.random();
-        router.startedLoadingAt = id;
-
-        if (next) {
-          // Ingest the new location
-          router.location = next;
-        } // Cancel any pending matches
-
-
-        router.cancelMatches(); // Match the routes
-
-        const matches = router.matchRoutes(router.location.pathname, {
-          strictParseParams: true
+        return this;
+      };
+      cancelMatches = () => {
+        this.state.matches.forEach(match => {
+          this.cancelMatch(match.id);
         });
-
-        if (typeof document !== 'undefined') {
-          router.state = _extends({}, router.state, {
-            pending: {
-              matches: matches,
-              location: router.location
-            },
-            status: 'loading'
-          });
-        } else {
-          router.state = _extends({}, router.state, {
-            matches: matches,
-            location: router.location,
-            status: 'loading'
-          });
+      };
+      cancelMatch = id => {
+        this.getRouteMatch(id)?.abortController?.abort();
+      };
+      safeLoad = async opts => {
+        try {
+          return this.load(opts);
+        } catch (err) {
+          // Don't do anything
         }
+      };
+      latestLoadPromise = Promise.resolve();
+      load = async opts => {
+        const promise = new Promise(async (resolve, reject) => {
+          const prevLocation = this.state.resolvedLocation;
+          const pathDidChange = !!(opts?.next && prevLocation.href !== opts.next.href);
+          let latestPromise;
+          const checkLatest = () => {
+            return this.latestLoadPromise !== promise ? this.latestLoadPromise : undefined;
+          };
 
-        router.notify(); // Load the matches
+          // Cancel any pending matches
 
-        await router.loadMatches(matches);
+          let pendingMatches;
+          this.#emit({
+            type: 'onBeforeLoad',
+            from: prevLocation,
+            to: opts?.next ?? this.state.location,
+            pathChanged: pathDidChange
+          });
+          this.__store.batch(() => {
+            if (opts?.next) {
+              // Ingest the new location
+              this.__store.setState(s => ({
+                ...s,
+                location: opts.next
+              }));
+            }
 
-        if (router.startedLoadingAt !== id) {
-          // Ignore side-effects of match loading
-          return router.navigationPromise;
-        }
+            // Match the routes
+            pendingMatches = this.matchRoutes(this.state.location.pathname, this.state.location.search, {
+              throwOnError: opts?.throwOnError,
+              debug: true
+            });
+            this.__store.setState(s => ({
+              ...s,
+              status: 'pending',
+              pendingMatchIds: pendingMatches.map(d => d.id),
+              matchesById: this.#mergeMatches(s.matchesById, pendingMatches)
+            }));
+          });
+          try {
+            // Load the matches
+            try {
+              await this.loadMatches(pendingMatches.map(d => d.id));
+            } catch (err) {
+              // swallow this error, since we'll display the
+              // errors on the route components
+            }
 
-        const previousMatches = router.state.matches;
-        const exiting = [],
-              staying = [];
-        previousMatches.forEach(d => {
-          if (matches.find(dd => dd.matchId === d.matchId)) {
-            staying.push(d);
-          } else {
-            exiting.push(d);
+            // Only apply the latest transition
+            if (latestPromise = checkLatest()) {
+              return latestPromise;
+            }
+            const exitingMatchIds = this.state.matchIds.filter(id => !this.state.pendingMatchIds.includes(id));
+            const enteringMatchIds = this.state.pendingMatchIds.filter(id => !this.state.matchIds.includes(id));
+            const stayingMatchIds = this.state.matchIds.filter(id => this.state.pendingMatchIds.includes(id));
+            this.__store.setState(s => ({
+              ...s,
+              status: 'idle',
+              resolvedLocation: s.location,
+              matchIds: s.pendingMatchIds,
+              pendingMatchIds: []
+            }));
+            [[exitingMatchIds, 'onLeave'], [enteringMatchIds, 'onEnter'], [stayingMatchIds, 'onTransition']].forEach(([matchIds, hook]) => {
+              matchIds.forEach(id => {
+                const match = this.getRouteMatch(id);
+                const route = this.getRoute(match.routeId);
+                route.options[hook]?.(match);
+              });
+            });
+            this.#emit({
+              type: 'onLoad',
+              from: prevLocation,
+              to: this.state.location,
+              pathChanged: pathDidChange
+            });
+            resolve();
+          } catch (err) {
+            // Only apply the latest transition
+            if (latestPromise = checkLatest()) {
+              return latestPromise;
+            }
+            reject(err);
           }
         });
-        const entering = matches.filter(d => {
-          return !previousMatches.find(dd => dd.matchId === d.matchId);
+        this.latestLoadPromise = promise;
+        this.latestLoadPromise.then(() => {
+          this.cleanMatches();
         });
-        const now = Date.now();
-        exiting.forEach(d => {
-          var _ref, _d$options$loaderGcMa, _ref2, _d$options$loaderMaxA;
-
-          d.__.onExit == null ? void 0 : d.__.onExit({
-            params: d.params,
-            search: d.routeSearch
-          }); // Clear idle error states when match leaves
-
-          if (d.status === 'error' && !d.isFetching) {
-            d.status = 'idle';
-            d.error = undefined;
-          }
-
-          const gc = Math.max((_ref = (_d$options$loaderGcMa = d.options.loaderGcMaxAge) != null ? _d$options$loaderGcMa : router.options.defaultLoaderGcMaxAge) != null ? _ref : 0, (_ref2 = (_d$options$loaderMaxA = d.options.loaderMaxAge) != null ? _d$options$loaderMaxA : router.options.defaultLoaderMaxAge) != null ? _ref2 : 0);
-
-          if (gc > 0) {
-            router.matchCache[d.matchId] = {
-              gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
-              match: d
-            };
+        return this.latestLoadPromise;
+      };
+      #mergeMatches = (prevMatchesById, nextMatches) => {
+        let matchesById = {
+          ...prevMatchesById
+        };
+        nextMatches.forEach(match => {
+          if (!matchesById[match.id]) {
+            matchesById[match.id] = match;
           }
+          matchesById[match.id] = {
+            ...matchesById[match.id],
+            ...match
+          };
         });
-        staying.forEach(d => {
-          d.options.onTransition == null ? void 0 : d.options.onTransition({
-            params: d.params,
-            search: d.routeSearch
-          });
-        });
-        entering.forEach(d => {
-          d.__.onExit = d.options.onMatch == null ? void 0 : d.options.onMatch({
-            params: d.params,
-            search: d.search
-          });
-          delete router.matchCache[d.matchId];
+        return matchesById;
+      };
+      getRoute = id => {
+        const route = this.routesById[id];
+        invariant(route, `Route with id "${id}" not found`);
+        return route;
+      };
+      preloadRoute = async (navigateOpts = this.state.location) => {
+        let next = this.buildLocation(navigateOpts);
+        const matches = this.matchRoutes(next.pathname, next.search, {
+          throwOnError: true
         });
-
-        if (router.startedLoadingAt !== id) {
-          // Ignore side-effects of match loading
-          return;
-        }
-
-        matches.forEach(match => {
-          // Clear actions
-          if (match.action) {
-            match.action.current = undefined;
-            match.action.submissions = [];
-          }
+        this.__store.setState(s => {
+          return {
+            ...s,
+            matchesById: this.#mergeMatches(s.matchesById, matches)
+          };
         });
-        router.state = _extends({}, router.state, {
-          location: router.location,
-          matches,
-          pending: undefined,
-          status: 'idle'
+        await this.loadMatches(matches.map(d => d.id), {
+          preload: true,
+          maxAge: navigateOpts.maxAge
         });
-        router.notify();
-        router.resolveNavigation();
-      },
-      cleanMatchCache: () => {
+        return [last(matches), matches];
+      };
+      cleanMatches = () => {
         const now = Date.now();
-        Object.keys(router.matchCache).forEach(matchId => {
-          const entry = router.matchCache[matchId]; // Don't remove loading matches
-
-          if (entry.match.status === 'loading') {
-            return;
-          } // Do not remove successful matches that are still valid
-
-
-          if (entry.gc > 0 && entry.gc > now) {
-            return;
-          } // Everything else gets removed
-
-
-          delete router.matchCache[matchId];
-        });
-      },
-      loadRoute: async function loadRoute(navigateOpts) {
-        if (navigateOpts === void 0) {
-          navigateOpts = router.location;
-        }
-
-        const next = router.buildNext(navigateOpts);
-        const matches = router.matchRoutes(next.pathname, {
-          strictParseParams: true
-        });
-        await router.loadMatches(matches);
-        return matches;
-      },
-      preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
-        var _ref3, _ref4, _loaderOpts$maxAge, _ref5, _ref6, _loaderOpts$gcMaxAge;
-
-        if (navigateOpts === void 0) {
-          navigateOpts = router.location;
+        const outdatedMatchIds = Object.values(this.state.matchesById).filter(match => {
+          const route = this.getRoute(match.routeId);
+          return !this.state.matchIds.includes(match.id) && !this.state.pendingMatchIds.includes(match.id) && (match.preloadMaxAge > -1 ? match.updatedAt + match.preloadMaxAge < now : true) && (route.options.gcMaxAge ? match.updatedAt + route.options.gcMaxAge < now : true);
+        }).map(d => d.id);
+        if (outdatedMatchIds.length) {
+          this.__store.setState(s => {
+            const matchesById = {
+              ...s.matchesById
+            };
+            outdatedMatchIds.forEach(id => {
+              delete matchesById[id];
+            });
+            return {
+              ...s,
+              matchesById
+            };
+          });
         }
-
-        const next = router.buildNext(navigateOpts);
-        const matches = router.matchRoutes(next.pathname, {
-          strictParseParams: true
-        });
-        await router.loadMatches(matches, {
-          preload: true,
-          maxAge: (_ref3 = (_ref4 = (_loaderOpts$maxAge = loaderOpts.maxAge) != null ? _loaderOpts$maxAge : router.options.defaultPreloadMaxAge) != null ? _ref4 : router.options.defaultLoaderMaxAge) != null ? _ref3 : 0,
-          gcMaxAge: (_ref5 = (_ref6 = (_loaderOpts$gcMaxAge = loaderOpts.gcMaxAge) != null ? _loaderOpts$gcMaxAge : router.options.defaultPreloadGcMaxAge) != null ? _ref6 : router.options.defaultLoaderGcMaxAge) != null ? _ref5 : 0
+      };
+      matchRoutes = (pathname, locationSearch, opts) => {
+        let routeParams = {};
+        let foundRoute = this.flatRoutes.find(route => {
+          const matchedParams = matchPathname(this.basepath, trimPathRight(pathname), {
+            to: route.fullPath,
+            caseSensitive: route.options.caseSensitive ?? this.options.caseSensitive
+          });
+          if (matchedParams) {
+            routeParams = matchedParams;
+            return true;
+          }
+          return false;
         });
-        return matches;
-      },
-      matchRoutes: (pathname, opts) => {
-        var _router$state$pending3, _router$state$pending4;
-
-        router.cleanMatchCache();
-        const matches = [];
-
-        if (!router.routeTree) {
-          return matches;
+        let routeCursor = foundRoute || this.routesById['__root__'];
+        let matchedRoutes = [routeCursor];
+        // let includingLayouts = true
+        while (routeCursor?.parentRoute) {
+          routeCursor = routeCursor.parentRoute;
+          if (routeCursor) matchedRoutes.unshift(routeCursor);
         }
 
-        const existingMatches = [...router.state.matches, ...((_router$state$pending3 = (_router$state$pending4 = router.state.pending) == null ? void 0 : _router$state$pending4.matches) != null ? _router$state$pending3 : [])];
-
-        const recurse = async routes => {
-          var _parentMatch$params, _router$options$filte, _foundRoute$childRout;
+        // Existing matches are matches that are already loaded along with
+        // pending matches that are still loading
 
-          const parentMatch = last(matches);
-          let params = (_parentMatch$params = parentMatch == null ? void 0 : parentMatch.params) != null ? _parentMatch$params : {};
-          const filteredRoutes = (_router$options$filte = router.options.filterRoutes == null ? void 0 : router.options.filterRoutes(routes)) != null ? _router$options$filte : routes;
-          let foundRoutes = [];
-
-          const findMatchInRoutes = (parentRoutes, routes) => {
-            routes.some(route => {
-              var _route$childRoutes, _route$childRoutes2, _route$options$caseSe;
-
-              if (!route.routePath && (_route$childRoutes = route.childRoutes) != null && _route$childRoutes.length) {
-                return findMatchInRoutes([...foundRoutes, route], route.childRoutes);
-              }
-
-              const fuzzy = !!(route.routePath !== '/' || (_route$childRoutes2 = route.childRoutes) != null && _route$childRoutes2.length);
-              const matchParams = matchPathname(pathname, {
-                to: route.fullPath,
-                fuzzy,
-                caseSensitive: (_route$options$caseSe = route.options.caseSensitive) != null ? _route$options$caseSe : router.options.caseSensitive
+        const parseErrors = matchedRoutes.map(route => {
+          let parsedParamsError;
+          if (route.options.parseParams) {
+            try {
+              const parsedParams = route.options.parseParams(routeParams);
+              // Add the parsed params to the accumulated params bag
+              Object.assign(routeParams, parsedParams);
+            } catch (err) {
+              parsedParamsError = new PathParamError(err.message, {
+                cause: err
               });
-
-              if (matchParams) {
-                let parsedParams;
-
-                try {
-                  var _route$options$parseP;
-
-                  parsedParams = (_route$options$parseP = route.options.parseParams == null ? void 0 : route.options.parseParams(matchParams)) != null ? _route$options$parseP : matchParams;
-                } catch (err) {
-                  if (opts != null && opts.strictParseParams) {
-                    throw err;
-                  }
-                }
-
-                params = _extends({}, params, parsedParams);
-              }
-
-              if (!!matchParams) {
-                foundRoutes = [...parentRoutes, route];
+              if (opts?.throwOnError) {
+                throw parsedParamsError;
               }
-
-              return !!foundRoutes.length;
-            });
-            return !!foundRoutes.length;
-          };
-
-          findMatchInRoutes([], filteredRoutes);
-
-          if (!foundRoutes.length) {
-            return;
-          }
-
-          foundRoutes.forEach(foundRoute => {
-            var _router$matchCache$ma;
-
-            const interpolatedPath = interpolatePath(foundRoute.routePath, params);
-            const matchId = interpolatePath(foundRoute.routeId, params, true);
-            const match = existingMatches.find(d => d.matchId === matchId) || ((_router$matchCache$ma = router.matchCache[matchId]) == null ? void 0 : _router$matchCache$ma.match) || createRouteMatch(router, foundRoute, {
-              parentMatch,
-              matchId,
-              params,
-              pathname: joinPaths([pathname, interpolatedPath])
-            });
-            matches.push(match);
-          });
-          const foundRoute = last(foundRoutes);
-
-          if ((_foundRoute$childRout = foundRoute.childRoutes) != null && _foundRoute$childRout.length) {
-            recurse(foundRoute.childRoutes);
+              return parsedParamsError;
+            }
           }
-        };
-
-        recurse([router.routeTree]);
-        cascadeLoaderData(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);
-          const search = match.search;
-
-          if (search.__data && search.__data.matchId !== match.matchId) {
-            return;
+          return;
+        });
+        const matches = matchedRoutes.map((route, index) => {
+          const interpolatedPath = interpolatePath(route.path, routeParams);
+          const key = route.options.key ? route.options.key({
+            params: routeParams,
+            search: locationSearch
+          }) ?? '' : '';
+          const stringifiedKey = key ? JSON.stringify(key) : '';
+          const matchId = interpolatePath(route.id, routeParams, true) + stringifiedKey;
+
+          // Waste not, want not. If we already have a match for this route,
+          // reuse it. This is important for layout routes, which might stick
+          // around between navigation actions that only change leaf routes.
+          const existingMatch = this.getRouteMatch(matchId);
+          if (existingMatch) {
+            return {
+              ...existingMatch
+            };
           }
 
-          if (match.__.loadPromise) {
-            // Wait for the first sign of activity from the match
-            await match.__.loadPromise;
-          }
+          // Create a fresh route match
+          const hasLoaders = !!(route.options.loader || componentTypes.some(d => route.options[d]?.preload));
+          const routeMatch = {
+            id: matchId,
+            key: stringifiedKey,
+            routeId: route.id,
+            params: routeParams,
+            pathname: joinPaths([this.basepath, interpolatedPath]),
+            updatedAt: Date.now(),
+            maxAge: -1,
+            preloadMaxAge: -1,
+            routeSearch: {},
+            search: {},
+            status: hasLoaders ? 'pending' : 'success',
+            isFetching: false,
+            invalid: false,
+            error: undefined,
+            paramsError: parseErrors[index],
+            searchError: undefined,
+            loaderData: undefined,
+            loadPromise: Promise.resolve(),
+            routeContext: undefined,
+            context: undefined,
+            abortController: new AbortController(),
+            fetchedAt: 0
+          };
+          return routeMatch;
         });
-        router.notify();
-        await Promise.all(matchPromises);
-      },
-      loadMatchData: async routeMatch => {
-        if (isServer || !router.options.useServerData) {
-          var _await$routeMatch$opt;
-
-          return (_await$routeMatch$opt = await (routeMatch.options.loader == null ? void 0 : routeMatch.options.loader({
-            // parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,
-            params: routeMatch.params,
-            search: routeMatch.routeSearch,
-            signal: routeMatch.__.abortController.signal
-          }))) != null ? _await$routeMatch$opt : {};
-        } else {
-          const next = router.buildNext({
-            to: '.',
-            search: d => _extends({}, d != null ? d : {}, {
-              __data: {
-                matchId: routeMatch.matchId
-              }
-            })
-          });
-          const res = await fetch(next.href, {
-            method: 'GET' // signal: routeMatch.__.abortController.signal,
 
+        // Take each match and resolve its search params and context
+        // This has to happen after the matches are created or found
+        // so that we can use the parent match's search params and context
+        matches.forEach((match, i) => {
+          const parentMatch = matches[i - 1];
+          const route = this.getRoute(match.routeId);
+          const searchInfo = (() => {
+            // Validate the search params and stabilize them
+            const parentSearchInfo = {
+              search: parentMatch?.search ?? locationSearch,
+              routeSearch: parentMatch?.routeSearch ?? locationSearch
+            };
+            try {
+              const validator = typeof route.options.validateSearch === 'object' ? route.options.validateSearch.parse : route.options.validateSearch;
+              let routeSearch = validator?.(parentSearchInfo.search) ?? {};
+              let search = {
+                ...parentSearchInfo.search,
+                ...routeSearch
+              };
+              routeSearch = replaceEqualDeep(match.routeSearch, routeSearch);
+              search = replaceEqualDeep(match.search, search);
+              return {
+                routeSearch,
+                search,
+                searchDidChange: match.routeSearch !== routeSearch
+              };
+            } catch (err) {
+              match.searchError = new SearchParamError(err.message, {
+                cause: err
+              });
+              if (opts?.throwOnError) {
+                throw match.searchError;
+              }
+              return parentSearchInfo;
+            }
+          })();
+          Object.assign(match, searchInfo);
+        });
+        return matches;
+      };
+      loadMatches = async (matchIds, opts) => {
+        const getFreshMatches = () => matchIds.map(d => this.getRouteMatch(d));
+        if (!opts?.preload) {
+          getFreshMatches().forEach(match => {
+            // Update each match with its latest route data
+            this.setRouteMatch(match.id, s => ({
+              ...s,
+              routeSearch: match.routeSearch,
+              search: match.search,
+              routeContext: match.routeContext,
+              context: match.context,
+              error: match.error,
+              paramsError: match.paramsError,
+              searchError: match.searchError,
+              params: match.params,
+              preloadMaxAge: 0
+            }));
           });
+        }
+        let firstBadMatchIndex;
 
-          if (res.ok) {
-            return res.json();
-          }
+        // Check each match middleware to see if the route can be accessed
+        try {
+          for (const [index, match] of getFreshMatches().entries()) {
+            const parentMatch = getFreshMatches()[index - 1];
+            const route = this.getRoute(match.routeId);
+            const handleError = (err, code) => {
+              err.routerCode = code;
+              firstBadMatchIndex = firstBadMatchIndex ?? index;
+              if (isRedirect(err)) {
+                throw err;
+              }
+              try {
+                route.options.onError?.(err);
+              } catch (errorHandlerErr) {
+                err = errorHandlerErr;
+                if (isRedirect(errorHandlerErr)) {
+                  throw errorHandlerErr;
+                }
+              }
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                error: err,
+                status: 'error',
+                updatedAt: Date.now()
+              }));
+            };
+            if (match.paramsError) {
+              handleError(match.paramsError, 'PARSE_PARAMS');
+            }
+            if (match.searchError) {
+              handleError(match.searchError, 'VALIDATE_SEARCH');
+            }
+            let didError = false;
+            try {
+              const routeContext = (await route.options.beforeLoad?.({
+                ...match,
+                preload: !!opts?.preload,
+                parentContext: parentMatch?.routeContext ?? {},
+                context: parentMatch?.context ?? this?.options.context ?? {}
+              })) ?? {};
+              const context = {
+                ...(parentMatch?.context ?? this?.options.context),
+                ...routeContext
+              };
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                context,
+                routeContext
+              }));
+            } catch (err) {
+              handleError(err, 'BEFORE_LOAD');
+              didError = true;
+            }
 
-          throw new Error('Failed to fetch match data');
-        }
-      },
-      invalidateRoute: opts => {
-        var _router$state$pending5, _router$state$pending6;
-
-        const next = router.buildNext(opts);
-        const unloadedMatchIds = router.matchRoutes(next.pathname).map(d => d.matchId);
-        [...router.state.matches, ...((_router$state$pending5 = (_router$state$pending6 = router.state.pending) == null ? void 0 : _router$state$pending6.matches) != null ? _router$state$pending5 : [])].forEach(match => {
-          if (unloadedMatchIds.includes(match.matchId)) {
-            match.invalidate();
+            // If we errored, do not run the next matches' middleware
+            if (didError) {
+              break;
+            }
           }
-        });
-      },
-      reload: () => router.__.navigate({
-        fromCurrent: true,
-        replace: true,
-        search: true
-      }),
-      resolvePath: (from, path) => {
-        return resolvePath(router.basepath, from, cleanPath(path));
-      },
-      matchRoute: (location, opts) => {
-        var _location$from;
-
-        // const location = router.buildNext(opts)
-        location = _extends({}, location, {
-          to: location.to ? router.resolvePath((_location$from = location.from) != null ? _location$from : '', location.to) : undefined
-        });
-        const next = router.buildNext(location);
-
-        if (opts != null && opts.pending) {
-          var _router$state$pending7;
-
-          if (!((_router$state$pending7 = router.state.pending) != null && _router$state$pending7.location)) {
-            return false;
+        } catch (err) {
+          if (isRedirect(err)) {
+            if (!opts?.preload) this.navigate(err);
+            return;
           }
-
-          return !!matchPathname(router.state.pending.location.pathname, _extends({}, opts, {
-            to: next.pathname
-          }));
+          throw err;
         }
-
-        return !!matchPathname(router.state.location.pathname, _extends({}, opts, {
-          to: next.pathname
-        }));
-      },
-      navigate: async _ref7 => {
-        let {
-          from,
-          to = '.',
-          search,
-          hash,
-          replace,
-          params
-        } = _ref7;
+        const validResolvedMatches = getFreshMatches().slice(0, firstBadMatchIndex);
+        const matchPromises = [];
+        validResolvedMatches.forEach((match, index) => {
+          matchPromises.push((async () => {
+            const parentMatchPromise = matchPromises[index - 1];
+            const route = this.getRoute(match.routeId);
+            if (match.isFetching || match.status === 'success' && !isMatchInvalid(match, {
+              preload: opts?.preload
+            })) {
+              return this.getRouteMatch(match.id)?.loadPromise;
+            }
+            const fetchedAt = Date.now();
+            const checkLatest = () => {
+              const latest = this.getRouteMatch(match.id);
+              return latest && latest.fetchedAt !== fetchedAt ? latest.loadPromise : undefined;
+            };
+            const handleIfRedirect = err => {
+              if (isRedirect(err)) {
+                if (!opts?.preload) {
+                  this.navigate(err);
+                }
+                return true;
+              }
+              return false;
+            };
+            const load = async () => {
+              let latestPromise;
+              try {
+                const componentsPromise = Promise.all(componentTypes.map(async type => {
+                  const component = route.options[type];
+                  if (component?.preload) {
+                    await component.preload();
+                  }
+                }));
+                const loaderPromise = route.options.loader?.({
+                  ...match,
+                  preload: !!opts?.preload,
+                  parentMatchPromise
+                });
+                const [_, loader] = await Promise.all([componentsPromise, loaderPromise]);
+                if (latestPromise = checkLatest()) return await latestPromise;
+                this.setRouteMatchData(match.id, () => loader, opts);
+              } catch (error) {
+                if (latestPromise = checkLatest()) return await latestPromise;
+                if (handleIfRedirect(error)) return;
+                try {
+                  route.options.onError?.(error);
+                } catch (onErrorError) {
+                  error = onErrorError;
+                  if (handleIfRedirect(onErrorError)) return;
+                }
+                this.setRouteMatch(match.id, s => ({
+                  ...s,
+                  error,
+                  status: 'error',
+                  isFetching: false,
+                  updatedAt: Date.now()
+                }));
+              }
+            };
+            let loadPromise;
+            this.__store.batch(() => {
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                // status: s.status !== 'success' ? 'pending' : s.status,
+                isFetching: true,
+                fetchedAt,
+                invalid: false
+              }));
+              loadPromise = load();
+              this.setRouteMatch(match.id, s => ({
+                ...s,
+                loadPromise
+              }));
+            });
+            await loadPromise;
+          })());
+        });
+        await Promise.all(matchPromises);
+      };
+      resolvePath = (from, path) => {
+        return resolvePath(this.basepath, from, cleanPath(path));
+      };
+      navigate = async ({
+        from,
+        to = '',
+        ...rest
+      }) => {
         // 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);
+        const fromString = typeof from === 'undefined' ? from : String(from);
         let isExternal;
-
         try {
-          new URL("" + toString);
+          new URL(`${toString}`);
           isExternal = true;
         } catch (e) {}
-
-        invariant(!isExternal, 'Attempting to navigate to external url with router.navigate!');
-        return router.__.navigate({
+        invariant(!isExternal, 'Attempting to navigate to external url with this.navigate!');
+        return this.#buildAndCommitLocation({
+          ...rest,
           from: fromString,
-          to: toString,
-          search,
-          hash,
-          replace,
-          params
+          to: toString
         });
-      },
-      buildLink: _ref8 => {
-        var _preload, _ref9;
-
-        let {
-          from,
-          to = '.',
-          search,
-          params,
-          hash,
-          target,
-          replace,
-          activeOptions,
-          preload,
-          preloadMaxAge: userPreloadMaxAge,
-          preloadGcMaxAge: userPreloadGcMaxAge,
-          preloadDelay: userPreloadDelay,
-          disabled
-        } = _ref8;
-
+      };
+      matchRoute = (location, opts) => {
+        location = {
+          ...location,
+          to: location.to ? this.resolvePath(location.from ?? '', location.to) : undefined
+        };
+        const next = this.buildLocation(location);
+        if (opts?.pending && this.state.status !== 'pending') {
+          return false;
+        }
+        const baseLocation = opts?.pending ? this.state.location : this.state.resolvedLocation;
+        if (!baseLocation) {
+          return false;
+        }
+        const match = matchPathname(this.basepath, baseLocation.pathname, {
+          ...opts,
+          to: next.pathname
+        });
+        if (!match) {
+          return false;
+        }
+        if (opts?.includeSearch ?? true) {
+          return partialDeepEqual(baseLocation.search, next.search) ? match : false;
+        }
+        return match;
+      };
+      buildLink = dest => {
         // 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 {
+          to,
+          preload: userPreload,
+          preloadDelay: userPreloadDelay,
+          activeOptions,
+          disabled,
+          target,
+          replace,
+          resetScroll
+        } = dest;
         try {
-          new URL("" + to);
+          new URL(`${to}`);
           return {
             type: 'external',
             href: to
           };
         } catch (e) {}
+        const nextOpts = dest;
+        const next = this.buildLocation(nextOpts);
+        const preload = userPreload ?? this.options.defaultPreload;
+        const preloadDelay = userPreloadDelay ?? this.options.defaultPreloadDelay ?? 0;
 
-        const nextOpts = {
-          from,
-          to,
-          search,
-          params,
-          hash,
-          replace
-        };
-        const next = router.buildNext(nextOpts);
-        preload = (_preload = preload) != null ? _preload : router.options.defaultPreload;
-        const preloadDelay = (_ref9 = userPreloadDelay != null ? userPreloadDelay : router.options.defaultPreloadDelay) != null ? _ref9 : 0; // Compare path/hash for matches
-
-        const pathIsEqual = router.state.location.pathname === next.pathname;
-        const currentPathSplit = router.state.location.pathname.split('/');
+        // Compare path/hash for matches
+        const currentPathSplit = this.state.location.pathname.split('/');
         const nextPathSplit = next.pathname.split('/');
         const pathIsFuzzyEqual = nextPathSplit.every((d, i) => d === currentPathSplit[i]);
-        const hashIsEqual = router.state.location.hash === next.hash; // Combine the matches based on user options
-
-        const pathTest = activeOptions != null && activeOptions.exact ? pathIsEqual : pathIsFuzzyEqual;
-        const hashTest = activeOptions != null && activeOptions.includeHash ? hashIsEqual : true; // The final "active" test
+        // Combine the matches based on user options
+        const pathTest = activeOptions?.exact ? this.state.location.pathname === next.pathname : pathIsFuzzyEqual;
+        const hashTest = activeOptions?.includeHash ? this.state.location.hash === next.hash : true;
+        const searchTest = activeOptions?.includeSearch ?? true ? partialDeepEqual(this.state.location.search, next.search) : true;
 
-        const isActive = pathTest && hashTest; // The click handler
+        // The final "active" test
+        const isActive = pathTest && hashTest && searchTest;
 
+        // The click handler
         const handleClick = e => {
           if (!disabled && !isCtrlEvent(e) && !e.defaultPrevented && (!target || target === '_self') && e.button === 0) {
             e.preventDefault();
 
-            if (pathIsEqual && !search && !hash) {
-              router.invalidateRoute(nextOpts);
-            } // All is well? Navigate!)
-
-
-            router.__.navigate(nextOpts);
+            // All is well? Navigate!
+            this.#commitLocation({
+              ...next,
+              replace,
+              resetScroll
+            });
           }
-        }; // The click handler
-
+        };
 
+        // The click handler
         const handleFocus = e => {
           if (preload) {
-            router.preloadRoute(nextOpts, {
-              maxAge: userPreloadMaxAge,
-              gcMaxAge: userPreloadGcMaxAge
+            this.preloadRoute(nextOpts).catch(err => {
+              console.warn(err);
+              console.warn(preloadWarning);
             });
           }
         };
-
+        const handleTouchStart = e => {
+          this.preloadRoute(nextOpts).catch(err => {
+            console.warn(err);
+            console.warn(preloadWarning);
+          });
+        };
         const handleEnter = e => {
           const target = e.target || {};
-
           if (preload) {
             if (target.preloadTimeout) {
               return;
             }
-
             target.preloadTimeout = setTimeout(() => {
               target.preloadTimeout = null;
-              router.preloadRoute(nextOpts, {
-                maxAge: userPreloadMaxAge,
-                gcMaxAge: userPreloadGcMaxAge
+              this.preloadRoute(nextOpts).catch(err => {
+                console.warn(err);
+                console.warn(preloadWarning);
               });
             }, preloadDelay);
           }
         };
-
         const handleLeave = e => {
           const target = e.target || {};
-
           if (target.preloadTimeout) {
             clearTimeout(target.preloadTimeout);
             target.preloadTimeout = null;
           }
         };
-
         return {
           type: 'internal',
           next,
@@ -2290,224 +1585,664 @@
           handleClick,
           handleEnter,
           handleLeave,
+          handleTouchStart,
           isActive,
           disabled
         };
-      },
-      buildNext: opts => {
-        const next = router.__.buildLocation(opts);
-
-        const matches = router.matchRoutes(next.pathname);
-
-        const __preSearchFilters = matches.map(match => {
-          var _match$options$preSea;
-
-          return (_match$options$preSea = match.options.preSearchFilters) != null ? _match$options$preSea : [];
-        }).flat().filter(Boolean);
-
-        const __postSearchFilters = matches.map(match => {
-          var _match$options$postSe;
-
-          return (_match$options$postSe = match.options.postSearchFilters) != null ? _match$options$postSe : [];
-        }).flat().filter(Boolean);
-
-        return router.__.buildLocation(_extends({}, opts, {
-          __preSearchFilters,
-          __postSearchFilters
-        }));
-      },
-      __: {
-        buildRouteTree: rootRouteConfig => {
-          const recurseRoutes = (routeConfigs, parent) => {
-            return routeConfigs.map(routeConfig => {
-              const routeOptions = routeConfig.options;
-              const route = createRoute(routeConfig, routeOptions, parent, router);
-              const existingRoute = router.routesById[route.routeId];
-
-              if (existingRoute) {
-                {
-                  console.warn("Duplicate routes found with id: " + String(route.routeId), router.routesById, route);
-                }
-
-                throw new Error();
-              }
-              router.routesById[route.routeId] = route;
-              const children = routeConfig.children;
-              route.childRoutes = children != null && children.length ? recurseRoutes(children, route) : undefined;
-              return route;
-            });
+      };
+      dehydrate = () => {
+        return {
+          state: {
+            matchIds: this.state.matchIds,
+            dehydratedMatches: this.state.matches.map(d => pick(d, ['fetchedAt', 'invalid', 'preloadMaxAge', 'maxAge', 'id', 'loaderData', 'status', 'updatedAt']))
+          }
+        };
+      };
+      hydrate = async __do_not_use_server_ctx => {
+        let _ctx = __do_not_use_server_ctx;
+        // Client hydrates from window
+        if (typeof document !== 'undefined') {
+          _ctx = window.__TSR_DEHYDRATED__;
+        }
+        invariant(_ctx, 'Expected to find a __TSR_DEHYDRATED__ property on window... but we did not. Did you forget to render <DehydrateRouter /> in your app?');
+        const ctx = _ctx;
+        this.dehydratedData = ctx.payload;
+        this.options.hydrate?.(ctx.payload);
+        const dehydratedState = ctx.router.state;
+        let matches = this.matchRoutes(this.state.location.pathname, this.state.location.search).map(match => {
+          const dehydratedMatch = dehydratedState.dehydratedMatches.find(d => d.id === match.id);
+          invariant(dehydratedMatch, `Could not find a client-side match for dehydrated match with id: ${match.id}!`);
+          if (dehydratedMatch) {
+            return {
+              ...match,
+              ...dehydratedMatch
+            };
+          }
+          return match;
+        });
+        this.__store.setState(s => {
+          return {
+            ...s,
+            matchIds: dehydratedState.matchIds,
+            matches,
+            matchesById: this.#mergeMatches(s.matchesById, matches)
           };
+        });
+      };
+      injectedHtml = [];
+      injectHtml = async html => {
+        this.injectedHtml.push(html);
+      };
+      dehydrateData = (key, getData) => {
+        if (typeof document === 'undefined') {
+          const strKey = typeof key === 'string' ? key : JSON.stringify(key);
+          this.injectHtml(async () => {
+            const id = `__TSR_DEHYDRATED__${strKey}`;
+            const data = typeof getData === 'function' ? await getData() : getData;
+            return `<script id='${id}' suppressHydrationWarning>window["__TSR_DEHYDRATED__${escapeJSON(strKey)}"] = ${JSON.stringify(data)}
+        ;(() => {
+          var el = document.getElementById('${id}')
+          el.parentElement.removeChild(el)
+        })()
+        </script>`;
+          });
+          return () => this.hydrateData(key);
+        }
+        return () => undefined;
+      };
+      hydrateData = key => {
+        if (typeof document !== 'undefined') {
+          const strKey = typeof key === 'string' ? key : JSON.stringify(key);
+          return window[`__TSR_DEHYDRATED__${strKey}`];
+        }
+        return undefined;
+      };
 
-          const routes = recurseRoutes([rootRouteConfig]);
-          return routes[0];
-        },
-        parseLocation: (location, previousLocation) => {
-          var _location$hash$split$;
-
-          const parsedSearch = router.options.parseSearch(location.search);
+      // resolveMatchPromise = (matchId: string, key: string, value: any) => {
+      //   this.state.matches
+      //     .find((d) => d.id === matchId)
+      //     ?.__promisesByKey[key]?.resolve(value)
+      // }
+
+      #processRoutes = routeTree => {
+        this.routeTree = routeTree;
+        this.routesById = {};
+        this.routesByPath = {};
+        this.flatRoutes = [];
+        const recurseRoutes = routes => {
+          routes.forEach((route, i) => {
+            route.init({
+              originalIndex: i,
+              router: this
+            });
+            const existingRoute = this.routesById[route.id];
+            invariant(!existingRoute, `Duplicate routes found with id: ${String(route.id)}`);
+            this.routesById[route.id] = route;
+            if (!route.isRoot && route.path) {
+              const trimmedFullPath = trimPathRight(route.fullPath);
+              if (!this.routesByPath[trimmedFullPath] || route.fullPath.endsWith('/')) {
+                this.routesByPath[trimmedFullPath] = route;
+              }
+            }
+            const children = route.children;
+            if (children?.length) {
+              recurseRoutes(children);
+            }
+          });
+        };
+        recurseRoutes([routeTree]);
+        this.flatRoutes = Object.values(this.routesByPath).map((d, i) => {
+          const trimmed = trimPath(d.fullPath);
+          const parsed = parsePathname(trimmed);
+          while (parsed.length > 1 && parsed[0]?.value === '/') {
+            parsed.shift();
+          }
+          const score = parsed.map(d => {
+            if (d.type === 'param') {
+              return 0.5;
+            }
+            if (d.type === 'wildcard') {
+              return 0.25;
+            }
+            return 1;
+          });
           return {
-            pathname: location.pathname,
-            searchStr: location.search,
-            search: replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.search, parsedSearch),
-            hash: (_location$hash$split$ = location.hash.split('#').reverse()[0]) != null ? _location$hash$split$ : '',
-            href: "" + location.pathname + location.search + location.hash,
-            state: location.state,
-            key: location.key
+            child: d,
+            trimmed,
+            parsed,
+            index: i,
+            score
           };
-        },
-        navigate: location => {
-          const next = router.buildNext(location);
-          return router.__.commitLocation(next, location.replace);
-        },
-        buildLocation: function buildLocation(dest) {
-          var _dest$from, _router$basepath, _dest$to, _last, _dest$params, _dest$__preSearchFilt, _functionalUpdate, _dest$__preSearchFilt2, _dest$__postSearchFil;
-
-          if (dest === void 0) {
-            dest = {};
+        }).sort((a, b) => {
+          let isIndex = a.trimmed === '/' ? 1 : b.trimmed === '/' ? -1 : 0;
+          if (isIndex !== 0) return isIndex;
+          const length = Math.min(a.score.length, b.score.length);
+
+          // Sort by length of score
+          if (a.score.length !== b.score.length) {
+            return b.score.length - a.score.length;
           }
 
-          // const resolvedFrom: Location = {
-          //   ...router.location,
-          const fromPathname = dest.fromCurrent ? router.location.pathname : (_dest$from = dest.from) != null ? _dest$from : router.location.pathname;
-
-          let pathname = resolvePath((_router$basepath = router.basepath) != null ? _router$basepath : '/', fromPathname, "" + ((_dest$to = dest.to) != null ? _dest$to : '.'));
-
-          const fromMatches = router.matchRoutes(router.location.pathname, {
-            strictParseParams: true
-          });
-          const toMatches = router.matchRoutes(pathname);
+          // Sort by min available score
+          for (let i = 0; i < length; i++) {
+            if (a.score[i] !== b.score[i]) {
+              return b.score[i] - a.score[i];
+            }
+          }
 
-          const prevParams = _extends({}, (_last = last(fromMatches)) == null ? void 0 : _last.params);
+          // Sort by min available parsed value
+          for (let i = 0; i < length; i++) {
+            if (a.parsed[i].value !== b.parsed[i].value) {
+              return a.parsed[i].value > b.parsed[i].value ? 1 : -1;
+            }
+          }
 
-          let nextParams = ((_dest$params = dest.params) != null ? _dest$params : true) === true ? prevParams : functionalUpdate(dest.params, prevParams);
+          // Sort by length of trimmed full path
+          if (a.trimmed !== b.trimmed) {
+            return a.trimmed > b.trimmed ? 1 : -1;
+          }
 
+          // Sort by original index
+          return a.index - b.index;
+        }).map((d, i) => {
+          d.child.rank = i;
+          return d.child;
+        });
+      };
+      #parseLocation = previousLocation => {
+        const parse = ({
+          pathname,
+          search,
+          hash,
+          state
+        }) => {
+          const parsedSearch = this.options.parseSearch(search);
+          return {
+            pathname: pathname,
+            searchStr: search,
+            search: replaceEqualDeep(previousLocation?.search, parsedSearch),
+            hash: hash.split('#').reverse()[0] ?? '',
+            href: `${pathname}${search}${hash}`,
+            state: replaceEqualDeep(previousLocation?.state, state)
+          };
+        };
+        const location = parse(this.history.location);
+        let {
+          __tempLocation,
+          __tempKey
+        } = location.state;
+        if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
+          // Sync up the location keys
+          const parsedTempLocation = parse(__tempLocation);
+          parsedTempLocation.state.key = location.state.key;
+          delete parsedTempLocation.state.__tempLocation;
+          return {
+            ...parsedTempLocation,
+            maskedLocation: location
+          };
+        }
+        return location;
+      };
+      buildLocation = (opts = {}) => {
+        const build = (dest = {}, matches) => {
+          const from = this.state.location;
+          const fromPathname = dest.from ?? from.pathname;
+          let pathname = resolvePath(this.basepath ?? '/', fromPathname, `${dest.to ?? ''}`);
+          const fromMatches = this.matchRoutes(fromPathname, from.search);
+          const prevParams = {
+            ...last(fromMatches)?.params
+          };
+          let nextParams = (dest.params ?? true) === true ? prevParams : functionalUpdate(dest.params, prevParams);
           if (nextParams) {
-            toMatches.map(d => d.options.stringifyParams).filter(Boolean).forEach(fn => {
-              Object.assign({}, nextParams, fn(nextParams));
+            matches?.map(d => this.getRoute(d.routeId).options.stringifyParams).filter(Boolean).forEach(fn => {
+              nextParams = {
+                ...nextParams,
+                ...fn(nextParams)
+              };
             });
           }
+          pathname = interpolatePath(pathname, nextParams ?? {});
+          const preSearchFilters = matches?.map(match => this.getRoute(match.routeId).options.preSearchFilters ?? []).flat().filter(Boolean) ?? [];
+          const postSearchFilters = matches?.map(match => this.getRoute(match.routeId).options.postSearchFilters ?? []).flat().filter(Boolean) ?? [];
 
-          pathname = interpolatePath(pathname, nextParams != null ? nextParams : {}); // Pre filters first
-
-          const preFilteredSearch = (_dest$__preSearchFilt = dest.__preSearchFilters) != null && _dest$__preSearchFilt.length ? dest.__preSearchFilters.reduce((prev, next) => next(prev), router.location.search) : router.location.search; // Then the link/navigate function
+          // Pre filters first
+          const preFilteredSearch = preSearchFilters?.length ? preSearchFilters?.reduce((prev, next) => next(prev), from.search) : from.search;
 
+          // Then the link/navigate function
           const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
-          : dest.search ? (_functionalUpdate = functionalUpdate(dest.search, preFilteredSearch)) != null ? _functionalUpdate : {} // Updater
-          : (_dest$__preSearchFilt2 = dest.__preSearchFilters) != null && _dest$__preSearchFilt2.length ? preFilteredSearch // Preserve resolvedFrom filters
-          : {}; // Then post filters
-
-          const postFilteredSearch = (_dest$__postSearchFil = dest.__postSearchFilters) != null && _dest$__postSearchFil.length ? dest.__postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
-          const search = replaceEqualDeep(router.location.search, postFilteredSearch);
-          const searchStr = router.options.stringifySearch(search);
-          let hash = dest.hash === true ? router.location.hash : functionalUpdate(dest.hash, router.location.hash);
-          hash = hash ? "#" + hash : '';
+          : dest.search ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
+          : preSearchFilters?.length ? preFilteredSearch // Preserve resolvedFrom filters
+          : {};
+
+          // Then post filters
+          const postFilteredSearch = postSearchFilters?.length ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
+          const search = replaceEqualDeep(from.search, postFilteredSearch);
+          const searchStr = this.options.stringifySearch(search);
+          const hash = dest.hash === true ? from.hash : dest.hash ? functionalUpdate(dest.hash, from.hash) : from.hash;
+          const hashStr = hash ? `#${hash}` : '';
+          let nextState = dest.state === true ? from.state : dest.state ? functionalUpdate(dest.state, from.state) : from.state;
+          nextState = replaceEqualDeep(from.state, nextState);
           return {
             pathname,
             search,
             searchStr,
-            state: router.location.state,
+            state: nextState,
             hash,
-            href: "" + pathname + searchStr + hash,
-            key: dest.key
+            href: this.history.createHref(`${pathname}${searchStr}${hashStr}`),
+            unmaskOnReload: dest.unmaskOnReload
           };
-        },
-        commitLocation: (next, replace) => {
-          const id = '' + Date.now() + Math.random();
-          if (router.navigateTimeout) clearTimeout(router.navigateTimeout);
-          let nextAction = 'replace';
-
-          if (!replace) {
-            nextAction = 'push';
+        };
+        const buildWithMatches = (dest = {}, maskedDest) => {
+          let next = build(dest);
+          let maskedNext = maskedDest ? build(maskedDest) : undefined;
+          if (!maskedNext) {
+            let params = {};
+            let foundMask = this.options.routeMasks?.find(d => {
+              const match = matchPathname(this.basepath, next.pathname, {
+                to: d.from,
+                fuzzy: false
+              });
+              if (match) {
+                params = match;
+                return true;
+              }
+              return false;
+            });
+            if (foundMask) {
+              foundMask = {
+                ...foundMask,
+                from: interpolatePath(foundMask.from, params)
+              };
+              maskedDest = foundMask;
+              maskedNext = build(maskedDest);
+            }
           }
-
-          const isSameUrl = router.__.parseLocation(history.location).href === next.href;
-
-          if (isSameUrl && !next.key) {
-            nextAction = 'replace';
+          const nextMatches = this.matchRoutes(next.pathname, next.search);
+          const maskedMatches = maskedNext ? this.matchRoutes(maskedNext.pathname, maskedNext.search) : undefined;
+          const maskedFinal = maskedNext ? build(maskedDest, maskedMatches) : undefined;
+          const final = build(dest, nextMatches);
+          if (maskedFinal) {
+            final.maskedLocation = maskedFinal;
           }
-
-          if (nextAction === 'replace') {
-            history.replace({
-              pathname: next.pathname,
-              hash: next.hash,
-              search: next.searchStr
-            }, _extends({
-              id
-            }, next.state));
-          } else {
-            history.push({
-              pathname: next.pathname,
-              hash: next.hash,
-              search: next.searchStr
-            }, {
-              id
+          return final;
+        };
+        if (opts.mask) {
+          return buildWithMatches(opts, {
+            ...pick(opts, ['from']),
+            ...opts.mask
+          });
+        }
+        return buildWithMatches(opts);
+      };
+      #buildAndCommitLocation = ({
+        replace,
+        resetScroll,
+        ...rest
+      } = {}) => {
+        const location = this.buildLocation(rest);
+        return this.#commitLocation({
+          ...location,
+          replace,
+          resetScroll
+        });
+      };
+      #commitLocation = async next => {
+        if (this.navigateTimeout) clearTimeout(this.navigateTimeout);
+        let nextAction = 'replace';
+        if (!next.replace) {
+          nextAction = 'push';
+        }
+        const isSameUrl = this.state.location.href === next.href;
+        if (isSameUrl) {
+          nextAction = 'replace';
+        }
+        let {
+          maskedLocation,
+          ...nextHistory
+        } = next;
+        if (maskedLocation) {
+          nextHistory = {
+            ...maskedLocation,
+            state: {
+              ...maskedLocation.state,
+              __tempKey: undefined,
+              __tempLocation: {
+                ...nextHistory,
+                search: nextHistory.searchStr,
+                state: {
+                  ...nextHistory.state,
+                  __tempKey: undefined,
+                  __tempLocation: undefined,
+                  key: undefined
+                }
+              }
+            }
+          };
+          if (nextHistory.unmaskOnReload ?? this.options.unmaskOnReload ?? false) {
+            nextHistory.state.__tempKey = this.tempLocationKey;
+          }
+        }
+        this.history[nextAction === 'push' ? 'push' : 'replace'](nextHistory.href, nextHistory.state);
+        this.resetNextScroll = next.resetScroll ?? true;
+        return this.latestLoadPromise;
+      };
+      getRouteMatch = id => {
+        return this.state.matchesById[id];
+      };
+      setRouteMatch = (id, updater) => {
+        this.__store.setState(prev => {
+          if (!prev.matchesById[id]) {
+            return prev;
+          }
+          return {
+            ...prev,
+            matchesById: {
+              ...prev.matchesById,
+              [id]: updater(prev.matchesById[id])
+            }
+          };
+        });
+      };
+      setRouteMatchData = (id, updater, opts) => {
+        const match = this.getRouteMatch(id);
+        if (!match) return;
+        const route = this.getRoute(match.routeId);
+        const updatedAt = opts?.updatedAt ?? Date.now();
+        const preloadMaxAge = opts?.maxAge ?? route.options.preloadMaxAge ?? this.options.defaultPreloadMaxAge ?? 5000;
+        const maxAge = opts?.maxAge ?? route.options.maxAge ?? this.options.defaultMaxAge ?? -1;
+        this.setRouteMatch(id, s => ({
+          ...s,
+          error: undefined,
+          status: 'success',
+          isFetching: false,
+          updatedAt: updatedAt,
+          loaderData: functionalUpdate(updater, s.loaderData),
+          preloadMaxAge,
+          maxAge
+        }));
+      };
+      invalidate = async opts => {
+        if (opts?.matchId) {
+          this.setRouteMatch(opts.matchId, s => ({
+            ...s,
+            invalid: true
+          }));
+          const matchIndex = this.state.matches.findIndex(d => d.id === opts.matchId);
+          const childMatch = this.state.matches[matchIndex + 1];
+          if (childMatch) {
+            return this.invalidate({
+              matchId: childMatch.id,
+              reload: false,
+              __fromFocus: opts.__fromFocus
             });
           }
+        } else {
+          this.__store.batch(() => {
+            Object.values(this.state.matchesById).forEach(match => {
+              const route = this.getRoute(match.routeId);
+              const shouldInvalidate = opts?.__fromFocus ? route.options.reloadOnWindowFocus ?? true : true;
+              if (shouldInvalidate) {
+                this.setRouteMatch(match.id, s => ({
+                  ...s,
+                  invalid: true
+                }));
+              }
+            });
+          });
+        }
+        if (opts?.reload ?? true) {
+          return this.load();
+        }
+      };
+    }
+
+    // Detect if we're in the DOM
+    const isServer = typeof window === 'undefined' || !window.document.createElement;
+    function getInitialRouterState() {
+      return {
+        status: 'idle',
+        isFetching: false,
+        resolvedLocation: null,
+        location: null,
+        matchesById: {},
+        matchIds: [],
+        pendingMatchIds: [],
+        matches: [],
+        pendingMatches: [],
+        renderedMatchIds: [],
+        renderedMatches: [],
+        lastUpdated: Date.now()
+      };
+    }
+    function isCtrlEvent(e) {
+      return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
+    }
+    function redirect(opts) {
+      opts.isRedirect = true;
+      return opts;
+    }
+    function isRedirect(obj) {
+      return !!obj?.isRedirect;
+    }
+    class SearchParamError extends Error {}
+    class PathParamError extends Error {}
+    function escapeJSON(jsonString) {
+      return jsonString.replace(/\\/g, '\\\\') // Escape backslashes
+      .replace(/'/g, "\\'") // Escape single quotes
+      .replace(/"/g, '\\"'); // Escape double quotes
+    }
 
-          router.navigationPromise = new Promise(resolve => {
-            const previousNavigationResolve = router.resolveNavigation;
+    // A function that takes an import() argument which is a function and returns a new function that will
+    // proxy arguments from the caller to the imported function, retaining all type
+    // information along the way
+    function lazyFn(fn, key) {
+      return async (...args) => {
+        const imported = await fn();
+        return imported[key || 'default'](...args);
+      };
+    }
+    function isMatchInvalid(match, opts) {
+      const now = Date.now();
+      if (match.invalid) {
+        return true;
+      }
+      if (opts?.preload) {
+        return match.preloadMaxAge < 0 ? false : match.updatedAt + match.preloadMaxAge < now;
+      }
+      return match.maxAge < 0 ? false : match.updatedAt + match.maxAge < now;
+    }
 
-            router.resolveNavigation = () => {
-              previousNavigationResolve();
-              resolve();
+    const windowKey = 'window';
+    const delimiter = '___';
+    let weakScrolledElementsByRestoreKey = {};
+    let cache;
+    let pathDidChange = false;
+    const sessionsStorage = typeof window !== 'undefined' && window.sessionStorage;
+    const defaultGetKey = location => location.state.key;
+    function watchScrollPositions(router, opts) {
+      const getKey = opts?.getKey || defaultGetKey;
+      if (sessionsStorage) {
+        if (!cache) {
+          cache = (() => {
+            const storageKey = 'tsr-scroll-restoration-v1';
+            const current = JSON.parse(window.sessionStorage.getItem(storageKey) || '{}');
+            return {
+              current,
+              set: (key, value) => {
+                current[key] = value;
+                window.sessionStorage.setItem(storageKey, JSON.stringify(cache));
+              }
             };
+          })();
+        }
+      }
+      const {
+        history
+      } = window;
+      if (history.scrollRestoration) {
+        history.scrollRestoration = 'manual';
+      }
+      const onScroll = event => {
+        const restoreKey = getKey(router.state.resolvedLocation);
+        if (!weakScrolledElementsByRestoreKey[restoreKey]) {
+          weakScrolledElementsByRestoreKey[restoreKey] = new WeakSet();
+        }
+        const set = weakScrolledElementsByRestoreKey[restoreKey];
+        if (set.has(event.target)) return;
+        set.add(event.target);
+        const cacheKey = [restoreKey, event.target === document || event.target === window ? windowKey : getCssSelector(event.target)].join(delimiter);
+        if (!cache.current[cacheKey]) {
+          cache.set(cacheKey, {
+            scrollX: NaN,
+            scrollY: NaN
           });
-          return router.navigationPromise;
         }
+      };
+      const getCssSelector = el => {
+        let path = [],
+          parent;
+        while (parent = el.parentNode) {
+          path.unshift(`${el.tagName}:nth-child(${[].indexOf.call(parent.children, el) + 1})`);
+          el = parent;
+        }
+        return `${path.join(' > ')}`.toLowerCase();
+      };
+      const onPathWillChange = from => {
+        const restoreKey = getKey(from);
+        for (const cacheKey in cache.current) {
+          const entry = cache.current[cacheKey];
+          const [key, elementSelector] = cacheKey.split(delimiter);
+          if (restoreKey === key) {
+            if (elementSelector === windowKey) {
+              entry.scrollX = window.scrollX || 0;
+              entry.scrollY = window.scrollY || 0;
+            } else if (elementSelector) {
+              const element = document.querySelector(elementSelector);
+              entry.scrollX = element?.scrollLeft || 0;
+              entry.scrollY = element?.scrollTop || 0;
+            }
+            cache.set(cacheKey, entry);
+          }
+        }
+      };
+      const onPathChange = () => {
+        pathDidChange = true;
+      };
+      if (typeof document !== 'undefined') {
+        document.addEventListener('scroll', onScroll, true);
       }
-    };
-    router.update(userOptions); // Allow frameworks to hook into the router creation
-
-    router.options.createRouter == null ? void 0 : router.options.createRouter(router);
-    return router;
-  }
-
-  function isCtrlEvent(e) {
-    return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
-  }
-
-  function cascadeLoaderData(matches) {
-    matches.forEach((match, index) => {
-      const parent = matches[index - 1];
+      const unsubOnBeforeLoad = router.subscribe('onBeforeLoad', event => {
+        if (event.pathChanged) onPathWillChange(event.from);
+      });
+      const unsubOnLoad = router.subscribe('onLoad', event => {
+        if (event.pathChanged) onPathChange();
+      });
+      return () => {
+        document.removeEventListener('scroll', onScroll);
+        unsubOnBeforeLoad();
+        unsubOnLoad();
+      };
+    }
+    function restoreScrollPositions(router, opts) {
+      if (pathDidChange) {
+        if (!router.resetNextScroll) {
+          return;
+        }
+        const getKey = opts?.getKey || defaultGetKey;
+        pathDidChange = false;
+        const restoreKey = getKey(router.state.location);
+        let windowRestored = false;
+        for (const cacheKey in cache.current) {
+          const entry = cache.current[cacheKey];
+          const [key, elementSelector] = cacheKey.split(delimiter);
+          if (key === restoreKey) {
+            if (elementSelector === windowKey) {
+              windowRestored = true;
+              window.scrollTo(entry.scrollX, entry.scrollY);
+            } else if (elementSelector) {
+              const element = document.querySelector(elementSelector);
+              if (element) {
+                element.scrollLeft = entry.scrollX;
+                element.scrollTop = entry.scrollY;
+              }
+            }
+          }
+        }
+        if (!windowRestored) {
+          window.scrollTo(0, 0);
+        }
+      }
+    }
 
-      if (parent) {
-        match.loaderData = replaceEqualDeep(match.loaderData, _extends({}, parent.loaderData, match.routeLoaderData));
+    function defer(_promise) {
+      const promise = _promise;
+      if (!promise.__deferredState) {
+        promise.__deferredState = {
+          uid: Math.random().toString(36).slice(2),
+          status: 'pending'
+        };
+        const state = promise.__deferredState;
+        promise.then(data => {
+          state.status = 'success';
+          state.data = data;
+        }).catch(error => {
+          state.status = 'error';
+          state.error = error;
+        });
       }
-    });
-  }
-
-  exports.cleanPath = cleanPath;
-  exports.createBrowserHistory = createBrowserHistory;
-  exports.createHashHistory = createHashHistory;
-  exports.createMemoryHistory = createMemoryHistory;
-  exports.createRoute = createRoute;
-  exports.createRouteConfig = createRouteConfig;
-  exports.createRouteMatch = createRouteMatch;
-  exports.createRouter = createRouter;
-  exports.decode = decode;
-  exports.defaultParseSearch = defaultParseSearch;
-  exports.defaultStringifySearch = defaultStringifySearch;
-  exports.encode = encode;
-  exports.functionalUpdate = functionalUpdate;
-  exports.interpolatePath = interpolatePath;
-  exports.invariant = invariant;
-  exports.joinPaths = joinPaths;
-  exports.last = last;
-  exports.matchByPath = matchByPath;
-  exports.matchPathname = matchPathname;
-  exports.parsePathname = parsePathname;
-  exports.parseSearchWith = parseSearchWith;
-  exports.pick = pick;
-  exports.replaceEqualDeep = replaceEqualDeep;
-  exports.resolvePath = resolvePath;
-  exports.rootRouteId = rootRouteId;
-  exports.stringifySearchWith = stringifySearchWith;
-  exports.trimPath = trimPath;
-  exports.trimPathLeft = trimPathLeft;
-  exports.trimPathRight = trimPathRight;
-  exports.warning = warning;
-
-  Object.defineProperty(exports, '__esModule', { value: true });
+      return promise;
+    }
+    function isDehydratedDeferred(obj) {
+      return typeof obj === 'object' && obj !== null && !(obj instanceof Promise) && !obj.then && '__deferredState' in obj;
+    }
+
+    exports.FileRoute = FileRoute;
+    exports.PathParamError = PathParamError;
+    exports.RootRoute = RootRoute;
+    exports.Route = Route;
+    exports.Router = Router;
+    exports.RouterContext = RouterContext;
+    exports.SearchParamError = SearchParamError;
+    exports.cleanPath = cleanPath;
+    exports.componentTypes = componentTypes;
+    exports.createBrowserHistory = createBrowserHistory;
+    exports.createHashHistory = createHashHistory;
+    exports.createMemoryHistory = createMemoryHistory;
+    exports.createRouteMask = createRouteMask;
+    exports.decode = decode;
+    exports.defaultParseSearch = defaultParseSearch;
+    exports.defaultStringifySearch = defaultStringifySearch;
+    exports.defer = defer;
+    exports.encode = encode;
+    exports.functionalUpdate = functionalUpdate;
+    exports.interpolatePath = interpolatePath;
+    exports.invariant = invariant;
+    exports.isDehydratedDeferred = isDehydratedDeferred;
+    exports.isMatchInvalid = isMatchInvalid;
+    exports.isPlainObject = isPlainObject;
+    exports.isRedirect = isRedirect;
+    exports.joinPaths = joinPaths;
+    exports.last = last;
+    exports.lazyFn = lazyFn;
+    exports.matchByPath = matchByPath;
+    exports.matchPathname = matchPathname;
+    exports.parsePathname = parsePathname;
+    exports.parseSearchWith = parseSearchWith;
+    exports.partialDeepEqual = partialDeepEqual;
+    exports.pick = pick;
+    exports.redirect = redirect;
+    exports.replaceEqualDeep = replaceEqualDeep;
+    exports.resolvePath = resolvePath;
+    exports.restoreScrollPositions = restoreScrollPositions;
+    exports.rootRouteId = rootRouteId;
+    exports.stringifySearchWith = stringifySearchWith;
+    exports.trimPath = trimPath;
+    exports.trimPathLeft = trimPathLeft;
+    exports.trimPathRight = trimPathRight;
+    exports.warning = warning;
+    exports.watchScrollPositions = watchScrollPositions;
+
+    Object.defineProperty(exports, '__esModule', { value: true });
 
 }));
 //# sourceMappingURL=index.development.js.map