totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-14 03:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #501 from sveltejs/gh-497

Browse Source 
consistent query parameter handling between client and server
This commit is contained in:
Rich Harris
2018-10-27 12:35:58 -04:00
committed by GitHub
parent 198be28f4b eadefd996b
commit eebf076f23
5 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/src/client/app.ts
View File

@@ -87,11 +87,14 @@ export function select_route(url: URL): Target {
const match = page.pattern.exec(path);
if (match) {
const query: Record<string, string | true> = {};
const query: Record<string, string | string[]> = Object.create(null);
if (url.search.length > 0) {
url.search.slice(1).split('&').forEach(searchParam => {
const [, key, value] = /([^=]*)(?:=(.*))?/.exec(searchParam);
query[decodeURIComponent(key)] = decodeURIComponent((value || '').replace(/\+/g, ' '));
let [, key, value] = /([^=]*)(?:=(.*))?/.exec(decodeURIComponent(searchParam));
value = (value || '').replace(/\+/g, ' ');
if (typeof query[key] === 'string') query[key] = [<string>query[key]];
if (typeof query[key] === 'object') query[key].push(value);
else query[key] = value;
});
}
return { url, path, page, match, query };

2
templates/src/client/types.ts
View File

@@ -55,7 +55,7 @@ export type Target = {
path: string;
page: Page;
match: RegExpExecArray;
query: Record<string, string | true>;
query: Record<string, string | string[]>;
};
export type Redirect = {