From d016532732c7c35e8585893039971c3124900789 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <dg@domgan.com>
Date: Thu, 4 Jan 2024 14:52:08 +0000
Subject: [PATCH] fix: improve text node output

---
 .changeset/dry-eggs-play.md                   |  5 ++++
 .../3-transform/client/visitors/template.js   |  8 ++++++-
 .../samples/each-text-template/_config.js     |  5 ++++
 .../samples/each-text-template/main.svelte    |  9 ++++++++
 .../samples/typescript/_config.js             | 11 ---------
 .../samples/typescript/main.svelte            | 23 -------------------
 .../runtime-runes/samples/typescript/types.ts |  3 ---
 7 files changed, 26 insertions(+), 38 deletions(-)
 create mode 100644 .changeset/dry-eggs-play.md
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-text-template/_config.js
 create mode 100644 packages/svelte/tests/runtime-runes/samples/each-text-template/main.svelte
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/typescript/_config.js
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/typescript/main.svelte
 delete mode 100644 packages/svelte/tests/runtime-runes/samples/typescript/types.ts

diff --git a/.changeset/dry-eggs-play.md b/.changeset/dry-eggs-play.md
new file mode 100644
index 0000000000..962e26fbff
--- /dev/null
+++ b/.changeset/dry-eggs-play.md
@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: improve text node output
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
index 3de77c8303..8c3cb748c4 100644
--- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
+++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js
@@ -1531,6 +1531,7 @@ function process_children(nodes, parent, { visit, state }) {
 		expression = b.call('$.sibling', text_id);
 	}
 
+	let is_fragment = false;
 	for (let i = 0; i < nodes.length; i += 1) {
 		const node = nodes[i];
 
@@ -1538,7 +1539,12 @@ function process_children(nodes, parent, { visit, state }) {
 			sequence.push(node);
 		} else {
 			if (sequence.length > 0) {
-				flush_sequence(sequence, true);
+				flush_sequence(sequence, is_fragment);
+				// Ensure we move to the next sibling for the case where we move reference within a fragment
+				if (!is_fragment && sequence.length === 1 && sequence[0].type === 'ExpressionTag') {
+					expression = b.call('$.sibling', expression);
+					is_fragment = true;
+				}
 				sequence = [];
 			}
 
diff --git a/packages/svelte/tests/runtime-runes/samples/each-text-template/_config.js b/packages/svelte/tests/runtime-runes/samples/each-text-template/_config.js
new file mode 100644
index 0000000000..439863e4d9
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-text-template/_config.js
@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: `<p>A<br>B<br>C<br></p>`
+});
diff --git a/packages/svelte/tests/runtime-runes/samples/each-text-template/main.svelte b/packages/svelte/tests/runtime-runes/samples/each-text-template/main.svelte
new file mode 100644
index 0000000000..5d91831d0e
--- /dev/null
+++ b/packages/svelte/tests/runtime-runes/samples/each-text-template/main.svelte
@@ -0,0 +1,9 @@
+<script>
+	let array = $state(['A', 'B', 'C']);
+</script>
+
+<p>
+{#each array as a}
+	{a}<br/>
+{/each}
+</p>
diff --git a/packages/svelte/tests/runtime-runes/samples/typescript/_config.js b/packages/svelte/tests/runtime-runes/samples/typescript/_config.js
deleted file mode 100644
index 2115ae298a..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/typescript/_config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { test } from '../../test';
-
-export default test({
-	html: '<button>clicks: 0</button>',
-
-	async test({ assert, target }) {
-		const btn = target.querySelector('button');
-		await btn?.click();
-		assert.htmlEqual(target.innerHTML, `<button>clicks: 1</button>`);
-	}
-});
diff --git a/packages/svelte/tests/runtime-runes/samples/typescript/main.svelte b/packages/svelte/tests/runtime-runes/samples/typescript/main.svelte
deleted file mode 100644
index e991aa7533..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/typescript/main.svelte
+++ /dev/null
@@ -1,23 +0,0 @@
-<script context="module" lang="ts">
-	interface Hello { message: 'hello' }
-	type Goodbye = { message: 'goodbye' };
-
-	export type { Hello };
-</script>
-
-<script>
-	import type { Foo } from './types';
-	import { type Bar, type Baz } from './types';
-
-	let count = $state(0);
-	const person = {
-		message: 'goodbye'
-	} satisfies Goodbye;
-</script>
-
-<button
-	on:click={(e: MouseEvent) => {
-		const next: number = count + 1;
-		count = next! as number;
-	}}
->clicks: {count}</button>
diff --git a/packages/svelte/tests/runtime-runes/samples/typescript/types.ts b/packages/svelte/tests/runtime-runes/samples/typescript/types.ts
deleted file mode 100644
index 9673715eed..0000000000
--- a/packages/svelte/tests/runtime-runes/samples/typescript/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface Foo {}
-export interface Bar {}
-export interface Baz {}