Skip to content

perf(router-core): match the current location lazily in buildLocation #8406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schiller-manuel merged 1 commit into from
Sep 13, 2026
Merged

perf(router-core): match the current location lazily in buildLocation #8406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/router-core/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1928,18 +1928,17 @@ export class RouterCore<
const currentLocation =
dest._fromLocation || this._pendingLocation || this.latestLocation

// Use lightweight matching - only computes what buildLocation needs
// (fullPath, search, params) without creating full match objects
const lightweight = this.matchRoutesLightweight(currentLocation)

// Value-affecting reads of the current location go through these two.
// The lightweight match (fullPath, search, params without full match
// objects) is only computed when a build actually reads it.
let lightweight: LightweightRouteMatchResult | undefined
const current = () => {
usedCurrent = true
return currentLocation
}
const currentMatch = () => {
usedCurrent = true
return lightweight
return (lightweight ??= this.matchRoutesLightweight(currentLocation))
}

// check that from path exists in the current route tree
Expand Down Expand Up @@ -1982,10 +1981,11 @@ export class RouterCore<
trimPathRight(nextTo) as keyof typeof this.routesByPath
] as AnyRoute | undefined

const isTemplate = nextTo.includes('$')
let destRoutes: ReadonlyArray<AnyRoute>
if (destRoute) {
destRoutes = destRoute._branch ??= buildRouteBranch(destRoute)
} else if (nextTo.includes('$')) {
} else if (isTemplate) {
// Route templates must match routesByPath exactly. A miss here is a
// typed destination mismatch, not a concrete URL to route-match.
destRoutes = []
Expand All @@ -2003,7 +2003,7 @@ export class RouterCore<
}

// One parsed template serves both trailing-slash variants.
const interpolation = nextTo.includes('$')
const interpolation = isTemplate
? (destRoute?._interpolation ??
parseSegments(false, { fullPath: nextTo }, 0))
: undefined
Expand Down
Loading