@sveltejs/kit 1.0.0-next.522 → 1.0.0-next.524

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.522",
+  "version": "1.0.0-next.524",
   "repository": {
     "type": "git",
     "url": "https://github.com/sveltejs/kit",

package/src/core/adapt/builder.js

@@ -5,7 +5,7 @@ import { pipeline } from 'stream';
 import { promisify } from 'util';
 import { copy, rimraf, mkdirp } from '../../utils/filesystem.js';
 import { generate_manifest } from '../generate_manifest/index.js';
-import { affects_path } from '../../utils/routing.js';
+import { get_route_segments } from '../../utils/routing.js';
 
 const pipe = promisify(pipeline);
 
@@ -48,14 +48,11 @@ export function create_builder({ config, build_data, routes, prerendered, log })
 
 				return {
 					id: route.id,
-					segments: route.id
-						.split('/')
-						.filter(affects_path)
-						.map((segment) => ({
-							dynamic: segment.includes('['),
-							rest: segment.includes('[...'),
-							content: segment
-						})),
+					segments: get_route_segments(route.id).map((segment) => ({
+						dynamic: segment.includes('['),
+						rest: segment.includes('[...'),
+						content: segment
+					})),
 					pattern: route.pattern,
 					methods: Array.from(methods)
 				};

package/src/core/prerender/prerender.js

@@ -9,7 +9,7 @@ import { crawl } from './crawl.js';
 import { escape_html_attr } from '../../utils/escape.js';
 import { logger } from '../utils.js';
 import { load_config } from '../config/index.js';
-import { affects_path } from '../../utils/routing.js';
+import { get_route_segments } from '../../utils/routing.js';
 import { get_option } from '../../runtime/server/utils.js';
 
 /**
@@ -370,7 +370,7 @@ export async function prerender() {
 			for (const [id, prerender] of prerender_map) {
 				if (prerender) {
 					if (id.includes('[')) continue;
-					const path = `${id.split('/').filter(affects_path).join('/')}`;
+					const path = `/${get_route_segments(id).join('/')}`;
 					enqueue(null, config.paths.base + path);
 				}
 			}

package/src/core/sync/create_manifest_data/sort.js

@@ -1,4 +1,4 @@
-import { affects_path } from '../../../utils/routing.js';
+import { get_route_segments } from '../../../utils/routing.js';
 
 /**
  * @typedef {{
@@ -133,13 +133,11 @@ export function sort_routes(routes) {
 
 /** @param {string} id */
 function split_route_id(id) {
-	return (
+	return get_route_segments(
 		id
 			// remove all [[optional]] parts unless they're at the very end
 			.replace(/\[\[[^\]]+\]\](?!$)/g, '')
-			.split('/')
-			.filter((segment) => segment !== '' && affects_path(segment))
-	);
+	).filter(Boolean);
 }
 
 /**

package/src/core/sync/write_types/index.js

@@ -147,7 +147,7 @@ export async function write_types(config, manifest_data, file) {
 		return;
 	}
 
-	const id = posixify(path.relative(config.kit.files.routes, path.dirname(file)));
+	const id = '/' + posixify(path.relative(config.kit.files.routes, path.dirname(file)));
 
 	const route = manifest_data.routes.find((route) => route.id === id);
 	if (!route) return; // this shouldn't ever happen

package/src/runtime/client/parse.js

@@ -18,7 +18,7 @@ export function parse(nodes, server_loads, dictionary, matchers) {
 			/** @param {string} path */
 			exec: (path) => {
 				const match = pattern.exec(path);
-				if (match) return exec(match, names, types, matchers);
+				if (match) return exec(match, id, names, types, matchers);
 			},
 			errors: [1, ...(errors || [])].map((n) => nodes[n]),
 			layouts: [0, ...(layouts || [])].map(create_layout_loader),

package/src/runtime/server/index.js

@@ -67,7 +67,7 @@ export async function respond(request, options, state) {
 			const match = candidate.pattern.exec(decoded);
 			if (!match) continue;
 
-			const matched = exec(match, candidate.names, candidate.types, matchers);
+			const matched = exec(match, candidate.id, candidate.names, candidate.types, matchers);
 			if (matched) {
 				route = candidate;
 				params = decode_params(matched);

package/src/utils/routing.js

@@ -16,10 +16,7 @@ export function parse_route_id(id) {
 		id === '/'
 			? /^\/$/
 			: new RegExp(
-					`^${id
-						.split(/(?:\/|$)/)
-						.slice(1)
-						.filter(affects_path)
+					`^${get_route_segments(id)
 						.map((segment, i, segments) => {
 							const decoded_segment = decodeURIComponent(segment);
 							// special case — /[...rest]/ could contain zero segments
@@ -98,19 +95,32 @@ export function parse_route_id(id) {
  * Returns `false` for `(group)` segments
  * @param {string} segment
  */
-export function affects_path(segment) {
+function affects_path(segment) {
 	return !/^\([^)]+\)$/.test(segment);
 }
 
+/**
+ * Splits a route id into its segments, removing segments that
+ * don't affect the path (i.e. groups). The root route is represented by `/`
+ * and will be returned as `['']`.
+ * @param {string} route
+ * @returns string[]
+ */
+export function get_route_segments(route) {
+	return route.slice(1).split('/').filter(affects_path);
+}
+
 /**
  * @param {RegExpMatchArray} match
+ * @param {string} routeId
  * @param {string[]} names
  * @param {string[]} types
  * @param {Record<string, import('types').ParamMatcher>} matchers
  */
-export function exec(match, names, types, matchers) {
+export function exec(match, routeId, names, types, matchers) {
 	/** @type {Record<string, string>} */
 	const params = {};
+	let last_type_idx = -1;
 
 	for (let i = 0; i < names.length; i += 1) {
 		const name = names[i];
@@ -121,7 +131,12 @@ export function exec(match, names, types, matchers) {
 			const matcher = matchers[type];
 			if (!matcher) throw new Error(`Missing "${type}" param matcher`); // TODO do this ahead of time?
 
-			if (!matcher(value)) return;
+			last_type_idx = routeId.indexOf(`=${type}`, last_type_idx + 1);
+			const is_empty_optional_param =
+				!value &&
+				// a param without a value can only be an optional or rest param
+				routeId.lastIndexOf('[[', last_type_idx) > routeId.lastIndexOf('[...', last_type_idx);
+			if (!is_empty_optional_param && !matcher(value)) return;
 		}
 
 		params[name] = value;