@tanstack/router-core 1.139.12 → 1.139.14

package/src/new-process-route-tree.ts

@@ -332,7 +332,13 @@ function parseSegments<TRouteLike extends RouteLike>(
       // but if there is *also* a layout route at this path, save it as notFound
       // we can use it when fuzzy matching to display the NotFound component in the layout route
       if (!isIndex) node.notFound = route
-      if (!node.route || (!node.isIndex && isIndex)) node.route = route
+      // does the new route take precedence over an existing one?
+      // yes if previous is not an index route and new one is an index route
+      if (!node.route || (!node.isIndex && isIndex)) {
+        node.route = route
+        // when replacing, replace all attributes that are route-specific (`fullPath` only at the moment)
+        node.fullPath = route.fullPath ?? route.from
+      }
       node.isIndex ||= isIndex
     }
   }

package/src/router.ts

@@ -1793,11 +1793,25 @@ export class RouterCore<
           )
           if (match) {
             Object.assign(params, match.params) // Copy params, because they're cached
-            const { from: _from, ...maskProps } = match.route
+            const {
+              from: _from,
+              params: maskParams,
+              ...maskProps
+            } = match.route
+
+            // If mask has a params function, call it with the matched params as context
+            // Otherwise, use the matched params or the provided params value
+            const nextParams =
+              maskParams === false || maskParams === null
+                ? {}
+                : (maskParams ?? true) === true
+                  ? params
+                  : Object.assign(params, functionalUpdate(maskParams, params))
+
             maskedDest = {
               from: opts.from,
               ...maskProps,
-              params,
+              params: nextParams,
             }
             maskedNext = build(maskedDest)
           }