sigh

Author: dummdidumm

packages/kit/src/core/sync/write_types/index.spec.js

@@ -14,12 +14,12 @@ const cwd = fileURLToPath(new URL('./test', import.meta.url));
 
 /**
  * @param {string} dir
- * @param {import('types').Config} config
+ * @param {(code: string) => string} [prepare_expected]
  */
-async function run_test(dir, config = {}) {
+async function run_test(dir, prepare_expected = (code) => code) {
 	rimraf(path.join(cwd, dir, '.svelte-kit'));
 
-	const initial = options(config, 'config');
+	const initial = options({}, 'config');
 
 	initial.kit.files.assets = path.resolve(cwd, 'static');
 	initial.kit.files.params = path.resolve(cwd, 'params');
@@ -56,7 +56,7 @@ async function run_test(dir, config = {}) {
 			parser: 'typescript'
 		});
 		const err_msg = `Expected equal file contents for ${file} in ${dir}`;
-		assert.fixture(actual, expected, err_msg);
+		assert.fixture(actual, prepare_expected(expected), err_msg);
 	}
 }
 
@@ -81,7 +81,15 @@ test('Create $types for grouped layout and page', async () => {
 });
 
 test('Create $types with params', async () => {
-	await run_test('slugs');
+	await run_test('slugs', (code) =>
+		// For some reason, the order of the params differentiates between windows and mac/linux
+		process.platform === 'win32'
+			? code.replace(
+					'rest?: string; slug?: string; optional?: string',
+					'optional?: string; rest?: string; slug?: string'
+			  )
+			: code
+	);
 });
 
 test('Create $types with params and required return types for layout', async () => {

packages/kit/src/core/sync/write_types/test/slugs/_expected/$types.d.ts

@@ -12,7 +12,7 @@ type OutputDataShape<T> = MaybeWithVoid<
 		Record<string, any>
 >;
 type EnsureDefined<T> = T extends null | undefined ? {} : T;
-type LayoutParams = RouteParams & { optional?: string; rest?: string; slug?: string };
+type LayoutParams = RouteParams & { rest?: string; slug?: string; optional?: string };
 type LayoutParentData = EnsureDefined<{}>;
 
 export type LayoutServerData = null;