@tanstack/router-core 0.0.1-beta.35 → 0.0.1-beta.39

package/build/cjs/router.js

@@ -12,14 +12,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
 var history = require('history');
 var invariant = require('tiny-invariant');
 var path = require('./path.js');
 var route = require('./route.js');
 var routeMatch = require('./routeMatch.js');
 var searchParams = require('./searchParams.js');
+var reactivity = require('@solidjs/reactivity');
 var utils = require('./utils.js');
+var sharedClone = require('./sharedClone.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -34,216 +35,296 @@ const createDefaultHistory = () => isServer ? history.createMemoryHistory() : hi
 function getInitialRouterState() {
   return {
     status: 'idle',
-    location: null,
-    matches: [],
+    latestLocation: null,
+    currentLocation: null,
+    currentMatches: [],
     actions: {},
     loaders: {},
     lastUpdated: Date.now(),
-    isFetching: false,
-    isPreloading: false
+    matchCache: {},
+    get isFetching() {
+      return this.status === 'loading' || this.currentMatches.some(d => d.store.isFetching);
+    },
+    get isPreloading() {
+      return Object.values(this.matchCache).some(d => d.match.store.isFetching && !this.currentMatches.find(dd => dd.matchId === d.match.matchId));
+    }
   };
 }
 function createRouter(userOptions) {
-  var _userOptions$stringif, _userOptions$parseSea;
-  const history = (userOptions == null ? void 0 : userOptions.history) || createDefaultHistory();
-  const originalOptions = _rollupPluginBabelHelpers["extends"]({
+  const originalOptions = {
     defaultLoaderGcMaxAge: 5 * 60 * 1000,
     defaultLoaderMaxAge: 0,
     defaultPreloadMaxAge: 2000,
     defaultPreloadDelay: 50,
-    context: undefined
-  }, userOptions, {
-    stringifySearch: (_userOptions$stringif = userOptions == null ? void 0 : userOptions.stringifySearch) != null ? _userOptions$stringif : searchParams.defaultStringifySearch,
-    parseSearch: (_userOptions$parseSea = userOptions == null ? void 0 : userOptions.parseSearch) != null ? _userOptions$parseSea : searchParams.defaultParseSearch
-  });
-  let router = {
+    context: undefined,
+    ...userOptions,
+    stringifySearch: (userOptions == null ? void 0 : userOptions.stringifySearch) ?? searchParams.defaultStringifySearch,
+    parseSearch: (userOptions == null ? void 0 : userOptions.parseSearch) ?? searchParams.defaultParseSearch
+  };
+  const [store, setStore] = reactivity.createStore(getInitialRouterState());
+  let navigationPromise;
+  let startedLoadingAt = Date.now();
+  let resolveNavigation = () => {};
+  function onFocus() {
+    router.load();
+  }
+  function buildRouteTree(rootRouteConfig) {
+    const recurseRoutes = (routeConfigs, parent) => {
+      return routeConfigs.map((routeConfig, i) => {
+        const routeOptions = routeConfig.options;
+        const route$1 = route.createRoute(routeConfig, routeOptions, i, parent, router);
+        const existingRoute = router.routesById[route$1.routeId];
+        if (existingRoute) {
+          if (process.env.NODE_ENV !== 'production') {
+            console.warn(`Duplicate routes found with id: ${String(route$1.routeId)}`, router.routesById, route$1);
+          }
+          throw new Error();
+        }
+        router.routesById[route$1.routeId] = route$1;
+        const children = routeConfig.children;
+        route$1.childRoutes = children != null && children.length ? recurseRoutes(children, route$1) : undefined;
+        return route$1;
+      });
+    };
+    const routes = recurseRoutes([rootRouteConfig]);
+    return routes[0];
+  }
+  function parseLocation(location, previousLocation) {
+    const parsedSearch = router.options.parseSearch(location.search);
+    return {
+      pathname: location.pathname,
+      searchStr: location.search,
+      search: sharedClone.sharedClone(previousLocation == null ? void 0 : previousLocation.search, parsedSearch),
+      hash: location.hash.split('#').reverse()[0] ?? '',
+      href: `${location.pathname}${location.search}${location.hash}`,
+      state: location.state,
+      key: location.key
+    };
+  }
+  function navigate(location) {
+    const next = router.buildNext(location);
+    return commitLocation(next, location.replace);
+  }
+  function buildLocation(dest) {
+    var _last, _dest$__preSearchFilt, _dest$__preSearchFilt2, _dest$__postSearchFil;
+    if (dest === void 0) {
+      dest = {};
+    }
+    const fromPathname = dest.fromCurrent ? store.latestLocation.pathname : dest.from ?? store.latestLocation.pathname;
+    let pathname = path.resolvePath(router.basepath ?? '/', fromPathname, `${dest.to ?? '.'}`);
+    const fromMatches = router.matchRoutes(store.latestLocation.pathname, {
+      strictParseParams: true
+    });
+    const toMatches = router.matchRoutes(pathname);
+    const prevParams = {
+      ...((_last = utils.last(fromMatches)) == null ? void 0 : _last.params)
+    };
+    let nextParams = (dest.params ?? true) === true ? prevParams : utils.functionalUpdate(dest.params, prevParams);
+    if (nextParams) {
+      toMatches.map(d => d.options.stringifyParams).filter(Boolean).forEach(fn => {
+        Object.assign({}, nextParams, fn(nextParams));
+      });
+    }
+    pathname = path.interpolatePath(pathname, nextParams ?? {});
+
+    // Pre filters first
+    const preFilteredSearch = (_dest$__preSearchFilt = dest.__preSearchFilters) != null && _dest$__preSearchFilt.length ? dest.__preSearchFilters.reduce((prev, next) => next(prev), store.latestLocation.search) : store.latestLocation.search;
+
+    // Then the link/navigate function
+    const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
+    : dest.search ? utils.functionalUpdate(dest.search, preFilteredSearch) ?? {} // 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 = sharedClone.sharedClone(store.latestLocation.search, postFilteredSearch);
+    const searchStr = router.options.stringifySearch(search);
+    let hash = dest.hash === true ? store.latestLocation.hash : utils.functionalUpdate(dest.hash, store.latestLocation.hash);
+    hash = hash ? `#${hash}` : '';
+    return {
+      pathname,
+      search,
+      searchStr,
+      state: store.latestLocation.state,
+      hash,
+      href: `${pathname}${searchStr}${hash}`,
+      key: dest.key
+    };
+  }
+  function commitLocation(next, replace) {
+    const id = '' + Date.now() + Math.random();
+    let nextAction = 'replace';
+    if (!replace) {
+      nextAction = 'push';
+    }
+    const isSameUrl = parseLocation(router.history.location).href === next.href;
+    if (isSameUrl && !next.key) {
+      nextAction = 'replace';
+    }
+    router.history[nextAction]({
+      pathname: next.pathname,
+      hash: next.hash,
+      search: next.searchStr
+    }, {
+      id,
+      ...next.state
+    });
+    return navigationPromise = new Promise(resolve => {
+      const previousNavigationResolve = resolveNavigation;
+      resolveNavigation = () => {
+        previousNavigationResolve();
+        resolve();
+      };
+    });
+  }
+  const router = {
     types: undefined,
     // public api
-    history,
+    history: (userOptions == null ? void 0 : userOptions.history) || createDefaultHistory(),
+    store,
+    setStore,
     options: originalOptions,
-    listeners: [],
-    // Resolved after construction
     basepath: '',
     routeTree: undefined,
     routesById: {},
-    __location: undefined,
-    //
-    resolveNavigation: () => {},
-    matchCache: {},
-    state: getInitialRouterState(),
     reset: () => {
-      router.state = getInitialRouterState();
-      router.notify();
-    },
-    startedLoadingAt: Date.now(),
-    subscribe: listener => {
-      router.listeners.push(listener);
-      return () => {
-        router.listeners = router.listeners.filter(x => x !== listener);
-      };
+      setStore(s => Object.assign(s, getInitialRouterState()));
     },
     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 = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-          isFetching,
-          isPreloading
-        });
-      }
-      cascadeLoaderData(router.state.matches);
-      router.listeners.forEach(listener => listener(router));
-    },
     dehydrate: () => {
       return {
-        location: router.__location,
-        state: _rollupPluginBabelHelpers["extends"]({}, utils.pick(router.state, ['status', 'location', 'lastUpdated', 'location']), {
-          matches: router.state.matches.map(match => utils.pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
-        }),
+        store: {
+          ...utils.pick(store, ['latestLocation', 'currentLocation', 'status', 'lastUpdated']),
+          currentMatches: store.currentMatches.map(match => ({
+            matchId: match.matchId,
+            store: utils.pick(match.store, ['status', 'routeLoaderData', 'isInvalid', 'invalidAt'])
+          }))
+        },
         context: router.options.context
       };
     },
-    hydrate: dehydratedState => {
-      // Update the location
-      router.__location = dehydratedState.location;
-
-      // Update the context
-      router.options.context = dehydratedState.context;
+    hydrate: dehydratedRouter => {
+      setStore(s => {
+        // Update the context TODO: make this part of state?
+        router.options.context = dehydratedRouter.context;
 
-      // Match the routes
-      const matches = router.matchRoutes(router.__location.pathname, {
-        strictParseParams: true
-      });
-      matches.forEach((match, index) => {
-        const dehydratedMatch = dehydratedState.state.matches[index];
-        invariant__default["default"](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 = _rollupPluginBabelHelpers["extends"]({}, router.state, dehydratedState, {
-        matches
+        // Match the routes
+        const currentMatches = router.matchRoutes(dehydratedRouter.store.latestLocation.pathname, {
+          strictParseParams: true
+        });
+        currentMatches.forEach((match, index) => {
+          const dehydratedMatch = dehydratedRouter.store.currentMatches[index];
+          invariant__default["default"](dehydratedMatch && dehydratedMatch.matchId === match.matchId, 'Oh no! There was a hydration mismatch when attempting to restore the state of the router! 😬');
+          Object.assign(match, dehydratedMatch);
+        });
+        currentMatches.forEach(match => match.__.validate());
+        Object.assign(s, {
+          ...dehydratedRouter.store,
+          currentMatches
+        });
       });
     },
     mount: () => {
-      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));
-      });
+      // Mount only does anything on the client
+      if (!isServer) {
+        // If the router matches are empty, load the matches
+        if (!store.currentMatches.length) {
+          router.load();
+        }
+        const unsub = router.history.listen(event => {
+          router.load(parseLocation(event.location, store.latestLocation));
+        });
 
-      // addEventListener does not exist in React Native, but window does
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-      if (!isServer && window.addEventListener) {
-        // Listen to visibillitychange and focus
-        window.addEventListener('visibilitychange', router.onFocus, false);
-        window.addEventListener('focus', router.onFocus, false);
-      }
-      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);
+        // 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 (window.addEventListener) {
+          // Listen to visibilitychange and focus
+          window.addEventListener('visibilitychange', onFocus, false);
+          window.addEventListener('focus', onFocus, false);
         }
-      };
-    },
-    onFocus: () => {
-      router.load();
+        return () => {
+          unsub();
+          if (window.removeEventListener) {
+            // Be sure to unsubscribe if a new handler is set
+            window.removeEventListener('visibilitychange', onFocus);
+            window.removeEventListener('focus', onFocus);
+          }
+        };
+      }
+      return () => {};
     },
     update: opts => {
-      var _trimPath;
       const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
-      if (!router.__location || newHistory) {
+      if (!store.latestLocation || newHistory) {
         if (opts != null && opts.history) {
           router.history = opts.history;
         }
-        router.__location = router.__.parseLocation(router.history.location);
-        router.state.location = router.__location;
+        setStore(s => {
+          s.latestLocation = parseLocation(router.history.location);
+          s.currentLocation = s.latestLocation;
+        });
       }
       Object.assign(router.options, opts);
       const {
         basepath,
         routeConfig
       } = router.options;
-      router.basepath = "/" + ((_trimPath = path.trimPath(basepath != null ? basepath : '')) != null ? _trimPath : '');
+      router.basepath = `/${path.trimPath(basepath ?? '') ?? ''}`;
       if (routeConfig) {
         router.routesById = {};
-        router.routeTree = router.__.buildRouteTree(routeConfig);
+        router.routeTree = buildRouteTree(routeConfig);
       }
       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 => {
+      [...store.currentMatches, ...(store.pendingMatches || [])].forEach(match => {
         match.cancel();
       });
     },
     load: async next => {
-      const id = Math.random();
-      router.startedLoadingAt = id;
-      if (next) {
-        // Ingest the new location
-        router.__location = next;
-      }
+      let now = Date.now();
+      const startedAt = now;
+      startedLoadingAt = startedAt;
 
       // Cancel any pending matches
       router.cancelMatches();
+      let matches;
+      reactivity.batch(() => {
+        if (next) {
+          // Ingest the new location
+          setStore(s => {
+            s.latestLocation = next;
+          });
+        }
 
-      // Match the routes
-      const matches = router.matchRoutes(router.__location.pathname, {
-        strictParseParams: true
-      });
-      if (typeof document !== 'undefined') {
-        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-          pending: {
-            matches: matches,
-            location: router.__location
-          },
-          status: 'loading'
+        // Match the routes
+        matches = router.matchRoutes(store.latestLocation.pathname, {
+          strictParseParams: true
         });
-      } else {
-        router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-          matches: matches,
-          location: router.__location,
-          status: 'loading'
+        console.log('set loading', matches);
+        setStore(s => {
+          s.status = 'loading';
+          s.pendingMatches = matches;
+          s.pendingLocation = store.latestLocation;
         });
-      }
+      });
 
-      // Check if each match middleware to see if the route can be accessed
+      // Load the matches
       try {
-        await Promise.all(matches.map(match => match.options.beforeLoad == null ? void 0 : match.options.beforeLoad({
-          router: router,
-          match
-        })));
+        await router.loadMatches(matches);
       } catch (err) {
-        console.info(err);
-        invariant__default["default"](false, "A route's beforeLoad middleware failed! \uD83D\uDC46");
+        console.log(err);
+        invariant__default["default"](false, 'Matches failed to load due to error above ☝️. Navigation cancelled!');
       }
-      router.notify();
-
-      // Load the matches
-      await router.loadMatches(matches);
-      if (router.startedLoadingAt !== id) {
-        // Ignore side-effects of match loading
-        return router.navigationPromise;
+      if (startedLoadingAt !== startedAt) {
+        // Ignore side-effects of outdated side-effects
+        return navigationPromise;
       }
-      const previousMatches = router.state.matches;
+      const previousMatches = store.currentMatches;
       const exiting = [],
         staying = [];
       previousMatches.forEach(d => {
@@ -256,22 +337,21 @@ function createRouter(userOptions) {
       const entering = matches.filter(d => {
         return !previousMatches.find(dd => dd.matchId === d.matchId);
       });
-      const now = Date.now();
+      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
+          search: d.store.routeSearch
         });
 
         // Clear idle error states when match leaves
-        if (d.status === 'error' && !d.isFetching) {
-          d.status = 'idle';
-          d.error = undefined;
+        if (d.store.status === 'error' && !d.store.isFetching) {
+          d.store.status = 'idle';
+          d.store.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);
+        const gc = Math.max(d.options.loaderGcMaxAge ?? router.options.defaultLoaderGcMaxAge ?? 0, d.options.loaderMaxAge ?? router.options.defaultLoaderMaxAge ?? 0);
         if (gc > 0) {
-          router.matchCache[d.matchId] = {
+          store.matchCache[d.matchId] = {
             gc: gc == Infinity ? Number.MAX_SAFE_INTEGER : now + gc,
             match: d
           };
@@ -280,58 +360,64 @@ function createRouter(userOptions) {
       staying.forEach(d => {
         d.options.onTransition == null ? void 0 : d.options.onTransition({
           params: d.params,
-          search: d.routeSearch
+          search: d.store.routeSearch
         });
       });
       entering.forEach(d => {
         d.__.onExit = d.options.onLoaded == null ? void 0 : d.options.onLoaded({
           params: d.params,
-          search: d.search
+          search: d.store.search
         });
-        delete router.matchCache[d.matchId];
+        delete store.matchCache[d.matchId];
       });
-      if (router.startedLoadingAt !== id) {
+      if (startedLoadingAt !== startedAt) {
         // Ignore side-effects of match loading
         return;
       }
       matches.forEach(match => {
         // Clear actions
         if (match.action) {
+          // TODO: Check reactivity here
           match.action.current = undefined;
           match.action.submissions = [];
         }
       });
-      router.state = _rollupPluginBabelHelpers["extends"]({}, router.state, {
-        location: router.__location,
-        matches,
-        pending: undefined,
-        status: 'idle'
+      setStore(s => {
+        console.log('set', matches);
+        Object.assign(s, {
+          status: 'idle',
+          currentLocation: store.latestLocation,
+          currentMatches: matches,
+          pendingLocation: undefined,
+          pendingMatches: undefined
+        });
       });
-      router.notify();
-      router.resolveNavigation();
+      resolveNavigation();
     },
     cleanMatchCache: () => {
       const now = Date.now();
-      Object.keys(router.matchCache).forEach(matchId => {
-        const entry = router.matchCache[matchId];
+      setStore(s => {
+        Object.keys(s.matchCache).forEach(matchId => {
+          const entry = s.matchCache[matchId];
 
-        // Don't remove loading matches
-        if (entry.match.status === 'loading') {
-          return;
-        }
+          // Don't remove loading matches
+          if (entry.match.store.status === 'loading') {
+            return;
+          }
 
-        // Do not remove successful matches that are still valid
-        if (entry.gc > 0 && entry.gc > now) {
-          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];
+          // Everything else gets removed
+          delete s.matchCache[matchId];
+        });
       });
     },
-    loadRoute: async function loadRoute(navigateOpts) {
+    loadRoute: async function (navigateOpts) {
       if (navigateOpts === void 0) {
-        navigateOpts = router.__location;
+        navigateOpts = store.latestLocation;
       }
       const next = router.buildNext(navigateOpts);
       const matches = router.matchRoutes(next.pathname, {
@@ -340,10 +426,9 @@ function createRouter(userOptions) {
       await router.loadMatches(matches);
       return matches;
     },
-    preloadRoute: async function preloadRoute(navigateOpts, loaderOpts) {
-      var _ref3, _ref4, _loaderOpts$maxAge, _ref5, _ref6, _loaderOpts$gcMaxAge;
+    preloadRoute: async function (navigateOpts, loaderOpts) {
       if (navigateOpts === void 0) {
-        navigateOpts = router.__location;
+        navigateOpts = store.latestLocation;
       }
       const next = router.buildNext(navigateOpts);
       const matches = router.matchRoutes(next.pathname, {
@@ -351,28 +436,27 @@ function createRouter(userOptions) {
       });
       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
+        maxAge: loaderOpts.maxAge ?? router.options.defaultPreloadMaxAge ?? router.options.defaultLoaderMaxAge ?? 0,
+        gcMaxAge: loaderOpts.gcMaxAge ?? router.options.defaultPreloadGcMaxAge ?? router.options.defaultLoaderGcMaxAge ?? 0
       });
       return matches;
     },
     matchRoutes: (pathname, opts) => {
-      var _router$state$pending3, _router$state$pending4;
       router.cleanMatchCache();
       const matches = [];
       if (!router.routeTree) {
         return matches;
       }
-      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 existingMatches = [...store.currentMatches, ...(store.pendingMatches ?? [])];
       const recurse = async routes => {
-        var _parentMatch$params, _router$options$filte, _foundRoute$childRout;
+        var _foundRoute$childRout;
         const parentMatch = utils.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 params = (parentMatch == null ? void 0 : parentMatch.params) ?? {};
+        const filteredRoutes = (router.options.filterRoutes == null ? void 0 : router.options.filterRoutes(routes)) ?? routes;
         let foundRoutes = [];
         const findMatchInRoutes = (parentRoutes, routes) => {
           routes.some(route => {
-            var _route$childRoutes, _route$childRoutes2, _route$options$caseSe;
+            var _route$childRoutes, _route$childRoutes2;
             if (!route.routePath && (_route$childRoutes = route.childRoutes) != null && _route$childRoutes.length) {
               return findMatchInRoutes([...foundRoutes, route], route.childRoutes);
             }
@@ -380,20 +464,21 @@ function createRouter(userOptions) {
             const matchParams = path.matchPathname(router.basepath, pathname, {
               to: route.fullPath,
               fuzzy,
-              caseSensitive: (_route$options$caseSe = route.options.caseSensitive) != null ? _route$options$caseSe : router.options.caseSensitive
+              caseSensitive: route.options.caseSensitive ?? router.options.caseSensitive
             });
-            console.log(router.basepath, route.fullPath, fuzzy, pathname, matchParams);
             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;
+                parsedParams = (route.options.parseParams == null ? void 0 : route.options.parseParams(matchParams)) ?? matchParams;
               } catch (err) {
                 if (opts != null && opts.strictParseParams) {
                   throw err;
                 }
               }
-              params = _rollupPluginBabelHelpers["extends"]({}, params, parsedParams);
+              params = {
+                ...params,
+                ...parsedParams
+              };
             }
             if (!!matchParams) {
               foundRoutes = [...parentRoutes, route];
@@ -407,10 +492,10 @@ function createRouter(userOptions) {
           return;
         }
         foundRoutes.forEach(foundRoute => {
-          var _router$matchCache$ma;
+          var _store$matchCache$mat;
           const interpolatedPath = path.interpolatePath(foundRoute.routePath, params);
           const matchId = path.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) || routeMatch.createRouteMatch(router, foundRoute, {
+          const match = existingMatches.find(d => d.matchId === matchId) || ((_store$matchCache$mat = store.matchCache[matchId]) == null ? void 0 : _store$matchCache$mat.match) || routeMatch.createRouteMatch(router, foundRoute, {
             parentMatch,
             matchId,
             params,
@@ -424,40 +509,56 @@ function createRouter(userOptions) {
         }
       };
       recurse([router.routeTree]);
-      cascadeLoaderData(matches);
+      linkMatches(matches);
       return matches;
     },
     loadMatches: async (resolvedMatches, loaderOpts) => {
-      const matchPromises = resolvedMatches.map(async match => {
-        var _search$__data;
+      resolvedMatches.forEach(async match => {
         // Validate the match (loads search params etc)
         match.__.validate();
-        const search = match.search;
+      });
+
+      // Check each match middleware to see if the route can be accessed
+      await Promise.all(resolvedMatches.map(async match => {
+        try {
+          await (match.options.beforeLoad == null ? void 0 : match.options.beforeLoad({
+            router: router,
+            match
+          }));
+        } catch (err) {
+          if (!(loaderOpts != null && loaderOpts.preload)) {
+            match.options.onLoadError == null ? void 0 : match.options.onLoadError(err);
+          }
+          throw err;
+        }
+      }));
+      const matchPromises = resolvedMatches.map(async match => {
+        var _search$__data;
+        const search = match.store.search;
         if ((_search$__data = search.__data) != null && _search$__data.matchId && search.__data.matchId !== match.matchId) {
           return;
         }
         match.load(loaderOpts);
-        if (match.status !== 'success' && match.__.loadPromise) {
+        if (match.store.status !== 'success' && match.__.loadPromise) {
           // Wait for the first sign of activity from the match
           await match.__.loadPromise;
         }
       });
-      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({
+        return (await (routeMatch.options.loader == null ? void 0 : routeMatch.options.loader({
           // parentLoaderPromise: routeMatch.parentMatch?.__.dataPromise,
           params: routeMatch.params,
-          search: routeMatch.routeSearch,
+          search: routeMatch.store.routeSearch,
           signal: routeMatch.__.abortController.signal
-        }))) != null ? _await$routeMatch$opt : {};
+        }))) || {};
       } else {
         const next = router.buildNext({
           to: '.',
-          search: d => _rollupPluginBabelHelpers["extends"]({}, d != null ? d : {}, {
+          search: d => ({
+            ...(d ?? {}),
             __data: {
               matchId: routeMatch.matchId
             }
@@ -486,16 +587,15 @@ function createRouter(userOptions) {
       }
     },
     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 => {
+      [...store.currentMatches, ...(store.pendingMatches ?? [])].forEach(match => {
         if (unloadedMatchIds.includes(match.matchId)) {
           match.invalidate();
         }
       });
     },
-    reload: () => router.__.navigate({
+    reload: () => navigate({
       fromCurrent: true,
       replace: true,
       search: true
@@ -504,27 +604,28 @@ function createRouter(userOptions) {
       return path.resolvePath(router.basepath, from, path.cleanPath(path$1));
     },
     matchRoute: (location, opts) => {
-      var _location$from;
       // const location = router.buildNext(opts)
 
-      location = _rollupPluginBabelHelpers["extends"]({}, location, {
-        to: location.to ? router.resolvePath((_location$from = location.from) != null ? _location$from : '', location.to) : undefined
-      });
+      location = {
+        ...location,
+        to: location.to ? router.resolvePath(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)) {
+        if (!store.pendingLocation) {
           return false;
         }
-        return !!path.matchPathname(router.basepath, router.state.pending.location.pathname, _rollupPluginBabelHelpers["extends"]({}, opts, {
+        return !!path.matchPathname(router.basepath, store.pendingLocation.pathname, {
+          ...opts,
           to: next.pathname
-        }));
+        });
       }
-      return !!path.matchPathname(router.basepath, router.state.location.pathname, _rollupPluginBabelHelpers["extends"]({}, opts, {
+      return path.matchPathname(router.basepath, store.currentLocation.pathname, {
+        ...opts,
         to: next.pathname
-      }));
+      });
     },
-    navigate: async _ref7 => {
+    navigate: async _ref => {
       let {
         from,
         to = '.',
@@ -532,7 +633,7 @@ function createRouter(userOptions) {
         hash,
         replace,
         params
-      } = _ref7;
+      } = _ref;
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
 
@@ -542,11 +643,11 @@ function createRouter(userOptions) {
       const fromString = String(from);
       let isExternal;
       try {
-        new URL("" + toString);
+        new URL(`${toString}`);
         isExternal = true;
       } catch (e) {}
       invariant__default["default"](!isExternal, 'Attempting to navigate to external url with router.navigate!');
-      return router.__.navigate({
+      return navigate({
         from: fromString,
         to: toString,
         search,
@@ -555,8 +656,7 @@ function createRouter(userOptions) {
         params
       });
     },
-    buildLink: _ref8 => {
-      var _preload, _ref9;
+    buildLink: _ref2 => {
       let {
         from,
         to = '.',
@@ -571,7 +671,7 @@ function createRouter(userOptions) {
         preloadGcMaxAge: userPreloadGcMaxAge,
         preloadDelay: userPreloadDelay,
         disabled
-      } = _ref8;
+      } = _ref2;
       // If this link simply reloads the current route,
       // make sure it has a new key so it will trigger a data refresh
 
@@ -579,7 +679,7 @@ function createRouter(userOptions) {
       // null for LinkUtils
 
       try {
-        new URL("" + to);
+        new URL(`${to}`);
         return {
           type: 'external',
           href: to
@@ -594,15 +694,15 @@ function createRouter(userOptions) {
         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;
+      preload = preload ?? router.options.defaultPreload;
+      const preloadDelay = userPreloadDelay ?? router.options.defaultPreloadDelay ?? 0;
 
       // Compare path/hash for matches
-      const pathIsEqual = router.state.location.pathname === next.pathname;
-      const currentPathSplit = router.state.location.pathname.split('/');
+      const pathIsEqual = store.currentLocation.pathname === next.pathname;
+      const currentPathSplit = store.currentLocation.pathname.split('/');
       const nextPathSplit = next.pathname.split('/');
       const pathIsFuzzyEqual = nextPathSplit.every((d, i) => d === currentPathSplit[i]);
-      const hashIsEqual = router.state.location.hash === next.hash;
+      const hashIsEqual = store.currentLocation.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;
@@ -618,8 +718,8 @@ function createRouter(userOptions) {
             router.invalidateRoute(nextOpts);
           }
 
-          // All is well? Navigate!)
-          router.__.navigate(nextOpts);
+          // All is well? Navigate!
+          navigate(nextOpts);
         }
       };
 
@@ -629,6 +729,9 @@ function createRouter(userOptions) {
           router.preloadRoute(nextOpts, {
             maxAge: userPreloadMaxAge,
             gcMaxAge: userPreloadGcMaxAge
+          }).catch(err => {
+            console.log(err);
+            console.warn('Error preloading route! ☝️');
           });
         }
       };
@@ -643,6 +746,9 @@ function createRouter(userOptions) {
             router.preloadRoute(nextOpts, {
               maxAge: userPreloadMaxAge,
               gcMaxAge: userPreloadGcMaxAge
+            }).catch(err => {
+              console.log(err);
+              console.warn('Error preloading route! ☝️');
             });
           }, preloadDelay);
         }
@@ -666,143 +772,15 @@ function createRouter(userOptions) {
       };
     },
     buildNext: opts => {
-      const next = router.__.buildLocation(opts);
+      const next = 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(_rollupPluginBabelHelpers["extends"]({}, opts, {
+      const __preSearchFilters = matches.map(match => match.options.preSearchFilters ?? []).flat().filter(Boolean);
+      const __postSearchFilters = matches.map(match => match.options.postSearchFilters ?? []).flat().filter(Boolean);
+      return buildLocation({
+        ...opts,
         __preSearchFilters,
         __postSearchFilters
-      }));
-    },
-    __: {
-      buildRouteTree: rootRouteConfig => {
-        const recurseRoutes = (routeConfigs, parent) => {
-          return routeConfigs.map(routeConfig => {
-            const routeOptions = routeConfig.options;
-            const route$1 = route.createRoute(routeConfig, routeOptions, parent, router);
-            const existingRoute = router.routesById[route$1.routeId];
-            if (existingRoute) {
-              if (process.env.NODE_ENV !== 'production') {
-                console.warn("Duplicate routes found with id: " + String(route$1.routeId), router.routesById, route$1);
-              }
-              throw new Error();
-            }
-            router.routesById[route$1.routeId] = route$1;
-            const children = routeConfig.children;
-            route$1.childRoutes = children != null && children.length ? recurseRoutes(children, route$1) : undefined;
-            return route$1;
-          });
-        };
-        const routes = recurseRoutes([rootRouteConfig]);
-        return routes[0];
-      },
-      parseLocation: (location, previousLocation) => {
-        var _location$hash$split$;
-        const parsedSearch = router.options.parseSearch(location.search);
-        return {
-          pathname: location.pathname,
-          searchStr: location.search,
-          search: utils.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
-        };
-      },
-      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 = {};
-        }
-        const fromPathname = dest.fromCurrent ? router.__location.pathname : (_dest$from = dest.from) != null ? _dest$from : router.__location.pathname;
-        let pathname = path.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);
-        const prevParams = _rollupPluginBabelHelpers["extends"]({}, (_last = utils.last(fromMatches)) == null ? void 0 : _last.params);
-        let nextParams = ((_dest$params = dest.params) != null ? _dest$params : true) === true ? prevParams : utils.functionalUpdate(dest.params, prevParams);
-        if (nextParams) {
-          toMatches.map(d => d.options.stringifyParams).filter(Boolean).forEach(fn => {
-            Object.assign({}, nextParams, fn(nextParams));
-          });
-        }
-        pathname = path.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
-        const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
-        : dest.search ? (_functionalUpdate = utils.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 = utils.replaceEqualDeep(router.__location.search, postFilteredSearch);
-        const searchStr = router.options.stringifySearch(search);
-        let hash = dest.hash === true ? router.__location.hash : utils.functionalUpdate(dest.hash, router.__location.hash);
-        hash = hash ? "#" + hash : '';
-        return {
-          pathname,
-          search,
-          searchStr,
-          state: router.__location.state,
-          hash,
-          href: "" + pathname + searchStr + hash,
-          key: dest.key
-        };
-      },
-      commitLocation: (next, replace) => {
-        const id = '' + Date.now() + Math.random();
-        if (router.navigateTimeout) clearTimeout(router.navigateTimeout);
-        let nextAction = 'replace';
-        if (!replace) {
-          nextAction = 'push';
-        }
-        const isSameUrl = router.__.parseLocation(history.location).href === next.href;
-        if (isSameUrl && !next.key) {
-          nextAction = 'replace';
-        }
-        if (nextAction === 'replace') {
-          history.replace({
-            pathname: next.pathname,
-            hash: next.hash,
-            search: next.searchStr
-          }, _rollupPluginBabelHelpers["extends"]({
-            id
-          }, next.state));
-        } else {
-          history.push({
-            pathname: next.pathname,
-            hash: next.hash,
-            search: next.searchStr
-          }, {
-            id
-          });
-        }
-        router.navigationPromise = new Promise(resolve => {
-          const previousNavigationResolve = router.resolveNavigation;
-          router.resolveNavigation = () => {
-            previousNavigationResolve();
-            resolve();
-            delete router.navigationPromise;
-          };
-        });
-        return router.navigationPromise;
-      }
+      });
     }
   };
   router.update(userOptions);
@@ -814,11 +792,13 @@ function createRouter(userOptions) {
 function isCtrlEvent(e) {
   return !!(e.metaKey || e.altKey || e.ctrlKey || e.shiftKey);
 }
-function cascadeLoaderData(matches) {
+function linkMatches(matches) {
   matches.forEach((match, index) => {
     const parent = matches[index - 1];
     if (parent) {
-      match.loaderData = utils.replaceEqualDeep(match.loaderData, _rollupPluginBabelHelpers["extends"]({}, parent.loaderData, match.routeLoaderData));
+      match.__.setParentMatch(parent);
+    } else {
+      match.__.setParentMatch(undefined);
     }
   });
 }