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

allow reserved words as route names - fixes #315

Browse Source
This commit is contained in:
Rich Harris
2018-09-02 21:46:25 -04:00
parent 4a92fbbbfa
commit 2c507b5a2e
5 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/create_manifest_data.ts
View File

@@ -2,7 +2,7 @@ import * as fs from 'fs';
import * as path from 'path';
import { locations } from '../config';
import { Page, PageComponent, ServerRoute, ManifestData } from '../interfaces';
import { posixify } from './utils';
import { posixify, reserved_words } from './utils';
export default function create_manifest_data(cwd = locations.routes()): ManifestData {
const components: PageComponent[] = [];
@@ -269,7 +269,7 @@ function get_parts(part: string): Part[] {
}
function get_slug(file: string) {
return file
let name = file
.replace(/[\\\/]index/, '')
.replace(/_default([\/\\index])?\.html$/, 'index')
.replace(/[\/\\]/g, '_')
@@ -278,6 +278,9 @@ function get_slug(file: string) {
.replace(/[^a-zA-Z0-9_$]/g, c => {
return c === '.' ? '_' : `$${c.charCodeAt(0)}`
});
if (reserved_words.has(name)) name += '_';
return name;
}
function get_pattern(segments: Part[][], add_trailing_slash: boolean) {