fix: sort query parameters without decoding their escapes

Disabling sortQueryParameters left the parameters in their original order, so the same link written with a different order would no longer be recognized as a duplicate. The parameters are now sorted by name like URLSearchParams.sort() does, but each one is kept as written, so %26, %3D, %3F and %2B are not decoded.
This commit is contained in:
leoca
2026-11-14 04:25:14 +00:00
parent d7c1a01cf6
commit ad0ebc21aa
+23 -1
View File
@@ -38,10 +38,32 @@ export function isURI(string: string): boolean {
}
}
// Sorts the query parameters like URLSearchParams.sort(), but keeps each one as written, so
// escapes like %26, %3D and %2B are not decoded the way normalize-url's own sorting does
function sortQueryParameters(url: string): string {
const queryStart = url.indexOf('?')
if (queryStart === -1) return url
const hashStart = url.indexOf('#', queryStart)
const queryEnd = hashStart === -1 ? url.length : hashStart
const getName = (param: string) => new URLSearchParams(param).keys().next().value ?? ''
const params = url
.slice(queryStart + 1, queryEnd)
.split('&')
.filter(Boolean)
.map(param => ({ param, name: getName(param) }))
.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))
.map(({ param }) => param)
const query = params.length ? `?${params.join('&')}` : ''
return url.slice(0, queryStart) + query + url.slice(queryEnd)
}
export function normalizeURL(url: string): string {
let normalized: string
try {
normalized = normalizeUrl(url, { stripWWW: false, sortQueryParameters: false })
normalized = sortQueryParameters(
normalizeUrl(url, { stripWWW: false, sortQueryParameters: false })
)
} catch {
return url.replace(/\s/g, '+')
}