Skip to content

refactor(router-core): parseLocation fast path w/ no rewrites #6516

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
Sheraff merged 4 commits into from
Jan 26, 2026
+26 −7
Merged

refactor(router-core): parseLocation fast path w/ no rewrites #6516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0271a0c
refactor(router-core): parseLocation fast path w/ no rewrites
Sheraff Jan 25, 2026
5c92260
ci: apply automated fixes
autofix-ci[bot] Jan 25, 2026
0853d9f
fix
Sheraff Jan 25, 2026
b542bc1
ci: apply automated fixes
autofix-ci[bot] Jan 25, 2026
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
6 changes: 0 additions & 6 deletions packages/react-router/tests/router.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,12 +706,6 @@ describe('encoding/decoding: wildcard routes/params', () => {

await router.load()

expect(
router.state.location.href.endsWith(
'/framework/react/guide/file-based-routing%20tanstack',
),
).toBe(true)

expect(router.state.location.href).toBe(
'/framework/react/guide/file-based-routing%20tanstack',
)
Expand Down
27 changes: 26 additions & 1 deletion packages/router-core/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,9 +1252,34 @@ export class RouterCore<
previousLocation,
) => {
const parse = ({
pathname,
search,
hash,
href,
state,
}: HistoryLocation): ParsedLocation<FullSearchSchema<TRouteTree>> => {
// Fast path: no rewrite configured and pathname doesn't need encoding
// Characters that need encoding: space, high unicode, control chars
// eslint-disable-next-line no-control-regex
if (!this.rewrite && !/[ \x00-\x1f\x7f\u0080-\uffff]/.test(pathname)) {
const parsedSearch = this.options.parseSearch(search)
const searchStr = this.options.stringifySearch(parsedSearch)

return {
href: pathname + searchStr + hash,
publicHref: href,
pathname: decodePath(pathname),
external: false,
searchStr,
search: replaceEqualDeep(
previousLocation?.search,
parsedSearch,
) as any,
hash: decodePath(hash.slice(1)),
state: replaceEqualDeep(previousLocation?.state, state),
}
}

// Before we do any processing, we need to allow rewrites to modify the URL
// build up the full URL by combining the href from history with the router's origin
const fullUrl = new URL(href, this.origin)
Expand All @@ -1276,7 +1301,7 @@ export class RouterCore<
external: !!this.rewrite && url.origin !== this.origin,
searchStr,
search: replaceEqualDeep(previousLocation?.search, parsedSearch) as any,
hash: decodePath(url.hash.split('#').reverse()[0] ?? ''),
hash: decodePath(url.hash.slice(1)),
state: replaceEqualDeep(previousLocation?.state, state),
}
}
Expand Down
Loading