From a0a31ed0d00eac7ff014eb4b254149b65b0f6a0b Mon Sep 17 00:00:00 2001
From: Rich Harris <rich.harris@vercel.com>
Date: Wed, 9 Oct 2024 12:25:26 -0400
Subject: [PATCH] fix: use `analysis.name` when migrating `<svelte:self>`
 (#13544)

* fix: use `analysis.name` when migrating `<svelte:self>`

* simplify
---
 .changeset/soft-stingrays-attend.md           |  5 ++++
 packages/svelte/src/compiler/migrate/index.js | 16 ++++++------
 .../svelte-self-name-conflict/input.svelte    |  4 +--
 .../svelte-self-name-conflict/output.svelte   | 26 +++++++++----------
 .../migrate/samples/svelte-self/output.svelte | 24 ++++++++---------
 5 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 .changeset/soft-stingrays-attend.md

diff --git a/.changeset/soft-stingrays-attend.md b/.changeset/soft-stingrays-attend.md
new file mode 100644
index 0000000000..d6bb949d81
--- /dev/null
+++ b/.changeset/soft-stingrays-attend.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: use `analysis.name` when migrating `<svelte:self>`
diff --git a/packages/svelte/src/compiler/migrate/index.js b/packages/svelte/src/compiler/migrate/index.js
index e0d8cd55df..5c2c1fb484 100644
--- a/packages/svelte/src/compiler/migrate/index.js
+++ b/packages/svelte/src/compiler/migrate/index.js
@@ -42,7 +42,7 @@ export function migrate(source, { filename } = {}) {
 		});
 
 		reset_warning_filter(() => false);
-		reset(source, { filename: filename ?? 'migrate.svelte' });
+		reset(source, { filename: filename ?? '(unknown)' });
 
 		let parsed = parse(source);
 
@@ -52,7 +52,8 @@ export function migrate(source, { filename } = {}) {
 		const combined_options = {
 			...validate_component_options({}, ''),
 			...parsed_options,
-			customElementOptions
+			customElementOptions,
+			filename: filename ?? '(unknown)'
 		};
 
 		const str = new MagicString(source);
@@ -92,8 +93,7 @@ export function migrate(source, { filename } = {}) {
 				createBubbler: analysis.root.unique('createBubbler').name,
 				bubble: analysis.root.unique('bubble').name,
 				passive: analysis.root.unique('passive').name,
-				nonpassive: analysis.root.unique('nonpassive').name,
-				svelte_self: analysis.root.unique('SvelteSelf').name
+				nonpassive: analysis.root.unique('nonpassive').name
 			},
 			legacy_imports: new Set(),
 			script_insertions: new Set(),
@@ -137,7 +137,7 @@ export function migrate(source, { filename } = {}) {
 			const file = filename.split('/').pop();
 			str.appendRight(
 				insertion_point,
-				`\n${indent}import ${state.names.svelte_self} from './${file}';`
+				`\n${indent}import ${state.analysis.name} from './${file}';`
 			);
 		}
 
@@ -759,14 +759,14 @@ const template = {
 		state.str.overwrite(
 			node.start + 1,
 			node.start + 1 + 'svelte:self'.length,
-			`${state.names.svelte_self}`
+			`${state.analysis.name}`
 		);
 		// if it has a fragment we need to overwrite the closing tag too
 		if (node.fragment.nodes.length > 0) {
 			state.str.overwrite(
 				state.str.original.lastIndexOf('<', node.end) + 2,
 				node.end - 1,
-				`${state.names.svelte_self}`
+				`${state.analysis.name}`
 			);
 		} else if (!source.endsWith('/>')) {
 			// special case for case `<svelte:self></svelte:self>` it has no fragment but
@@ -774,7 +774,7 @@ const template = {
 			state.str.overwrite(
 				node.start + source.lastIndexOf('</', node.end) + 2,
 				node.end - 1,
-				`${state.names.svelte_self}`
+				`${state.analysis.name}`
 			);
 		}
 		state.has_svelte_self = true;
diff --git a/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/input.svelte b/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/input.svelte
index 8309282ce4..1f7080611a 100644
--- a/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/input.svelte
+++ b/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/input.svelte
@@ -1,5 +1,5 @@
 <script>
-	let SvelteSelf;
+	let Output;
 </script>
 
 {#if false}
@@ -16,4 +16,4 @@
 		child
 	</svelte:self>
 	<svelte:self></svelte:self>
-{/if}
\ No newline at end of file
+{/if}
diff --git a/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/output.svelte b/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/output.svelte
index 827d06c3a3..50f7e42112 100644
--- a/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/output.svelte
+++ b/packages/svelte/tests/migrate/samples/svelte-self-name-conflict/output.svelte
@@ -1,22 +1,22 @@
 <script>
-	import SvelteSelf_1 from './output.svelte';
+	import Output_1 from './output.svelte';
 	/** @type {Record<string, any>} */
 	let { ...props } = $props();
-	let SvelteSelf;
+	let Output;
 </script>
 
 {#if false}
-	<SvelteSelf_1 />
-	<SvelteSelf_1 with_attributes/>
-	<SvelteSelf_1 count={count+1}/>
-	<SvelteSelf_1>
+	<Output_1 />
+	<Output_1 with_attributes/>
+	<Output_1 count={count+1}/>
+	<Output_1>
 		child
-	</SvelteSelf_1>
-	<SvelteSelf_1 count={count+1}>
+	</Output_1>
+	<Output_1 count={count+1}>
 		child
-	</SvelteSelf_1>
-	<SvelteSelf_1 count={props.count}     >
+	</Output_1>
+	<Output_1 count={props.count}     >
 		child
-	</SvelteSelf_1>
-	<SvelteSelf_1></SvelteSelf_1>
-{/if}
\ No newline at end of file
+	</Output_1>
+	<Output_1></Output_1>
+{/if}
diff --git a/packages/svelte/tests/migrate/samples/svelte-self/output.svelte b/packages/svelte/tests/migrate/samples/svelte-self/output.svelte
index 7e7ebae215..8a01edce69 100644
--- a/packages/svelte/tests/migrate/samples/svelte-self/output.svelte
+++ b/packages/svelte/tests/migrate/samples/svelte-self/output.svelte
@@ -1,21 +1,21 @@
 <script>
-	import SvelteSelf from './output.svelte';
+	import Output from './output.svelte';
 	/** @type {Record<string, any>} */
 	let { ...props } = $props();
 </script>
 
 {#if false}
-	<SvelteSelf />
-	<SvelteSelf with_attributes/>
-	<SvelteSelf count={count+1}/>
-	<SvelteSelf>
+	<Output />
+	<Output with_attributes/>
+	<Output count={count+1}/>
+	<Output>
 		child
-	</SvelteSelf>
-	<SvelteSelf count={count+1}>
+	</Output>
+	<Output count={count+1}>
 		child
-	</SvelteSelf>
-	<SvelteSelf count={props.count}     >
+	</Output>
+	<Output count={props.count}     >
 		child
-	</SvelteSelf>
-	<SvelteSelf></SvelteSelf>
-{/if}
\ No newline at end of file
+	</Output>
+	<Output></Output>
+{/if}