@tanstack/router-core 1.131.3 → 1.131.5

package/dist/esm/router.js

@@ -217,13 +217,8 @@ class RouterCore {
       const match = this.getMatch(id);
       if (!match) return;
       match.abortController.abort();
-      this.updateMatch(id, (prev) => {
-        clearTimeout(prev.pendingTimeout);
-        return {
-          ...prev,
-          pendingTimeout: void 0
-        };
-      });
+      match._nonReactive.pendingTimeout = void 0;
+      clearTimeout(match._nonReactive.pendingTimeout);
     };
     this.cancelMatches = () => {
       var _a;
@@ -274,13 +269,9 @@ class RouterCore {
           params: nextParams ?? {},
           parseCache: this.parsePathnameCache
         }).interpolatedPath;
-        const destRoutes = this.matchRoutes(
-          interpolatedNextTo,
-          {},
-          {
-            _buildLocation: true
-          }
-        ).map((d) => this.looseRoutesById[d.routeId]);
+        const destRoutes = this.matchRoutes(interpolatedNextTo, void 0, {
+          _buildLocation: true
+        }).map((d) => this.looseRoutesById[d.routeId]);
         if (Object.keys(nextParams).length > 0) {
           destRoutes.map((route) => {
             var _a2;
@@ -743,20 +734,20 @@ class RouterCore {
               }
             }
           }
-          (_a = match.beforeLoadPromise) == null ? void 0 : _a.resolve();
-          (_b = match.loaderPromise) == null ? void 0 : _b.resolve();
+          (_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;
           updateMatch(match.id, (prev) => ({
             ...prev,
             status: isRedirect(err) ? "redirected" : isNotFound(err) ? "notFound" : "error",
             isFetching: false,
-            error: err,
-            beforeLoadPromise: void 0,
-            loaderPromise: void 0
+            error: err
           }));
           if (!err.routeId) {
             err.routeId = match.routeId;
           }
-          (_c = match.loadPromise) == null ? void 0 : _c.resolve();
+          (_c = match._nonReactive.loadPromise) == null ? void 0 : _c.resolve();
           if (isRedirect(err)) {
             rendered = true;
             err.options._fromLocation = location;
@@ -773,7 +764,7 @@ class RouterCore {
       };
       const shouldSkipLoader = (matchId) => {
         const match = this.getMatch(matchId);
-        if (!this.isServer && match._dehydrated) {
+        if (!this.isServer && match._nonReactive.dehydrated) {
           return true;
         }
         if (this.isServer) {
@@ -807,16 +798,16 @@ class RouterCore {
                 }
                 updateMatch(matchId, (prev) => {
                   var _a3, _b3;
-                  (_a3 = prev.beforeLoadPromise) == null ? void 0 : _a3.resolve();
-                  (_b3 = prev.loadPromise) == null ? void 0 : _b3.resolve();
+                  (_a3 = prev._nonReactive.beforeLoadPromise) == null ? void 0 : _a3.resolve();
+                  prev._nonReactive.beforeLoadPromise = void 0;
+                  (_b3 = prev._nonReactive.loadPromise) == null ? void 0 : _b3.resolve();
                   return {
                     ...prev,
                     error: err,
                     status: "error",
                     isFetching: false,
                     updatedAt: Date.now(),
-                    abortController: new AbortController(),
-                    beforeLoadPromise: void 0
+                    abortController: new AbortController()
                   };
                 });
               };
@@ -873,10 +864,7 @@ class RouterCore {
                       }
                     }
                   }
-                  updateMatch(matchId, (prev) => ({
-                    ...prev,
-                    ssr
-                  }));
+                  existingMatch.ssr = ssr;
                 }
                 if (shouldSkipLoader(matchId)) {
                   continue;
@@ -884,26 +872,24 @@ class RouterCore {
                 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)));
                 let executeBeforeLoad = true;
                 const setupPendingTimeout = () => {
-                  if (shouldPending && this.getMatch(matchId).pendingTimeout === void 0) {
+                  const match = this.getMatch(matchId);
+                  if (shouldPending && match._nonReactive.pendingTimeout === void 0) {
                     const pendingTimeout = setTimeout(() => {
                       try {
                         triggerOnReady();
                       } catch {
                       }
                     }, pendingMs);
-                    updateMatch(matchId, (prev) => ({
-                      ...prev,
-                      pendingTimeout
-                    }));
+                    match._nonReactive.pendingTimeout = 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.beforeLoadPromise || existingMatch.loaderPromise
+                  existingMatch._nonReactive.beforeLoadPromise || existingMatch._nonReactive.loaderPromise
                 ) {
                   setupPendingTimeout();
-                  await existingMatch.beforeLoadPromise;
+                  await existingMatch._nonReactive.beforeLoadPromise;
                   const match = this.getMatch(matchId);
                   if (match.status === "error") {
                     executeBeforeLoad = true;
@@ -913,15 +899,11 @@ class RouterCore {
                 }
                 if (executeBeforeLoad) {
                   try {
-                    updateMatch(matchId, (prev) => {
-                      const prevLoadPromise = prev.loadPromise;
-                      return {
-                        ...prev,
-                        loadPromise: createControlledPromise(() => {
-                          prevLoadPromise == null ? void 0 : prevLoadPromise.resolve();
-                        }),
-                        beforeLoadPromise: createControlledPromise()
-                      };
+                    const match = this.getMatch(matchId);
+                    match._nonReactive.beforeLoadPromise = createControlledPromise();
+                    const prevLoadPromise = match._nonReactive.loadPromise;
+                    match._nonReactive.loadPromise = createControlledPromise(() => {
+                      prevLoadPromise == null ? void 0 : prevLoadPromise.resolve();
                     });
                     const { paramsError, searchError } = this.getMatch(matchId);
                     if (paramsError) {
@@ -932,7 +914,7 @@ class RouterCore {
                     }
                     setupPendingTimeout();
                     const abortController = new AbortController();
-                    const parentMatchContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? {};
+                    const parentMatchContext = (parentMatch == null ? void 0 : parentMatch.context) ?? this.options.context ?? void 0;
                     updateMatch(matchId, (prev) => ({
                       ...prev,
                       isFetching: "beforeLoad",
@@ -978,10 +960,10 @@ class RouterCore {
                   }
                   updateMatch(matchId, (prev) => {
                     var _a2;
-                    (_a2 = prev.beforeLoadPromise) == null ? void 0 : _a2.resolve();
+                    (_a2 = prev._nonReactive.beforeLoadPromise) == null ? void 0 : _a2.resolve();
+                    prev._nonReactive.beforeLoadPromise = void 0;
                     return {
                       ...prev,
-                      beforeLoadPromise: void 0,
                       isFetching: false
                     };
                   });
@@ -992,11 +974,12 @@ 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 _a2, _b2, _c2, _d2, _e, _f;
+                      var _a3, _b3, _c2, _d2, _e, _f;
                       const match = this.getMatch(matchId);
                       if (!match) {
                         return;
@@ -1007,7 +990,7 @@ class RouterCore {
                         params: match.params,
                         loaderData: match.loaderData
                       };
-                      const headFnContent = await ((_b2 = (_a2 = route.options).head) == null ? void 0 : _b2.call(_a2, assetContext));
+                      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;
@@ -1025,8 +1008,8 @@ class RouterCore {
                     };
                     const potentialPendingMinPromise = async () => {
                       const latestMatch = this.getMatch(matchId);
-                      if (latestMatch.minPendingPromise) {
-                        await latestMatch.minPendingPromise;
+                      if (latestMatch._nonReactive.minPendingPromise) {
+                        await latestMatch._nonReactive.minPendingPromise;
                       }
                     };
                     const prevMatch = this.getMatch(matchId);
@@ -1039,11 +1022,11 @@ class RouterCore {
                         }));
                         return this.getMatch(matchId);
                       }
-                    } else if (prevMatch.loaderPromise) {
+                    } else if (prevMatch._nonReactive.loaderPromise) {
                       if (prevMatch.status === "success" && !sync && !prevMatch.preload) {
                         return this.getMatch(matchId);
                       }
-                      await prevMatch.loaderPromise;
+                      await prevMatch._nonReactive.loaderPromise;
                       const match = this.getMatch(matchId);
                       if (match.error) {
                         handleRedirectAndNotFound(match, match.error);
@@ -1077,13 +1060,15 @@ 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,
-                        loaderPromise: createControlledPromise(),
-                        preload: !!preload && !this.state.matches.some((d) => d.id === matchId)
-                      }));
+                      updateMatch(matchId, (prev) => {
+                        prev._nonReactive.loaderPromise = createControlledPromise();
+                        return {
+                          ...prev,
+                          preload: !!preload && !this.state.matches.some((d) => d.id === matchId)
+                        };
+                      });
                       const runLoader = async () => {
-                        var _a2, _b2, _c2, _d2;
+                        var _a3, _b3, _c2, _d2;
                         try {
                           try {
                             if (!this.isServer || this.isServer && this.getMatch(matchId).ssr === true) {
@@ -1093,7 +1078,7 @@ class RouterCore {
                               ...prev,
                               isFetching: "loader"
                             }));
-                            const loaderData = await ((_b2 = (_a2 = route.options).loader) == null ? void 0 : _b2.call(_a2, getLoaderContext()));
+                            const loaderData = await ((_b3 = (_a3 = route.options).loader) == null ? void 0 : _b3.call(_a3, getLoaderContext()));
                             handleRedirectAndNotFound(
                               this.getMatch(matchId),
                               loaderData
@@ -1138,11 +1123,13 @@ class RouterCore {
                           }
                         } catch (err) {
                           const head = await executeHead();
-                          updateMatch(matchId, (prev) => ({
-                            ...prev,
-                            loaderPromise: void 0,
-                            ...head
-                          }));
+                          updateMatch(matchId, (prev) => {
+                            prev._nonReactive.loaderPromise = void 0;
+                            return {
+                              ...prev,
+                              ...head
+                            };
+                          });
                           handleRedirectAndNotFound(this.getMatch(matchId), err);
                         }
                       };
@@ -1152,15 +1139,13 @@ class RouterCore {
                       } else if (loaderShouldRunAsync && !sync) {
                         loaderIsRunningAsync = true;
                         (async () => {
+                          var _a3, _b3;
                           try {
                             await runLoader();
-                            const { loaderPromise, loadPromise } = this.getMatch(matchId);
-                            loaderPromise == null ? void 0 : loaderPromise.resolve();
-                            loadPromise == null ? void 0 : loadPromise.resolve();
-                            updateMatch(matchId, (prev) => ({
-                              ...prev,
-                              loaderPromise: void 0
-                            }));
+                            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;
                           } catch (err) {
                             if (isRedirect(err)) {
                               await this.navigate(err.options);
@@ -1178,19 +1163,20 @@ class RouterCore {
                       }
                     }
                     if (!loaderIsRunningAsync) {
-                      const { loaderPromise, loadPromise } = this.getMatch(matchId);
-                      loaderPromise == null ? void 0 : loaderPromise.resolve();
-                      loadPromise == null ? void 0 : loadPromise.resolve();
+                      const match = this.getMatch(matchId);
+                      (_a2 = match._nonReactive.loaderPromise) == null ? void 0 : _a2.resolve();
+                      (_b2 = match._nonReactive.loadPromise) == null ? void 0 : _b2.resolve();
                     }
                     updateMatch(matchId, (prev) => {
-                      clearTimeout(prev.pendingTimeout);
+                      clearTimeout(prev._nonReactive.pendingTimeout);
+                      prev._nonReactive.pendingTimeout = void 0;
+                      if (!loaderIsRunningAsync)
+                        prev._nonReactive.loaderPromise = void 0;
+                      prev._nonReactive.dehydrated = void 0;
                       return {
                         ...prev,
                         isFetching: loaderIsRunningAsync ? prev.isFetching : false,
-                        loaderPromise: loaderIsRunningAsync ? prev.loaderPromise : void 0,
-                        invalid: false,
-                        pendingTimeout: void 0,
-                        _dehydrated: void 0
+                        invalid: false
                       };
                     });
                     return this.getMatch(matchId);
@@ -1222,7 +1208,7 @@ class RouterCore {
           return {
             ...d,
             invalid: true,
-            ...(opts == null ? void 0 : opts.forcePending) || d.status === "error" ? { status: "pending", error: void 0 } : {}
+            ...(opts == null ? void 0 : opts.forcePending) || d.status === "error" ? { status: "pending", error: void 0 } : void 0
           };
         }
         return d;
@@ -1525,7 +1511,7 @@ class RouterCore {
     const matches = [];
     const getParentContext = (parentMatch) => {
       const parentMatchId = parentMatch == null ? void 0 : parentMatch.id;
-      const parentContext = !parentMatchId ? this.options.context ?? {} : parentMatch.context ?? this.options.context ?? {};
+      const parentContext = !parentMatchId ? this.options.context ?? void 0 : parentMatch.context ?? this.options.context ?? void 0;
       return parentContext;
     };
     matchedRoutes.forEach((route, index) => {
@@ -1533,9 +1519,9 @@ class RouterCore {
       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) ?? {};
+        const parentStrictSearch = (parentMatch == null ? void 0 : parentMatch._strictSearch) ?? void 0;
         try {
-          const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? {};
+          const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? void 0;
           return [
             {
               ...parentSearch,
@@ -1605,7 +1591,10 @@ class RouterCore {
           isFetching: false,
           error: void 0,
           paramsError: parseErrors[index],
-          __routeContext: {},
+          __routeContext: void 0,
+          _nonReactive: {
+            loadPromise: createControlledPromise()
+          },
           __beforeLoadContext: void 0,
           context: {},
           abortController: new AbortController(),
@@ -1619,7 +1608,6 @@ class RouterCore {
           headScripts: void 0,
           meta: void 0,
           staticData: route.options.staticData || {},
-          loadPromise: createControlledPromise(),
           fullPath: route.fullPath
         };
       }
@@ -1636,25 +1624,26 @@ class RouterCore {
       matches.push(match);
     });
     matches.forEach((match, index) => {
-      var _a2, _b;
       const route = this.looseRoutesById[match.routeId];
       const existingMatch = this.getMatch(match.id);
       if (!existingMatch && (opts == null ? void 0 : opts._buildLocation) !== true) {
         const parentMatch = matches[index - 1];
         const parentContext = getParentContext(parentMatch);
-        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 = ((_b = (_a2 = route.options).context) == null ? void 0 : _b.call(_a2, contextFnContext)) ?? {};
+        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;
+        }
         match.context = {
           ...parentContext,
           ...match.__routeContext,
@@ -1961,7 +1950,7 @@ function applySearchMiddleware({
           try {
             const validatedSearch = {
               ...result,
-              ...validateSearch(route.options.validateSearch, result) ?? {}
+              ...validateSearch(route.options.validateSearch, result) ?? void 0
             };
             return validatedSearch;
           } catch {