Allow multiple slugs in route segment

src/core/create_manifest_data.ts

@@ -84,16 +84,16 @@ export default function create_manifest_data(cwd: string, extensions: string = '
 					? basename
 					: basename.slice(0, -ext.length);
 
+				if (/\]\[/.test(segment)) {
+					throw new Error(`Invalid route ${file} — parameters must be separated`);
+				}
+
 				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)) {
-						throw new Error(`Invalid route ${file} — parameters must be separated`);
-					}
-
 					if (part.qualifier && /[\(\)\?\:]/.test(part.qualifier.slice(1, -1))) {
 						throw new Error(`Invalid route ${file} — cannot use (, ), ? or : in route qualifiers`);
 					}
@@ -298,7 +298,7 @@ function comparator(
 }
 
 function get_parts(part: string): Part[] {
-	return part.split(/\[(.+)\]/)
+	return part.split(/\[(.+?\(.+?\)|.+?)\]/)
 		.map((str, i) => {
 			if (!str) return null;
 			const dynamic = i % 2 === 1;
@@ -340,7 +340,8 @@ function get_pattern(segments: Part[][], add_trailing_slash: boolean) {
 					.replace(/\?/g, '%3F')
 					.replace(/#/g, '%23')
 					.replace(/%5B/g, '[')
-					.replace(/%5D/g, ']');
+					.replace(/%5D/g, ']')
+					.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 		}).join('');
 	}).join('\\/');
 

test/unit/create_manifest_data/test.ts

@@ -59,14 +59,14 @@ describe('manifest_data', () => {
 
 			{
 				name: 'route_blog_json',
-				pattern: /^\/blog.json$/,
+				pattern: /^\/blog\.json$/,
 				file: 'blog/index.json.js',
 				params: []
 			},
 
 			{
 				name: 'route_blog_$slug_json',
-				pattern: /^\/blog\/([^\/]+?).json$/,
+				pattern: /^\/blog\/([^\/]+?)\.json$/,
 				file: 'blog/[slug].json.js',
 				params: ['slug']
 			}
@@ -143,6 +143,32 @@ describe('manifest_data', () => {
 		]);
 	});
 
+	it('allows mutliple slugs', () => {
+		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/multiple-slugs'));
+
+		assert.deepEqual(server_routes, [
+			{
+				name: "route_$file$93_$91ext",
+				pattern: /^\/([^\/]+?)\.([^\/]+?)$/,
+				file: "[file].[ext].js",
+				params: ["file", "ext"]
+			}
+		]);
+	});
+
+	it('allows mutliple slugs with nested square brackets', () => {
+		const { server_routes } = create_manifest_data(path.join(__dirname, 'samples/nested-square-brackets'));
+
+		assert.deepEqual(server_routes, [
+			{
+				name: "route_$file_$91ext$40$91a$45z$93$43$41$93",
+				pattern: /^\/([a-z]+)\.([a-z]+)$/,
+				file: "[file([a-z]+)].[ext([a-z]+)].js",
+				params: ["file", "ext"]
+			}
+		]);
+	});
+
 	it('fails on clashes', () => {
 		assert.throws(() => {
 			const { pages } = create_manifest_data(path.join(__dirname, 'samples/clash-pages'));
@@ -226,13 +252,13 @@ describe('manifest_data', () => {
 		assert.deepEqual(server_routes, [
 			{
 				name: 'route_blog_json',
-				pattern: /^\/blog.json$/,
+				pattern: /^\/blog\.json$/,
 				file: 'blog/index.json.js',
 				params: []
 			},
 			{
 				name: 'route_blog_$slug_json',
-				pattern: /^\/blog\/([^\/]+?).json$/,
+				pattern: /^\/blog\/([^\/]+?)\.json$/,
 				file: 'blog/[slug].json.js',
 				params: ['slug']
 			}