@tanstack/router-core 1.131.5 → 1.132.0-alpha.0

package/dist/cjs/router.cjs

@@ -29,9 +29,9 @@ function defaultSerializeError(err) {
 function getLocationChangeInfo(routerState) {
   const fromLocation = routerState.resolvedLocation;
   const toLocation = routerState.location;
-  const pathChanged = (fromLocation == null ? void 0 : fromLocation.pathname) !== toLocation.pathname;
-  const hrefChanged = (fromLocation == null ? void 0 : fromLocation.href) !== toLocation.href;
-  const hashChanged = (fromLocation == null ? void 0 : fromLocation.hash) !== toLocation.hash;
+  const pathChanged = fromLocation?.pathname !== toLocation.pathname;
+  const hrefChanged = fromLocation?.href !== toLocation.href;
+  const hashChanged = fromLocation?.hash !== toLocation.hash;
   return { fromLocation, toLocation, pathChanged, hrefChanged, hashChanged };
 }
 class RouterCore {
@@ -50,7 +50,6 @@ class RouterCore {
     this.isScrollRestorationSetup = false;
     this.startTransition = (fn) => fn();
     this.update = (newOptions) => {
-      var _a;
       if (newOptions.notFoundRoute) {
         console.warn(
           "The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/framework/react/guide/not-found-errors#migrating-from-notfoundroute for more info."
@@ -79,7 +78,7 @@ class RouterCore {
         this.history = this.options.history ?? (this.isServer ? history.createMemoryHistory({
           initialEntries: [this.basepath || "/"]
         }) : history.createBrowserHistory());
-        this.updateLatestLocation();
+        this.latestLocation = this.parseLocation();
       }
       if (this.options.routeTree !== this.routeTree) {
         this.routeTree = this.options.routeTree;
@@ -98,18 +97,12 @@ class RouterCore {
         });
         scrollRestoration.setupScrollRestoration(this);
       }
-      if (typeof window !== "undefined" && "CSS" in window && typeof ((_a = window.CSS) == null ? void 0 : _a.supports) === "function") {
+      if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") {
         this.isViewTransitionTypesSupported = window.CSS.supports(
           "selector(:active-view-transition-type(a)"
         );
       }
     };
-    this.updateLatestLocation = () => {
-      this.latestLocation = this.parseLocation(
-        this.history.location,
-        this.latestLocation
-      );
-    };
     this.buildRouteTree = () => {
       const { routesById, routesByPath, flatRoutes } = processRouteTree({
         routeTree: this.routeTree,
@@ -147,7 +140,7 @@ class RouterCore {
         }
       });
     };
-    this.parseLocation = (locationToParse, previousLocation) => {
+    this.parseLocation = (previousLocation, locationToParse) => {
       const parse = ({
         pathname,
         search,
@@ -159,13 +152,13 @@ class RouterCore {
         return {
           pathname,
           searchStr,
-          search: utils.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.search, parsedSearch),
+          search: utils.replaceEqualDeep(previousLocation?.search, parsedSearch),
           hash: hash.split("#").reverse()[0] ?? "",
           href: `${pathname}${searchStr}${hash}`,
-          state: utils.replaceEqualDeep(previousLocation == null ? void 0 : previousLocation.state, state)
+          state: utils.replaceEqualDeep(previousLocation?.state, state)
         };
       };
-      const location = parse(locationToParse);
+      const location = parse(locationToParse ?? this.history.location);
       const { __tempLocation, __tempKey } = location.state;
       if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
         const parsedTempLocation = parse(__tempLocation);
@@ -219,18 +212,21 @@ class RouterCore {
       const match = this.getMatch(id);
       if (!match) return;
       match.abortController.abort();
-      match._nonReactive.pendingTimeout = void 0;
-      clearTimeout(match._nonReactive.pendingTimeout);
+      this.updateMatch(id, (prev) => {
+        clearTimeout(prev.pendingTimeout);
+        return {
+          ...prev,
+          pendingTimeout: void 0
+        };
+      });
     };
     this.cancelMatches = () => {
-      var _a;
-      (_a = this.state.pendingMatches) == null ? void 0 : _a.forEach((match) => {
+      this.state.pendingMatches?.forEach((match) => {
         this.cancelMatch(match.id);
       });
     };
     this.buildLocation = (opts) => {
       const build = (dest = {}) => {
-        var _a;
         const currentLocation = dest._fromLocation || this.latestLocation;
         const allCurrentLocationMatches = this.matchRoutes(currentLocation, {
           _buildLocation: true
@@ -271,13 +267,16 @@ class RouterCore {
           params: nextParams ?? {},
           parseCache: this.parsePathnameCache
         }).interpolatedPath;
-        const destRoutes = this.matchRoutes(interpolatedNextTo, void 0, {
-          _buildLocation: true
-        }).map((d) => this.looseRoutesById[d.routeId]);
+        const destRoutes = this.matchRoutes(
+          interpolatedNextTo,
+          {},
+          {
+            _buildLocation: true
+          }
+        ).map((d) => this.looseRoutesById[d.routeId]);
         if (Object.keys(nextParams).length > 0) {
           destRoutes.map((route) => {
-            var _a2;
-            return ((_a2 = route.options.params) == null ? void 0 : _a2.stringify) ?? route.options.stringifyParams;
+            return route.options.params?.stringify ?? route.options.stringifyParams;
           }).filter(Boolean).forEach((fn) => {
             nextParams = { ...nextParams, ...fn(nextParams) };
           });
@@ -293,7 +292,7 @@ class RouterCore {
           parseCache: this.parsePathnameCache
         }).interpolatedPath;
         let nextSearch = fromSearch;
-        if (opts._includeValidateSearch && ((_a = this.options.search) == null ? void 0 : _a.strict)) {
+        if (opts._includeValidateSearch && this.options.search?.strict) {
           let validatedSearch = {};
           destRoutes.forEach((route) => {
             try {
@@ -334,12 +333,11 @@ class RouterCore {
         };
       };
       const buildWithMatches = (dest = {}, maskedDest) => {
-        var _a;
         const next = build(dest);
         let maskedNext = maskedDest ? build(maskedDest) : void 0;
         if (!maskedNext) {
           let params = {};
-          const foundMask = (_a = this.options.routeMasks) == null ? void 0 : _a.find((d) => {
+          const foundMask = this.options.routeMasks?.find((d) => {
             const match = path.matchPathname(
               this.basepath,
               next.pathname,
@@ -405,7 +403,7 @@ class RouterCore {
       const isSameUrl = this.latestLocation.href === next.href;
       const previousCommitPromise = this.commitLocationPromise;
       this.commitLocationPromise = utils.createControlledPromise(() => {
-        previousCommitPromise == null ? void 0 : previousCommitPromise.resolve();
+        previousCommitPromise?.resolve();
       });
       if (isSameUrl && isSameState()) {
         this.load();
@@ -509,7 +507,7 @@ class RouterCore {
     };
     this.beforeLoad = () => {
       this.cancelMatches();
-      this.updateLatestLocation();
+      this.latestLocation = this.parseLocation(this.latestLocation);
       if (this.isServer) {
         const nextLocation = this.buildLocation({
           to: this.latestLocation.pathname,
@@ -550,7 +548,6 @@ class RouterCore {
       let loadPromise;
       loadPromise = new Promise((resolve) => {
         this.startTransition(async () => {
-          var _a;
           try {
             this.beforeLoad();
             const next = this.latestLocation;
@@ -572,7 +569,7 @@ class RouterCore {
               })
             });
             await this.loadMatches({
-              sync: opts == null ? void 0 : opts.sync,
+              sync: opts?.sync,
               matches: this.state.pendingMatches,
               location: next,
               // eslint-disable-next-line @typescript-eslint/require-await
@@ -614,8 +611,7 @@ class RouterCore {
                     [stayingMatches, "onStay"]
                   ].forEach(([matches, hook]) => {
                     matches.forEach((match) => {
-                      var _a2, _b;
-                      (_b = (_a2 = this.looseRoutesById[match.routeId].options)[hook]) == null ? void 0 : _b.call(_a2, match);
+                      this.looseRoutesById[match.routeId].options[hook]?.(match);
                     });
                   });
                 });
@@ -641,7 +637,7 @@ class RouterCore {
             }));
           }
           if (this.latestLoadPromise === loadPromise) {
-            (_a = this.commitLocationPromise) == null ? void 0 : _a.resolve();
+            this.commitLocationPromise?.resolve();
             this.latestLoadPromise = void 0;
             this.commitLocationPromise = void 0;
           }
@@ -687,22 +683,17 @@ class RouterCore {
       }
     };
     this.updateMatch = (id, updater) => {
-      var _a;
-      const matchesKey = ((_a = this.state.pendingMatches) == null ? void 0 : _a.some((d) => d.id === id)) ? "pendingMatches" : this.state.matches.some((d) => d.id === id) ? "matches" : this.state.cachedMatches.some((d) => d.id === id) ? "cachedMatches" : "";
+      const matchesKey = this.state.pendingMatches?.some((d) => d.id === id) ? "pendingMatches" : this.state.matches.some((d) => d.id === id) ? "matches" : this.state.cachedMatches.some((d) => d.id === id) ? "cachedMatches" : "";
       if (matchesKey) {
-        this.__store.setState((s) => {
-          var _a2;
-          return {
-            ...s,
-            [matchesKey]: (_a2 = s[matchesKey]) == null ? void 0 : _a2.map((d) => d.id === id ? updater(d) : d)
-          };
-        });
+        this.__store.setState((s) => ({
+          ...s,
+          [matchesKey]: s[matchesKey]?.map((d) => d.id === id ? updater(d) : d)
+        }));
       }
     };
     this.getMatch = (matchId) => {
-      var _a;
       const findFn = (d) => d.id === matchId;
-      return this.state.cachedMatches.find(findFn) ?? ((_a = this.state.pendingMatches) == null ? void 0 : _a.find(findFn)) ?? this.state.matches.find(findFn);
+      return this.state.cachedMatches.find(findFn) ?? this.state.pendingMatches?.find(findFn) ?? this.state.matches.find(findFn);
     };
     this.loadMatches = async ({
       location,
@@ -717,7 +708,7 @@ class RouterCore {
       const triggerOnReady = async () => {
         if (!rendered) {
           rendered = true;
-          await (onReady == null ? void 0 : onReady());
+          await onReady?.();
         }
       };
       const resolvePreload = (matchId) => {
@@ -727,7 +718,6 @@ class RouterCore {
         triggerOnReady();
       }
       const handleRedirectAndNotFound = (match, err) => {
-        var _a, _b, _c;
         if (redirect.isRedirect(err) || notFound.isNotFound(err)) {
           if (redirect.isRedirect(err)) {
             if (err.redirectHandled) {
@@ -736,20 +726,20 @@ class RouterCore {
               }
             }
           }
-          (_a = match._nonReactive.beforeLoadPromise) == null ? void 0 : _a.resolve();
-          (_b = match._nonReactive.loaderPromise) == null ? void 0 : _b.resolve();
-          match._nonReactive.beforeLoadPromise = void 0;
-          match._nonReactive.loaderPromise = void 0;
+          match.beforeLoadPromise?.resolve();
+          match.loaderPromise?.resolve();
           updateMatch(match.id, (prev) => ({
             ...prev,
             status: redirect.isRedirect(err) ? "redirected" : notFound.isNotFound(err) ? "notFound" : "error",
             isFetching: false,
-            error: err
+            error: err,
+            beforeLoadPromise: void 0,
+            loaderPromise: void 0
           }));
           if (!err.routeId) {
             err.routeId = match.routeId;
           }
-          (_c = match._nonReactive.loadPromise) == null ? void 0 : _c.resolve();
+          match.loadPromise?.resolve();
           if (redirect.isRedirect(err)) {
             rendered = true;
             err.options._fromLocation = location;
@@ -766,7 +756,7 @@ class RouterCore {
       };
       const shouldSkipLoader = (matchId) => {
         const match = this.getMatch(matchId);
-        if (!this.isServer && match._nonReactive.dehydrated) {
+        if (!this.isServer && match._dehydrated) {
           return true;
         }
         if (this.isServer) {
@@ -780,10 +770,8 @@ class RouterCore {
         await new Promise((resolveAll, rejectAll) => {
           ;
           (async () => {
-            var _a, _b, _c, _d;
             try {
               const handleSerialError = (index, err, routerCode) => {
-                var _a2, _b2;
                 const { id: matchId, routeId } = matches[index];
                 const route = this.looseRoutesById[routeId];
                 if (err instanceof Promise) {
@@ -793,29 +781,28 @@ class RouterCore {
                 firstBadMatchIndex = firstBadMatchIndex ?? index;
                 handleRedirectAndNotFound(this.getMatch(matchId), err);
                 try {
-                  (_b2 = (_a2 = route.options).onError) == null ? void 0 : _b2.call(_a2, err);
+                  route.options.onError?.(err);
                 } catch (errorHandlerErr) {
                   err = errorHandlerErr;
                   handleRedirectAndNotFound(this.getMatch(matchId), err);
                 }
                 updateMatch(matchId, (prev) => {
-                  var _a3, _b3;
-                  (_a3 = prev._nonReactive.beforeLoadPromise) == null ? void 0 : _a3.resolve();
-                  prev._nonReactive.beforeLoadPromise = void 0;
-                  (_b3 = prev._nonReactive.loadPromise) == null ? void 0 : _b3.resolve();
+                  prev.beforeLoadPromise?.resolve();
+                  prev.loadPromise?.resolve();
                   return {
                     ...prev,
                     error: err,
                     status: "error",
                     isFetching: false,
                     updatedAt: Date.now(),
-                    abortController: new AbortController()
+                    abortController: new AbortController(),
+                    beforeLoadPromise: void 0
                   };
                 });
               };
               for (const [index, { id: matchId, routeId }] of matches.entries()) {
                 const existingMatch = this.getMatch(matchId);
-                const parentMatchId = (_a = matches[index - 1]) == null ? void 0 : _a.id;
+                const parentMatchId = matches[index - 1]?.id;
                 const parentMatch = parentMatchId ? this.getMatch(parentMatchId) : void 0;
                 const route = this.looseRoutesById[routeId];
                 const pendingMs = route.options.pendingMs ?? this.options.defaultPendingMs;
@@ -825,7 +812,7 @@ class RouterCore {
                     ssr = matchId === root.rootRouteId;
                   } else {
                     const defaultSsr = this.options.defaultSsr ?? true;
-                    if ((parentMatch == null ? void 0 : parentMatch.ssr) === false) {
+                    if (parentMatch?.ssr === false) {
                       ssr = false;
                     } else {
                       let tempSsr;
@@ -859,39 +846,44 @@ class RouterCore {
                       } else {
                         tempSsr = route.options.ssr;
                       }
-                      if (tempSsr === true && (parentMatch == null ? void 0 : parentMatch.ssr) === "data-only") {
+                      if (tempSsr === true && parentMatch?.ssr === "data-only") {
                         ssr = "data-only";
                       } else {
                         ssr = tempSsr;
                       }
                     }
                   }
-                  existingMatch.ssr = ssr;
+                  updateMatch(matchId, (prev) => ({
+                    ...prev,
+                    ssr
+                  }));
                 }
                 if (shouldSkipLoader(matchId)) {
                   continue;
                 }
-                const shouldPending = !!(onReady && !this.isServer && !resolvePreload(matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? ((_b = this.options) == null ? void 0 : _b.defaultPendingComponent)));
+                const shouldPending = !!(onReady && !this.isServer && !resolvePreload(matchId) && (route.options.loader || route.options.beforeLoad || routeNeedsPreload(route)) && typeof pendingMs === "number" && pendingMs !== Infinity && (route.options.pendingComponent ?? this.options?.defaultPendingComponent));
                 let executeBeforeLoad = true;
                 const setupPendingTimeout = () => {
-                  const match = this.getMatch(matchId);
-                  if (shouldPending && match._nonReactive.pendingTimeout === void 0) {
+                  if (shouldPending && this.getMatch(matchId).pendingTimeout === void 0) {
                     const pendingTimeout = setTimeout(() => {
                       try {
                         triggerOnReady();
                       } catch {
                       }
                     }, pendingMs);
-                    match._nonReactive.pendingTimeout = pendingTimeout;
+                    updateMatch(matchId, (prev) => ({
+                      ...prev,
+                      pendingTimeout
+                    }));
                   }
                 };
                 if (
                   // If we are in the middle of a load, either of these will be present
                   // (not to be confused with `loadPromise`, which is always defined)
-                  existingMatch._nonReactive.beforeLoadPromise || existingMatch._nonReactive.loaderPromise
+                  existingMatch.beforeLoadPromise || existingMatch.loaderPromise
                 ) {
                   setupPendingTimeout();
-                  await existingMatch._nonReactive.beforeLoadPromise;
+                  await existingMatch.beforeLoadPromise;
                   const match = this.getMatch(matchId);
                   if (match.status === "error") {
                     executeBeforeLoad = true;
@@ -901,11 +893,15 @@ class RouterCore {
                 }
                 if (executeBeforeLoad) {
                   try {
-                    const match = this.getMatch(matchId);
-                    match._nonReactive.beforeLoadPromise = utils.createControlledPromise();
-                    const prevLoadPromise = match._nonReactive.loadPromise;
-                    match._nonReactive.loadPromise = utils.createControlledPromise(() => {
-                      prevLoadPromise == null ? void 0 : prevLoadPromise.resolve();
+                    updateMatch(matchId, (prev) => {
+                      const prevLoadPromise = prev.loadPromise;
+                      return {
+                        ...prev,
+                        loadPromise: utils.createControlledPromise(() => {
+                          prevLoadPromise?.resolve();
+                        }),
+                        beforeLoadPromise: utils.createControlledPromise()
+                      };
                     });
                     const { paramsError, searchError } = this.getMatch(matchId);
                     if (paramsError) {
@@ -916,7 +912,7 @@ class RouterCore {
                     }
                     setupPendingTimeout();
                     const abortController = new AbortController();
-                    const parentMatchContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? void 0;
+                    const parentMatchContext = parentMatch?.context ?? this.options.context ?? {};
                     updateMatch(matchId, (prev) => ({
                       ...prev,
                       isFetching: "beforeLoad",
@@ -941,7 +937,7 @@ class RouterCore {
                       cause: preload ? "preload" : cause,
                       matches
                     };
-                    const beforeLoadContext = await ((_d = (_c = route.options).beforeLoad) == null ? void 0 : _d.call(_c, beforeLoadFnContext));
+                    const beforeLoadContext = await route.options.beforeLoad?.(beforeLoadFnContext);
                     if (redirect.isRedirect(beforeLoadContext) || notFound.isNotFound(beforeLoadContext)) {
                       handleSerialError(index, beforeLoadContext, "BEFORE_LOAD");
                     }
@@ -961,11 +957,10 @@ class RouterCore {
                     handleSerialError(index, err, "BEFORE_LOAD");
                   }
                   updateMatch(matchId, (prev) => {
-                    var _a2;
-                    (_a2 = prev._nonReactive.beforeLoadPromise) == null ? void 0 : _a2.resolve();
-                    prev._nonReactive.beforeLoadPromise = void 0;
+                    prev.beforeLoadPromise?.resolve();
                     return {
                       ...prev,
+                      beforeLoadPromise: void 0,
                       isFetching: false
                     };
                   });
@@ -976,12 +971,10 @@ class RouterCore {
               validResolvedMatches.forEach(({ id: matchId, routeId }, index) => {
                 matchPromises.push(
                   (async () => {
-                    var _a2, _b2;
                     let loaderShouldRunAsync = false;
                     let loaderIsRunningAsync = false;
                     const route = this.looseRoutesById[routeId];
                     const executeHead = async () => {
-                      var _a3, _b3, _c2, _d2, _e, _f;
                       const match = this.getMatch(matchId);
                       if (!match) {
                         return;
@@ -992,13 +985,13 @@ class RouterCore {
                         params: match.params,
                         loaderData: match.loaderData
                       };
-                      const headFnContent = await ((_b3 = (_a3 = route.options).head) == null ? void 0 : _b3.call(_a3, assetContext));
-                      const meta = headFnContent == null ? void 0 : headFnContent.meta;
-                      const links = headFnContent == null ? void 0 : headFnContent.links;
-                      const headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
-                      const styles = headFnContent == null ? void 0 : headFnContent.styles;
-                      const scripts = await ((_d2 = (_c2 = route.options).scripts) == null ? void 0 : _d2.call(_c2, assetContext));
-                      const headers = await ((_f = (_e = route.options).headers) == null ? void 0 : _f.call(_e, assetContext));
+                      const headFnContent = await route.options.head?.(assetContext);
+                      const meta = headFnContent?.meta;
+                      const links = headFnContent?.links;
+                      const headScripts = headFnContent?.scripts;
+                      const styles = headFnContent?.styles;
+                      const scripts = await route.options.scripts?.(assetContext);
+                      const headers = await route.options.headers?.(assetContext);
                       return {
                         meta,
                         links,
@@ -1010,8 +1003,8 @@ class RouterCore {
                     };
                     const potentialPendingMinPromise = async () => {
                       const latestMatch = this.getMatch(matchId);
-                      if (latestMatch._nonReactive.minPendingPromise) {
-                        await latestMatch._nonReactive.minPendingPromise;
+                      if (latestMatch.minPendingPromise) {
+                        await latestMatch.minPendingPromise;
                       }
                     };
                     const prevMatch = this.getMatch(matchId);
@@ -1024,11 +1017,11 @@ class RouterCore {
                         }));
                         return this.getMatch(matchId);
                       }
-                    } else if (prevMatch._nonReactive.loaderPromise) {
+                    } else if (prevMatch.loaderPromise) {
                       if (prevMatch.status === "success" && !sync && !prevMatch.preload) {
                         return this.getMatch(matchId);
                       }
-                      await prevMatch._nonReactive.loaderPromise;
+                      await prevMatch.loaderPromise;
                       const match = this.getMatch(matchId);
                       if (match.error) {
                         handleRedirectAndNotFound(match, match.error);
@@ -1062,15 +1055,12 @@ class RouterCore {
                       const staleAge = preload ? route.options.preloadStaleTime ?? this.options.defaultPreloadStaleTime ?? 3e4 : route.options.staleTime ?? this.options.defaultStaleTime ?? 0;
                       const shouldReloadOption = route.options.shouldReload;
                       const shouldReload = typeof shouldReloadOption === "function" ? shouldReloadOption(getLoaderContext()) : shouldReloadOption;
-                      updateMatch(matchId, (prev) => {
-                        prev._nonReactive.loaderPromise = utils.createControlledPromise();
-                        return {
-                          ...prev,
-                          preload: !!preload && !this.state.matches.some((d) => d.id === matchId)
-                        };
-                      });
+                      updateMatch(matchId, (prev) => ({
+                        ...prev,
+                        loaderPromise: utils.createControlledPromise(),
+                        preload: !!preload && !this.state.matches.some((d) => d.id === matchId)
+                      }));
                       const runLoader = async () => {
-                        var _a3, _b3, _c2, _d2;
                         try {
                           try {
                             if (!this.isServer || this.isServer && this.getMatch(matchId).ssr === true) {
@@ -1080,7 +1070,7 @@ class RouterCore {
                               ...prev,
                               isFetching: "loader"
                             }));
-                            const loaderData = await ((_b3 = (_a3 = route.options).loader) == null ? void 0 : _b3.call(_a3, getLoaderContext()));
+                            const loaderData = await route.options.loader?.(getLoaderContext());
                             handleRedirectAndNotFound(
                               this.getMatch(matchId),
                               loaderData
@@ -1106,7 +1096,7 @@ class RouterCore {
                             await potentialPendingMinPromise();
                             handleRedirectAndNotFound(this.getMatch(matchId), e);
                             try {
-                              (_d2 = (_c2 = route.options).onError) == null ? void 0 : _d2.call(_c2, e);
+                              route.options.onError?.(e);
                             } catch (onErrorError) {
                               error = onErrorError;
                               handleRedirectAndNotFound(
@@ -1125,13 +1115,11 @@ class RouterCore {
                           }
                         } catch (err) {
                           const head = await executeHead();
-                          updateMatch(matchId, (prev) => {
-                            prev._nonReactive.loaderPromise = void 0;
-                            return {
-                              ...prev,
-                              ...head
-                            };
-                          });
+                          updateMatch(matchId, (prev) => ({
+                            ...prev,
+                            loaderPromise: void 0,
+                            ...head
+                          }));
                           handleRedirectAndNotFound(this.getMatch(matchId), err);
                         }
                       };
@@ -1141,13 +1129,15 @@ class RouterCore {
                       } else if (loaderShouldRunAsync && !sync) {
                         loaderIsRunningAsync = true;
                         (async () => {
-                          var _a3, _b3;
                           try {
                             await runLoader();
-                            const match = this.getMatch(matchId);
-                            (_a3 = match._nonReactive.loaderPromise) == null ? void 0 : _a3.resolve();
-                            (_b3 = match._nonReactive.loadPromise) == null ? void 0 : _b3.resolve();
-                            match._nonReactive.loaderPromise = void 0;
+                            const { loaderPromise, loadPromise } = this.getMatch(matchId);
+                            loaderPromise?.resolve();
+                            loadPromise?.resolve();
+                            updateMatch(matchId, (prev) => ({
+                              ...prev,
+                              loaderPromise: void 0
+                            }));
                           } catch (err) {
                             if (redirect.isRedirect(err)) {
                               await this.navigate(err.options);
@@ -1165,20 +1155,19 @@ class RouterCore {
                       }
                     }
                     if (!loaderIsRunningAsync) {
-                      const match = this.getMatch(matchId);
-                      (_a2 = match._nonReactive.loaderPromise) == null ? void 0 : _a2.resolve();
-                      (_b2 = match._nonReactive.loadPromise) == null ? void 0 : _b2.resolve();
+                      const { loaderPromise, loadPromise } = this.getMatch(matchId);
+                      loaderPromise?.resolve();
+                      loadPromise?.resolve();
                     }
                     updateMatch(matchId, (prev) => {
-                      clearTimeout(prev._nonReactive.pendingTimeout);
-                      prev._nonReactive.pendingTimeout = void 0;
-                      if (!loaderIsRunningAsync)
-                        prev._nonReactive.loaderPromise = void 0;
-                      prev._nonReactive.dehydrated = void 0;
+                      clearTimeout(prev.pendingTimeout);
                       return {
                         ...prev,
                         isFetching: loaderIsRunningAsync ? prev.isFetching : false,
-                        invalid: false
+                        loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
+                        invalid: false,
+                        pendingTimeout: void 0,
+                        _dehydrated: void 0
                       };
                     });
                     return this.getMatch(matchId);
@@ -1205,27 +1194,23 @@ class RouterCore {
     };
     this.invalidate = (opts) => {
       const invalidate = (d) => {
-        var _a;
-        if (((_a = opts == null ? void 0 : opts.filter) == null ? void 0 : _a.call(opts, d)) ?? true) {
+        if (opts?.filter?.(d) ?? true) {
           return {
             ...d,
             invalid: true,
-            ...(opts == null ? void 0 : opts.forcePending) || d.status === "error" ? { status: "pending", error: void 0 } : void 0
+            ...opts?.forcePending || d.status === "error" ? { status: "pending", error: void 0 } : {}
           };
         }
         return d;
       };
-      this.__store.setState((s) => {
-        var _a;
-        return {
-          ...s,
-          matches: s.matches.map(invalidate),
-          cachedMatches: s.cachedMatches.map(invalidate),
-          pendingMatches: (_a = s.pendingMatches) == null ? void 0 : _a.map(invalidate)
-        };
-      });
+      this.__store.setState((s) => ({
+        ...s,
+        matches: s.matches.map(invalidate),
+        cachedMatches: s.cachedMatches.map(invalidate),
+        pendingMatches: s.pendingMatches?.map(invalidate)
+      }));
       this.shouldViewTransition = false;
-      return this.load({ sync: opts == null ? void 0 : opts.sync });
+      return this.load({ sync: opts?.sync });
     };
     this.resolveRedirect = (redirect2) => {
       if (!redirect2.options.href) {
@@ -1238,7 +1223,7 @@ class RouterCore {
       return redirect2;
     };
     this.clearCache = (opts) => {
-      const filter = opts == null ? void 0 : opts.filter;
+      const filter = opts?.filter;
       if (filter !== void 0) {
         this.__store.setState((s) => {
           return {
@@ -1287,7 +1272,7 @@ class RouterCore {
           () => Promise.all(
             componentTypes.map(async (type) => {
               const component = route.options[type];
-              if (component == null ? void 0 : component.preload) {
+              if (component?.preload) {
                 await component.preload();
               }
             })
@@ -1363,10 +1348,10 @@ class RouterCore {
         leaveParams: true
       };
       const next = this.buildLocation(matchLocation);
-      if ((opts == null ? void 0 : opts.pending) && this.state.status !== "pending") {
+      if (opts?.pending && this.state.status !== "pending") {
         return false;
       }
-      const pending = (opts == null ? void 0 : opts.pending) === void 0 ? !this.state.isLoading : opts.pending;
+      const pending = opts?.pending === void 0 ? !this.state.isLoading : opts.pending;
       const baseLocation = pending ? this.latestLocation : this.state.resolvedLocation || this.state.location;
       const match = path.matchPathname(
         this.basepath,
@@ -1385,7 +1370,7 @@ class RouterCore {
           return false;
         }
       }
-      if (match && ((opts == null ? void 0 : opts.includeSearch) ?? true)) {
+      if (match && (opts?.includeSearch ?? true)) {
         return utils.deepEqual(baseLocation.search, next.search, { partial: true }) ? match : false;
       }
       return match;
@@ -1393,13 +1378,12 @@ class RouterCore {
     this._handleNotFound = (matches, err, {
       updateMatch = this.updateMatch
     } = {}) => {
-      var _a;
       const routeCursor = this.routesById[err.routeId ?? ""] ?? this.routeTree;
       const matchesByRouteId = {};
       for (const match of matches) {
         matchesByRouteId[match.routeId] = match;
       }
-      if (!routeCursor.options.notFoundComponent && ((_a = this.options) == null ? void 0 : _a.defaultNotFoundComponent)) {
+      if (!routeCursor.options.notFoundComponent && this.options?.defaultNotFoundComponent) {
         routeCursor.options.notFoundComponent = this.options.defaultNotFoundComponent;
       }
       invariant(
@@ -1457,10 +1441,9 @@ class RouterCore {
     return this.routesById;
   }
   matchRoutesInternal(next, opts) {
-    var _a;
     const { foundRoute, matchedRoutes, routeParams } = this.getMatchedRoutes(
       next.pathname,
-      (_a = opts == null ? void 0 : opts.dest) == null ? void 0 : _a.to
+      opts?.dest?.to
     );
     let isGlobalNotFound = false;
     if (
@@ -1491,9 +1474,8 @@ class RouterCore {
       return root.rootRouteId;
     })();
     const parseErrors = matchedRoutes.map((route) => {
-      var _a2;
       let parsedParamsError;
-      const parseParams = ((_a2 = route.options.params) == null ? void 0 : _a2.parse) ?? route.options.parseParams;
+      const parseParams = route.options.params?.parse ?? route.options.parseParams;
       if (parseParams) {
         try {
           const parsedParams = parseParams(routeParams);
@@ -1502,7 +1484,7 @@ class RouterCore {
           parsedParamsError = new PathParamError(err.message, {
             cause: err
           });
-          if (opts == null ? void 0 : opts.throwOnError) {
+          if (opts?.throwOnError) {
             throw parsedParamsError;
           }
           return parsedParamsError;
@@ -1512,18 +1494,17 @@ class RouterCore {
     });
     const matches = [];
     const getParentContext = (parentMatch) => {
-      const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
-      const parentContext = !parentMatchId ? this.options.context ?? void 0 : parentMatch.context ?? this.options.context ?? void 0;
+      const parentMatchId = parentMatch?.id;
+      const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};
       return parentContext;
     };
     matchedRoutes.forEach((route, index) => {
-      var _a2, _b;
       const parentMatch = matches[index - 1];
       const [preMatchSearch, strictMatchSearch, searchError] = (() => {
-        const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? next.search;
-        const parentStrictSearch = (parentMatch == null ? void 0 : parentMatch._strictSearch) ?? void 0;
+        const parentSearch = parentMatch?.search ?? next.search;
+        const parentStrictSearch = parentMatch?._strictSearch ?? {};
         try {
-          const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? void 0;
+          const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? {};
           return [
             {
               ...parentSearch,
@@ -1539,15 +1520,15 @@ class RouterCore {
               cause: err
             });
           }
-          if (opts == null ? void 0 : opts.throwOnError) {
+          if (opts?.throwOnError) {
             throw searchParamError;
           }
           return [parentSearch, {}, searchParamError];
         }
       })();
-      const loaderDeps = ((_b = (_a2 = route.options).loaderDeps) == null ? void 0 : _b.call(_a2, {
+      const loaderDeps = route.options.loaderDeps?.({
         search: preMatchSearch
-      })) ?? "";
+      }) ?? "";
       const loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) : "";
       const { usedParams, interpolatedPath } = path.interpolatePath({
         path: route.fullPath,
@@ -1593,10 +1574,7 @@ class RouterCore {
           isFetching: false,
           error: void 0,
           paramsError: parseErrors[index],
-          __routeContext: void 0,
-          _nonReactive: {
-            loadPromise: utils.createControlledPromise()
-          },
+          __routeContext: {},
           __beforeLoadContext: void 0,
           context: {},
           abortController: new AbortController(),
@@ -1610,10 +1588,11 @@ class RouterCore {
           headScripts: void 0,
           meta: void 0,
           staticData: route.options.staticData || {},
+          loadPromise: utils.createControlledPromise(),
           fullPath: route.fullPath
         };
       }
-      if (!(opts == null ? void 0 : opts.preload)) {
+      if (!opts?.preload) {
         match.globalNotFound = globalNotFoundRouteId === route.id;
       }
       match.searchError = searchError;
@@ -1628,24 +1607,22 @@ class RouterCore {
     matches.forEach((match, index) => {
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
-      if (!existingMatch && (opts == null ? void 0 : opts._buildLocation) !== true) {
+      if (!existingMatch && opts?._buildLocation !== true) {
         const parentMatch = matches[index - 1];
         const parentContext = getParentContext(parentMatch);
-        if (route.options.context) {
-          const contextFnContext = {
-            deps: match.loaderDeps,
-            params: match.params,
-            context: parentContext ?? {},
-            location: next,
-            navigate: (opts2) => this.navigate({ ...opts2, _fromLocation: next }),
-            buildLocation: this.buildLocation,
-            cause: match.cause,
-            abortController: match.abortController,
-            preload: !!match.preload,
-            matches
-          };
-          match.__routeContext = route.options.context(contextFnContext) ?? void 0;
-        }
+        const contextFnContext = {
+          deps: match.loaderDeps,
+          params: match.params,
+          context: parentContext,
+          location: next,
+          navigate: (opts2) => this.navigate({ ...opts2, _fromLocation: next }),
+          buildLocation: this.buildLocation,
+          cause: match.cause,
+          abortController: match.abortController,
+          preload: !!match.preload,
+          matches
+        };
+        match.__routeContext = route.options.context?.(contextFnContext) ?? {};
         match.context = {
           ...parentContext,
           ...match.__routeContext,
@@ -1711,9 +1688,8 @@ const componentTypes = [
   "notFoundComponent"
 ];
 function routeNeedsPreload(route) {
-  var _a;
   for (const componentType of componentTypes) {
-    if ((_a = route.options[componentType]) == null ? void 0 : _a.preload) {
+    if (route.options[componentType]?.preload) {
       return true;
     }
   }
@@ -1747,7 +1723,7 @@ function processRouteTree({
   const routesByPath = {};
   const recurseRoutes = (childRoutes) => {
     childRoutes.forEach((childRoute, i) => {
-      initRoute == null ? void 0 : initRoute(childRoute, i);
+      initRoute?.(childRoute, i);
       const existingRoute = routesById[childRoute.id];
       invariant(
         !existingRoute,
@@ -1761,7 +1737,7 @@ function processRouteTree({
         }
       }
       const children = childRoute.children;
-      if (children == null ? void 0 : children.length) {
+      if (children?.length) {
         recurseRoutes(children);
       }
     });
@@ -1770,14 +1746,13 @@ function processRouteTree({
   const scoredRoutes = [];
   const routes = Object.values(routesById);
   routes.forEach((d, i) => {
-    var _a;
     if (d.isRoot || !d.path) {
       return;
     }
     const trimmed = path.trimPathLeft(d.fullPath);
     let parsed = path.parsePathname(trimmed);
     let skip = 0;
-    while (parsed.length > skip + 1 && ((_a = parsed[skip]) == null ? void 0 : _a.value) === "/") {
+    while (parsed.length > skip + 1 && parsed[skip]?.value === "/") {
       skip++;
     }
     if (skip > 0) parsed = parsed.slice(skip);
@@ -1862,13 +1837,12 @@ function getMatchedRoutes({
   let routeParams = {};
   const trimmedPath = path.trimPathRight(pathname);
   const getMatchedParams = (route) => {
-    var _a;
     const result = path.matchPathname(
       basepath,
       trimmedPath,
       {
         to: route.fullPath,
-        caseSensitive: ((_a = route.options) == null ? void 0 : _a.caseSensitive) ?? caseSensitive,
+        caseSensitive: route.options?.caseSensitive ?? caseSensitive,
         // we need fuzzy matching for `notFoundMode: 'fuzzy'`
         fuzzy: true
       },
@@ -1917,10 +1891,9 @@ function applySearchMiddleware({
 }) {
   const allMiddlewares = destRoutes.reduce(
     (acc, route) => {
-      var _a;
       const middlewares = [];
       if ("search" in route.options) {
-        if ((_a = route.options.search) == null ? void 0 : _a.middlewares) {
+        if (route.options.search?.middlewares) {
           middlewares.push(...route.options.search.middlewares);
         }
       } else if (route.options.preSearchFilters || route.options.postSearchFilters) {
@@ -1952,7 +1925,7 @@ function applySearchMiddleware({
           try {
             const validatedSearch = {
               ...result,
-              ...validateSearch(route.options.validateSearch, result) ?? void 0
+              ...validateSearch(route.options.validateSearch, result) ?? {}
             };
             return validatedSearch;
           } catch {