From 7df45050d76db15de4585176637c74834f05457e Mon Sep 17 00:00:00 2001
From: paoloricciuti <ricciutipaolo@gmail.com>
Date: Wed, 28 May 2025 22:07:06 +0200
Subject: [PATCH] fix: runtime valueless option selection

---
 .../server/visitors/RegularElement.js         | 36 +++++++++++++------
 .../server/visitors/shared/element.js         |  9 +----
 packages/svelte/src/internal/server/index.js  | 21 +++++++++++
 .../_expected.html                            |  2 +-
 .../main.svelte                               | 12 +++++--
 .../_expected/server/index.svelte.js          | 10 +++++-
 6 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
index 8e0303e934..06bbd47be1 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/RegularElement.js
@@ -137,19 +137,35 @@ export function RegularElement(node, context) {
 			state.template.push(b.const(id, body));
 		}
 
-		// if this is a `<textarea>` value or a contenteditable binding, we only add
-		// the body if the attribute/binding is falsy
+		// we need the body if:
+
+		// - it's a <textarea> or a contenteditable element...we will add it ad the inner template in case the value of value is falsy
+		// - it's a valueless <option> element...we will check the body value at runtime to determine the implicit value selection
 		const inner_state = { ...state, template: [], init: [] };
 		process_children(trimmed, { ...context, state: inner_state });
 
-		// Use the body expression as the body if it's truthy, otherwise use the inner template
-		state.template.push(
-			b.if(
-				id,
-				b.block(build_template([id])),
-				b.block([...inner_state.init, ...build_template(inner_state.template)])
-			)
-		);
+		if (node.name === 'option') {
+			// in case of a valueless `<option>` element, $$body is a function that accepts the children...internally it
+			// will run the children to get the value of the body at runtime since it's needed to for the implicit value
+			// selection
+			state.template.push(
+				b.stmt(
+					b.call(
+						id,
+						b.thunk(b.block([...inner_state.init, ...build_template(inner_state.template)]))
+					)
+				)
+			);
+		} else {
+			// Use the body expression as the body if it's truthy, otherwise use the inner template
+			state.template.push(
+				b.if(
+					id,
+					b.block(build_template([id])),
+					b.block([...inner_state.init, ...build_template(inner_state.template)])
+				)
+			);
+		}
 	}
 
 	if (select_with_value) {
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
index edaa76ceec..f12a067e94 100644
--- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
+++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/shared/element.js
@@ -305,14 +305,7 @@ export function build_element_attributes(node, context) {
 	}
 
 	if (!option_has_value && node.name === 'option') {
-		context.state.template.push(
-			b.call(
-				'$.maybe_selected',
-				b.id('$$payload'),
-				// this should be fine for the moment since option can only contain text and expressions
-				build_attribute_value(/** @type {*} */ (node.fragment.nodes), context)
-			)
-		);
+		content = b.call('$.valueless_option', b.id('$$payload'));
 	}
 
 	if (events_to_capture.size !== 0) {
diff --git a/packages/svelte/src/internal/server/index.js b/packages/svelte/src/internal/server/index.js
index a815d0755e..27a4198840 100644
--- a/packages/svelte/src/internal/server/index.js
+++ b/packages/svelte/src/internal/server/index.js
@@ -544,3 +544,24 @@ export function derived(fn) {
 export function maybe_selected(payload, value) {
 	return value === payload.select_value ? ' selected' : '';
 }
+
+/**
+ * @param {Payload} payload
+ * @returns {(child: () => void) => void}
+ */
+export function valueless_option(payload) {
+	return (child) => {
+		// store the initial payload before executing the child
+		let initial_payload = payload.out;
+		// execute the child to get the runtime body of the option
+		child();
+		// remove the initial payload and eventual hydration comments
+		let body = payload.out.substring(initial_payload.length).replace(/<!---->/g, '');
+		// check the value of the body with the select_value
+		if (body === payload.select_value) {
+			// substring the initial payload to remove the last character (the closing `>`)
+			// append selected and the body (the closing tag will be added later)
+			payload.out = initial_payload.substring(0, initial_payload.length - 1) + ' selected>' + body;
+		}
+	};
+}
diff --git a/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/_expected.html b/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/_expected.html
index 96d1d8b233..de7cba8837 100644
--- a/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/_expected.html
+++ b/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/_expected.html
@@ -1 +1 @@
-<select><option value="">--Please choose an option--</option><option value="dog" selected>Dog</option><option value="cat">Cat</option></select>
\ No newline at end of file
+<select><option>--Please choose an option--</option><option selected>dog</option><option>cat</option></select>
\ No newline at end of file
diff --git a/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/main.svelte b/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/main.svelte
index b568099878..45ae9aefe0 100644
--- a/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/main.svelte
+++ b/packages/svelte/tests/server-side-rendering/samples/select-value-implicit-value-complex/main.svelte
@@ -1,7 +1,13 @@
 <select value="dog">
-	<option>{@render option("--Please choose an option--")}</option>
-	<option>{@render option("dog")}</option>
-	<option>{@render option("cat")}</option>
+	<option>
+		{@render option("--Please choose an option--")}
+	</option>
+	<option>
+		{@render option("dog")}
+	</option>
+	<option>
+		{@render option("cat")}
+	</option>
 </select>
 
 {#snippet option(val)}{val}{/snippet}
\ No newline at end of file
diff --git a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
index 2dc6abd731..142e55d843 100644
--- a/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
+++ b/packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
@@ -3,5 +3,13 @@ import * as $ from 'svelte/internal/server';
 export default function Skip_static_subtree($$payload, $$props) {
 	let { title, content } = $$props;
 
-	$$payload.out += `<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$payload, 'a')}${$.maybe_selected($$payload, 'a')}>a</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`;
+	$$payload.out += `<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip> <div><input autofocus/></div> <div><source muted/></div> <select><option value="a"${$.maybe_selected($$payload, 'a')}>`;
+
+	const $$body = $.valueless_option($$payload);
+
+	$$body(() => {
+		$$payload.out += `a`;
+	});
+
+	$$payload.out += `</option></select> <img src="..." alt="" loading="lazy"/> <div><img src="..." alt="" loading="lazy"/></div>`;
 }
\ No newline at end of file