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

handle nested routes - fixes #55

Browse Source
This commit is contained in:
Rich Harris
2017-12-31 13:25:52 -05:00
parent 12b73ecebf
commit 423e02aeae
2 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/utils/create_routes.js
View File

@@ -16,9 +16,22 @@ module.exports = function create_matchers(files) {
.filter(part => part[0] === '[')
.map(part => part.slice(1, -1));
const pattern = new RegExp(
`^\\/${parts.map(p => p[0] === '[' ? '([^/]+)' : p).join('\\/')}$`
);
let pattern_string = '';
let i = parts.length;
let nested = true;
while (i--) {
const part = parts[i];
const dynamic = part[0] === '[';
if (dynamic) {
pattern_string = nested ? `(?:\\/([^/]+)${pattern_string})?` : `\\/([^/]+)${pattern_string}`;
} else {
nested = false;
pattern_string = `\\/${part}${pattern_string}`;
}
}
const pattern = new RegExp(`^${pattern_string}$`);
const test = url => pattern.test(url);
@@ -28,7 +41,7 @@ module.exports = function create_matchers(files) {
const params = {};
dynamic.forEach((param, i) => {
params[param] = match[i + 1];
params[param] = match[i + 1] || null;
});
return params;
@@ -58,8 +71,8 @@ module.exports = function create_matchers(files) {
return 0;
}
if (!a_part) return 1;
if (!b_part) return -1;
if (!a_part) return -1;
if (!b_part) return 1;
const a_is_dynamic = a_part[0] === '[';
const b_is_dynamic = b_part[0] === '[';