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

Merge pull request #676 from mrkishi/server-indexes

Browse Source 
Consolidate index handling for page and server routes
This commit is contained in:
Rich Harris
2019-05-09 09:18:26 -04:00
committed by GitHub
parent cf8d5ee717 54e92c3b99
commit 2792b7c5d1
4 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/src/app/app.ts
View File

@@ -101,7 +101,11 @@ export function select_target(url: URL): Target {
if (url.origin !== location.origin) return null;
if (!url.pathname.startsWith(initial_data.baseUrl)) return null;
const path = url.pathname.slice(initial_data.baseUrl.length);
let path = url.pathname.slice(initial_data.baseUrl.length);
if (path === '') {
path = '/';
}
// avoid accidental clashes between server routes and page routes
if (ignore.some(pattern => pattern.test(path))) return;

79
src/core/create_manifest_data.ts
View File

@@ -86,6 +86,7 @@ export default function create_manifest_data(cwd: string): ManifestData {
const parts = get_parts(segment);
const is_index = is_dir ? false : basename.startsWith('index.');
const is_page = component_extensions.indexOf(ext) !== -1;
const route_suffix = basename.slice(basename.indexOf('.'), -ext.length);
parts.forEach(part => {
if (/\]\[/.test(part.content)) {
@@ -104,7 +105,8 @@ export default function create_manifest_data(cwd: string): ManifestData {
file: posixify(file),
is_dir,
is_index,
is_page
is_page,
route_suffix
};
})
.filter(Boolean)
@@ -113,25 +115,25 @@ export default function create_manifest_data(cwd: string): ManifestData {
items.forEach(item => {
const segments = parent_segments.slice();
if (item.is_index && segments.length > 0) {
const suffix = item.basename
.slice(0, -item.ext.length)
.replace('index', '');
if (item.is_index) {
if (item.route_suffix) {
if (segments.length > 0) {
const last_segment = segments[segments.length - 1].slice();
const last_part = last_segment[last_segment.length - 1];
if (suffix) {
const last_segment = segments[segments.length - 1].slice();
const last_part = last_segment[last_segment.length - 1];
if (last_part.dynamic) {
last_segment.push({ dynamic: false, content: item.route_suffix });
} else {
last_segment[last_segment.length - 1] = {
dynamic: false,
content: `${last_part.content}${item.route_suffix}`
};
}
if (last_part.dynamic) {
last_segment.push({ dynamic: false, content: suffix });
segments[segments.length - 1] = last_segment;
} else {
last_segment[last_segment.length - 1] = {
dynamic: false,
content: `${last_part.content}${suffix}`
};
segments.push(item.parts);
}
segments[segments.length - 1] = last_segment;
}
} else {
segments.push(item.parts);
@@ -156,8 +158,6 @@ export default function create_manifest_data(cwd: string): ManifestData {
}
else if (item.is_page) {
const is_index = item.basename === `index${item.ext}`;
const component = {
name: get_slug(item.file),
file: item.file,
@@ -166,22 +166,20 @@ export default function create_manifest_data(cwd: string): ManifestData {
components.push(component);
const parts = (is_index && stack[stack.length - 1] === null)
const parts = (item.is_index && stack[stack.length - 1] === null)
? stack.slice(0, -1).concat({ component, params })
: stack.concat({ component, params })
const page = {
pattern: get_pattern(is_index ? parent_segments : segments, true),
pages.push({
pattern: get_pattern(segments, true),
parts
};
pages.push(page);
});
}
else {
server_routes.push({
name: `route_${get_slug(item.file)}`,
pattern: get_pattern(segments, false),
pattern: get_pattern(segments, !item.route_suffix),
file: item.file,
params: params
});
@@ -321,7 +319,6 @@ function get_parts(part: string): Part[] {
function get_slug(file: string) {
let name = file
.replace(/[\\\/]index/, '')
.replace(/_default([\/\\index])?\.html$/, 'index')
.replace(/[\/\\]/g, '_')
.replace(/\.\w+$/, '')
.replace(/\[([^(]+)(?:\([^(]+\))?\]/, '$$$1')
@@ -334,19 +331,19 @@ function get_slug(file: string) {
}
function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
return new RegExp(
`^` +
segments.map(segment => {
return '\\/' + segment.map(part => {
return part.dynamic
? part.qualifier || part.spread ? '(.+)' : '([^\\/]+?)'
: encodeURI(part.content.normalize())
.replace(/\?/g, '%3F')
.replace(/#/g, '%23')
.replace(/%5B/g, '[')
.replace(/%5D/g, ']');
}).join('');
}).join('') +
(add_trailing_slash ? '\\\/?$' : '$')
);
const path = segments.map(segment => {
return segment.map(part => {
return part.dynamic
? part.qualifier || part.spread ? '(.+)' : '([^\\/]+?)'
: encodeURI(part.content.normalize())
.replace(/\?/g, '%3F')
.replace(/#/g, '%23')
.replace(/%5B/g, '[')
.replace(/%5D/g, ']');
}).join('');
}).join('\\/');
const trailing = add_trailing_slash && segments.length ? '\\/?$' : '$';
return new RegExp(`^\\/${path}${trailing}`);
}

0
test/unit/create_manifest_data/samples/basic/index.js Normal file
View File

11
test/unit/create_manifest_data/test.ts
View File

@@ -20,7 +20,7 @@ describe('manifest_data', () => {
assert.deepEqual(pages, [
{
pattern: /^\/?$/,
pattern: /^\/$/,
parts: [
{ component: index, params: [] }
]
@@ -50,6 +50,13 @@ describe('manifest_data', () => {
]);
assert.deepEqual(server_routes, [
{
name: 'route_index',
pattern: /^\/$/,
file: 'index.js',
params: []
},
{
name: 'route_blog_json',
pattern: /^\/blog.json$/,
@@ -167,7 +174,7 @@ describe('manifest_data', () => {
file: 'foo.js',
name: 'route_foo',
params: [],
pattern: /^\/foo$/
pattern: /^\/foo\/?$/
}]);
});
});