@tanstack/react-router 1.97.25 → 1.98.0

package/dist/esm/router.js

@@ -327,7 +327,7 @@ class Router {
               path: route.fullPath,
               params: (matchedRoutesResult == null ? void 0 : matchedRoutesResult.routeParams) ?? {},
               decodeCharMap: this.pathParamsDecodeCharMap
-            });
+            }).interpolatedPath;
             const pathname2 = joinPaths([this.basepath, interpolatedPath]);
             return pathname2 === fromPath;
           })) == null ? void 0 : _d.id];
@@ -355,7 +355,7 @@ class Router {
           leaveWildcards: false,
           leaveParams: opts.leaveParams,
           decodeCharMap: this.pathParamsDecodeCharMap
-        });
+        }).interpolatedPath;
         let search = fromSearch;
         if (opts._includeValidateSearch && ((_f = this.options.search) == null ? void 0 : _f.strict)) {
           let validatedSearch = {};
@@ -814,7 +814,7 @@ class Router {
         triggerOnReady();
       }
       const handleRedirectAndNotFound = (match, err) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (isResolvedRedirect(err)) {
           if (!err.reloadDocument) {
             throw err;
@@ -843,6 +843,10 @@ class Router {
             this._handleNotFound(matches, err, {
               updateMatch
             });
+            (_d = this.serverSsr) == null ? void 0 : _d.onMatchSettled({
+              router: this,
+              match: this.getMatch(match.id)
+            });
             throw err;
           }
         }
@@ -1312,7 +1316,9 @@ class Router {
             _fromLocation: next
           });
         }
-        console.error(err);
+        if (!isNotFound(err)) {
+          console.error(err);
+        }
         return void 0;
       }
     };
@@ -1479,15 +1485,17 @@ class Router {
     matchedRoutes.forEach((route, index) => {
       var _a, _b, _c, _d;
       const parentMatch = matches[index - 1];
-      const [preMatchSearch, searchError] = (() => {
+      const [preMatchSearch, strictMatchSearch, searchError] = (() => {
         const parentSearch = (parentMatch == null ? void 0 : parentMatch.search) ?? next.search;
+        const parentStrictSearch = (parentMatch == null ? void 0 : parentMatch._strictSearch) ?? {};
         try {
-          const search = validateSearch(route.options.validateSearch, parentSearch) ?? {};
+          const strictSearch = validateSearch(route.options.validateSearch, { ...parentSearch }) ?? {};
           return [
             {
               ...parentSearch,
-              ...search
+              ...strictSearch
             },
+            { ...parentStrictSearch, ...strictSearch },
             void 0
           ];
         } catch (err) {
@@ -1500,14 +1508,14 @@ class Router {
           if (opts == null ? void 0 : opts.throwOnError) {
             throw searchParamError;
           }
-          return [parentSearch, searchParamError];
+          return [parentSearch, {}, searchParamError];
         }
       })();
       const loaderDeps = ((_b = (_a = route.options).loaderDeps) == null ? void 0 : _b.call(_a, {
         search: preMatchSearch
       })) ?? "";
       const loaderDepsHash = loaderDeps ? JSON.stringify(loaderDeps) : "";
-      const interpolatedPath = interpolatePath({
+      const { usedParams, interpolatedPath } = interpolatePath({
         path: route.fullPath,
         params: routeParams,
         decodeCharMap: this.pathParamsDecodeCharMap
@@ -1517,7 +1525,7 @@ class Router {
         params: routeParams,
         leaveWildcards: true,
         decodeCharMap: this.pathParamsDecodeCharMap
-      }) + loaderDepsHash;
+      }).interpolatedPath + loaderDepsHash;
       const existingMatch = this.getMatch(matchId);
       const previousMatch = this.state.matches.find(
         (d) => d.routeId === route.id
@@ -1529,7 +1537,9 @@ class Router {
           ...existingMatch,
           cause,
           params: previousMatch ? replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
-          search: previousMatch ? replaceEqualDeep(previousMatch.search, preMatchSearch) : replaceEqualDeep(existingMatch.search, preMatchSearch)
+          _strictParams: usedParams,
+          search: previousMatch ? replaceEqualDeep(previousMatch.search, preMatchSearch) : replaceEqualDeep(existingMatch.search, preMatchSearch),
+          _strictSearch: strictMatchSearch
         };
       } else {
         const status = route.options.loader || route.options.beforeLoad || route.lazyFn || routeNeedsPreload(route) ? "pending" : "success";
@@ -1538,9 +1548,11 @@ class Router {
           index,
           routeId: route.id,
           params: previousMatch ? replaceEqualDeep(previousMatch.params, routeParams) : routeParams,
+          _strictParams: usedParams,
           pathname: joinPaths([this.basepath, interpolatedPath]),
           updatedAt: Date.now(),
           search: previousMatch ? replaceEqualDeep(previousMatch.search, preMatchSearch) : preMatchSearch,
+          _strictSearch: strictMatchSearch,
           searchError: void 0,
           status,
           isFetching: false,