fix rest sorting for endpoints and pages (#3168)

* fix rest sorting for endpoints and pages

* changeset

Co-authored-by: Rich Harris <[email protected]>

Author: tanhauhau

.changeset/strange-kiwis-tell.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+Sort rest endpoints before pages

packages/kit/src/core/create_manifest_data/index.js

@@ -303,6 +303,9 @@ function comparator(a, b) {
 		if (!b_sub_part) return -1;
 
 		if (a_sub_part.rest && b_sub_part.rest) {
+			if (a.is_page !== b.is_page) {
+				return a.is_page ? 1 : -1;
+			}
 			// sort alphabetically
 			return a_sub_part.content < b_sub_part.content ? -1 : 1;
 		}

packages/kit/src/core/create_manifest_data/index.spec.js

@@ -200,6 +200,20 @@ test('sorts routes correctly', () => {
 	);
 });
 
+test('sorts routes with rest correctly', () => {
+	const { routes } = create('samples/rest');
+
+	assert.equal(
+		routes.map((p) => (p.type === 'page' ? p.a : p.file)),
+		[
+			'samples/rest/a/[...rest].js',
+			[layout, 'samples/rest/a/[...rest].svelte'],
+			'samples/rest/b/[...rest].ts',
+			[layout, 'samples/rest/b/[...rest].svelte']
+		]
+	);
+});
+
 test('disallows rest parameters inside segments', () => {
 	assert.throws(
 		() => {