@tanstack/router-core 1.141.0 → 1.141.2

package/src/load-matches.ts

@@ -50,6 +50,29 @@ const resolvePreload = (inner: InnerLoadContext, matchId: string): boolean => {
   )
 }
 
+/**
+ * Builds the accumulated context from router options and all matches up to (and optionally including) the given index.
+ * Merges __routeContext and __beforeLoadContext from each match.
+ */
+const buildMatchContext = (
+  inner: InnerLoadContext,
+  index: number,
+  includeCurrentMatch: boolean = true,
+): Record<string, unknown> => {
+  const context: Record<string, unknown> = {
+    ...(inner.router.options.context ?? {}),
+  }
+  const end = includeCurrentMatch ? index : index - 1
+  for (let i = 0; i <= end; i++) {
+    const innerMatch = inner.matches[i]
+    if (!innerMatch) continue
+    const m = inner.router.getMatch(innerMatch.id)
+    if (!m) continue
+    Object.assign(context, m.__routeContext, m.__beforeLoadContext)
+  }
+  return context
+}
+
 const _handleNotFound = (inner: InnerLoadContext, err: NotFoundError) => {
   // Find the route that should handle the not found error
   // First check if a specific route is requested to show the error
@@ -407,6 +430,12 @@ const executeBeforeLoad = (
 
   match._nonReactive.beforeLoadPromise = createControlledPromise<void>()
 
+  // Build context from all parent matches, excluding current match's __beforeLoadContext
+  // (since we're about to execute beforeLoad for this match)
+  const context = {
+    ...buildMatchContext(inner, index, false),
+    ...match.__routeContext,
+  }
   const { search, params, cause } = match
   const preload = resolvePreload(inner, matchId)
   const beforeLoadFnContext: BeforeLoadContextOptions<
@@ -423,12 +452,7 @@ const executeBeforeLoad = (
     abortController,
     params,
     preload,
-    // Include parent's __beforeLoadContext so child routes can access it during their beforeLoad
-    context: {
-      ...parentMatchContext,
-      ...parentMatch?.__beforeLoadContext,
-      ...match.__routeContext,
-    },
+    context,
     location: inner.location,
     navigate: (opts: any) =>
       inner.router.navigate({
@@ -569,19 +593,7 @@ const getLoaderContext = (
   const { params, loaderDeps, abortController, cause } =
     inner.router.getMatch(matchId)!
 
-  let context = inner.router.options.context ?? {}
-
-  for (let i = 0; i <= index; i++) {
-    const innerMatch = inner.matches[i]
-    if (!innerMatch) continue
-    const m = inner.router.getMatch(innerMatch.id)
-    if (!m) continue
-    context = {
-      ...context,
-      ...(m.__routeContext ?? {}),
-      ...(m.__beforeLoadContext ?? {}),
-    }
-  }
+  const context = buildMatchContext(inner, index)
 
   const preload = resolvePreload(inner, matchId)
 
@@ -747,19 +759,9 @@ const loadRouteMatch = async (
   const route = inner.router.looseRoutesById[routeId]!
 
   const commitContext = () => {
-    const context = { ...inner.router.options.context }
-
-    for (let i = 0; i <= index; i++) {
-      const innerMatch = inner.matches[i]
-      if (!innerMatch) continue
-      const m = inner.router.getMatch(innerMatch.id)
-      if (!m) continue
-      Object.assign(context, m.__routeContext, m.__beforeLoadContext)
-    }
-
     inner.updateMatch(matchId, (prev) => ({
       ...prev,
-      context,
+      context: buildMatchContext(inner, index),
     }))
   }
 

package/src/location.ts

@@ -38,14 +38,14 @@ export interface ParsedLocation<TSearchObj extends AnySchema = {}> {
   unmaskOnReload?: boolean
   /**
    * @private
-   * @description The public href of the location, including the origin before any rewrites.
+   * @description The public href of the location.
    * If a rewrite is applied, the `href` property will be the rewritten URL.
    */
   publicHref: string
   /**
    * @private
-   * @description The full URL of the location, including the origin.
+   * @description The full URL of the location.
    * @private
    */
-  url: string
+  url: URL
 }

package/src/router.ts

@@ -1176,16 +1176,14 @@ export class RouterCore<
 
       const fullPath = url.href.replace(url.origin, '')
 
-      const { pathname, hash } = url
-
       return {
         href: fullPath,
         publicHref: href,
-        url: url.href,
-        pathname: decodePath(pathname),
+        url: url,
+        pathname: decodePath(url.pathname),
         searchStr,
         search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
-        hash: hash.split('#').reverse()[0] ?? '',
+        hash: url.hash.split('#').reverse()[0] ?? '',
         state: replaceEqualDeep(previousLocation?.state, state),
       }
     }
@@ -1765,7 +1763,7 @@ export class RouterCore<
         publicHref:
           rewrittenUrl.pathname + rewrittenUrl.search + rewrittenUrl.hash,
         href: fullPath,
-        url: rewrittenUrl.href,
+        url: rewrittenUrl,
         pathname: nextPathname,
         search: nextSearch,
         searchStr,
@@ -1878,8 +1876,16 @@ export class RouterCore<
     if (isSameUrl && isSameState()) {
       this.load()
     } else {
-      // eslint-disable-next-line prefer-const
-      let { maskedLocation, hashScrollIntoView, ...nextHistory } = next
+      let {
+        // eslint-disable-next-line prefer-const
+        maskedLocation,
+        // eslint-disable-next-line prefer-const
+        hashScrollIntoView,
+        // don't pass url into history since it is a URL instance that cannot be serialized
+        // eslint-disable-next-line prefer-const
+        url: _url,
+        ...nextHistory
+      } = next
 
       if (maskedLocation) {
         nextHistory = {
@@ -2000,7 +2006,7 @@ export class RouterCore<
     if (reloadDocument) {
       if (!href) {
         const location = this.buildLocation({ to, ...rest } as any)
-        href = location.url
+        href = location.url.href
       }
 
       // Check blockers for external URLs unless ignoreBlocker is true
@@ -2056,24 +2062,11 @@ export class RouterCore<
         _includeValidateSearch: true,
       })
 
-      // Normalize URLs for comparison to handle encoding differences
-      // Browser history always stores encoded URLs while buildLocation may produce decoded URLs
-      const normalizeUrl = (url: string) => {
-        try {
-          return encodeURI(decodeURI(url))
-        } catch {
-          return url
-        }
-      }
-
       if (
-        trimPath(normalizeUrl(this.latestLocation.href)) !==
-        trimPath(normalizeUrl(nextLocation.href))
+        this.latestLocation.publicHref !== nextLocation.publicHref ||
+        nextLocation.url.origin !== this.origin
       ) {
-        let href = nextLocation.url
-        if (this.origin && href.startsWith(this.origin)) {
-          href = href.replace(this.origin, '') || '/'
-        }
+        const href = this.getParsedLocationHref(nextLocation)
 
         throw redirect({ href })
       }
@@ -2395,13 +2388,18 @@ export class RouterCore<
     return this.load({ sync: opts?.sync })
   }
 
+  getParsedLocationHref = (location: ParsedLocation) => {
+    let href = location.url.href
+    if (this.origin && location.url.origin === this.origin) {
+      href = href.replace(this.origin, '') || '/'
+    }
+    return href
+  }
+
   resolveRedirect = (redirect: AnyRedirect): AnyRedirect => {
     if (!redirect.options.href) {
       const location = this.buildLocation(redirect.options)
-      let href = location.url
-      if (this.origin && href.startsWith(this.origin)) {
-        href = href.replace(this.origin, '') || '/'
-      }
+      const href = this.getParsedLocationHref(location)
       redirect.options.href = location.href
       redirect.headers.set('Location', href)
     }