svelte-effect-runtime 3.4.11 → 4.0.0

package/.dist/remote/client/types.d.ts

@@ -1,6 +1,6 @@
 import type { RemoteForm, RemoteFormInput, RemoteLiveQuery, RemoteQuery, RemoteQueryOverride } from "@sveltejs/kit";
 import type { RemoteFailure } from "../shared.js";
-import type { Effect } from "effect";
+import type { Effect, Schema, Stream } from "effect";
 /**
  * Type-only marker attached to SER query and live-query adapter functions so
  * form updates can distinguish them from command adapters.
@@ -21,6 +21,34 @@ export type EffectRemoteQueryUpdateBrand = {
 type EffectRemoteFormCallable<Input extends RemoteFormInput | void, Output, ErrorType> = [
     Input
 ] extends [void] ? () => Effect.Effect<Output, RemoteFailure<ErrorType>> : undefined extends Input ? (input?: Input) => Effect.Effect<Output, RemoteFailure<ErrorType>> : (input: Input) => Effect.Effect<Output, RemoteFailure<ErrorType>>;
+type NativeRemoteFormPreflightSchema<Input extends RemoteFormInput | void, Output> = Parameters<RemoteForm<Input, Output>["preflight"]>[0];
+type NativeRemoteFormValidateOptions<Input extends RemoteFormInput | void, Output> = NonNullable<Parameters<RemoteForm<Input, Output>["validate"]>[0]>;
+/**
+ * Schema values accepted by SER's remote form preflight adapter.
+ *
+ * @example
+ * ```ts
+ * form.preflight(Schema.Struct({ email: Schema.String }));
+ * ```
+ *
+ * @since 3.4.6
+ */
+export type EffectRemoteFormPreflightSchema<Input extends RemoteFormInput | void, Output = unknown> = NativeRemoteFormPreflightSchema<Input, Output> | Schema.Schema<unknown>;
+/**
+ * Options accepted by SER's remote form validation adapter.
+ *
+ * @example
+ * ```ts
+ * yield* form.validate({ all: true, preflightOnly: true });
+ * ```
+ *
+ * @since 3.4.6
+ */
+export type EffectRemoteFormValidateOptions<Input extends RemoteFormInput | void, Output = unknown> = Omit<NativeRemoteFormValidateOptions<Input, Output>, "all" | "includeUntouched" | "preflightOnly"> & {
+    readonly all?: boolean;
+    readonly includeUntouched?: boolean;
+    readonly preflightOnly?: boolean;
+};
 type EffectRemoteQueryUpdate = NativeRemoteQueryUpdate | EffectRemoteQueryUpdateFunction | EffectRemoteLiveQueryUpdateFunction;
 type EffectRemoteCommandUpdate = {
     readonly pending: number;
@@ -31,21 +59,12 @@ type EffectRemoteQueryUpdates<Updates extends readonly unknown[]> = Updates & {
 };
 type NativeRemoteQueryUpdate = RemoteQuery<unknown> | RemoteLiveQuery<unknown> | RemoteQueryOverride;
 type EffectRemoteQueryUpdateFunction = EffectRemoteQueryUpdateBrand & ((input: never) => EffectRemoteQueryUpdateResource);
-type EffectRemoteLiveQueryUpdateFunction = EffectRemoteQueryUpdateBrand & ((input: never) => Effect.Effect<EffectRemoteLiveQueryUpdateResource, unknown>);
+type EffectRemoteLiveQueryUpdateFunction = EffectRemoteQueryUpdateBrand & ((input: never) => Stream.Stream<unknown, unknown, unknown>);
 type EffectRemoteQueryUpdateResource = Effect.Effect<unknown, unknown> & {
     readonly refresh: () => Effect.Effect<void, unknown, never>;
     readonly set: (value: never) => void;
     readonly withOverride: (update: (current: never) => unknown) => unknown;
 };
-type EffectRemoteLiveQueryUpdateResource = {
-    readonly connected: boolean;
-    readonly current: unknown;
-    readonly done: boolean;
-    readonly error: unknown;
-    readonly loading: boolean;
-    readonly ready: boolean;
-    readonly reconnect: () => Effect.Effect<void, unknown, never>;
-} & AsyncIterable<unknown>;
 /**
  * Represents a pending operation counter that remote command adapters
  * use to track in-flight requests.
@@ -122,8 +141,8 @@ export type EffectRemoteFormEnhanceOptions<Input extends RemoteFormInput | void,
 export type EffectRemoteForm<Input extends RemoteFormInput | void, Output, ErrorType = never> = EffectRemoteFormCallable<Input, Output, ErrorType> & Omit<RemoteForm<Input, Output>, "enhance" | "for" | "preflight" | "submit" | "validate"> & {
     enhance(callback?: (options: EffectRemoteFormEnhanceOptions<Input, Output, ErrorType>) => void | Promise<void> | Effect.Effect<void, unknown, unknown>): ReturnType<RemoteForm<Input, Output>["enhance"]>;
     for(id: Parameters<RemoteForm<Input, Output>["for"]>[0]): Omit<EffectRemoteForm<Input, Output, ErrorType>, "for">;
-    preflight(schema: Parameters<RemoteForm<Input, Output>["preflight"]>[0]): EffectRemoteForm<Input, Output, ErrorType>;
+    preflight(schema: EffectRemoteFormPreflightSchema<Input, Output>): EffectRemoteForm<Input, Output, ErrorType>;
     submit: EffectRemoteFormCallable<Input, Output, ErrorType>;
-    validate(options?: Parameters<RemoteForm<Input, Output>["validate"]>[0]): Effect.Effect<void, RemoteFailure<ErrorType>>;
+    validate(options?: EffectRemoteFormValidateOptions<Input, Output>): Effect.Effect<void, RemoteFailure<ErrorType>>;
 };
 export {};

package/.dist/remote/client.d.ts

@@ -1,2 +1,2 @@
 export { create_remote_command_adapter, create_remote_form_adapter, create_remote_live_query_adapter, create_remote_query_adapter, } from "./client/index.js";
-export type { EffectRemoteForm, EffectRemoteFormEnhanceOptions, EffectRemoteFormSubmit, Pending, } from "./client/index.js";
+export type { EffectRemoteForm, EffectRemoteFormEnhanceOptions, EffectRemoteFormPreflightSchema, EffectRemoteFormSubmit, EffectRemoteFormValidateOptions, Pending, } from "./client/index.js";

package/.dist/remote/client.js

@@ -1,2 +1,2 @@
-import { i as create_remote_command_adapter, n as create_remote_query_adapter, r as create_remote_form_adapter, t as create_remote_live_query_adapter } from "../chunks/client-CsVu54pU.js";
+import { i as create_remote_command_adapter, n as create_remote_query_adapter, r as create_remote_form_adapter, t as create_remote_live_query_adapter } from "../chunks/client-DcZUV4rR.js";
 export { create_remote_command_adapter, create_remote_form_adapter, create_remote_live_query_adapter, create_remote_query_adapter };

package/.dist/remote/server.d.ts

@@ -1,7 +1,8 @@
 import type { FormIssue } from "./shared.js";
-import { Cause, Effect } from "effect";
+import { Effect } from "effect";
 type SvelteInvalid = (...issues: readonly (FormIssue | string)[]) => never;
 type SvelteError = (status: number, body: unknown) => never;
+export { encode_remote_failure } from "./cause-codec.js";
 /**
  * Runs a user-supplied Effect program through a ManagedRuntime, maps its
  * exit into the shape expected by SvelteKit, and returns the result or
@@ -18,16 +19,6 @@ type SvelteError = (status: number, body: unknown) => never;
 export declare function run_remote_effect<A>(effect: Effect.Effect<A, unknown, unknown>, runtime: {
     runPromise: (e: Effect.Effect<unknown, unknown, unknown>) => Promise<unknown>;
 }, invalid: SvelteInvalid, error: SvelteError): Promise<A>;
-/**
- * Encodes an Effect Cause into a string that the client-side adapter can
- * decode back into a typed `RemoteFailure`.
- *
- * @since 2.0.0
- * @param cause - The Effect Cause from a failed execution.
- * @returns A devalue-encoded string representing the serialised failure.
- * @internal
- */
-export declare function encode_remote_failure(cause: Cause.Cause<unknown>): string;
 /**
  * Throws a SvelteKit `invalid` response from a {@link FormError}, calling
  * through to the request-scoped `invalid` helper.
@@ -66,4 +57,3 @@ export declare function throw_form_error(issues: readonly FormIssue[], invalid:
  * @internal
  */
 export declare function normalize_remote_helper_error(err: unknown, helper_name: string): Error;
-export {};

package/.dist/remote/server.js

@@ -1,179 +1,2 @@
-import { h as RemoteHelperError, m as RemoteHelperContextError } from "../chunks/errors-Dcf0MVbq.js";
-import { create_serialized_remote_failure_envelope } from "./shared.js";
-import { Cause, Effect, Exit } from "effect";
-import { isHttpError, isRedirect, isValidationError } from "@sveltejs/kit";
-import { stringify } from "devalue";
-//#region src/remote/server.ts
-const request_event_context_error_start = "Can only read the current request event inside functions invoked during `handle`";
-const request_store_context_error = "Could not get the request store.";
-/**
-* Runs a user-supplied Effect program through a ManagedRuntime, maps its
-* exit into the shape expected by SvelteKit, and returns the result or
-* throws a SvelteKit-compatible error.
-*
-* @since 2.0.0
-* @param effect - The Effect program to execute.
-* @param runtime - The server-side ManagedRuntime.
-* @param invalid - SvelteKit's `invalid` helper (bound per-request).
-* @param error - SvelteKit's `error` helper.
-* @returns A Promise that resolves with the effect's success value.
-* @internal
-*/
-async function run_remote_effect(effect, runtime, invalid, error) {
-	const exit = await runtime.runPromise(Effect.exit(effect));
-	if (Exit.isSuccess(exit)) return exit.value;
-	handle_failure(exit.cause, invalid, error);
-}
-/**
-* Inspects the Effect Cause for failures and either throws a form
-* validation error (via SvelteKit's `invalid`) or encodes the error
-* and throws it via SvelteKit's `error`.
-*/
-function handle_failure(cause, invalid, error) {
-	const reasons = get_cause_reasons(cause);
-	/**
-	* Phase 1 — let SvelteKit's thrown control-flow sentinels escape.
-	*/
-	for (const reason of reasons) {
-		if (!Cause.isDieReason(reason)) continue;
-		const defect = reason.defect;
-		if (is_sveltekit_control_flow(defect)) throw defect;
-	}
-	/**
-	* Phase 2 — let cancellation escape without becoming a remote failure.
-	*/
-	if (Cause.hasInterruptsOnly(cause)) throw Cause.squash(cause);
-	/**
-	* Phase 3 — preserve typed form validation failures.
-	*/
-	for (const reason of reasons) if (Cause.isFailReason(reason)) {
-		const failure = reason.error;
-		if (typeof failure === "object" && failure !== null && failure._tag === "FormError") invalid(...failure.issues ?? []);
-	}
-	error(500, create_serialized_remote_failure_envelope(encode_remote_failure(cause)));
-}
-/**
-* Encodes an Effect Cause into a string that the client-side adapter can
-* decode back into a typed `RemoteFailure`.
-*
-* @since 2.0.0
-* @param cause - The Effect Cause from a failed execution.
-* @returns A devalue-encoded string representing the serialised failure.
-* @internal
-*/
-function encode_remote_failure(cause) {
-	const reasons = get_cause_reasons(cause);
-	for (const reason of reasons) if (Cause.isFailReason(reason)) {
-		const encoded = stringify_failure(to_public_remote_failure(reason.error));
-		if (encoded !== void 0) return encoded;
-	}
-	return stringify_unknown_remote_failure();
-}
-function get_cause_reasons(cause) {
-	return cause.reasons ?? [];
-}
-function is_sveltekit_control_flow(value) {
-	return isRedirect(value) || isHttpError(value) || isValidationError(value);
-}
-function stringify_failure(value) {
-	try {
-		return stringify(value);
-	} catch {
-		return;
-	}
-}
-function to_public_remote_failure(value) {
-	if (!has_public_remote_failure_tag(value)) return create_unknown_remote_failure();
-	return to_serializable_public_failure(value) ?? create_unknown_remote_failure();
-}
-function to_serializable_public_failure(value, seen = /* @__PURE__ */ new WeakSet()) {
-	if (typeof value === "function" || typeof value === "symbol") return;
-	if (!is_object_like(value)) return value;
-	if (stringify_failure(value) !== void 0) return value;
-	if (is_internal_object(value)) return;
-	if (seen.has(value)) return;
-	seen.add(value);
-	const serializable = Array.isArray(value) ? value.map((item) => to_serializable_public_failure(item, seen)) : to_plain_record(value, seen);
-	seen.delete(value);
-	return serializable;
-}
-function to_plain_record(value, seen) {
-	const descriptors = Object.getOwnPropertyDescriptors(value);
-	const record = {};
-	for (const [key, descriptor] of Object.entries(descriptors)) {
-		if (key === "stack" || !("value" in descriptor)) continue;
-		record[key] = to_serializable_public_failure(descriptor.value, seen);
-	}
-	if (value instanceof Error && !("message" in record)) record.message = value.message;
-	return record;
-}
-function is_object_like(value) {
-	return typeof value === "object" && value !== null;
-}
-function has_public_remote_failure_tag(value) {
-	return is_object_like(value) && typeof value._tag === "string";
-}
-function is_internal_object(value) {
-	return !Array.isArray(value) && !is_plain_record(value) && !has_public_remote_failure_tag(value);
-}
-function is_plain_record(value) {
-	const prototype = Object.getPrototypeOf(value);
-	return prototype === Object.prototype || prototype === null;
-}
-function create_unknown_remote_failure() {
-	return { message: "[UNKNOWN_REMOTE_FAILURE]: Unknown error" };
-}
-function stringify_unknown_remote_failure() {
-	return stringify(create_unknown_remote_failure());
-}
-/**
-* Throws a SvelteKit `invalid` response from a {@link FormError}, calling
-* through to the request-scoped `invalid` helper.
-*
-* @example
-* ```ts
-* throw_form_error(
-*   [{ message: "Name is required", path: ["name"] }],
-*   invalid,
-* );
-* ```
-*
-* @since 2.0.0
-* @param issues - The list of form validation issues.
-* @param invalid - SvelteKit's `invalid` helper bound to the current request.
-* @internal
-*/
-function throw_form_error(issues, invalid) {
-	invalid(...issues);
-}
-/**
-* Remaps SvelteKit's unbranded request-context errors into clear, actionable
-* messages.
-*
-* @example
-* ```ts
-* try {
-*   return native_query(handler);
-* } catch (err) {
-*   throw normalize_remote_helper_error(err, "Query");
-* }
-* ```
-*
-* @since 2.0.0
-* @param err - The error thrown by SvelteKit's native functions.
-* @param helper_name - Name of the helper that triggered the error.
-* @returns A more descriptive error.
-* @internal
-*/
-function normalize_remote_helper_error(err, helper_name) {
-	if (is_sveltekit_remote_context_error(err)) return new RemoteHelperContextError(helper_name);
-	return err instanceof Error ? err : new RemoteHelperError(err);
-}
-function is_sveltekit_remote_context_error(err) {
-	if (!(err instanceof Error)) return false;
-	return err.message.startsWith(request_event_context_error_start) || err.message === request_store_context_error;
-}
-//#endregion
+import { i as encode_remote_failure, n as run_remote_effect, r as throw_form_error, t as normalize_remote_helper_error } from "../chunks/server-D1LcDnZE.js";
 export { encode_remote_failure, normalize_remote_helper_error, run_remote_effect, throw_form_error };
-
-//# sourceMappingURL=server.js.map

package/.dist/runtime/transform.js

@@ -1,5 +1,6 @@
-import { d as PreprocessError, r as AwaitInEffectWorkError } from "../chunks/errors-Dcf0MVbq.js";
-import { a as is_yield_star_expression, c as slice, d as collect_top_level_binding_names, f as has_local_import_binding, i as find_yield_star_node, l as slice_start, n as collect_yield_star_nodes, o as validate_rune_yield_usage, p as make_imports, r as contains_top_level_await, s as create_source_map, t as transform_markup_effect, u as collect_free_identifiers } from "../chunks/transform-CtQDGS9c.js";
+import { f as PreprocessError, r as AwaitInEffectWorkError } from "../chunks/errors-IJjsUwrE.js";
+import { t as scan_svelte_effect_source } from "../chunks/source-scan-C4PsggID.js";
+import { a as slice_start, c as contains_top_level_await, d as collect_top_level_binding_names, f as has_local_import_binding, i as slice, l as find_yield_star_node, n as validate_rune_yield_usage, o as collect_free_identifiers, p as make_imports, r as create_source_map, s as collect_yield_star_nodes, t as transform_markup_effect, u as is_yield_star_expression } from "../chunks/transform-jNUr65K9.js";
 import { contains_top_level_yield_star } from "../detect.js";
 import ts from "typescript";
 import MagicString from "magic-string";
@@ -14,9 +15,11 @@ import MagicString from "magic-string";
 * @returns Full `$effect` blocks that fork generated `Effect.gen` programs.
 */
 function make_runtime_block_with_bindings(blocks, bindings) {
-	const merged_block = merge_effect_blocks(blocks);
-	const dep_reads = merged_block.deps.map((dep) => `  ${dep};`);
-	const body = merged_block.statements.map((statement) => `    ${statement}`).join("\n");
+	return blocks.map((block) => make_runtime_effect_block(block, bindings)).join("\n");
+}
+function make_runtime_effect_block(block, bindings) {
+	const dep_reads = block.deps.map((dep) => `  ${dep};`);
+	const body = block.statements.map((statement) => `    ${statement}`).join("\n");
 	return [
 		"",
 		"$effect(() => {",
@@ -32,14 +35,6 @@ function make_runtime_block_with_bindings(blocks, bindings) {
 		""
 	].join("\n");
 }
-function merge_effect_blocks(blocks) {
-	const statements = blocks.flatMap((block) => block.statements);
-	const deps = blocks.flatMap((block) => block.deps);
-	return {
-		statements,
-		deps: [...new Set(deps)]
-	};
-}
 //#endregion
 //#region src/script-transform/lower.ts
 /**
@@ -58,7 +53,7 @@ function lower_statement(stmt, content, context) {
 	return {
 		temps: [],
 		rewritten_text: "",
-		effect_blocks: [make_effect_block([text], collect_deps(text))],
+		effect_blocks: [make_effect_block([wrap_yield_stars_in_node(stmt, content, context)], collect_deps(text))],
 		range: {
 			start: stmt.getFullStart(),
 			end: stmt.end
@@ -109,7 +104,7 @@ function lower_expression_statement(stmt, content, context) {
 		return {
 			temps: [],
 			rewritten_text: "",
-			effect_blocks: [make_effect_block([text + ";"], collect_deps(text))],
+			effect_blocks: [make_effect_block([wrap_yield_text(text, context) + ";"], collect_deps(text))],
 			range: {
 				start: stmt.getFullStart(),
 				end: stmt.end
@@ -124,7 +119,7 @@ function lower_expression_statement(stmt, content, context) {
 			return {
 				temps: [],
 				rewritten_text: "",
-				effect_blocks: [make_effect_block([`${target} = ${yield_text};`], collect_deps(yield_text, target_names))],
+				effect_blocks: [make_effect_block([`${target} = ${wrap_yield_text(yield_text, context)};`], collect_deps(yield_text, target_names))],
 				range: {
 					start: stmt.getStart(),
 					end: stmt.end
@@ -185,7 +180,7 @@ function lower_expression_yields(expr, content, hint, context) {
 				type: type_helper.type
 			});
 		} else temps.push({ name: temp_name });
-		statements.push(`${temp_name} = ${yield_text};`);
+		statements.push(`${temp_name} = ${wrap_yield_text(yield_text, context)};`);
 		deps.push(...collect_deps(yield_text));
 		replacements.push({
 			start: node.getStart(),
@@ -238,7 +233,7 @@ function make_awaited_yield_expression(node, content, hint, context) {
 	const helper_id = make_script_effect_id(node, context);
 	const deps_text = `[${collect_deps(yield_text).join(", ")}]`;
 	return {
-		declaration: `function* ${helper_name}() { return (${yield_text}); }`,
+		declaration: `function* ${helper_name}() { return (${wrap_yield_text(yield_text, context)}); }`,
 		expression: [
 			`await ${context.dispatcher_name}().promise({`,
 			`id: ${JSON.stringify(helper_id)}, `,
@@ -253,11 +248,30 @@ function make_yield_type_helper(yield_text, hint, context) {
 	const helper_name = context.next_type_helper_name(hint);
 	return {
 		declaration: `function ${helper_name}() { return (${strip_yield_star(yield_text)}); }`,
-		type: `${context.effect_name}.Success<ReturnType<typeof ${helper_name}>> | undefined`
+		type: `${context.yield_success_name}<ReturnType<typeof ${helper_name}>> | undefined`
 	};
 }
 function strip_yield_star(yield_text) {
-	return yield_text.replace(/^yield\*\s*/, "");
+	return yield_text.replace(/^yield\s*\*\s*/, "");
+}
+function wrap_yield_text(yield_text, context) {
+	return `yield* ${context.yieldable_name}(${strip_yield_star(yield_text)})`;
+}
+function wrap_yield_stars_in_node(node, content, context) {
+	const replacements = [];
+	collect_yield_star_nodes(node, (yield_node) => {
+		const yield_text = slice_start(content, yield_node).trim();
+		replacements.push({
+			start: yield_node.getStart(),
+			end: yield_node.end,
+			text: wrap_yield_text(yield_text, context)
+		});
+	});
+	replacements.sort((a, b) => b.start - a.start);
+	const offset = node.getFullStart();
+	let text = slice(content, node);
+	for (const replacement of replacements) text = text.slice(0, replacement.start - offset) + replacement.text + text.slice(replacement.end - offset);
+	return text.trim();
 }
 function make_script_effect_id(expr, context) {
 	return `${context.filename}:${expr.getStart()}:${expr.end}`;
@@ -341,7 +355,7 @@ function transform_script_effect(content, filename, options = {}) {
 	const emit_types = options.emit_types ?? true;
 	let has_effect = false;
 	let uses_dispatcher_promise = false;
-	let uses_effect_types = false;
+	let uses_yield_success_types = false;
 	/** Phase 1: detect imports already provided by the user. */
 	const has_effect_import = has_local_import_binding(source_file, "effect", "Effect");
 	const has_dispatcher_import = has_local_import_binding(source_file, "svelte-effect-runtime/internal/generators", "get_dispatcher");
@@ -353,13 +367,17 @@ function transform_script_effect(content, filename, options = {}) {
 		dispatcher_value: name_allocator.reserve("__SER___dispatcher"),
 		effect: has_effect_import ? "Effect" : reserve_runtime_import("Effect"),
 		program: name_allocator.reserve("__SER___program"),
-		untrack: has_untrack_import ? "untrack" : reserve_runtime_import("untrack")
+		untrack: has_untrack_import ? "untrack" : reserve_runtime_import("untrack"),
+		yield_success: reserve_runtime_import("YieldSuccess"),
+		yieldable: reserve_runtime_import("ToEffect")
 	};
 	const context = {
 		filename,
 		dispatcher_name: runtime_bindings.dispatcher,
 		effect_name: runtime_bindings.effect,
 		emit_types,
+		yield_success_name: runtime_bindings.yield_success,
+		yieldable_name: runtime_bindings.yieldable,
 		next_helper_name(hint) {
 			return name_allocator.reserve(make_generated_name(hint ?? "helper", ""));
 		},
@@ -389,7 +407,7 @@ function transform_script_effect(content, filename, options = {}) {
 		}
 		effect_blocks.push(...lowered.effect_blocks);
 		uses_dispatcher_promise ||= lowered.uses_dispatcher_promise ?? false;
-		uses_effect_types ||= lowered.temps.some((temp) => temp.type?.includes(`${runtime_bindings.effect}.Success`) ?? false);
+		uses_yield_success_types ||= lowered.temps.some((temp) => temp.type?.includes(runtime_bindings.yield_success) ?? false);
 	}
 	if (!has_effect) {
 		block_refs.push({
@@ -404,8 +422,10 @@ function transform_script_effect(content, filename, options = {}) {
 	/** Phase 3: inject runtime imports after the last user import. */
 	const imports = make_imports(has_effect_import, has_dispatcher_import, has_untrack_import, runtime_bindings, {
 		needs_dispatcher: effect_blocks.length > 0 || uses_dispatcher_promise,
-		needs_effect: effect_blocks.length > 0 || uses_effect_types,
-		needs_untrack: effect_blocks.length > 0
+		needs_effect: effect_blocks.length > 0,
+		needs_untrack: effect_blocks.length > 0,
+		needs_yield_success: uses_yield_success_types,
+		needs_yieldable: effect_blocks.length > 0 || uses_dispatcher_promise
 	});
 	const last_import = [...source_file.statements].reverse().find(ts.isImportDeclaration);
 	if (imports) if (last_import) magic.appendRight(last_import.end, "\n" + imports);
@@ -424,33 +444,41 @@ function transform_script_effect(content, filename, options = {}) {
 		code,
 		blocks: block_refs,
 		map: create_source_map(magic, filename),
-		relocations: create_script_relocations(content, code, source_file)
+		relocations: create_script_relocations(content, code, source_file, runtime_bindings.yieldable)
 	};
 }
-function create_script_relocations(content, code, source_file) {
+function create_script_relocations(content, code, source_file, yieldable_name) {
 	const candidates = source_file.statements.flatMap((stmt) => {
 		const relocations = [];
 		if (contains_top_level_yield_star(stmt) && ts.isVariableStatement(stmt)) for (const decl of stmt.declarationList.declarations) collect_binding_relocation_candidates(decl.name, relocations);
 		collect_yield_star_nodes(stmt, (node) => {
-			const text = content.slice(node.getStart(), node.end).trim();
+			const expression = ts.isBinaryExpression(node) ? node.right : node;
+			const text = content.slice(expression.getStart(), expression.end).trim();
 			relocations.push({
-				originalStart: node.getStart(),
-				originalEnd: node.end,
+				originalStart: expression.getStart(),
+				originalEnd: expression.end,
 				text,
-				match: "exact"
+				match: "yield_operand",
+				wrapper: `${yieldable_name}(${text})`
 			});
 		});
 		return relocations;
 	});
 	const used_ranges = [];
+	const search_cursors = /* @__PURE__ */ new Map();
 	return candidates.flatMap((candidate) => {
-		const generated_start = find_available_generated_text(code, candidate, used_ranges);
-		if (generated_start < 0) return [];
+		const search_key = make_relocation_search_key(candidate);
+		const generated_start = find_available_generated_text(code, candidate, used_ranges, search_cursors.get(search_key) ?? 0);
+		if (generated_start < 0) {
+			search_cursors.set(search_key, code.length);
+			return [];
+		}
 		const generated_end = generated_start + candidate.text.length;
 		used_ranges.push({
 			start: generated_start,
 			end: generated_end
 		});
+		search_cursors.set(search_key, generated_end);
 		return [{
 			originalStart: candidate.originalStart,
 			originalEnd: candidate.originalEnd,
@@ -459,6 +487,9 @@ function create_script_relocations(content, code, source_file) {
 		}];
 	});
 }
+function make_relocation_search_key(candidate) {
+	return `${candidate.match}:${candidate.text}`;
+}
 function collect_binding_relocation_candidates(name, candidates) {
 	if (ts.isIdentifier(name)) {
 		candidates.push({
@@ -474,16 +505,19 @@ function collect_binding_relocation_candidates(name, candidates) {
 		collect_binding_relocation_candidates(element.name, candidates);
 	}
 }
-function find_available_generated_text(code, candidate, used_ranges) {
-	let search_start = 0;
+function find_available_generated_text(code, candidate, used_ranges, search_start) {
 	while (search_start < code.length) {
-		const index = code.indexOf(candidate.text, search_start);
+		const search_text = candidate.match === "yield_operand" ? candidate.wrapper : candidate.text;
+		if (!search_text) return -1;
+		const index = code.indexOf(search_text, search_start);
 		if (index < 0) return -1;
-		const end = index + candidate.text.length;
-		const overlaps_used_range = used_ranges.some((range) => index < range.end && end > range.start);
-		const is_text_match = candidate.match === "exact" || is_identifier_text_match(code, index, end);
-		if (!overlaps_used_range && is_text_match) return index;
-		search_start = candidate.match === "identifier" ? index + 1 : end;
+		const operand_offset = candidate.match === "yield_operand" && candidate.wrapper ? candidate.wrapper.indexOf(candidate.text) : 0;
+		const start = index + Math.max(operand_offset, 0);
+		const end = start + candidate.text.length;
+		const overlaps_used_range = used_ranges.some((range) => start < range.end && end > range.start);
+		const is_text_match = candidate.match !== "identifier" || is_identifier_text_match(code, start, end);
+		if (!overlaps_used_range && is_text_match) return start;
+		search_start = candidate.match === "identifier" ? index + 1 : index + search_text.length;
 	}
 	return -1;
 }
@@ -559,38 +593,17 @@ function make_generated_name(hint, suffix) {
 * @returns The transformed component source.
 */
 function transform_svelte_effect(content, filename = "unknown.svelte", options = {}) {
-	const script = find_script(content);
+	const script = scan_svelte_effect_source(content, filename).effect_script;
 	let combined = content;
-	if (script?.has_effect) {
+	if (script) {
+		const effect_attribute = script.effect_attribute;
+		const effect_attribute_start = effect_attribute?.start ?? script.opening_tag_end;
+		const effect_attribute_end = effect_attribute?.end ?? script.opening_tag_end;
 		const result = transform_script_effect(script.text, filename, { emit_types: script.is_typescript });
-		combined = content.slice(0, script.effect_attr_start) + content.slice(script.effect_attr_end, script.open_end) + result.code + content.slice(script.close_start);
+		combined = content.slice(0, effect_attribute_start) + content.slice(effect_attribute_end, script.opening_tag_end) + result.code + content.slice(script.closing_tag_start);
 	}
 	return { code: transform_markup_effect(combined, filename, { target: options.target }).code };
 }
-function find_script(content) {
-	for (const match of content.matchAll(/<script\b([^>]*)>([\s\S]*?)<\/script\s*>/gi)) {
-		if (match.index === void 0 || /\bmodule\b/.test(match[1] ?? "")) continue;
-		const attrs = match[1] ?? "";
-		const effect_match = /\s+effect(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s>]+))?/.exec(attrs);
-		const open_end = match.index + match[0].indexOf(">") + 1;
-		const attr_start = effect_match?.index ?? attrs.length;
-		const attr_end = attr_start + (effect_match?.[0].length ?? 0);
-		return {
-			text: match[2],
-			open_end,
-			close_start: match.index + match[0].lastIndexOf("<"),
-			has_effect: effect_match !== null,
-			effect_attr_start: match.index + 7 + attr_start,
-			effect_attr_end: match.index + 7 + attr_end,
-			is_typescript: has_typescript_lang(attrs)
-		};
-	}
-}
-function has_typescript_lang(attrs) {
-	const lang_match = /\blang\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(attrs);
-	const lang = (lang_match?.[1] ?? lang_match?.[2] ?? lang_match?.[3] ?? "").toLowerCase();
-	return lang === "ts" || lang === "typescript";
-}
 //#endregion
 export { transform_markup_effect, transform_script_effect, transform_svelte_effect };