svelte-effect-runtime 3.4.5 → 3.4.7

package/.dist/chunks/{transform-Cdsx7ygD.js → transform-CEK6Ccll.js}

@@ -1,8 +1,8 @@
-import { A as YieldStarInEventCallbackError, D as UnsupportedMarkupEffectPositionError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-0PaWf7Bq.js";
+import { A as YieldStarInEventCallbackError, D as UnsupportedMarkupEffectPositionError, n as AsyncEffectInSyncRuneError, t as AsyncEffectInEventCallbackError } from "./errors-Dcf0MVbq.js";
 import { contains_top_level_yield_star } from "../detect.js";
+import ts from "typescript";
 import { parse } from "svelte/compiler";
 import MagicString from "magic-string";
-import ts from "typescript";
 //#region src/script-transform/imports.ts
 /**
 * Builds the import statements injected by the script transform.
@@ -244,148 +244,6 @@ function make_name_allocator(initial_names) {
 	} };
 }
 //#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 = [];
-	const matched = /* @__PURE__ */ new Set();
-	walk_ast(ast.fragment, by_placeholder, matched, classified);
-	return classified;
-}
-function walk_ast(fragment, candidates, matched, classified) {
-	for (const node of fragment.nodes) visit_ast_node(node, candidates, matched, classified);
-}
-function visit_ast_node(node, candidates, matched, classified) {
-	switch (node.type) {
-		case "ExpressionTag":
-			classify_expression(node.expression, "plain", candidates, matched, classified);
-			return;
-		case "IfBlock":
-			classify_expression(node.test, "plain", candidates, matched, classified);
-			walk_ast(node.consequent, candidates, matched, classified);
-			if (node.alternate) walk_ast(node.alternate, candidates, matched, classified);
-			return;
-		case "EachBlock":
-			classify_expression(node.expression, "each", candidates, matched, classified);
-			walk_ast(node.body, candidates, matched, classified);
-			if (node.fallback) walk_ast(node.fallback, candidates, matched, classified);
-			return;
-		case "AwaitBlock":
-			classify_expression(node.expression, "await", candidates, matched, classified);
-			if (node.pending) walk_ast(node.pending, candidates, matched, classified);
-			if (node.then) walk_ast(node.then, candidates, matched, classified);
-			if (node.catch) walk_ast(node.catch, candidates, matched, classified);
-			return;
-		case "RenderTag":
-			classify_expression(node.expression, "render", candidates, matched, classified);
-			return;
-		case "HtmlTag":
-			classify_expression(node.expression, "plain", candidates, matched, classified);
-			return;
-		case "DebugTag": return;
-		case "ConstTag":
-		case "DeclarationTag":
-			classify_declaration_tag(node, candidates, matched, classified);
-			return;
-		case "KeyBlock":
-			classify_expression(node.expression, "plain", candidates, matched, classified);
-			walk_ast(node.fragment, candidates, matched, classified);
-			return;
-		case "RegularElement":
-		case "Component":
-		case "TitleElement":
-		case "SlotElement":
-		case "SvelteBody":
-		case "SvelteBoundary":
-		case "SvelteComponent":
-		case "SvelteDocument":
-		case "SvelteElement":
-		case "SvelteFragment":
-		case "SvelteHead":
-		case "SvelteSelf":
-		case "SvelteWindow":
-			visit_element_attributes(node, candidates, matched, classified);
-			walk_ast(node.fragment, candidates, matched, classified);
-			return;
-		default: return;
-	}
-}
-function classify_declaration_tag(node, candidates, matched, classified) {
-	for (const decl of node.declaration.declarations) classify_expression(decl, "plain", candidates, matched, classified);
-}
-function visit_element_attributes(node, candidates, matched, classified) {
-	for (const attr of node.attributes) {
-		if (attr.type === "Attribute" && attr.name && is_event_attribute_name(attr.name)) {
-			visit_attribute_value(attr.value, "event", candidates, matched, classified);
-			continue;
-		}
-		if (attr.type === "OnDirective" && attr.expression) {
-			classify_expression(attr.expression, "event", candidates, matched, classified);
-			continue;
-		}
-	}
-}
-function is_event_attribute_name(name) {
-	return name.startsWith("on:") || /^on[a-z]/.test(name);
-}
-function visit_attribute_value(value, kind, candidates, matched, classified) {
-	if (value === true) return;
-	if (Array.isArray(value)) {
-		for (const part of value) if (part.type === "ExpressionTag") classify_expression(part.expression, kind, candidates, matched, classified);
-		return;
-	}
-	classify_expression(value.expression, kind, candidates, matched, classified);
-}
-function classify_expression(expression, kind, candidates, matched, classified) {
-	if (!expression) return;
-	const found_candidates = find_candidates(expression, candidates);
-	for (const candidate of found_candidates) {
-		if (matched.has(candidate.placeholder)) continue;
-		matched.add(candidate.placeholder);
-		classified.push({
-			candidate,
-			kind: resolve_candidate_kind(candidate, kind)
-		});
-	}
-}
-function resolve_candidate_kind(candidate, context_kind) {
-	if (candidate.key === "render_argument") return "render_argument";
-	return context_kind;
-}
-function find_candidates(expression, candidates) {
-	const found = [];
-	visit_expression_value(expression, candidates, /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), found);
-	return found;
-}
-function visit_expression_value(value, candidates, seen_nodes, seen_placeholders, found) {
-	if (Array.isArray(value)) {
-		for (const item of value) visit_expression_value(item, candidates, seen_nodes, seen_placeholders, found);
-		return;
-	}
-	if (!is_record(value) || seen_nodes.has(value)) return;
-	seen_nodes.add(value);
-	if (value.type === "Identifier" && typeof value.name === "string") {
-		const candidate = candidates.get(value.name);
-		if (candidate && !seen_placeholders.has(candidate.placeholder)) {
-			seen_placeholders.add(candidate.placeholder);
-			found.push(candidate);
-		}
-	}
-	for (const child of Object.values(value)) visit_expression_value(child, candidates, seen_nodes, seen_placeholders, found);
-}
-function is_record(value) {
-	return typeof value === "object" && value !== null;
-}
-//#endregion
 //#region src/markup/transform/effect-bindings.ts
 const EFFECT_PACKAGE_MODULE = "effect";
 const EFFECT_DIRECT_MODULE = "effect/Effect";
@@ -529,6 +387,148 @@ function add_ordered_name(names, name) {
 	names.push(name);
 }
 //#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 = [];
+	const matched = /* @__PURE__ */ new Set();
+	walk_ast(ast.fragment, by_placeholder, matched, classified);
+	return classified;
+}
+function walk_ast(fragment, candidates, matched, classified) {
+	for (const node of fragment.nodes) visit_ast_node(node, candidates, matched, classified);
+}
+function visit_ast_node(node, candidates, matched, classified) {
+	switch (node.type) {
+		case "ExpressionTag":
+			classify_expression(node.expression, "plain", candidates, matched, classified);
+			return;
+		case "IfBlock":
+			classify_expression(node.test, "plain", candidates, matched, classified);
+			walk_ast(node.consequent, candidates, matched, classified);
+			if (node.alternate) walk_ast(node.alternate, candidates, matched, classified);
+			return;
+		case "EachBlock":
+			classify_expression(node.expression, "each", candidates, matched, classified);
+			walk_ast(node.body, candidates, matched, classified);
+			if (node.fallback) walk_ast(node.fallback, candidates, matched, classified);
+			return;
+		case "AwaitBlock":
+			classify_expression(node.expression, "await", candidates, matched, classified);
+			if (node.pending) walk_ast(node.pending, candidates, matched, classified);
+			if (node.then) walk_ast(node.then, candidates, matched, classified);
+			if (node.catch) walk_ast(node.catch, candidates, matched, classified);
+			return;
+		case "RenderTag":
+			classify_expression(node.expression, "render", candidates, matched, classified);
+			return;
+		case "HtmlTag":
+			classify_expression(node.expression, "plain", candidates, matched, classified);
+			return;
+		case "DebugTag": return;
+		case "ConstTag":
+		case "DeclarationTag":
+			classify_declaration_tag(node, candidates, matched, classified);
+			return;
+		case "KeyBlock":
+			classify_expression(node.expression, "plain", candidates, matched, classified);
+			walk_ast(node.fragment, candidates, matched, classified);
+			return;
+		case "RegularElement":
+		case "Component":
+		case "TitleElement":
+		case "SlotElement":
+		case "SvelteBody":
+		case "SvelteBoundary":
+		case "SvelteComponent":
+		case "SvelteDocument":
+		case "SvelteElement":
+		case "SvelteFragment":
+		case "SvelteHead":
+		case "SvelteSelf":
+		case "SvelteWindow":
+			visit_element_attributes(node, candidates, matched, classified);
+			walk_ast(node.fragment, candidates, matched, classified);
+			return;
+		default: return;
+	}
+}
+function classify_declaration_tag(node, candidates, matched, classified) {
+	for (const decl of node.declaration.declarations) classify_expression(decl, "plain", candidates, matched, classified);
+}
+function visit_element_attributes(node, candidates, matched, classified) {
+	for (const attr of node.attributes) {
+		if (attr.type === "Attribute" && attr.name && is_event_attribute_name(attr.name)) {
+			visit_attribute_value(attr.value, "event", candidates, matched, classified);
+			continue;
+		}
+		if (attr.type === "OnDirective" && attr.expression) {
+			classify_expression(attr.expression, "event", candidates, matched, classified);
+			continue;
+		}
+	}
+}
+function is_event_attribute_name(name) {
+	return name.startsWith("on:") || /^on[a-z]/.test(name);
+}
+function visit_attribute_value(value, kind, candidates, matched, classified) {
+	if (value === true) return;
+	if (Array.isArray(value)) {
+		for (const part of value) if (part.type === "ExpressionTag") classify_expression(part.expression, kind, candidates, matched, classified);
+		return;
+	}
+	classify_expression(value.expression, kind, candidates, matched, classified);
+}
+function classify_expression(expression, kind, candidates, matched, classified) {
+	if (!expression) return;
+	const found_candidates = find_candidates(expression, candidates);
+	for (const candidate of found_candidates) {
+		if (matched.has(candidate.placeholder)) continue;
+		matched.add(candidate.placeholder);
+		classified.push({
+			candidate,
+			kind: resolve_candidate_kind(candidate, kind)
+		});
+	}
+}
+function resolve_candidate_kind(candidate, context_kind) {
+	if (candidate.key === "render_argument") return "render_argument";
+	return context_kind;
+}
+function find_candidates(expression, candidates) {
+	const found = [];
+	visit_expression_value(expression, candidates, /* @__PURE__ */ new Set(), /* @__PURE__ */ new Set(), found);
+	return found;
+}
+function visit_expression_value(value, candidates, seen_nodes, seen_placeholders, found) {
+	if (Array.isArray(value)) {
+		for (const item of value) visit_expression_value(item, candidates, seen_nodes, seen_placeholders, found);
+		return;
+	}
+	if (!is_record(value) || seen_nodes.has(value)) return;
+	seen_nodes.add(value);
+	if (value.type === "Identifier" && typeof value.name === "string") {
+		const candidate = candidates.get(value.name);
+		if (candidate && !seen_placeholders.has(candidate.placeholder)) {
+			seen_placeholders.add(candidate.placeholder);
+			found.push(candidate);
+		}
+	}
+	for (const child of Object.values(value)) visit_expression_value(child, candidates, seen_nodes, seen_placeholders, found);
+}
+function is_record(value) {
+	return typeof value === "object" && value !== null;
+}
+//#endregion
 //#region src/markup/transform/expressions.ts
 /**
 * Strips an event handler arrow function down to its executable body.
@@ -702,8 +702,8 @@ function is_property_access_name(node) {
 }
 //#endregion
 //#region src/markup/transform/effect-callbacks.ts
-const MATCH_EFFECT_MEMBERS = new Map([["match", "matchEffect"], ["matchCause", "matchCauseEffect"]]);
-const EFFECTFUL_CALLBACK_MEMBERS = new Set([
+const match_effect_members = /* @__PURE__ */ new Map([["match", "matchEffect"], ["matchCause", "matchCauseEffect"]]);
+const effectful_callback_members = /* @__PURE__ */ new Set([
 	"andThen",
 	"catchAll",
 	"catchAllCause",
@@ -715,11 +715,12 @@ const EFFECTFUL_CALLBACK_MEMBERS = new Set([
 	"tapError",
 	"tapErrorCause"
 ]);
-const EFFECTFUL_HANDLER_MEMBERS = new Set([
+const effectful_handler_members = /* @__PURE__ */ new Set([
 	"matchCauseEffect",
 	"matchEffect",
 	"tapBoth"
 ]);
+const effectful_handler_property_names = /* @__PURE__ */ new Set(["onFailure", "onSuccess"]);
 /**
 * Rewrites effectful callback shorthand inside event handler expressions.
 *
@@ -787,7 +788,7 @@ function visit_expression(node, context) {
 }
 function rewrite_match_call(call, context) {
 	const member = get_effect_member(call.expression, context);
-	const upgraded_name = member && MATCH_EFFECT_MEMBERS.get(member.name);
+	const upgraded_name = member && match_effect_members.get(member.name);
 	const options = get_last_object_argument(call);
 	if (!member || !upgraded_name || !options) return;
 	const handlers = get_handler_properties(options);
@@ -803,12 +804,12 @@ function rewrite_match_call(call, context) {
 function rewrite_effectful_handler_call(call, context) {
 	const member = get_effect_member(call.expression, context);
 	const options = get_last_object_argument(call);
-	if (!member || !EFFECTFUL_HANDLER_MEMBERS.has(member.name) || !options) return;
+	if (!member || !effectful_handler_members.has(member.name) || !options) return;
 	for (const handler of get_handler_properties(options)) if (handler.callback && is_non_generator_callback_with_top_level_yield(handler.callback)) rewrite_callback_to_effect_gen(handler.callback, context);
 }
 function rewrite_effectful_callback_arguments(call, context) {
 	const member = get_effect_member(call.expression, context);
-	if (!member || !EFFECTFUL_CALLBACK_MEMBERS.has(member.name)) return;
+	if (!member || !effectful_callback_members.has(member.name)) return;
 	for (const argument of call.arguments) if (is_callback_expression(argument) && is_non_generator_callback_with_top_level_yield(argument)) rewrite_callback_to_effect_gen(argument, context);
 }
 function rewrite_callback_to_effect_gen(callback, context) {
@@ -860,7 +861,7 @@ function get_handler_properties(object_literal) {
 	return object_literal.properties.flatMap((property) => {
 		if (!ts.isPropertyAssignment(property)) return [];
 		const name = get_property_name(property.name);
-		if (name !== "onFailure" && name !== "onSuccess") return [];
+		if (!name || !effectful_handler_property_names.has(name)) return [];
 		return [{ callback: is_callback_expression(property.initializer) ? property.initializer : void 0 }];
 	});
 }
@@ -1098,14 +1099,14 @@ function slice_start(content, node) {
 }
 //#endregion
 //#region src/script-transform/runes.ts
-const ASYNC_EXPRESSION_RUNES = new Set([
+const ASYNC_EXPRESSION_RUNES = /* @__PURE__ */ new Set([
 	"$derived",
 	"$state",
 	"$state.raw",
 	"$state.snapshot",
 	"$bindable"
 ]);
-const CALLBACK_RUNES = new Set([
+const CALLBACK_RUNES = /* @__PURE__ */ new Set([
 	"$derived.by",
 	"$effect",
 	"$effect.pre",
@@ -1224,8 +1225,29 @@ function find_yield_star_node(node, on_found) {
 }
 //#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) {
 	const candidates = [];
+	const excluded_ranges = collect_excluded_ranges(content);
 	const magic = new MagicString(content);
 	let helper_index = 0;
 	let cursor = 0;
@@ -1233,8 +1255,9 @@ function sanitize_markup(content, filename) {
 		const open = content.indexOf("{", cursor);
 		if (open === -1) break;
 		/** Skip braces inside <script> and <style> blocks. */
-		if (is_inside_excluded_block(content, open) || is_inside_html_comment(content, open)) {
-			cursor = open + 1;
+		const excluded_range = find_excluded_range(excluded_ranges, open);
+		if (excluded_range) {
+			cursor = excluded_range.end;
 			continue;
 		}
 		/** Find the matching closing brace. */
@@ -1359,25 +1382,68 @@ function collect_expression_yield_expressions(content, expr_start, expr_text, fi
 	});
 	return expressions;
 }
-function is_inside_excluded_block(content, pos) {
-	const script = find_tag_end(content, "script", pos);
-	const style = find_tag_end(content, "style", pos);
-	return script !== void 0 && pos < script.end && pos > script.start || style !== void 0 && pos < style.end && pos > style.start;
-}
-function is_inside_html_comment(content, pos) {
-	const open = content.lastIndexOf("<!--", pos);
-	const close = content.lastIndexOf("-->", pos);
-	return open !== -1 && open > close;
+function collect_excluded_ranges(content) {
+	const ranges = [
+		...collect_tag_ranges(content, "script"),
+		...collect_tag_ranges(content, "style"),
+		...collect_html_comment_ranges(content)
+	];
+	ranges.sort((a, b) => a.start - b.start);
+	return merge_ranges(ranges);
 }
-function find_tag_end(content, tag, after_pos) {
+function collect_tag_ranges(content, tag) {
 	const pattern = new RegExp(`<${tag}\\b[^>]*>([\\s\\S]*?)<\\/${tag}\\s*>`, "gi");
-	for (const match of content.matchAll(pattern)) {
-		if (match.index === void 0) continue;
-		const end_pos = match.index + match[0].length;
-		if (match.index <= after_pos && after_pos < end_pos) return {
+	return [...content.matchAll(pattern)].flatMap((match) => {
+		if (match.index === void 0) return [];
+		return [{
 			start: match.index,
-			end: end_pos
-		};
+			end: match.index + match[0].length
+		}];
+	});
+}
+function collect_html_comment_ranges(content) {
+	const ranges = [];
+	let cursor = 0;
+	while (cursor < content.length) {
+		const start = content.indexOf("<!--", cursor);
+		if (start === -1) break;
+		const close = content.indexOf("-->", start + 4);
+		const end = close === -1 ? content.length : close + 3;
+		ranges.push({
+			start,
+			end
+		});
+		cursor = end;
+	}
+	return ranges;
+}
+function merge_ranges(ranges) {
+	const merged = [];
+	for (const range of ranges) {
+		const previous = merged.at(-1);
+		if (!previous || range.start > previous.end) {
+			merged.push({ ...range });
+			continue;
+		}
+		previous.end = Math.max(previous.end, range.end);
+	}
+	return merged;
+}
+function find_excluded_range(ranges, pos) {
+	let low = 0;
+	let high = ranges.length - 1;
+	while (low <= high) {
+		const mid = Math.floor((low + high) / 2);
+		const range = ranges[mid];
+		if (pos <= range.start) {
+			high = mid - 1;
+			continue;
+		}
+		if (pos >= range.end) {
+			low = mid + 1;
+			continue;
+		}
+		return range;
 	}
 }
 /** Brace matching helpers for extracting complete markup expressions. */
@@ -1528,6 +1594,14 @@ function contains_yield_star_in_text(text) {
 * context for each placeholder (plain expression, #each, #await, event
 * handler, etc.).
 *
+* @example
+* ```ts
+* const result = transform_markup_effect(
+*   "<button onclick={yield* save()}>Save</button>",
+*   "SaveButton.svelte",
+* );
+* ```
+*
 * @since 2.0.0
 * @param content - The raw `.svelte` file content.
 * @param filename - The source filename, used in error messages.
@@ -1572,4 +1646,4 @@ 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 };
 
-//# sourceMappingURL=transform-Cdsx7ygD.js.map
+//# sourceMappingURL=transform-CEK6Ccll.js.map