svelte-effect-runtime 3.4.6 → 3.4.8

package/.dist/chunks/{transform-02e-RvXH.js → transform-C2fCVPL_.js}

@@ -1,8 +1,8 @@
-import { A as YieldStarInEventCallbackError, D as UnsupportedMarkupEffectPositionError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-Dcf0MVbq.js";
+import { O as UnsupportedMarkupEffectPositionError, j as YieldStarInEventCallbackError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-Bl3NVEez.js";
 import { contains_top_level_yield_star } from "../detect.js";
-import MagicString from "magic-string";
 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.
@@ -22,20 +22,37 @@ function make_imports(has_effect_import, has_dispatcher_import, has_untrack_impo
 	dispatcher_value: "__SER___dispatcher",
 	effect: "Effect",
 	program: "__SER___program",
-	untrack: "untrack"
+	untrack: "untrack",
+	yield_success: "YieldSuccess",
+	yieldable: "ToEffect"
 }, options = {}) {
 	const needs_dispatcher = options.needs_dispatcher ?? true;
 	const needs_effect = options.needs_effect ?? true;
 	const needs_untrack = options.needs_untrack ?? true;
-	const dispatcher_import = bindings.dispatcher === "get_dispatcher" ? `import { get_dispatcher } from "svelte-effect-runtime/internal/generators";` : `import { get_dispatcher as ${bindings.dispatcher} } from "svelte-effect-runtime/internal/generators";`;
+	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 untrack_import = bindings.untrack === "untrack" ? `import { untrack } from "svelte";` : `import { untrack as ${bindings.untrack} } from "svelte";`;
 	const effect_import = has_effect_import ? false : bindings.effect === "Effect" ? `import { Effect } from "effect";` : `import { Effect as ${bindings.effect} } from "effect";`;
 	return [
-		needs_dispatcher && !has_dispatcher_import && dispatcher_import,
+		generator_import,
 		needs_untrack && !has_untrack_import && untrack_import,
 		needs_effect && effect_import
 	].filter(Boolean).join("\n");
 }
+function make_generator_import(bindings, needs_dispatcher, needs_yieldable, needs_yield_success) {
+	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)
+	].filter((specifier) => specifier !== false);
+	if (specifiers.length === 0) return false;
+	return `import { ${specifiers.join(", ")} } from "svelte-effect-runtime/internal/generators";`;
+}
+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.
 *
@@ -93,7 +110,8 @@ function collect_binding_name_text(name) {
 //#region src/markup/transform/constants.ts
 const HELPERS = {
 	codes: "Code",
-	dispatcher: "Dispatcher"
+	dispatcher: "Dispatcher",
+	yieldable: "ToEffect"
 };
 //#endregion
 //#region src/markup/transform/apply.ts
@@ -144,7 +162,8 @@ function make_markup_helper_bindings(content) {
 	return {
 		bindings: {
 			codes: name_allocator.reserve(HELPERS.codes),
-			dispatcher: name_allocator.reserve(HELPERS.dispatcher)
+			dispatcher: name_allocator.reserve(HELPERS.dispatcher),
+			yieldable: name_allocator.reserve(HELPERS.yieldable)
 		},
 		name_allocator
 	};
@@ -183,7 +202,7 @@ function make_import_helper(content, import_text) {
 	return import_text;
 }
 function make_dispatcher_import(bindings) {
-	return `import { ${make_import_specifier(HELPERS.dispatcher, bindings.dispatcher)}, ${make_import_specifier(HELPERS.codes, bindings.codes)} } from "svelte-effect-runtime/internal/generators";`;
+	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_import_specifier(imported_name, local_name) {
 	if (imported_name === local_name) return imported_name;
@@ -529,6 +548,75 @@ 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.
@@ -673,7 +761,7 @@ function add_binding_names(name, locals) {
 	}
 }
 function visit_event_body(node, context, result) {
-	if (is_yield_star_expression$1(node)) {
+	if (is_yield_star_expression(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));
@@ -692,7 +780,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$1(node) {
+function is_yield_star_expression(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";
 }
@@ -953,32 +1041,28 @@ function emit_replacement(candidate, kind, effect_context, helper_bindings, name
 	let helpers;
 	let relocation;
 	if (kind === "await") {
-		const effect = make_effect_helper(normalized_candidate, helper_name);
+		const effect = make_effect_helper(normalized_candidate, helper_name, helper_bindings);
 		replacement_text = emit_promise_expression(id_text, effect, helper_bindings, "undefined", `{ ssr: "pending" }`);
 		helpers = [...normalized.helpers, effect.helper];
 	} else if (kind === "render") {
-		const effect = make_effect_helper(normalized_candidate, helper_name);
+		const effect = make_effect_helper(normalized_candidate, helper_name, helper_bindings);
 		replacement_text = emit_render_expression(id_text, effect, candidate, helper_bindings, is_server_target);
 		helpers = [...normalized.helpers, effect.helper];
 	} else if (kind === "render_argument") {
-		const effect = make_effect_helper(normalized_candidate, helper_name);
+		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"));
 		helpers = [...normalized.helpers, effect.helper];
 	} else if (kind === "each") {
-		const effect = make_effect_helper(normalized_candidate, helper_name);
+		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, "[]"));
 		helpers = [...normalized.helpers, effect.helper];
 	} else if (kind === "event") {
 		const event = make_event_handler(normalized_candidate, helper_bindings);
 		replacement_text = event.text;
 		helpers = normalized.helpers;
-		relocation = make_relocation(candidate, replacement_text, {
-			originalStart: 0,
-			originalEnd: candidate.expr_text.length,
-			generatedText: event.expr_text
-		});
+		relocation = make_pending_relocation(candidate, replacement_text, event.expr_text, event.relocation);
 	} else {
-		const effect = make_effect_helper(normalized_candidate, helper_name);
+		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"));
 		helpers = [...normalized.helpers, effect.helper];
 	}
@@ -994,9 +1078,11 @@ function make_event_handler(candidate, helper_bindings) {
 	const expr_text = candidate.expr_text;
 	if (is_callback_function_expression(expr_text)) throw new YieldStarInEventCallbackError(candidate.filename, expr_text);
 	if (analyze_event_body_yield_star(expr_text).has_nested_invalid_yield_star) throw new AsyncEffectInEventCallbackError(candidate.filename, expr_text);
+	const wrapped_expr_text = wrap_yield_stars(expr_text, helper_bindings);
 	return {
-		expr_text,
-		text: `(event) => { ${helper_bindings.dispatcher}.emit({ type: ${helper_bindings.codes}.Markup.Run, fn: function* () { ${expr_text}; } }); }`
+		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}; } }); }`
 	};
 }
 function emit_promise_expression(id_text, effect, helper_bindings, ssr_fallback, options) {
@@ -1021,41 +1107,91 @@ function emit_await_expression(id_text, effect, helper_bindings, ssr_fallback) {
 function server_fallback(is_server_target, fallback) {
 	return is_server_target ? fallback : void 0;
 }
-function make_effect_helper(candidate, helper_name) {
+function make_effect_helper(candidate, helper_name, helper_bindings) {
 	const deps = collect_free_identifiers(candidate.expr_text);
 	const args_text = deps.join(", ");
 	const deps_text = deps.length === 0 ? "[]" : `[${args_text}]`;
 	const call = `${helper_name}()`;
-	const text = `function* ${helper_name}() { return (${candidate.expr_text}); }`;
-	const generated_start = text.indexOf(candidate.expr_text);
+	const effect_text = wrap_yield_stars(candidate.expr_text, helper_bindings);
+	const text = `function* ${helper_name}() { return (${effect_text}); }`;
+	const generated_start = text.indexOf(effect_text);
+	const relocation = make_yield_operand_relocation(candidate.expr_text, effect_text, helper_bindings) ?? {
+		originalStart: 0,
+		originalEnd: candidate.expr_text.length,
+		generatedStart: 0,
+		generatedEnd: effect_text.length
+	};
 	return {
 		call,
 		deps_text,
 		helper: {
 			text,
 			relocation: {
-				originalStart: candidate.start,
-				originalEnd: candidate.end,
-				generatedStartInReplacement: generated_start,
-				generatedEndInReplacement: generated_start + candidate.expr_text.length
+				originalStart: candidate.start + relocation.originalStart,
+				originalEnd: candidate.start + relocation.originalEnd,
+				generatedStartInReplacement: generated_start + relocation.generatedStart,
+				generatedEndInReplacement: generated_start + relocation.generatedEnd
 			}
 		}
 	};
 }
+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 = [];
+	collect_yield_star_nodes(source_file, (node) => {
+		const yield_text = text.slice(node.getStart(source_file), node.end).trim();
+		replacements.push({
+			start: node.getStart(source_file),
+			end: node.end,
+			text: `yield* ${helper_bindings.yieldable}(${strip_yield_star(yield_text)})`
+		});
+	});
+	if (replacements.length === 0) return text;
+	replacements.sort((a, b) => b.start - a.start);
+	let output = text;
+	for (const replacement of replacements) output = output.slice(0, replacement.start) + replacement.text + output.slice(replacement.end);
+	return output;
+}
+function strip_yield_star(yield_text) {
+	return yield_text.replace(/^yield\s*\*\s*/, "");
+}
+function make_yield_operand_relocation(original_text, generated_text, helper_bindings) {
+	const source_file = ts.createSourceFile("markup-yield-relocation.ts", original_text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+	let yield_node;
+	collect_yield_star_nodes(source_file, (node) => {
+		yield_node ??= node;
+	});
+	if (!yield_node || !ts.isBinaryExpression(yield_node)) return;
+	const operand = yield_node.right;
+	const original_start = operand.getStart(source_file);
+	const original_end = operand.end;
+	const operand_text = original_text.slice(original_start, original_end).trim();
+	const wrapper_text = `${helper_bindings.yieldable}(${operand_text})`;
+	const wrapper_start = generated_text.indexOf(wrapper_text);
+	if (wrapper_start === -1) return;
+	const generated_start = wrapper_start + wrapper_text.indexOf(operand_text);
+	return {
+		originalStart: original_start,
+		originalEnd: original_end,
+		generatedStart: generated_start,
+		generatedEnd: generated_start + operand_text.length
+	};
+}
 function make_cache_id(candidate) {
 	return `${candidate.filename.replace(/[?#].*$/, "")}:${candidate.start}:${candidate.end}`;
 }
 function make_helper_name(candidate, name_allocator) {
 	return name_allocator.reserve(`__SER___markup_effect_${candidate.start}_${candidate.end}`);
 }
-function make_relocation(candidate, replacement_text, inner) {
-	const generated_start = replacement_text.indexOf(inner.generatedText);
+function make_pending_relocation(candidate, replacement_text, expression_text, relocation) {
+	if (!relocation) return;
+	const generated_start = replacement_text.indexOf(expression_text);
 	if (generated_start === -1) return;
 	return {
-		originalStart: candidate.start + inner.originalStart,
-		originalEnd: candidate.start + inner.originalEnd,
-		generatedStartInReplacement: generated_start,
-		generatedEndInReplacement: generated_start + inner.generatedText.length
+		originalStart: candidate.start + relocation.originalStart,
+		originalEnd: candidate.start + relocation.originalEnd,
+		generatedStartInReplacement: generated_start + relocation.generatedStart,
+		generatedEndInReplacement: generated_start + relocation.generatedEnd
 	};
 }
 //#endregion
@@ -1155,75 +1291,6 @@ function is_rune_root(name) {
 	return name === "$bindable" || name === "$derived" || name === "$effect" || name === "$host" || name === "$inspect" || name === "$props" || name === "$state";
 }
 //#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(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(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(node)) {
-		on_found(node);
-		return;
-	}
-	node.forEachChild((child) => {
-		find_yield_star_node(child, on_found);
-	});
-}
-//#endregion
 //#region src/markup/transform/scan.ts
 /**
 * Replaces markup `yield*` expressions with placeholders before Svelte parses
@@ -1644,6 +1711,6 @@ function transform_markup_effect(content, filename, options = {}) {
 	};
 }
 //#endregion
-export { is_yield_star_expression as a, slice as c, collect_top_level_binding_names as d, has_local_import_binding as f, find_yield_star_node as i, slice_start as l, collect_yield_star_nodes as n, validate_rune_yield_usage as o, make_imports as p, contains_top_level_await as r, create_source_map as s, transform_markup_effect as t, collect_free_identifiers as u };
+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 };
 
-//# sourceMappingURL=transform-02e-RvXH.js.map
+//# sourceMappingURL=transform-C2fCVPL_.js.map