Skip to content
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

Jump to bottom

fix(query): & sign doesn't remove properly #935

Merged
merged 2 commits into from May 10, 2021
Merged

fix(query): & sign doesn't remove properly #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b713c6
fix(query): `&` sign doesn't remove properly
mattersj May 9, 2021
1026a41
test: improve title and remove unnecessary test case
mattersj May 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions __tests__/stringifyQuery.spec.ts
View file
Open in desktop
Expand Up @@ -28,6 +28,12 @@ describe('stringifyQuery', () => {
expect(stringifyQuery({ e: undefined, b: 'a' })).toEqual('b=a')
})

it('ignores undefined and empty arrays', () => {
expect(
stringifyQuery({ a: [undefined, 'b'], b: undefined, c: [] })
).toEqual('a=b')
})

it('stringifies arrays', () => {
expect(stringifyQuery({ e: ['b', 'a'] })).toEqual('e=b&e=a')
})
Expand Down
10 changes: 5 additions & 5 deletions src/query.ts
View file
Open in desktop
Expand Up @@ -89,12 +89,11 @@ export function parseQuery(search: string): LocationQuery {
export function stringifyQuery(query: LocationQueryRaw): string {
let search = ''
for (let key in query) {
if (search.length) search += '&'
const value = query[key]
key = encodeQueryKey(key)
if (value == null) {
// only null adds the value
if (value !== undefined) search += key
if (value !== undefined) search += (search.length ? '&' : '') + key
continue
}
// keep null values
Expand All @@ -103,9 +102,10 @@ export function stringifyQuery(query: LocationQueryRaw): string {
: [value && encodeQueryValue(value)]

for (let i = 0; i < values.length; i++) {
// only append & with i > 0
search += (i ? '&' : '') + key
if (values[i] != null) search += ('=' + values[i]) as string
if (values[i] === undefined) continue
// only append & with non-empty search
search += (search.length ? '&' : '') + key
if (values[i] !== null) search += ('=' + values[i]) as string
}
}

Expand Down