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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltejs/kit",
-  "version": "1.0.0-next.522",
+  "version": "1.0.0-next.523",
   "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/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,10 +95,21 @@ 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[]} names