svelte-effect-runtime 4.0.0 → 4.1.0

package/.dist/chunks/{transform-jNUr65K9.js → transform-D7TTlPpK.js}

@@ -1,28 +1,19 @@
-import { D as UnsupportedMarkupEffectPositionError, k as YieldStarInEventCallbackError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-IJjsUwrE.js";
-import { t as scan_svelte_effect_source } from "./source-scan-C4PsggID.js";
+import { A as UnsupportedMarkupEffectPositionError, M as YieldStarInEventCallbackError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-qhcbUH6o.js";
+import { t as scan_svelte_effect_source } from "./source-scan-cSawCvsg.js";
 import { contains_top_level_yield_star } from "../detect.js";
 import ts from "typescript";
 import { parse } from "svelte/compiler";
 import MagicString from "magic-string";
 //#region src/script-transform/imports.ts
-/**
-* Builds the import statements injected by the script transform.
-*
-* @since 2.0.0
-* @param has_effect_import - Whether the user already imports `Effect`.
-* @param has_dispatcher_import - Whether the user already imports
-*   `get_dispatcher`.
-* @param has_untrack_import - Whether the user already imports `untrack`.
-* @param bindings - Local names reserved for generated runtime helpers.
-* @param options - Runtime helper imports required by this transformed script.
-* @returns Newline-separated import statements to inject.
-*/
-function make_imports(has_effect_import, has_dispatcher_import, has_untrack_import, bindings = {
+function make_imports(has_effect_import, has_dispatcher_import, has_untrack_import, has_on_destroy_import, bindings = {
 	cancel: "__SER___cancel",
+	component_scope_ref: "ComponentScopeRef",
 	dispatcher: "get_dispatcher",
 	dispatcher_value: "__SER___dispatcher",
 	effect: "Effect",
+	on_destroy: "onDestroy",
 	program: "__SER___program",
+	scope: "__SER___scope",
 	untrack: "untrack",
 	yield_success: "YieldSuccess",
 	yieldable: "ToEffect"
@@ -30,22 +21,27 @@ function make_imports(has_effect_import, has_dispatcher_import, has_untrack_impo
 	const needs_dispatcher = options.needs_dispatcher ?? true;
 	const needs_effect = options.needs_effect ?? true;
 	const needs_untrack = options.needs_untrack ?? true;
+	const needs_on_destroy = options.needs_on_destroy ?? false;
 	const needs_yield_success = options.needs_yield_success ?? false;
 	const needs_yieldable = options.needs_yieldable ?? false;
-	const generator_import = make_generator_import(bindings, needs_dispatcher && !has_dispatcher_import, needs_yieldable, needs_yield_success);
+	const needs_scope_ref = options.needs_scope_ref ?? true;
+	const generator_import = make_generator_import(bindings, needs_dispatcher && !has_dispatcher_import, needs_yieldable, needs_yield_success, needs_scope_ref);
 	const untrack_import = bindings.untrack === "untrack" ? `import { untrack } from "svelte";` : `import { untrack as ${bindings.untrack} } from "svelte";`;
+	const on_destroy_import = bindings.on_destroy === "onDestroy" ? `import { onDestroy } from "svelte";` : `import { onDestroy as ${bindings.on_destroy} } from "svelte";`;
 	const effect_import = has_effect_import ? false : bindings.effect === "Effect" ? `import { Effect } from "effect";` : `import { Effect as ${bindings.effect} } from "effect";`;
 	return [
 		generator_import,
 		needs_untrack && !has_untrack_import && untrack_import,
+		needs_on_destroy && !has_on_destroy_import && on_destroy_import,
 		needs_effect && effect_import
 	].filter(Boolean).join("\n");
 }
-function make_generator_import(bindings, needs_dispatcher, needs_yieldable, needs_yield_success) {
+function make_generator_import(bindings, needs_dispatcher, needs_yieldable, needs_yield_success, needs_scope_ref) {
 	const specifiers = [
 		needs_dispatcher && make_named_import("get_dispatcher", bindings.dispatcher),
 		needs_yieldable && make_named_import("ToEffect", bindings.yieldable),
-		needs_yield_success && make_named_import("YieldSuccess", bindings.yield_success, true)
+		needs_yield_success && make_named_import("YieldSuccess", bindings.yield_success, true),
+		needs_scope_ref && make_named_import("ComponentScopeRef", bindings.component_scope_ref)
 	].filter((specifier) => specifier !== false);
 	if (specifiers.length === 0) return false;
 	return `import { ${specifiers.join(", ")} } from "svelte-effect-runtime/internal/generators";`;
@@ -54,15 +50,6 @@ function make_named_import(imported_name, local_name, type_only = false) {
 	const prefix = type_only ? "type " : "";
 	return imported_name === local_name ? `${prefix}${imported_name}` : `${prefix}${imported_name} as ${local_name}`;
 }
-/**
-* Checks whether a source file imports a local binding from a module.
-*
-* @since 2.0.0
-* @param source_file - Parsed TypeScript source file to inspect.
-* @param module_name - Module specifier to match.
-* @param local_name - Local binding name to look for.
-* @returns Whether that binding is already locally available.
-*/
 function has_local_import_binding(source_file, module_name, local_name) {
 	return source_file.statements.some((stmt) => {
 		if (!ts.isImportDeclaration(stmt) || !ts.isStringLiteral(stmt.moduleSpecifier) || stmt.moduleSpecifier.text !== module_name) return false;
@@ -75,13 +62,6 @@ function has_local_import_binding(source_file, module_name, local_name) {
 		return named_bindings.elements.some((element) => !element.isTypeOnly && element.name.text === local_name);
 	});
 }
-/**
-* Collects every local binding declared at module top level.
-*
-* @since 2.4.2
-* @param source_file - Parsed TypeScript source file to inspect.
-* @returns Top-level names declared by imports, declarations, and variables.
-*/
 function collect_top_level_binding_names(source_file) {
 	return source_file.statements.flatMap(collect_statement_binding_names);
 }
@@ -108,11 +88,49 @@ function collect_binding_name_text(name) {
 	});
 }
 //#endregion
+//#region src/compiler/markup-identifiers.ts
+const wrapper_name = "__SER___markup_identifiers";
+const identifier_names_by_scan = /* @__PURE__ */ new WeakMap();
+function collect_markup_identifier_names(source_scan) {
+	const cached_names = identifier_names_by_scan.get(source_scan);
+	if (cached_names) return cached_names;
+	const names = new Set(source_scan.markup_binding_names);
+	for (const expression of source_scan.markup_expressions) collect_source_file_identifier_names(ts.createSourceFile("markup-identifiers.ts", make_identifier_parse_source(expression.inner), ts.ScriptTarget.Latest, true, ts.ScriptKind.TS), names);
+	names.delete(wrapper_name);
+	identifier_names_by_scan.set(source_scan, names);
+	return names;
+}
+function make_identifier_parse_source(expression) {
+	const snippet = expression.match(/^(\s*)#snippet\s+([\s\S]*)$/);
+	if (snippet) return `function* ${wrapper_name}() { ${snippet[1]}function ${snippet[2]} {} }`;
+	return `function* ${wrapper_name}() { ${expression} }`;
+}
+function collect_source_file_identifier_names(source_file, names) {
+	const visit = (node) => {
+		if (ts.isIdentifier(node) && !is_non_runtime_property_name(node)) names.add(node.text);
+		ts.forEachChild(node, visit);
+	};
+	visit(source_file);
+}
+function is_non_runtime_property_name(identifier) {
+	const parent = identifier.parent;
+	return is_within_type_node(identifier) || ts.isPropertyAccessExpression(parent) && parent.name === identifier || ts.isPropertyAssignment(parent) && parent.name === identifier || ts.isPropertySignature(parent) && parent.name === identifier || ts.isMethodDeclaration(parent) && parent.name === identifier || ts.isMethodSignature(parent) && parent.name === identifier || ts.isGetAccessorDeclaration(parent) && parent.name === identifier || ts.isSetAccessorDeclaration(parent) && parent.name === identifier || ts.isPropertyDeclaration(parent) && parent.name === identifier || ts.isEnumMember(parent) && parent.name === identifier || ts.isBindingElement(parent) && parent.propertyName === identifier;
+}
+function is_within_type_node(identifier) {
+	let ancestor = identifier.parent;
+	while (ancestor) {
+		if (ts.isTypeNode(ancestor)) return true;
+		ancestor = ancestor.parent;
+	}
+	return false;
+}
+//#endregion
 //#region src/markup/transform/constants.ts
-const HELPERS = {
+const default_helper_bindings = {
 	codes: "Code",
 	dispatcher: "Dispatcher",
-	yieldable: "ToEffect"
+	yieldable: "ToEffect",
+	scope: "__SER___scope"
 };
 //#endregion
 //#region src/markup/transform/apply.ts
@@ -123,65 +141,98 @@ function create_source_map$1(magic, filename) {
 		source: filename
 	});
 }
-function blank_script_blocks(content) {
-	return content.replace(/<script\b[^>]*>[\s\S]*?<\/script\s*>/gi, (match) => {
-		return match.split("\n").map((l) => " ".repeat(l.length)).join("\n");
-	});
-}
-function inject_helpers(magic, content, helpers = [], bindings = HELPERS) {
+function inject_helpers(magic, source_scan, helpers = [], bindings = default_helper_bindings, scope_wiring) {
 	const import_helpers = unique_import_helpers(helpers);
 	const local_helpers = helpers.filter((helper) => !is_import_helper(helper));
 	const helper_segments = [
-		make_import_helper(content, make_dispatcher_import(bindings)),
+		make_dispatcher_import(bindings, scope_wiring),
 		...import_helpers,
 		...local_helpers
 	].filter((helper) => helper !== void 0).map((helper) => typeof helper === "string" ? { text: helper } : helper);
 	if (helper_segments.length === 0) return;
 	const helper_block = helper_segments.map((segment) => segment.text).join("\n");
-	const script_tag = find_instance_script_tag(content);
-	if (script_tag) {
+	const scope_block = scope_wiring ? make_scope_wiring_block(bindings, scope_wiring) : void 0;
+	const instance_script = source_scan.instance_script;
+	if (instance_script) {
+		/**
+		* The scope holder must be declared before any user statement so its
+		* `onDestroy` runs during component initialisation, ahead of any
+		* top-level `await`.
+		*/
+		const scope_text = scope_block ? `\n${scope_block}\n` : void 0;
+		if (scope_text) magic.appendLeft(instance_script.content_start, scope_text);
 		const text = `\n${helper_block}\n`;
-		magic.appendLeft(script_tag.end, text);
+		magic.appendLeft(instance_script.content_end, text);
 		return {
-			start: script_tag.end,
+			start: instance_script.content_end,
 			text,
+			extra_insertions: scope_text ? [{
+				start: instance_script.content_start,
+				text: scope_text
+			}] : [],
 			relocations: make_insertion_relocations(helper_segments, "\n")
 		};
 	} else {
-		const text = `<script>\n${helper_block}\n<\/script>\n\n`;
+		const text = `<script>\n${[scope_block, helper_block].filter(Boolean).join("\n")}\n<\/script>\n\n`;
+		const helper_prefix = `<script>\n${scope_block ? scope_block + "\n" : ""}`;
 		magic.prepend(text);
 		return {
 			start: 0,
 			text,
-			relocations: make_insertion_relocations(helper_segments, "<script>\n")
+			relocations: make_insertion_relocations(helper_segments, helper_prefix)
 		};
 	}
 }
-function make_markup_helper_bindings(content) {
-	const script_tag = find_instance_script_tag(content);
-	const name_allocator = make_name_allocator(script_tag ? collect_script_binding_names(content.slice(script_tag.start, script_tag.end)) : []);
+function make_markup_helper_bindings(source_scan, target = "client") {
+	const script_binding_names = source_scan.scripts.flatMap((script) => collect_script_binding_names(script.text));
+	const markup_identifier_names = collect_markup_identifier_names(source_scan);
+	const name_allocator = make_name_allocator([...script_binding_names, ...markup_identifier_names]);
+	const bindings = {
+		codes: name_allocator.reserve(default_helper_bindings.codes),
+		dispatcher: name_allocator.reserve(default_helper_bindings.dispatcher),
+		yieldable: name_allocator.reserve(default_helper_bindings.yieldable),
+		scope: default_helper_bindings.scope
+	};
+	const is_server_target = target === "server";
 	return {
-		bindings: {
-			codes: name_allocator.reserve(HELPERS.codes),
-			dispatcher: name_allocator.reserve(HELPERS.dispatcher),
-			yieldable: name_allocator.reserve(HELPERS.yieldable)
-		},
-		name_allocator
+		bindings,
+		name_allocator,
+		scope_wiring: script_binding_names.includes(default_helper_bindings.scope) ? void 0 : {
+			component_scope_ref: name_allocator.reserve("ComponentScopeRef"),
+			get_dispatcher: name_allocator.reserve("get_dispatcher"),
+			...is_server_target ? {} : { on_destroy: name_allocator.reserve("onDestroy") }
+		}
 	};
 }
 function create_relocations(replacements, helper_insertion) {
-	const edits = [helper_insertion && {
-		start: helper_insertion.start,
-		removedLength: 0,
-		insertedLength: helper_insertion.text.length
-	}, ...replacements.map((replacement) => ({
-		start: replacement.start,
-		removedLength: replacement.end - replacement.start,
-		insertedLength: replacement.text.length
-	}))].filter(Boolean);
+	const ordered_replacements = [...replacements].sort((left, right) => left.start - right.start);
+	const replacement_deltas = /* @__PURE__ */ new Map();
+	let accumulated_delta = 0;
+	let replacement_delta_before_helper = 0;
+	let cursor = 0;
+	while (cursor < ordered_replacements.length) {
+		const start = ordered_replacements[cursor]?.start;
+		let group_end = cursor;
+		let group_delta = 0;
+		while (ordered_replacements[group_end]?.start === start) {
+			const replacement = ordered_replacements[group_end];
+			if (replacement) {
+				replacement_deltas.set(replacement, accumulated_delta);
+				group_delta += replacement.text.length - (replacement.end - replacement.start);
+			}
+			group_end += 1;
+		}
+		if (helper_insertion && start !== void 0 && start < helper_insertion.start) replacement_delta_before_helper += group_delta;
+		accumulated_delta += group_delta;
+		cursor = group_end;
+	}
+	const insertion_shift_before = (point) => {
+		if (!helper_insertion) return 0;
+		return (helper_insertion.start <= point ? helper_insertion.text.length : 0) + (helper_insertion.extra_insertions ?? []).filter((insertion) => insertion.start <= point).reduce((shift, insertion) => shift + insertion.text.length, 0);
+	};
 	const replacement_relocations = replacements.flatMap((replacement) => {
 		if (!replacement.relocation) return [];
-		const delta_before = edits.filter((edit) => edit.start < replacement.start).reduce((total, edit) => total + edit.insertedLength - edit.removedLength, 0);
+		const delta_before = (replacement_deltas.get(replacement) ?? 0) + insertion_shift_before(replacement.start);
 		const generated_start = replacement.start + delta_before;
 		return [{
 			originalStart: replacement.relocation.originalStart,
@@ -190,25 +241,36 @@ function create_relocations(replacements, helper_insertion) {
 			generatedEnd: generated_start + replacement.relocation.generatedEndInReplacement
 		}];
 	});
+	const helper_generated_start = (helper_insertion?.start ?? 0) + replacement_delta_before_helper + (helper_insertion?.extra_insertions ?? []).filter((insertion) => helper_insertion && insertion.start <= helper_insertion.start).reduce((shift, insertion) => shift + insertion.text.length, 0);
 	const helper_relocations = helper_insertion?.relocations?.map((relocation) => ({
 		originalStart: relocation.originalStart,
 		originalEnd: relocation.originalEnd,
-		generatedStart: helper_insertion.start + relocation.generatedStartInReplacement,
-		generatedEnd: helper_insertion.start + relocation.generatedEndInReplacement
+		generatedStart: helper_generated_start + relocation.generatedStartInReplacement,
+		generatedEnd: helper_generated_start + relocation.generatedEndInReplacement
 	})) ?? [];
 	return [...replacement_relocations, ...helper_relocations];
 }
-function make_import_helper(content, import_text) {
-	if (content.includes(import_text)) return;
-	return import_text;
-}
-function make_dispatcher_import(bindings) {
-	return `import { ${make_import_specifier(HELPERS.dispatcher, bindings.dispatcher)}, ${make_import_specifier(HELPERS.codes, bindings.codes)}, ${make_import_specifier(HELPERS.yieldable, bindings.yieldable)} } from "svelte-effect-runtime/internal/generators";`;
+function make_dispatcher_import(bindings, scope_wiring) {
+	return `import { ${[
+		make_import_specifier(default_helper_bindings.dispatcher, bindings.dispatcher),
+		make_import_specifier(default_helper_bindings.codes, bindings.codes),
+		make_import_specifier(default_helper_bindings.yieldable, bindings.yieldable),
+		...scope_wiring ? [make_import_specifier("ComponentScopeRef", scope_wiring.component_scope_ref), make_import_specifier("get_dispatcher", scope_wiring.get_dispatcher)] : []
+	].join(", ")} } from "svelte-effect-runtime/internal/generators";`;
 }
 function make_import_specifier(imported_name, local_name) {
 	if (imported_name === local_name) return imported_name;
 	return `${imported_name} as ${local_name}`;
 }
+function make_scope_wiring_block(bindings, scope_wiring) {
+	const on_destroy_import = scope_wiring.on_destroy ? make_import_specifier("onDestroy", scope_wiring.on_destroy) : void 0;
+	const on_destroy_call = scope_wiring.on_destroy ? `${scope_wiring.on_destroy}(() => ${bindings.scope}.dispose());` : void 0;
+	return [
+		on_destroy_import ? `import { ${on_destroy_import} } from "svelte";` : void 0,
+		`const ${bindings.scope} = new ${scope_wiring.component_scope_ref}(${scope_wiring.get_dispatcher});`,
+		on_destroy_call
+	].join("\n");
+}
 function make_insertion_relocations(segments, prefix) {
 	const relocations = [];
 	let offset = prefix.length;
@@ -223,18 +285,6 @@ function make_insertion_relocations(segments, prefix) {
 	}
 	return relocations;
 }
-function find_instance_script_tag(content) {
-	for (const match of content.matchAll(/<script\b([^>]*)>([\s\S]*?)<\/script\s*>/gi)) {
-		if (match.index === void 0) continue;
-		const attrs = match[1] ?? "";
-		if (/\bcontext\s*=\s*["']module["']/.test(attrs) || /\bmodule\b/.test(attrs)) continue;
-		const open_end = match[0].indexOf(">") + 1;
-		return {
-			start: match.index + open_end,
-			end: match.index + match[0].length - 9
-		};
-	}
-}
 function unique_import_helpers(helpers) {
 	const seen = /* @__PURE__ */ new Set();
 	return helpers.filter((helper) => {
@@ -265,27 +315,12 @@ function make_name_allocator(initial_names) {
 }
 //#endregion
 //#region src/markup/transform/effect-bindings.ts
-const EFFECT_PACKAGE_MODULE = "effect";
-const EFFECT_DIRECT_MODULE = "effect/Effect";
-const GENERATED_EFFECT_NAME = "__SER___Effect";
-/**
-* Collects Effect import bindings that markup callback rewriting can trust.
-*
-* @example
-* ```ts
-* const bindings = collect_effect_callback_bindings(
-*   `<script>import { Effect as E } from "effect";<\/script>`,
-* );
-* ```
-*
-* @since 2.4.0
-* @param content - Full Svelte component source before markup lowering.
-* @returns Binding metadata used to identify Effect callback combinators.
-*/
-function collect_effect_callback_bindings(content) {
+const effect_package_module = "effect";
+const effect_direct_module = "effect/Effect";
+const generated_effect_name = "__SER___Effect";
+function collect_effect_callback_bindings(scripts) {
 	const state = make_effect_binding_state();
-	const scripts = collect_script_blocks(content);
-	for (const script of scripts) collect_source_file_bindings(ts.createSourceFile("component-script.ts", script, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS), state);
+	for (const script of scripts) collect_source_file_bindings(ts.createSourceFile("component-script.ts", script.text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS), state);
 	ensure_implicit_effect_binding(state);
 	const wrapper = choose_effect_wrapper(state);
 	return {
@@ -307,9 +342,6 @@ function make_effect_binding_state() {
 		implicit_effect_import: false
 	};
 }
-function collect_script_blocks(content) {
-	return [...content.matchAll(/<script\b[^>]*>([\s\S]*?)<\/script\s*>/gi)].map((match) => match[1] ?? "");
-}
 function collect_source_file_bindings(source_file, state) {
 	for (const statement of source_file.statements) collect_statement_binding(statement, state);
 }
@@ -346,21 +378,21 @@ function collect_import_binding(statement, state) {
 }
 function collect_namespace_import_binding(module_name, local_name, state) {
 	state.local_names.add(local_name);
-	if (module_name === EFFECT_DIRECT_MODULE) {
+	if (module_name === effect_direct_module) {
 		add_ordered_name(state.effect_module_names, local_name);
 		return;
 	}
-	if (module_name === EFFECT_PACKAGE_MODULE) add_ordered_name(state.effect_package_names, local_name);
+	if (module_name === effect_package_module) add_ordered_name(state.effect_package_names, local_name);
 }
 function collect_named_import_binding(module_name, element, state) {
 	const imported_name = element.propertyName?.text ?? element.name.text;
 	const local_name = element.name.text;
 	state.local_names.add(local_name);
-	if (module_name === EFFECT_PACKAGE_MODULE && imported_name === "Effect") {
+	if (module_name === effect_package_module && imported_name === "Effect") {
 		add_ordered_name(state.effect_object_names, local_name);
 		return;
 	}
-	if (module_name === EFFECT_DIRECT_MODULE) state.direct_members.set(local_name, imported_name);
+	if (module_name === effect_direct_module) state.direct_members.set(local_name, imported_name);
 }
 function collect_binding_name(name, local_names) {
 	if (ts.isIdentifier(name)) {
@@ -382,10 +414,10 @@ function has_effect_binding(state) {
 }
 function choose_effect_wrapper(state) {
 	const effect_object = state.effect_object_names[0];
-	if (effect_object) return {
+	if (effect_object) return state.implicit_effect_import ? {
 		expression: effect_object,
-		import_text: state.implicit_effect_import ? `import { Effect } from "effect";` : void 0
-	};
+		import_text: `import { Effect } from "effect";`
+	} : { expression: effect_object };
 	const effect_module = state.effect_module_names[0];
 	if (effect_module) return { expression: effect_module };
 	const effect_package = state.effect_package_names[0];
@@ -397,10 +429,10 @@ function choose_effect_wrapper(state) {
 	};
 }
 function make_generated_effect_name(local_names) {
-	if (!local_names.has(GENERATED_EFFECT_NAME)) return GENERATED_EFFECT_NAME;
+	if (!local_names.has(generated_effect_name)) return generated_effect_name;
 	let index = 1;
-	while (local_names.has(`${GENERATED_EFFECT_NAME}_${index}`)) index += 1;
-	return `${GENERATED_EFFECT_NAME}_${index}`;
+	while (local_names.has(`${generated_effect_name}_${index}`)) index += 1;
+	return `${generated_effect_name}_${index}`;
 }
 function add_ordered_name(names, name) {
 	if (names.includes(name)) return;
@@ -408,58 +440,17 @@ function add_ordered_name(names, name) {
 }
 //#endregion
 //#region src/markup/event-attributes.ts
-/**
-* Checks whether a parsed Svelte attribute has the same event shape that
-* Svelte's compiler recognizes.
-*
-* @example
-* ```ts
-* is_svelte_event_attribute({
-*   type: "Attribute",
-*   name: "onclick",
-*   value: { type: "ExpressionTag" },
-* });
-* ```
-*
-* @since 4.0.0
-* @param attribute - Parsed Svelte attribute with its name and complete value
-*   shape.
-* @returns Whether Svelte treats the attribute as an event attribute.
-*/
 function is_svelte_event_attribute(attribute) {
 	if (attribute.type !== "Attribute" || !attribute.name?.startsWith("on")) return false;
 	const value = attribute.value;
 	return value !== true && !Array.isArray(value) || Array.isArray(value) && value.length === 1 && value[0]?.type === "ExpressionTag";
 }
-/**
-* Normalizes an event-like attribute name to Svelte's lowercase DOM event
-* spelling while keeping the legacy directive prefix intact.
-*
-* @example
-* ```ts
-* normalize_event_attribute_name("onChange");
-* ```
-*
-* @since 3.4.11
-* @param name - Event-like attribute name read from Svelte source or the
-*   parsed AST.
-* @returns Lowercase event attribute spelling for DOM-facing Svelte nodes.
-*/
 function normalize_event_attribute_name(name) {
 	if (name.startsWith("on:")) return `on:${name.slice(3).toLowerCase()}`;
 	return name.toLowerCase();
 }
 //#endregion
 //#region src/markup/transform/classify.ts
-/**
-* Matches sanitized placeholders back to their Svelte AST context.
-*
-* @since 2.0.0
-* @param ast - Parsed Svelte AST for the sanitized component markup.
-* @param candidates - Placeholder candidates produced by the scanner.
-* @returns Candidates paired with the markup context that determines how they
-*   should be emitted.
-*/
 function classify_candidates(ast, candidates) {
 	const by_placeholder = new Map(candidates.map((candidate) => [candidate.placeholder, candidate]));
 	const classified = [];
@@ -495,7 +486,7 @@ function visit_ast_node(node, candidates, matched, classified) {
 			classify_expression(node.expression, "render", candidates, matched, classified);
 			return;
 		case "HtmlTag":
-			classify_expression(node.expression, "plain", candidates, matched, classified);
+			classify_expression(node.expression, "html", candidates, matched, classified);
 			return;
 		case "DebugTag": return;
 		case "ConstTag":
@@ -623,83 +614,7 @@ function is_record(value) {
 	return typeof value === "object" && value !== null;
 }
 //#endregion
-//#region src/script-transform/ast.ts
-/**
-* Checks whether a node is a `yield*` binary expression.
-*
-* @since 2.0.0
-* @param node - TypeScript AST node to check.
-* @returns Whether the node represents `yield * operand`.
-*/
-function is_yield_star_expression$1(node) {
-	return ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.AsteriskToken && ts.isIdentifier(node.left) && node.left.text === "yield";
-}
-/**
-* Checks whether a node owns its own yield semantics.
-*
-* @since 2.0.0
-* @param node - TypeScript AST node to check.
-* @returns Whether traversal should stop at this function boundary.
-*/
-function is_function_boundary_node(node) {
-	return ts.isArrowFunction(node) || ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) || ts.isMethodDeclaration(node) || ts.isGetAccessorDeclaration(node) || ts.isSetAccessorDeclaration(node);
-}
-/**
-* Returns `true` if the node tree contains a top-level `await`.
-*
-* @since 2.0.0
-* @param node - Root node to search.
-* @returns Whether a top-level await expression was found.
-*/
-function contains_top_level_await(node) {
-	if (ts.isAwaitExpression(node)) return true;
-	return node.getChildren().some((child) => !is_function_boundary_node(child) && contains_top_level_await(child));
-}
-/**
-* Collects top-level `yield*` nodes under an expression.
-*
-* @since 2.0.0
-* @param node - Root node to search.
-* @param on_found - Callback invoked for each matching yield node.
-* @returns Nothing.
-*/
-function collect_yield_star_nodes(node, on_found) {
-	if (is_function_boundary_node(node)) return;
-	if (is_yield_star_expression$1(node)) {
-		on_found(node);
-		return;
-	}
-	node.forEachChild((child) => {
-		collect_yield_star_nodes(child, on_found);
-	});
-}
-/**
-* Finds the first top-level `yield*` expression below a node.
-*
-* @since 2.0.0
-* @param node - Root node to search.
-* @param on_found - Callback invoked with the first matching node.
-* @returns Nothing.
-*/
-function find_yield_star_node(node, on_found) {
-	if (is_function_boundary_node(node)) return;
-	if (is_yield_star_expression$1(node)) {
-		on_found(node);
-		return;
-	}
-	node.forEachChild((child) => {
-		find_yield_star_node(child, on_found);
-	});
-}
-//#endregion
 //#region src/markup/transform/expressions.ts
-/**
-* Strips an event handler arrow function down to its executable body.
-*
-* @since 2.0.0
-* @param expr - Event handler expression text from the original markup.
-* @returns Handler parameters, body text, and body offsets inside `expr`.
-*/
 function strip_arrow_function(expr) {
 	const arrow_idx = expr.indexOf("=>");
 	if (arrow_idx === -1) return {
@@ -735,13 +650,6 @@ function strip_arrow_function(expr) {
 		body_end
 	};
 }
-/**
-* Returns whether an expression is a callback function.
-*
-* @since 2.0.0
-* @param expr - Expression text from a markup attribute or expression tag.
-* @returns Whether the expression parses as an arrow or function expression.
-*/
 function is_callback_function_expression(expr) {
 	const wrapped = `const __SER___callback = ${expr};`;
 	const stmt = ts.createSourceFile("callback.ts", wrapped, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS).statements[0];
@@ -749,20 +657,6 @@ function is_callback_function_expression(expr) {
 	const initializer = stmt.declarationList.declarations[0]?.initializer;
 	return initializer !== void 0 && (ts.isArrowFunction(initializer) || ts.isFunctionExpression(initializer));
 }
-/**
-* Classifies `yield*` placement inside an event handler body.
-*
-* @example
-* ```ts
-* analyze_event_body_yield_star("yield* save()");
-* ```
-*
-* @since 2.0.0
-* @param body - Event handler body text after the outer arrow has been
-*   stripped.
-* @returns Whether the body has top-level yield* expressions and whether any
-*   yield* appears inside a nested non-generator callback.
-*/
 function analyze_event_body_yield_star(body) {
 	const wrapped = `function* __SER___event() { ${body}; }`;
 	const stmt = ts.createSourceFile("event.ts", wrapped, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS).statements[0];
@@ -777,13 +671,6 @@ function analyze_event_body_yield_star(body) {
 	visit_event_body(stmt.body, "top_level", result);
 	return result;
 }
-/**
-* Collects free identifiers that must be captured as reactive dependencies.
-*
-* @since 2.0.0
-* @param expr_text - Markup expression text to inspect.
-* @returns Identifier names referenced by the expression.
-*/
 function collect_free_identifiers(expr_text) {
 	const wrapped = `function* __SER___w() { return (${expr_text}); }`;
 	let sf;
@@ -836,7 +723,7 @@ function add_binding_names(name, locals) {
 	}
 }
 function visit_event_body(node, context, result) {
-	if (is_yield_star_expression(node)) {
+	if (is_yield_star_expression$1(node)) {
 		if (context === "top_level") result.has_top_level_yield_star = true;
 		else if (context === "nested_invalid") result.has_nested_invalid_yield_star = true;
 		node.forEachChild((child) => visit_event_body(child, context, result));
@@ -855,7 +742,7 @@ function is_nested_function_boundary(node) {
 function is_generator_function_boundary(node) {
 	return (ts.isFunctionExpression(node) || ts.isFunctionDeclaration(node) || ts.isMethodDeclaration(node)) && node.asteriskToken !== void 0;
 }
-function is_yield_star_expression(node) {
+function is_yield_star_expression$1(node) {
 	if (ts.isYieldExpression(node)) return node.asteriskToken !== void 0;
 	return ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.AsteriskToken && ts.isIdentifier(node.left) && node.left.text === "yield";
 }
@@ -884,26 +771,6 @@ const effectful_handler_members = /* @__PURE__ */ new Set([
 	"tapBoth"
 ]);
 const effectful_handler_property_names = /* @__PURE__ */ new Set(["onFailure", "onSuccess"]);
-/**
-* Rewrites effectful callback shorthand inside event handler expressions.
-*
-* @example
-* ```ts
-* normalize_effect_callback_yields(
-*   `yield* action.pipe(Effect.flatMap((value) => yield* next(value)))`,
-*   collect_effect_callback_bindings(source),
-* );
-* ```
-*
-* @since 2.0.0
-* @param expr_text - Markup expression text before it is wrapped in the
-*   generated Effect runner.
-* @param bindings - Local Effect import bindings collected from the Svelte
-*   component's script blocks.
-* @returns The expression with nested Effect callback `yield*` shorthand
-*   lowered into explicit Effect callbacks, plus any import needed by generated
-*   wrapper calls.
-*/
 function normalize_effect_callback_yields(expr_text, bindings) {
 	const source_text = `const __SER___expression = ${expr_text};`;
 	const source_file = ts.createSourceFile("event-expression.ts", source_text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
@@ -1089,16 +956,39 @@ function to_expr_pos(pos, context) {
 	return pos - context.offset;
 }
 //#endregion
+//#region src/script-transform/ast.ts
+function is_yield_star_expression(node) {
+	return ts.isBinaryExpression(node) && node.operatorToken.kind === ts.SyntaxKind.AsteriskToken && ts.isIdentifier(node.left) && node.left.text === "yield";
+}
+function is_function_boundary_node(node) {
+	return ts.isArrowFunction(node) || ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) || ts.isMethodDeclaration(node) || ts.isGetAccessorDeclaration(node) || ts.isSetAccessorDeclaration(node);
+}
+function contains_top_level_await(node) {
+	if (ts.isAwaitExpression(node)) return true;
+	return node.getChildren().some((child) => !is_function_boundary_node(child) && contains_top_level_await(child));
+}
+function collect_yield_star_nodes(node, on_found) {
+	if (is_function_boundary_node(node)) return;
+	if (is_yield_star_expression(node)) {
+		on_found(node);
+		return;
+	}
+	node.forEachChild((child) => {
+		collect_yield_star_nodes(child, on_found);
+	});
+}
+function find_yield_star_node(node, on_found) {
+	if (is_function_boundary_node(node)) return;
+	if (is_yield_star_expression(node)) {
+		on_found(node);
+		return;
+	}
+	node.forEachChild((child) => {
+		find_yield_star_node(child, on_found);
+	});
+}
+//#endregion
 //#region src/markup/transform/emit.ts
-/**
-* Emits source edits for classified markup Effect expressions.
-*
-* @since 2.0.0
-* @param classified - Candidates paired with their Svelte markup context.
-* @param effect_context - Effect import bindings available to markup
-*   expression rewrites.
-* @returns Replacements ready to apply to the original component source.
-*/
 function emit_replacements(classified, effect_context, helper_bindings, name_allocator, target) {
 	const expression_replacements = classified.map(({ candidate, kind }) => emit_replacement(candidate, kind, effect_context, helper_bindings, name_allocator, target));
 	return [...unique_attribute_name_replacements(classified).map((replacement) => ({
@@ -1151,6 +1041,11 @@ function emit_replacement(candidate, kind, effect_context, helper_bindings, name
 		replacement_text = event.text;
 		helpers = normalized.helpers;
 		relocation = make_pending_relocation(candidate, replacement_text, event.expr_text, event.relocation);
+	} else if (kind === "html") {
+		const effect = make_inline_effect(normalized_candidate, helper_bindings);
+		replacement_text = emit_await_expression(id_text, effect, helper_bindings);
+		helpers = normalized.helpers;
+		relocation = make_pending_relocation(candidate, replacement_text, effect.effect_text, effect.relocation);
 	} else {
 		const effect = make_effect_helper(normalized_candidate, helper_name, helper_bindings);
 		replacement_text = emit_await_expression(id_text, effect, helper_bindings, server_fallback(is_server_target, "undefined"));
@@ -1161,7 +1056,7 @@ function emit_replacement(candidate, kind, effect_context, helper_bindings, name
 		end: candidate.end,
 		text: replacement_text,
 		helpers,
-		relocation
+		...relocation ? { relocation } : {}
 	};
 }
 function make_event_handler(candidate, helper_bindings) {
@@ -1172,7 +1067,7 @@ function make_event_handler(candidate, helper_bindings) {
 	return {
 		expr_text: wrapped_expr_text,
 		relocation: make_yield_operand_relocation(expr_text, wrapped_expr_text, helper_bindings),
-		text: `(event) => { ${helper_bindings.dispatcher}.emit({ type: ${helper_bindings.codes}.Markup.Run, fn: function* () { ${wrapped_expr_text}; } }); }`
+		text: `(event) => { ${helper_bindings.dispatcher}.with_scope(${helper_bindings.scope}.scope, () => ${helper_bindings.dispatcher}.emit({ type: ${helper_bindings.codes}.Markup.Run, fn: function* () { ${wrapped_expr_text}; } })); }`
 	};
 }
 function emit_promise_expression(id_text, effect, helper_bindings, ssr_fallback, options) {
@@ -1184,7 +1079,7 @@ function emit_promise_expression(id_text, effect, helper_bindings, ssr_fallback,
 		ssr_fallback !== void 0 && `ssr_fallback: ${ssr_fallback}`,
 		options !== void 0 && `options: ${options}`
 	].filter((property) => property !== false);
-	return `${helper_bindings.dispatcher}.emit({ ${properties.join(", ")} })`;
+	return `${helper_bindings.dispatcher}.with_scope(${helper_bindings.scope}.scope, () => ${helper_bindings.dispatcher}.emit({ ${properties.join(", ")} }))`;
 }
 function emit_render_expression(id_text, effect, candidate, helper_bindings, is_server_target) {
 	const expression = emit_promise_expression(id_text, effect, helper_bindings, server_fallback(is_server_target, `() => undefined`));
@@ -1225,6 +1120,18 @@ function make_effect_helper(candidate, helper_name, helper_bindings) {
 		}
 	};
 }
+function make_inline_effect(candidate, helper_bindings) {
+	const deps = collect_free_identifiers(candidate.expr_text);
+	const deps_text = deps.length === 0 ? "[]" : `[${deps.join(", ")}]`;
+	const effect_text = wrap_yield_stars(candidate.expr_text, helper_bindings);
+	const relocation = make_yield_operand_relocation(candidate.expr_text, effect_text, helper_bindings);
+	return {
+		call: `(function* () { return (${effect_text}); })()`,
+		deps_text,
+		effect_text,
+		relocation
+	};
+}
 function wrap_yield_stars(text, helper_bindings) {
 	const source_file = ts.createSourceFile("markup-yield.ts", text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
 	const replacements = [];
@@ -1286,14 +1193,6 @@ function make_pending_relocation(candidate, replacement_text, expression_text, r
 }
 //#endregion
 //#region src/script-transform/source.ts
-/**
-* Creates a source map from transformed script back to the original block.
-*
-* @since 2.0.0
-* @param magic - MagicString instance holding the transformed source.
-* @param filename - Source filename used for the source map entry.
-* @returns A plain source map object.
-*/
 function create_source_map(magic, filename) {
 	return magic.generateMap({
 		hires: true,
@@ -1301,53 +1200,27 @@ function create_source_map(magic, filename) {
 		source: filename
 	});
 }
-/**
-* Slices a substring matching a node's full source range.
-*
-* @since 2.0.0
-* @param content - Original source text.
-* @param node - AST node whose full range should be extracted.
-* @returns Source text including leading trivia.
-*/
 function slice(content, node) {
 	return content.slice(node.getFullStart(), node.end);
 }
-/**
-* Slices a substring matching a node's source range without leading trivia.
-*
-* @since 2.0.0
-* @param content - Original source text.
-* @param node - AST node whose non-trivia range should be extracted.
-* @returns Source text excluding leading trivia.
-*/
 function slice_start(content, node) {
 	return content.slice(node.getStart(), node.end);
 }
 //#endregion
 //#region src/script-transform/runes.ts
-const ASYNC_EXPRESSION_RUNES = /* @__PURE__ */ new Set([
+const async_expression_runes = /* @__PURE__ */ new Set([
 	"$derived",
 	"$state",
 	"$state.raw",
 	"$state.snapshot",
 	"$bindable"
 ]);
-const CALLBACK_RUNES = /* @__PURE__ */ new Set([
+const callback_runes = /* @__PURE__ */ new Set([
 	"$derived.by",
 	"$effect",
 	"$effect.pre",
 	"$effect.root"
 ]);
-/**
-* Validates that `yield*` only appears in rune positions the script-effect
-* transform can lower without changing the rune's normal Svelte contract.
-*
-* @since 2.0.0
-* @param node - AST node to scan.
-* @param content - Original script source used for diagnostics.
-* @param filename - Source filename used for diagnostics.
-* @returns Nothing.
-*/
 function validate_rune_yield_usage(node, content, filename) {
 	visit_rune_yield_usage(node, content, filename);
 }
@@ -1360,8 +1233,8 @@ function visit_rune_yield_usage(node, content, filename) {
 function validate_call_expression(call, content, filename) {
 	const rune_name = get_rune_name(call.expression);
 	if (!rune_name) return;
-	if (!ASYNC_EXPRESSION_RUNES.has(rune_name) && contains_top_level_yield_star(call)) throw new AsyncEffectInSyncRuneError(rune_name, slice(content, call), filename);
-	if (!CALLBACK_RUNES.has(rune_name)) return;
+	if (!async_expression_runes.has(rune_name) && contains_top_level_yield_star(call)) throw new AsyncEffectInSyncRuneError(rune_name, slice(content, call), filename);
+	if (!callback_runes.has(rune_name)) return;
 	const callback = call.arguments[0];
 	if (!callback || !callback_has_top_level_yield_star(callback)) return;
 	throw new AsyncEffectInSyncRuneError(rune_name, slice(content, call), filename);
@@ -1382,29 +1255,10 @@ function is_rune_root(name) {
 }
 //#endregion
 //#region src/markup/transform/scan.ts
-/**
-* Replaces markup `yield*` expressions with placeholders before Svelte parses
-* the component.
-*
-* @example
-* ```ts
-* const sanitized = sanitize_markup(
-*   `<p>{yield* loadLabel()}</p>`,
-*   "Label.svelte",
-* );
-* ```
-*
-* @since 2.0.0
-* @param content - Raw Svelte component source to scan for effectful markup
-*   expressions.
-* @param filename - Source filename used when validation errors need to point
-*   back to the component being transformed.
-* @returns Sanitized source plus placeholder candidates that should be lowered
-*   after Svelte classifies their markup positions.
-*/
-function sanitize_markup(content, filename) {
+function sanitize_markup(source_scan) {
+	const content = source_scan.source;
+	const filename = source_scan.filename;
 	const candidates = [];
-	const source_scan = scan_svelte_effect_source(content, filename);
 	const magic = new MagicString(content);
 	let helper_index = 0;
 	for (const expression of source_scan.markup_expressions) {
@@ -1491,11 +1345,30 @@ function sanitize_markup(content, filename) {
 		});
 		magic.overwrite(expr_start, expr_end, key === "render" ? `${placeholder}()` : placeholder);
 	}
+	if (candidates.length === 0) return {
+		parse_code: content,
+		candidates
+	};
+	for (const region of source_scan.scripts) {
+		const region_source = content.slice(region.start, region.end);
+		magic.overwrite(region.start, region.end, blank_script_region(region_source, region.is_module, region.is_typescript));
+	}
+	for (const region of source_scan.styles) {
+		const region_source = content.slice(region.start, region.end);
+		magic.overwrite(region.start, region.end, blank_source_region(region_source));
+	}
 	return {
-		code: magic.toString(),
+		parse_code: magic.toString(),
 		candidates
 	};
 }
+function blank_source_region(source) {
+	return source.replace(/[^\r\n]/g, " ");
+}
+function blank_script_region(source, is_module, is_typescript) {
+	const scaffold = `<script${is_module ? " module" : ""}${is_typescript ? " lang=ts" : ""}><\/script>`;
+	return scaffold + blank_source_region(source.slice(scaffold.length));
+}
 function collect_expression_yield_expressions(content, expr_start, expr_text, filename) {
 	const source_file = ts.createSourceFile("markup-expression.ts", `const __SER___expr = ${expr_text};`, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
 	const stmt = source_file.statements[0];
@@ -1552,7 +1425,7 @@ function get_tag_info(trimmed) {
 		prefix_length: 7
 	};
 	if (trimmed.startsWith("@html ")) return {
-		kind: "plain",
+		kind: "html",
 		prefix_length: 6
 	};
 	if (trimmed.startsWith("@debug ")) return {
@@ -1607,7 +1480,7 @@ function is_event_callback_expression(inner) {
 function analyze_event_yield(inner) {
 	const event = strip_arrow_function(inner);
 	const analysis = analyze_event_body_yield_star(event.body);
-	if (new RegExp(`${HELPERS.dispatcher}(?:_\\d+)?\\.emit\\(\\{\\s*type:\\s*${HELPERS.codes}(?:_\\d+)?\\.Markup\\.Run`).test(event.body)) return { has_top_level_yield_star: false };
+	if (new RegExp(`${default_helper_bindings.dispatcher}(?:_\\d+)?\\.emit\\(\\{\\s*type:\\s*${default_helper_bindings.codes}(?:_\\d+)?\\.Markup\\.Run`).test(event.body)) return { has_top_level_yield_star: false };
 	return { has_top_level_yield_star: analysis.has_top_level_yield_star || analysis.has_nested_invalid_yield_star || /\byield\s*\*/.test(event.body) };
 }
 function contains_yield_star_in_text(text) {
@@ -1655,16 +1528,17 @@ function transform_markup_effect(content, filename, options = {}) {
 		code: content,
 		has_yield: false
 	};
+	const source_scan = scan_svelte_effect_source(content, filename);
 	/** Find all brace expressions containing yield* and replace with placeholders. */
-	const work = sanitize_markup(content, filename);
-	const effect_context = collect_effect_callback_bindings(content);
-	const helper_context = make_markup_helper_bindings(content);
+	const work = sanitize_markup(source_scan);
 	if (work.candidates.length === 0) return {
 		code: content,
 		has_yield: false
 	};
+	const effect_context = collect_effect_callback_bindings(source_scan.scripts);
+	const helper_context = make_markup_helper_bindings(source_scan, options.target ?? "client");
 	/** Match placeholders to their AST context and build replacements. */
-	const classified = classify_candidates(parse(blank_script_blocks(work.code), {
+	const classified = classify_candidates(parse(work.parse_code, {
 		filename,
 		modern: true
 	}), work.candidates);
@@ -1676,7 +1550,7 @@ function transform_markup_effect(content, filename, options = {}) {
 	const magic = new MagicString(content);
 	replacements.sort((a, b) => b.start - a.start);
 	for (const r of replacements) magic.overwrite(r.start, r.end, r.text);
-	const relocations = create_relocations(replacements, inject_helpers(magic, content, helpers, helper_context.bindings));
+	const relocations = create_relocations(replacements, inject_helpers(magic, source_scan, helpers, helper_context.bindings, helper_context.scope_wiring));
 	return {
 		code: magic.toString(),
 		has_yield: true,
@@ -1685,6 +1559,6 @@ function transform_markup_effect(content, filename, options = {}) {
 	};
 }
 //#endregion
-export { slice_start as a, contains_top_level_await as c, collect_top_level_binding_names as d, has_local_import_binding as f, slice as i, find_yield_star_node as l, validate_rune_yield_usage as n, collect_free_identifiers as o, make_imports as p, create_source_map as r, collect_yield_star_nodes as s, transform_markup_effect as t, is_yield_star_expression$1 as u };
+export { slice_start as a, find_yield_star_node as c, collect_top_level_binding_names as d, has_local_import_binding as f, slice as i, is_yield_star_expression as l, validate_rune_yield_usage as n, collect_yield_star_nodes as o, make_imports as p, create_source_map as r, contains_top_level_await as s, transform_markup_effect as t, collect_free_identifiers as u };
 
-//# sourceMappingURL=transform-jNUr65K9.js.map
+//# sourceMappingURL=transform-D7TTlPpK.js.map