@tanstack/router-core 1.145.11 → 1.146.0

package/dist/esm/router.js

@@ -394,7 +394,7 @@ class RouterCore {
               this.processedTree
             );
             if (match) {
-              Object.assign(params, match.params);
+              Object.assign(params, match.rawParams);
               const {
                 from: _from,
                 params: maskParams,
@@ -965,14 +965,14 @@ class RouterCore {
         return false;
       }
       if (location.params) {
-        if (!deepEqual(match.params, location.params, { partial: true })) {
+        if (!deepEqual(match.rawParams, location.params, { partial: true })) {
           return false;
         }
       }
       if (opts?.includeSearch ?? true) {
-        return deepEqual(baseLocation.search, next.search, { partial: true }) ? match.params : false;
+        return deepEqual(baseLocation.search, next.search, { partial: true }) ? match.rawParams : false;
       }
-      return match.params;
+      return match.rawParams;
     };
     this.hasNotFoundMatch = () => {
       return this.__store.state.matches.some(
@@ -1008,7 +1008,7 @@ class RouterCore {
   }
   matchRoutesInternal(next, opts) {
     const matchedRoutesResult = this.getMatchedRoutes(next.pathname);
-    const { foundRoute, routeParams } = matchedRoutesResult;
+    const { foundRoute, routeParams, parsedParams } = matchedRoutesResult;
     let { matchedRoutes } = matchedRoutesResult;
     let isGlobalNotFound = false;
     if (
@@ -1094,23 +1094,31 @@ class RouterCore {
       const strictParams = existingMatch?._strictParams ?? usedParams;
       let paramsError = void 0;
       if (!existingMatch) {
-        const strictParseParams = route.options.params?.parse ?? route.options.parseParams;
-        if (strictParseParams) {
-          try {
-            Object.assign(
-              strictParams,
-              strictParseParams(strictParams)
-            );
-          } catch (err) {
-            if (isNotFound(err) || isRedirect(err)) {
-              paramsError = err;
-            } else {
-              paramsError = new PathParamError(err.message, {
-                cause: err
-              });
+        if (route.options.skipRouteOnParseError) {
+          for (const key in usedParams) {
+            if (key in parsedParams) {
+              strictParams[key] = parsedParams[key];
             }
-            if (opts?.throwOnError) {
-              throw paramsError;
+          }
+        } else {
+          const strictParseParams = route.options.params?.parse ?? route.options.parseParams;
+          if (strictParseParams) {
+            try {
+              Object.assign(
+                strictParams,
+                strictParseParams(strictParams)
+              );
+            } catch (err) {
+              if (isNotFound(err) || isRedirect(err)) {
+                paramsError = err;
+              } else {
+                paramsError = new PathParamError(err.message, {
+                  cause: err
+                });
+              }
+              if (opts?.throwOnError) {
+                throw paramsError;
+              }
             }
           }
         }
@@ -1264,13 +1272,15 @@ function getMatchedRoutes({
   const routeParams = {};
   const trimmedPath = trimPathRight(pathname);
   let foundRoute = void 0;
+  let parsedParams = void 0;
   const match = findRouteMatch(trimmedPath, processedTree, true);
   if (match) {
     foundRoute = match.route;
-    Object.assign(routeParams, match.params);
+    Object.assign(routeParams, match.rawParams);
+    parsedParams = Object.assign({}, match.parsedParams);
   }
   const matchedRoutes = match?.branch || [routesById[rootRouteId]];
-  return { matchedRoutes, routeParams, foundRoute };
+  return { matchedRoutes, routeParams, foundRoute, parsedParams };
 }
 function applySearchMiddleware({
   search,