refactor(router-core): skip full matchRoutesInternal for Link's buildLocation, use simple getMatchedRoutes by Sheraff · Pull Request #6445 · TanStack/router

Sheraff · 2026-01-21T21:31:36Z

SSR benchmarks for 100 parallel connections, fetching pages w/ 100 links

Before:

21k requests in 30.02s, 283 MB read
=== SSR Benchmark Results ===
Total requests: 20949
Requests/sec: 698.3
Latency (avg): 142.4ms
Latency (p99): 231ms
Throughput: 8.99 MB/s

After

24k requests in 30.02s, 328 MB read
=== SSR Benchmark Results ===
Total requests: 24322
Requests/sec: 810.74
Latency (avg): 122.6ms
Latency (p99): 185ms
Throughput: 10.44 MB/s

Summary by CodeRabbit

Refactor
- Reduced routing overhead with a lightweight matching path and centralized global 404 resolution, preserving URL params and search state for more consistent, responsive navigation.
Tests
- Adjusted test expectations across frameworks to reflect fewer or no mock invocations during several navigation and rendering scenarios.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

…Location, use simple getMatchedRoutes

coderabbitai · 2026-01-21T21:32:07Z

📝 Walkthrough

Walkthrough

Replaces full-match construction in buildLocation with lightweight getMatchedRoutes to obtain destRoutes/rawParams, centralizes global-not-found determination via a new findGlobalNotFoundRouteId, threads globalNotFoundRouteId into buildMatchSnapshotFromRoutes, and updates framework useParams test expectations.

Changes

Cohort / File(s)	Summary
Router core `packages/router-core/src/router.ts`	Replace heavy `matchRoutesInternal` usage with `getMatchedRoutes` returning `destRoutes` and `rawParams`; add `findGlobalNotFoundRouteId(notFoundMode, routes)`; compute and pass `globalNotFoundRouteId` into `buildMatchSnapshotFromRoutes`; extend its signature; change `applySearchMiddleware` param to `ReadonlyArray<AnyRoute>`; preserve `destParams` in params flow.
Framework tests (useParams) `packages/react-router/tests/useParams.test.tsx`, `packages/solid-router/tests/useParams.test.tsx`, `packages/vue-router/tests/useParams.test.tsx`	Update mocked function invocation assertions to expect fewer or no calls (use `not.toHaveBeenCalled()` or reduced counts) to reflect the revised matching/resolution behavior during navigation and rendering.

Sequence Diagram(s)

sequenceDiagram
participant Client as Client
participant Router as Router.buildLocation
participant Matcher as getMatchedRoutes
participant Finder as findGlobalNotFoundRouteId
participant Snapshot as buildMatchSnapshotFromRoutes
participant Location as LocationBuilder
Client->>Router: navigate(request)
Router->>Matcher: getMatchedRoutes(destPath)
Note right of Matcher: returns destRoutes + rawParams
Router->>Finder: findGlobalNotFoundRouteId(notFoundMode, destRoutes)
Finder-->>Router: globalNotFoundRouteId
Router->>Snapshot: buildMatchSnapshotFromRoutes(routes, params, searchStr, globalNotFoundRouteId)
Snapshot-->>Router: match snapshot
Router->>Location: assemble final Location with snapshot
Location-->>Client: navigation completed

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~40 minutes

Possibly related PRs

refactor(router-core): simplify matchId #5807 — Modifies buildLocation and match-id/path computation; overlaps with switching to getMatchedRoutes and global-not-found handling.
refactor(router-core): cache matched route branch alongside the rest of the route match #5882 — Alters matched-routes handling and match chain derivation; touches same matching code paths and types.
refactor(router-core): index routes have index nodes in the segment tree #6171 — Changes not-found/index route representation and resolution; directly related to global-not-found logic.

Suggested reviewers

schiller-manuel
nlynzaad

Poem

🐇
I hopped through maps and paths anew,
Swapped heavy matches for a lighter view.
I chased the lost route, gave it a sign,
Threaded snapshots neat — the rails align.
Thump-thump, the router hums — hooray, it's fine.

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title directly and specifically describes the main change: refactoring router-core to use the lightweight getMatchedRoutes instead of the full matchRoutesInternal path for Link's buildLocation function.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

📝 Generate docstrings

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

nx-cloud · 2026-01-21T21:32:21Z

View your CI Pipeline Execution ↗ for commit 99c67fe

Command	Status	Duration	Result
`nx affected --targets=test:eslint,test:unit,tes...`	✅ Succeeded	12m 37s	View ↗
`nx run-many --target=build --exclude=examples/*...`	✅ Succeeded	1m 41s	View ↗

☁️ Nx Cloud last updated this comment at 2026-01-22 21:18:06 UTC

pkg-pr-new · 2026-01-21T21:35:25Z

More templates

@tanstack/arktype-adapter

npm i https://pkg.pr.new/TanStack/router/@tanstack/arktype-adapter@6445

@tanstack/eslint-plugin-router

npm i https://pkg.pr.new/TanStack/router/@tanstack/eslint-plugin-router@6445

@tanstack/history

npm i https://pkg.pr.new/TanStack/router/@tanstack/history@6445

@tanstack/nitro-v2-vite-plugin

npm i https://pkg.pr.new/TanStack/router/@tanstack/nitro-v2-vite-plugin@6445

@tanstack/react-router

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-router@6445

@tanstack/react-router-devtools

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-router-devtools@6445

@tanstack/react-router-ssr-query

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-router-ssr-query@6445

@tanstack/react-start

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-start@6445

@tanstack/react-start-client

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-start-client@6445

@tanstack/react-start-server

npm i https://pkg.pr.new/TanStack/router/@tanstack/react-start-server@6445

@tanstack/router-cli

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-cli@6445

@tanstack/router-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-core@6445

@tanstack/router-devtools

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-devtools@6445

@tanstack/router-devtools-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-devtools-core@6445

@tanstack/router-generator

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-generator@6445

@tanstack/router-plugin

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-plugin@6445

@tanstack/router-ssr-query-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-ssr-query-core@6445

@tanstack/router-utils

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-utils@6445

@tanstack/router-vite-plugin

npm i https://pkg.pr.new/TanStack/router/@tanstack/router-vite-plugin@6445

@tanstack/solid-router

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-router@6445

@tanstack/solid-router-devtools

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-router-devtools@6445

@tanstack/solid-router-ssr-query

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-router-ssr-query@6445

@tanstack/solid-start

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-start@6445

@tanstack/solid-start-client

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-start-client@6445

@tanstack/solid-start-server

npm i https://pkg.pr.new/TanStack/router/@tanstack/solid-start-server@6445

@tanstack/start-client-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-client-core@6445

@tanstack/start-fn-stubs

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-fn-stubs@6445

@tanstack/start-plugin-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-plugin-core@6445

@tanstack/start-server-core

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-server-core@6445

@tanstack/start-static-server-functions

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-static-server-functions@6445

@tanstack/start-storage-context

npm i https://pkg.pr.new/TanStack/router/@tanstack/start-storage-context@6445

@tanstack/valibot-adapter

npm i https://pkg.pr.new/TanStack/router/@tanstack/valibot-adapter@6445

@tanstack/virtual-file-routes

npm i https://pkg.pr.new/TanStack/router/@tanstack/virtual-file-routes@6445

@tanstack/vue-router

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-router@6445

@tanstack/vue-router-devtools

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-router-devtools@6445

@tanstack/vue-router-ssr-query

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-router-ssr-query@6445

@tanstack/vue-start

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-start@6445

@tanstack/vue-start-client

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-start-client@6445

@tanstack/vue-start-server

npm i https://pkg.pr.new/TanStack/router/@tanstack/vue-start-server@6445

@tanstack/zod-adapter

npm i https://pkg.pr.new/TanStack/router/@tanstack/zod-adapter@6445

commit: d0092a8

coderabbitai

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@packages/router-core/src/router.ts`:
- Around line 1765-1788: In buildLocation the snapshot uses getMatchedRoutes
(destMatchResult -> destRoutes) which doesn't append a notFound route, so
snapshots can omit the 404 route; update buildLocation to mirror
matchRoutesInternal by appending this.options.notFoundRoute to destRoutes when
present and only compute globalNotFoundRouteId via
findGlobalNotFoundRouteId(this.options.notFoundMode, destRoutes) when there is
no custom this.options.notFoundRoute; ensure references to destRoutes,
globalNotFoundRouteId, this.options.notFoundRoute, getMatchedRoutes, and
findGlobalNotFoundRouteId are adjusted so the snapshot includes the notFound
route and still falls back to globalNotFoundRouteId when no custom notFoundRoute
exists.

…uild-for-location-only-link

Sheraff · 2026-01-22T17:52:15Z

Comparing the new code (16:07:01) vs main branch (16:13:51):

Overview Comparison

Metric	New Code	Main Branch	Verdict
Duration	16.3s	15.9s	Main slightly faster
Samples	274	240	-
Critical Path 1	41.1%	45.4%	✅ New wins (-9.5%)
Application code	-	36.7%	-

Hotspot Comparison

Function	New Code	Main Branch	Verdict
`(anonymous)` link.js:321	4.6%	5.7%	✅ New wins (-19%)
Garbage Collection	5.1%	5.2%	≈ Same
`(anonymous)` router.js	1.6% (L#1124)	4.9% (L#1130)	✅ New wins (-67%)
`useLinkProps`	3.2%	2.4%	❌ New regressed (+33%)
`buildWithMatches`	-	2.7%	✅ Not in new top 10
`build`	-	2.7%	✅ Not in new top 10
`matchRoutesInternal`	-	2.7%	✅ Not in new top 10
`getEnumerableOwnKeys`	1.6%	2.4%	✅ New wins (-33%)
`parseSegment`	-	1.9%	✅ Not in new top 10

What Changed

Dropped from main's top 10 in new code:

buildWithMatches (was 2.7%)
build (was 2.7%)
matchRoutesInternal (was 2.7%)
parseSegment (was 1.9%)

New in new code's top 10:

writev at 1.6%
(anonymous:L#1444:C#5) at 1.6%
nextTick at 1.4%
emit at 1.4%

Line Number Shifts

router.js: 1130 → 1124 (anonymous function)
Route tree processing code location changed

Summary

Aspect	Winner	Delta
Critical path	✅ New code	-9.5% (45.4% → 41.1%)
link.js:321	✅ New code	-19% (5.7% → 4.6%)
router.js anonymous	✅ New code	-67% (4.9% → 1.6%)
Route matching	✅ New code	All 3 functions dropped out
getEnumerableOwnKeys	✅ New code	-33% (2.4% → 1.6%)
useLinkProps	❌ Main branch	+33% (2.4% → 3.2%)
GC	≈ Tie	~same (5.2% vs 5.1%)

Bottom line: The new code shows significant improvements across most metrics:

Critical path reduced by ~10%
Route matching code (buildWithMatches, build, matchRoutesInternal, parseSegment) all dropped out of the top 10
The router anonymous function improved by 67%
Link anonymous function improved by 19%

The only regression is useLinkProps (+33%), but this is offset by the improvement in the link anonymous function, and both are in the same code path. Overall, new code appears to be a net performance win.

…uild-for-location-only-link

refactor(router-core): skip full matchRoutesInternal for Link's build…
5b7f61d
…Location, use simple getMatchedRoutes

github-actionsBot added the package: router-core label Jan 21, 2026

Sheraff commented Jan 21, 2026
View reviewed changes

Comment threadpackages/router-core/src/router.ts

Sheraff commented Jan 21, 2026
View reviewed changes

Comment threadpackages/router-core/src/router.ts

update unit tests, useParams not called on link building, only nav
5704974

github-actionsBot added package: react-router package: solid-router package: vue-router labels Jan 22, 2026

Sheraff added 2 commits January 22, 2026 15:14

factorize a little
df7decf

remove type cast
7de43c4

Sheraff requested a review from schiller-manuel January 22, 2026 14:17

coderabbitaiBot reviewed Jan 22, 2026
View reviewed changes

Comment threadpackages/router-core/src/router.ts

Sheraff added 2 commits January 22, 2026 15:33

fix deprecated not found route handling
3e7e9a0

Merge branch 'main' into refactor-router-core-skip-full-route-match-b…
d0092a8
…uild-for-location-only-link

Merge branch 'main' into refactor-router-core-skip-full-route-match-b…
99c67fe
…uild-for-location-only-link

Sheraff merged commit 655496f into mainJan 22, 2026
4 of 5 checks passed

Sheraff deleted the refactor-router-core-skip-full-route-match-build-for-location-only-link branch January 22, 2026 22:24

coderabbitaiBot mentioned this pull request Feb 8, 2026
feat(router): Add useHistoryState hook for type-safe state management #3967
Open

coderabbitaiBot mentioned this pull request Feb 17, 2026
fix(react-router): keep relative link active when changing inherited param #6689
Merged

coderabbitaiBot mentioned this pull request Mar 3, 2026
fix: handle beforeLoad throwing notFound correctly #6811
Merged

Navigation Menu

Uh oh!

Uh oh!

refactor(router-core): skip full matchRoutesInternal for Link's buildLocation, use simple getMatchedRoutes - #6445

refactor(router-core): skip full matchRoutesInternal for Link's buildLocation, use simple getMatchedRoutes#6445
Sheraff merged 7 commits into
mainfrom
refactor-router-core-skip-full-route-match-build-for-location-only-link

Sheraff commented Jan 21, 2026•
edited
Loading

Uh oh!

coderabbitaiBot commented Jan 21, 2026•
edited
Loading

Walkthrough

Changes

Sequence Diagram(s)

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

nx-cloudBot commented Jan 21, 2026•
edited
Loading

Uh oh!

pkg-pr-newBot commented Jan 21, 2026•
edited
Loading

Uh oh!

Uh oh!

Uh oh!

coderabbitaiBot left a comment

Uh oh!

Uh oh!

Sheraff commented Jan 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Uh oh!

Conversation

Sheraff commented Jan 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitaiBot commented Jan 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Estimated code review effort

Possibly related PRs

Suggested reviewers

Poem

Uh oh!

nx-cloudBot commented Jan 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkg-pr-newBot commented Jan 21, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

coderabbitaiBot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Sheraff commented Jan 22, 2026

Overview Comparison

Hotspot Comparison

What Changed

Line Number Shifts

Summary

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Sheraff commented Jan 21, 2026•
edited
Loading

coderabbitaiBot commented Jan 21, 2026•
edited
Loading

nx-cloudBot commented Jan 21, 2026•
edited
Loading

pkg-pr-newBot commented Jan 21, 2026•
edited
Loading