tighten up

Author: Rich-Harris

packages/repl/src/lib/Bundler.ts

@@ -1,5 +1,4 @@
-import type { BundleResult } from './workers/bundler';
-import type { BundleMessageData } from './workers/workers';
+import type { BundleMessageData, BundleResult } from './workers/workers';
 import type { File } from './Workspace.svelte';
 
 let uid = 1;

packages/repl/src/lib/workers/bundler/index.ts

@@ -12,7 +12,7 @@ import svg from './plugins/svg';
 import replace from './plugins/replace';
 import loop_protect from './plugins/loop-protect';
 import type { Plugin, RollupCache, TransformResult } from '@rollup/browser';
-import type { BundleMessageData, BundleOptions } from '../workers';
+import type { BundleMessageData, BundleOptions, BundleResult } from '../workers';
 import type { Warning } from '../../types';
 import type { CompileError, CompileResult } from 'svelte/compiler';
 import type { File } from '../../Workspace.svelte';
@@ -427,16 +427,14 @@ async function get_bundle(
 	};
 }
 
-export type BundleResult = ReturnType<typeof bundle>;
-
 async function bundle(
 	svelte: typeof import('svelte/compiler'),
 	svelte_version: string,
 	uid: number,
 	files: File[],
 	options: BundleOptions,
 	can_use_experimental_async: boolean
-) {
+): Promise<BundleResult> {
 	if (!DEV) {
 		console.clear();
 		console.log(`running Svelte compiler version %c${svelte.VERSION}`, 'font-weight: bold');
@@ -547,27 +545,24 @@ async function bundle(
 
 		return {
 			uid,
+			error: null,
 			client: client_result,
 			server: server_result,
 			tailwind: client.tailwind,
-			imports: client.imports,
-			// Svelte 5 returns warnings as error objects with a toJSON method, prior versions return a POJO
-			// TODO are bundler warnings even used anywhere?
-			warnings: client.warnings.map((w: any) => w.toJSON?.() ?? w),
-			error: null
+			imports: client.imports
 		};
 	} catch (err) {
 		console.error(err);
 
-		const e = err as CompileError;
+		const e = err as CompileError; // TODO could be a non-Svelte error?
 
 		return {
 			uid,
+			error: { ...e, message: e.message }, // not all Svelte versions return an enumerable message property
 			client: null,
 			server: null,
-			imports: null,
-			warnings: [],
-			error: { ...e, message: e.message } // not all Svelte versions return an enumerable message property
+			tailwind: null,
+			imports: null
 		};
 	}
 }

packages/repl/src/lib/workers/workers.d.ts

@@ -1,5 +1,6 @@
 import type { CompileError, CompileOptions, CompileResult, Warning } from 'svelte/compiler';
 import type { File } from '../Workspace.svelte';
+import type { MessageDetails } from '$lib/types';
 
 export type CompilerCommand =
 	| {
@@ -61,6 +62,15 @@ export type BundleMessageData = {
 	options: BundleOptions;
 };
 
+export interface BundleResult {
+	uid: number;
+	error: CompileError | null;
+	client: any | null; // TODO
+	server: any | null; // TODO
+	tailwind: string | null;
+	imports: string[];
+}
+
 declare global {
 	var svelte: typeof import('svelte/compiler');
 }