fix(router-core): support parsed params in matchRoute

[LadyBluenotes]

matchRoute now resolves matches through the processed route tree.

• Applies route params.parse results before comparing or returning params.
• Preserves parsed parent params for child parsers and handles repeated param names.
• Uses route precedence and parser rejection during matching, so lower-priority or rejected routes no longer match through raw path templates.
• Replaces findSingleMatch and its cache with findRouteMatch.
• Normalizes exact trailing-slash matching while leaving fuzzy matching unchanged.
• Keeps caseSensitive, basepath, search, pending, optional-param, and wildcard behavior covered.

matchRoute now returns false for destination templates that are not registered in the route tree.

Includes the reproducer from #2460.

Closes#2450.

Summary by CodeRabbit

• Bug Fixes
  • Fixed route matching to fully respect custom typed params.parse/params.stringify, including proper numeric conversions.
  • matchRoute now returns parsed parameters (not raw strings) and correctly fails when typed parsing is rejected or throws.
  • Improved matching consistency across nested routes, including search and trailing-slash behavior.
• Tests
  • Added/expanded matchRoute and useMatchRoute test coverage for React, Solid, and Vue, covering typed params, fuzzy matching, and mismatch cases.
• Chores
  • Added a patch changeset documenting the matching fix.

[coderabbitai]

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

• @coderabbitai resume to resume automatic reviews.
• @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

• ▶️ Resume reviews
• 🔍 Trigger review

📝 Walkthrough

Walkthrough

matchRoute now parses route parameters before matching and returns typed values. Route-tree extraction preserves parsed state across branches, core tests cover matching modes, and React, Solid, and Vue tests verify typed hook results.

Changes

Typed route matching

Layer / File(s)	Summary
Track parsed route parameters packages/router-core/src/new-process-route-tree.ts	Route-tree matching records route metadata, separates raw and parsed parameters, and carries parsed values through parser validation and branch exploration.
Parse parameters during route matching packages/router-core/src/router.ts, .changeset/plenty-jokes-listen.md	matchRoute resolves destination branches, validates parsed parameters and search values, handles fuzzy remainders, returns typed params, and updates processed-tree types.
Validate core matching behavior packages/router-core/tests/match-route.test.ts, packages/router-core/tests/{path,optional-path-params*}.test.ts	Tests cover typed parsing, parser failures, parent-child params, fuzzy and case-sensitive matching, search, base paths, trailing slashes, and migration to findRouteMatch.
Verify typed adapter results packages/{react-router,solid-router,vue-router}/tests/Matches.test.tsx	Framework adapter tests verify that useMatchRoute returns numeric parameters from custom parsers.

Estimated code review effort: 4 (Complex) | ~60 minutes

Sequence Diagram(s)

sequenceDiagram
participant useMatchRoute
participant RouterCoreMatchRoute
participant RouteTreeMatcher
participant RouteParamParser
useMatchRoute->>RouterCoreMatchRoute: Match route with typed params
RouterCoreMatchRoute->>RouteTreeMatcher: Resolve destination branch
RouteTreeMatcher->>RouteParamParser: Parse extracted parameters
RouteParamParser-->>RouteTreeMatcher: Return parsed params or rejection
RouteTreeMatcher-->>RouterCoreMatchRoute: Return parsed route match
RouterCoreMatchRoute-->>useMatchRoute: Return typed match or false

Loading

Possibly related PRs

• TanStack/router#5722: Updates matchRoute and route-tree matching around parsed parameter extraction and validation.

Suggested labels:package: router-core

Suggested reviewers:schiller-manuel

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

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

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly summarizes the main change: matchRoute now supports parsed params.
Linked Issues check	✅ Passed	The changes address #2450 by making MatchRoute/matchRoute honor custom parse/stringify for numeric params and adding regression tests.
Out of Scope Changes check	✅ Passed	The deletions and API updates appear tied to the matchRoute refactor and related test coverage, with no unrelated changes evident.

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch match-route-parsed-params

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

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

[nx-cloud]

View your CI Pipeline Execution ↗ for commit 6556dae

Command	Status	Duration	Result
nx affected --targets=test:eslint,test:unit,tes...	❌ Failed	13m 22s	View ↗
nx run-many --target=build --exclude=examples/*...	✅ Succeeded	2m 3s	View ↗

---

☁️ Nx Cloud last updated this comment at 2026-07-12 13:10:19 UTC

[github-actions]

🚀 Changeset Version Preview

1 package(s) bumped directly, 22 bumped as dependents.

🟩 Patch bumps

Package	Version	Reason
@tanstack/router-core	1.171.14 → 1.171.15	Changeset
@tanstack/react-router	1.170.17 → 1.170.18	Dependent
@tanstack/react-start	1.168.27 → 1.168.28	Dependent
@tanstack/react-start-client	1.168.15 → 1.168.16	Dependent
@tanstack/react-start-rsc	0.1.26 → 0.1.27	Dependent
@tanstack/react-start-server	1.167.21 → 1.167.22	Dependent
@tanstack/router-cli	1.167.18 → 1.167.19	Dependent
@tanstack/router-generator	1.167.18 → 1.167.19	Dependent
@tanstack/router-plugin	1.168.19 → 1.168.20	Dependent
@tanstack/router-vite-plugin	1.167.19 → 1.167.20	Dependent
@tanstack/solid-router	1.170.17 → 1.170.18	Dependent
@tanstack/solid-start	1.168.27 → 1.168.28	Dependent
@tanstack/solid-start-client	1.168.15 → 1.168.16	Dependent
@tanstack/solid-start-server	1.167.21 → 1.167.22	Dependent
@tanstack/start-client-core	1.170.13 → 1.170.14	Dependent
@tanstack/start-plugin-core	1.171.19 → 1.171.20	Dependent
@tanstack/start-server-core	1.169.16 → 1.169.17	Dependent
@tanstack/start-static-server-functions	1.167.18 → 1.167.19	Dependent
@tanstack/start-storage-context	1.167.16 → 1.167.17	Dependent
@tanstack/vue-router	1.170.16 → 1.170.17	Dependent
@tanstack/vue-start	1.168.26 → 1.168.27	Dependent
@tanstack/vue-start-client	1.167.18 → 1.167.19	Dependent
@tanstack/vue-start-server	1.167.21 → 1.167.22	Dependent

[pkg-pr-new]

More templates

• tanstack-router-react-example-authenticated-routes
• tanstack-router-react-example-authenticated-routes-firebase
• tanstack-router-react-example-basic
• tanstack-router-react-example-basic-default-search-params
• tanstack-router-react-example-basic-devtools-panel
• tanstack-router-react-example-basic-file-based
• tanstack-router-react-example-basic-non-nested-devtools
• tanstack-router-react-example-react-query
• tanstack-router-react-example-basic-react-query-file-based
• tanstack-router-react-example-basic-ssr-file-based
• tanstack-router-react-example-basic-ssr-streaming-file-based
• tanstack-router-react-example-basic-virtual-file-based
• tanstack-router-react-example-basic-virtual-inside-file-based
• tanstack-router-react-example-deferred-data
• tanstack-router-i18n-paraglide
• tanstack-router-react-example-kitchen-sink
• tanstack-router-react-example-kitchen-sink-file-based
• tanstack-router-react-example-kitchen-sink-react-query
• tanstack-router-react-example-kitchen-sink-react-query-file-based
• tanstack-router-react-example-large-file-based
• tanstack-router-react-example-location-masking
• tanstack-router-react-example-navigation-blocking
• tanstack-router-react-example-quickstart
• tanstack-router-react-example-quickstart-esbuild-file-based
• tanstack-router-react-example-quickstart-file-based
• tanstack-router-react-example-quickstart-rspack-file-based
• tanstack-router-react-example-quickstart-webpack-file-based
• router-monorepo-react-query
• router-mono-simple
• router-mono-simple-lazy
• tanstack-router-react-example-scroll-restoration
• tanstack-search-validator-adapters
• tanstack-start-example-bare
• tanstack-start-example-basic
• tanstack-start-example-basic-auth
• tanstack-router-react-example-basic-authjs
• tanstack-start-example-basic-cloudflare
• tanstack-start-example-basic-react-query
• tanstack-start-example-basic-static
• tanstack-start-bun-hosting
• tanstack-start-example-clerk-basic
• tanstack-start-example-convex-trellaux
• tanstack-start-example-counter
• tanstack-start-i18n-paraglide
• tanstack-start-example-large
• tanstack-start-example-material-ui
• tanstack-start-example-rscs
• tanstack-start-streaming-data-from-server-functions
• tanstack-start-example-supabase-basic
• tanstack-start-tailwind-v4
• tanstack-start-example-trellaux
• tanstack-start-example-workos
• tanstack-router-react-example-view-transitions
• tanstack-router-react-example-with-framer-motion
• tanstack-router-react-example-with-trpc
• tanstack-router-react-example-with-trpc-react-query
• tanstack-router-solid-example-authenticated-routes
• tanstack-router-solid-example-authenticated-routes-firebase
• tanstack-router-solid-example-basic
• tanstack-router-solid-example-basic-default-search-params
• tanstack-router-solid-example-basic-devtools-panel
• tanstack-router-solid-example-basic-file-based
• tanstack-router-solid-example-basic-non-nested-devtools
• tanstack-router-solid-example-basic-solid-query
• tanstack-router-solid-example-basic-solid-query-file-based
• tanstack-router-solid-example-basic-ssr-file-based
• tanstack-router-solid-example-basic-ssr-streaming-file-based
• tanstack-router-solid-example-basic-virtual-file-based
• tanstack-router-solid-example-basic-virtual-inside-file-based
• tanstack-router-solid-example-deferred-data
• tanstack-router-solid-i18n-paraglide
• tanstack-router-solid-example-kitchen-sink
• tanstack-router-solid-example-kitchen-sink-file-based
• tanstack-router-solid-example-kitchen-sink-solid-query
• tanstack-router-solid-example-kitchen-sink-solid-query-file-based
• tanstack-router-solid-example-large-file-based
• tanstack-router-solid-example-location-masking
• tanstack-router-solid-example-navigation-blocking
• tanstack-router-solid-example-quickstart
• tanstack-router-solid-example-quickstart-esbuild-file-based
• tanstack-router-solid-example-quickstart-file-based
• tanstack-router-solid-example-quickstart-rspack-file-based
• tanstack-router-solid-example-quickstart-webpack-file-based
• @tanstack/router-solid-mono-simple
• router-solid-mono-simple-lazy
• router-solid-monorepo-solid-query
• tanstack-router-solid-example-scroll-restoration
• tanstack-solid-router-search-validator-adapters
• tanstack-solid-start-example-basic
• tanstack-solid-start-example-basic-auth
• tanstack-solid-start-example-basic-authjs
• tanstack-solid-start-example-basic-cloudflare
• tanstack-solid-start-example-basic-netlify
• tanstack-solid-start-example-basic-nitro
• tanstack-start-example-basic-solid-query
• tanstack-solid-start-example-basic-static
• tanstack-solid-start-bun-hosting
• tanstack-solid-start-example-convex-better-auth
• tanstack-solid-start-example-counter
• tanstack-solid-start-i18n-paraglide
• tanstack-solid-start-example-large
• tanstack-solid-start-streaming-data-from-server-functions
• tanstack-solid-start-example-supabase-basic
• tanstack-solid-start-tailwind-v4
• tanstack-router-solid-example-view-transitions
• tanstack-router-solid-example-with-framer-motion
• tanstack-router-solid-example-with-trpc
• tanstack-router-vue-example-basic-jsx
• tanstack-router-vue-example-basic-file-based-jsx
• tanstack-router-vue-example-basic-file-based-sfc

@tanstack/arktype-adapter

npm i https://pkg.pr.new/@tanstack/arktype-adapter@7776

@tanstack/eslint-plugin-router

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

@tanstack/eslint-plugin-start

npm i https://pkg.pr.new/@tanstack/eslint-plugin-start@7776

@tanstack/history

npm i https://pkg.pr.new/@tanstack/history@7776

@tanstack/nitro-v2-vite-plugin

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

@tanstack/react-router

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

@tanstack/react-router-devtools

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

@tanstack/react-router-ssr-query

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

@tanstack/react-start

npm i https://pkg.pr.new/@tanstack/react-start@7776

@tanstack/react-start-client

npm i https://pkg.pr.new/@tanstack/react-start-client@7776

@tanstack/react-start-rsc

npm i https://pkg.pr.new/@tanstack/react-start-rsc@7776

@tanstack/react-start-server

npm i https://pkg.pr.new/@tanstack/react-start-server@7776

@tanstack/router-cli

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

@tanstack/router-core

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

@tanstack/router-devtools

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

@tanstack/router-devtools-core

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

@tanstack/router-generator

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

@tanstack/router-plugin

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

@tanstack/router-ssr-query-core

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

@tanstack/router-utils

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

@tanstack/router-vite-plugin

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

@tanstack/solid-router

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

@tanstack/solid-router-devtools

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

@tanstack/solid-router-ssr-query

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

@tanstack/solid-start

npm i https://pkg.pr.new/@tanstack/solid-start@7776

@tanstack/solid-start-client

npm i https://pkg.pr.new/@tanstack/solid-start-client@7776

@tanstack/solid-start-server

npm i https://pkg.pr.new/@tanstack/solid-start-server@7776

@tanstack/start-client-core

npm i https://pkg.pr.new/@tanstack/start-client-core@7776

@tanstack/start-fn-stubs

npm i https://pkg.pr.new/@tanstack/start-fn-stubs@7776

@tanstack/start-plugin-core

npm i https://pkg.pr.new/@tanstack/start-plugin-core@7776

@tanstack/start-server-core

npm i https://pkg.pr.new/@tanstack/start-server-core@7776

@tanstack/start-static-server-functions

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

@tanstack/start-storage-context

npm i https://pkg.pr.new/@tanstack/start-storage-context@7776

@tanstack/valibot-adapter

npm i https://pkg.pr.new/@tanstack/valibot-adapter@7776

@tanstack/virtual-file-routes

npm i https://pkg.pr.new/@tanstack/virtual-file-routes@7776

@tanstack/vue-router

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

@tanstack/vue-router-devtools

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

@tanstack/vue-router-ssr-query

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

@tanstack/vue-start

npm i https://pkg.pr.new/@tanstack/vue-start@7776

@tanstack/vue-start-client

npm i https://pkg.pr.new/@tanstack/vue-start-client@7776

@tanstack/vue-start-server

npm i https://pkg.pr.new/@tanstack/vue-start-server@7776

@tanstack/zod-adapter

npm i https://pkg.pr.new/@tanstack/zod-adapter@7776

commit: 6556dae

[github-actions]

Bundle Size Benchmarks

• Commit: d45ed8fa386a
• Measured at: 2026-07-12T12:58:07.054Z
• Baseline source: history:a3e24c35a58d
• Dashboard: bundle-size history

Scenario	Current (gzip)	Delta vs baseline	Initial gzip	Raw	Brotli	Trend
react-router.minimal	87.57 KiB	+207 B (+0.23%)	87.44 KiB	274.56 KiB	76.11 KiB	▁▂▂▂▂▃▃▃▃▃▃█
react-router.full	91.31 KiB	+213 B (+0.23%)	91.18 KiB	286.45 KiB	79.40 KiB	▁▂▂▂▂▃▃▃▃▃▃█
solid-router.minimal	35.81 KiB	+256 B (+0.70%)	35.69 KiB	106.76 KiB	32.17 KiB	▁▂▂▂▂▃▃▃▃▃▃█
solid-router.full	40.84 KiB	+234 B (+0.56%)	40.71 KiB	121.98 KiB	36.67 KiB	▁▂▂▂▂▃▃▃▃▃▃█
vue-router.minimal	53.29 KiB	+228 B (+0.42%)	53.16 KiB	150.80 KiB	47.88 KiB	▁▂▂▂▂▃▃▃▃▃▃█
vue-router.full	59.26 KiB	+236 B (+0.39%)	59.13 KiB	169.56 KiB	53.06 KiB	▁▂▂▂▂▃▃▃▃▃▃█
react-start.minimal	102.28 KiB	+264 B (+0.25%)	102.14 KiB	322.98 KiB	88.51 KiB	▁▂▂▂▂▃▃▃▃▃▃█
react-start.deferred-hydration	103.02 KiB	+269 B (+0.26%)	102.17 KiB	324.36 KiB	89.15 KiB	▁▂▂▂▂▃▃▃▃▃▃█
react-start.full	105.67 KiB	+228 B (+0.21%)	105.54 KiB	332.91 KiB	91.34 KiB	▁▂▂▂▃▄▄▄▄▄▄█
react-start.rsbuild.minimal	99.93 KiB	+195 B (+0.19%)	99.76 KiB	317.47 KiB	86.00 KiB	▁▂▁▁▂▄▄▄▄▄▄█
react-start.rsbuild.minimal-iife	100.33 KiB	+192 B (+0.19%)	100.17 KiB	318.41 KiB	86.31 KiB	▁▂▂▂▂▄▄▄▄▄▄█
react-start.rsbuild.full	103.15 KiB	+195 B (+0.18%)	102.98 KiB	327.53 KiB	88.75 KiB	▁▂▂▂▂▃▃▃▃▃▃█
solid-start.minimal	49.96 KiB	+259 B (+0.51%)	49.83 KiB	152.94 KiB	44.05 KiB	▁▂▂▂▂▃▃▃▃▃▃█
solid-start.deferred-hydration	53.22 KiB	+256 B (+0.47%)	49.89 KiB	160.98 KiB	47.02 KiB	▁▂▂▂▂▃▃▃▃▃▃█
solid-start.full	55.77 KiB	+263 B (+0.46%)	55.64 KiB	169.99 KiB	49.08 KiB	▁▂▂▂▃▃▃▃▃▃▃█
vue-start.minimal	71.35 KiB	+229 B (+0.31%)	71.23 KiB	208.05 KiB	63.09 KiB	▁▂▂▂▃▃▃▃▃▃▃█
vue-start.full	75.36 KiB	+237 B (+0.31%)	75.23 KiB	220.69 KiB	66.71 KiB	▁▂▂▂▃▃▃▃▃▃▃█

Current gzip tracks all emitted client JS chunks. Initial gzip tracks only the entry/import graph. Trend sparkline is historical current gzip ending with this PR measurement; lower is better.

[codspeed-hq]

Merging this PR will improve performance by 5.98%

⚠️Different runtime environments detected

Some benchmarks with significant performance changes were compared across different runtime environments,
which may affect the accuracy of the results.

Open the report in CodSpeed to investigate

⚡ 3 improved benchmarks
❌ 5 regressed benchmarks
✅ 172 untouched benchmarks

Warning

Please fix the performance issues or acknowledge them on CodSpeed.

Performance Changes

	Mode	Benchmark	BASE	HEAD	Efficiency
❌	Memory	mem server error-paths redirect (vue)	304.6 KB	386.6 KB	-21.21%
❌	Memory	mem server error-paths redirect (solid)	440.8 KB	547.3 KB	-19.46%
❌	Simulation	ssr before-load chain (react)	50 ms	55 ms	-8.96%
❌	Simulation	client-route-tree-scale navigation loop (react)	74.1 ms	77.3 ms	-4.12%
❌	Simulation	ssr streaming deferred (react)	70.6 ms	73 ms	-3.25%
⚡	Memory	mem server error-paths unmatched (react)	606.9 KB	264.3 KB	×2.3
⚡	Memory	mem server streaming-peak chunked (vue)	13.9 MB	11.1 MB	+25.42%
⚡	Memory	mem server error-paths not-found (solid)	427 KB	414.1 KB	+3.12%

Tip

Investigate this regression by commenting @codspeedbot fix this regression on this PR, or directly use the CodSpeed MCP with your agent.

---

_{Comparing match-route-parsed-params (6556dae) with main (a3e24c3)}

[Sheraff]

I think it makes sense to fix this. But also router.matchRoute is broken more generally because it does not take the route tree into account. It could return true for the specific route you're asking for, but when actually compared against the entire tree, another route would match because it had higher matching priority.

[LadyBluenotes]

I think it makes sense to fix this. But also router.matchRoute is broken more generally because it does not take the route tree into account. It could return true for the specific route you're asking for, but when actually compared against the entire tree, another route would match because it had higher matching priority.

Added a regression for osts/edit versus posts/$postId. So when full-tree matching identifies /posts/edit as the winner, matchRoute({ to: '/posts/$postId' }) now returns false. The existing fallback remains for route branches that cannot be resolved through parser-aware tree matching :))

[LadyBluenotes]

@Sheraff made the changes we talked about in discord

[coderabbitai]

Actionable comments posted: 1

🧹 Nitpick comments (2)

packages/router-core/src/new-process-route-tree.ts (2)

812-849: 🚀 Performance & Scalability | 🔵 Trivial | ⚖️ Poor tradeoff

findMatch always redoes full extraction from scratch, discarding the incremental extract state already computed during getNodeMatch.

When includeRouteParams is set, the constructed leaf object omits extract (only node, skipped, rawParams are carried over), forcing extractParams to restart from partIndex/nodeIndex/pathIndex/segmentCount = 0 even though the winning frame may already have partially-resumed extract state from earlier validateParseParams calls along the branch. This is correct but redundant for branches that use .parse(), doing O(n) extraction twice. Worth a look if this path is hot, though likely low priority given branch depth is typically small.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/router-core/src/new-process-route-tree.ts` around lines 812 - 849,
Reuse the incremental extract state from getNodeMatch in findMatch instead of
restarting extractParams from zero. Preserve the winning leaf frame’s extract
data when constructing or passing the leaf, and update extractParams to continue
from that state while retaining existing rawParams and matchData behavior.

---

688-696: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

RouteMatchData is defined but not reused for the identical inline shapes.

The new RouteMatchData type (line 858-862) exactly matches the matchData element shape that's independently inlined three more times: RouteMatch<T>.matchData (692-696), findMatch's return type (820-824), and extractParams's return tuple (885-889). Consolidating onto the shared alias avoids the four copies drifting apart if the shape changes later.

♻️ Proposed refactor

 type RouteMatch<T extends Extract<RouteLike, { fullPath: string }>> = {
route: T
rawParams: Record<string, string>
branch: ReadonlyArray<T>
- matchData: ReadonlyArray<{- rawParams?: Record<string, string>- pathnameEnd: number- caseSensitive: boolean- }>+ matchData: ReadonlyArray<RouteMatchData>
}

 ): {
route: T
rawParams: Record<string, string>
- matchData?: ReadonlyArray<{- rawParams?: Record<string, string>- pathnameEnd: number- caseSensitive: boolean- }>+ matchData?: ReadonlyArray<RouteMatchData>
} | null {

 extractedParams: Record<string, string>,
- matchData?: Array<{- rawParams?: Record<string, string>- pathnameEnd: number- caseSensitive: boolean- }>,+ matchData?: Array<RouteMatchData>,
] {

(Note: TypeScript type aliases aren't order-sensitive, so RouteMatchData can be referenced ahead of its declaration without issue.)

Also applies to: 813-825, 858-863, 885-889

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@packages/router-core/src/new-process-route-tree.ts` around lines 688 - 696,
Reuse the shared RouteMatchData alias for every matchData element type instead
of repeating its inline shape. Update RouteMatch<T>.matchData, findMatch’s
return type, and extractParams’ return tuple to reference RouteMatchData, while
keeping the alias definition and existing type structure unchanged.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@packages/router-core/src/new-process-route-tree.ts`:
- Line 951: Update the one-line conditionals in the route-tree logic: wrap the
body of the `if (part)` statement around `pathIndex += part.length` and the body
of the `if (result === false)` statement around `return null` in curly braces,
preserving their existing behavior.
---
Nitpick comments:
In `@packages/router-core/src/new-process-route-tree.ts`:
- Around line 812-849: Reuse the incremental extract state from getNodeMatch in
findMatch instead of restarting extractParams from zero. Preserve the winning
leaf frame’s extract data when constructing or passing the leaf, and update
extractParams to continue from that state while retaining existing rawParams and
matchData behavior.
- Around line 688-696: Reuse the shared RouteMatchData alias for every matchData
element type instead of repeating its inline shape. Update
RouteMatch<T>.matchData, findMatch’s return type, and extractParams’ return
tuple to reference RouteMatchData, while keeping the alias definition and
existing type structure unchanged.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: af4b87d9-0cd5-46e6-9821-c5369b926b71

📥 Commits

Reviewing files that changed from the base of the PR and between 24a76d9 and 06a3de5.

📒 Files selected for processing (7)

• packages/router-core/src/new-process-route-tree.ts
• packages/router-core/src/router.ts
• packages/router-core/tests/match-by-path.test.ts
• packages/router-core/tests/match-route.test.ts
• packages/router-core/tests/optional-path-params-clean.test.ts
• packages/router-core/tests/optional-path-params.test.ts
• packages/router-core/tests/path.test.ts

💤 Files with no reviewable changes (1)

• packages/router-core/tests/match-by-path.test.ts

🚧 Files skipped from review as they are similar to previous changes (1)

• packages/router-core/src/router.ts

[nx-cloud]

Important

At least one additional CI pipeline execution has run since the conclusion below was written and it may no longer be applicable.

Nx Cloud has identified a possible root cause for your failed CI:

We classified this build failure as an environment issue rather than a code change. The failing project tanstack-start-example-rscs is not touched by this PR, and the error (ERR_PACKAGE_PATH_NOT_EXPORTED for nitro's ./runtime/meta subpath) is a pre-existing dependency incompatibility between nitro-nightly and the installed nitro version. Our changes to route matching logic have no bearing on this failure.

No code changes were suggested for this issue.

Trigger a rerun:

View detailed reasoning on Nx Cloud ↗

_{🎓 Learn more about Self-Healing CI on nx.dev}