(fix) loading files from repl json broke the REPL upon renaming (#506)

* (fix) loading files from repl json broke the REPL upon renaming * Add changesets * Clean imports * Minor fixes --------- Co-authored-by: Puru Vijay <[email protected]>
sveltejs · Jun 28, 2023 · 4918664 · 4918664 · vercel · Jun 28, 2023
1 parent f89a8b3
commit 4918664
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 11 deletions.
diff --git a/.changeset/proud-wombats-buy.md b/.changeset/proud-wombats-buy.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/repl': patch
+---
+
+(fix) loading files in editor state map upon loading
diff --git a/packages/repl/src/lib/Repl.svelte b/packages/repl/src/lib/Repl.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { EditorState } from '@codemirror/state';
 	import { SplitPane } from '@rich_harris/svelte-split-pane';
 	import { BROWSER } from 'esm-env';
 	import { createEventDispatcher } from 'svelte';
@@ -9,7 +10,7 @@
 	import InputOutputToggle from './InputOutputToggle.svelte';
 	import Output from './Output/Output.svelte';
 	import { set_repl_context } from './context.js';
-	import { get_full_filename, sleep } from './utils.js';
+	import { get_full_filename } from './utils.js';
 
 	export let packagesUrl = 'https://unpkg.com';
 	export let svelteUrl = `${packagesUrl}/svelte`;
@@ -50,17 +51,17 @@
 
 		injectedCSS = data.css || '';
 
-		await sleep(50);
+		// when we set new files we also populate the EDITOR_STATE_MAP
+		// with a new state for each file containing the source as docs
+		// this allows the editor to behave correctly when renaming a tab
+		// after having loaded the files externally
+		populate_editor_state();
 
-		EDITOR_STATE_MAP.set(get_full_filename(data.files[0]), $module_editor?.getEditorState());
+		dispatch('change', { files: $files });
 	}
 
 	export function markSaved() {
 		$files = $files.map((val) => ({ ...val, modified: false }));
-
-		// if (!$selected) return;
-
-		// const current = $files.find(val => get_full_filename(val) === $selected_name).modified = false;
 	}
 
 	/** @param {{ files: import('./types').File[], css?: string }} data */
@@ -84,6 +85,8 @@
 			$module_editor?.clearEditorState();
 		}
 
+		populate_editor_state();
+
 		dispatch('change', { files: $files });
 	}
 
@@ -94,7 +97,7 @@
 	 * @typedef {import('./types').ReplContext} ReplContext
 	 */
 
-	/** @type {import('svelte/types/compiler').CompileOptions} */
+	/** @type {import('svelte/compiler').CompileOptions} */
 	const DEFAULT_COMPILE_OPTIONS = {
 		generate: 'dom',
 		dev: false,
@@ -196,8 +199,6 @@
 			$module_editor?.clearEditorState();
 		}
 
-		EDITOR_STATE_MAP.set(filename, $module_editor?.getEditorState());
-
 		$output?.set($selected, $compile_options);
 
 		is_select_changing = false;
@@ -251,6 +252,17 @@
 		EDITOR_STATE_MAP.clear();
 	}
 
+	function populate_editor_state() {
+		for (const file of $files) {
+			EDITOR_STATE_MAP.set(
+				get_full_filename(file),
+				EditorState.create({
+					doc: file.source
+				}).toJSON()
+			);
+		}
+	}
+
 	$: if ($output && $selected) {
 		$output?.update?.($selected, $compile_options);
 	}

diff --git a/packages/repl/src/lib/types.d.ts b/packages/repl/src/lib/types.d.ts
@@ -1,7 +1,7 @@
 import type { EditorState } from '@codemirror/state';
 import { OutputChunk } from '@rollup/browser';
 import type { Readable, Writable } from 'svelte/store';
-import { CompileOptions } from 'svelte/types/compiler';
+import { CompileOptions } from 'svelte/compiler';
 
 export type Lang = 'js' | 'svelte' | 'json' | 'md' | 'css' | (string & Record<never, never>);
 

diff --git a/packages/repl/src/routes/+page.svelte b/packages/repl/src/routes/+page.svelte
@@ -15,11 +15,17 @@
 					source:
 						`<scr` +
 						`ipt>
+    import B from './B.svelte';
 	let name = 'world';
 </scr` +
 						`ipt>
 
 <h1>Hello {name}!</h1>`
+				},
+				{
+					name: 'B',
+					type: 'svelte',
+					source: `B`
 				}
 			]
 		});