marko 6.4.4 → 6.4.6

package/dist/debug/html.js

@@ -40,7 +40,7 @@ const Embed = "embed";
 const Lazy = "lazy";
 //#endregion
 //#region src/common/helpers.ts
-const htmlAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
+const invalidNativeAttrNameReg = /^[^a-z_]|[^a-z0-9._:-]/i;
 const knownWrongAttrs = {
 	className: "class",
 	classList: "class",
@@ -78,11 +78,11 @@ function getWrongAttrSuggestion(name) {
 		}
 	}
 }
-function stringifyClassObject(name, value) {
+function stringifyClassEntry(name, value) {
 	return value ? name : "";
 }
 const warnedStyleKeys = /* @__PURE__ */ new Set();
-function stringifyStyleObject(name, value) {
+function stringifyStyleEntry(name, value) {
 	if (/[A-Z]/.test(name) && !name.includes("-") && !warnedStyleKeys.has(name)) {
 		warnedStyleKeys.add(name);
 		console.warn(`\`${name}\` is not a CSS property name; \`style\` object keys are written verbatim, so it renders as invalid CSS. Use \`${name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()).replace(/^ms-/, "-ms-")}\`.`);
@@ -129,17 +129,17 @@ const toDelimitedString = function toDelimitedString(val, delimiter, stringify)
 function isEventHandler(name) {
 	return /^on[A-Z-]/.test(name);
 }
-function getEventHandlerName(name) {
+function getEventType(name) {
 	return name[2] === "-" ? name.slice(3) : name.slice(2).toLowerCase();
 }
 function hasKeys(obj) {
 	for (const _ in obj) return true;
 	return false;
 }
-function isVoid(value) {
+function isNullishOrFalse(value) {
 	return value == null || value === false;
 }
-function isNotVoid(value) {
+function isNotNullishOrFalse(value) {
 	return value != null && value !== false;
 }
 function isPromise(value) {
@@ -158,9 +158,9 @@ function normalizeDynamicRenderer(value) {
 }
 //#endregion
 //#region src/common/errors.ts
-const lowercaseEventHandlerReg = /^on[a-z]/;
+const lowercaseOnAttrReg = /^on[a-z]/;
 function assertValidAttrValue(name, value) {
-	if (value && typeof value !== "string" && lowercaseEventHandlerReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
+	if (value && typeof value !== "string" && lowercaseOnAttrReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
 	if (typeof value === "function") throw new Error(`The \`${name}\` attribute cannot be a function.${/Change$/.test(name) ? " A change handler is only used when its matching controllable attribute combination applies." : ""}`);
 	const unrenderable = describeUnrenderable(value);
 	if (unrenderable) throw new Error(`The \`${name}\` attribute cannot be ${unrenderable}.`);
@@ -199,7 +199,7 @@ function describeUnrenderable(value) {
 	}
 }
 function assertValidLoopKey(key, seenKeys) {
-	if (typeof key !== "string" && typeof key !== "number") throw new Error(`A \`<for>\` tag's \`by\` attribute must return a string or number for each item, but received ${key === null ? "null" : `type "${typeof key}"`}.`);
+	if (typeof key !== "string" && typeof key !== "number" || key !== key) throw new Error(`A \`<for>\` tag's \`by\` attribute must return a string or number for each item, but received ${key === null || key !== key ? key : `type "${typeof key}"`}.`);
 	if (seenKeys) {
 		if (seenKeys.has(key)) throw new Error(`A \`<for>\` tag's \`by\` attribute must return a unique value for each item, but \`${key}\` was used more than once.`);
 		seenKeys.add(key);
@@ -208,7 +208,7 @@ function assertValidLoopKey(key, seenKeys) {
 function assertValidList(value) {
 	if (value && typeof value[Symbol.iterator] !== "function") throw new Error(`A \`<for>\` tag's \`of\` attribute must be an iterable, such as an array, but received ${describeForValue(value)}.`);
 }
-function assertValidRangeStart(name, value) {
+function assertOptionalRangeNumber(name, value) {
 	if (value && (typeof value !== "number" || !isFinite(value))) throw new Error(`A \`<for>\` tag's \`${name}\` attribute must be a finite number, but received ${describeForValue(value)}.`);
 }
 function assertValidRangeBound(name, value) {
@@ -218,7 +218,7 @@ function describeForValue(value) {
 	return typeof value === "number" || typeof value === "bigint" ? `\`${value}\`` : value === null ? "null" : `type "${typeof value}"`;
 }
 function assertValidAttrName(name) {
-	if (htmlAttrNameReg.test(name)) throw new Error(`Invalid attribute name: ${JSON.stringify(name)}`);
+	if (invalidNativeAttrNameReg.test(name)) throw new Error(`Invalid attribute name: ${JSON.stringify(name)}`);
 	const suggestion = getWrongAttrSuggestion(name);
 	if (suggestion) throw new Error(`\`${name}\` is not a valid attribute, did you mean \`${suggestion}\`?`);
 }
@@ -278,34 +278,6 @@ const DYNAMIC_TAG_SCRIPT_REGISTER_ID = "_dynamicTagScript";
 const DYNAMIC_TAG_VAR_REGISTER_ID = "_dynamicTagVar";
 const PLACEHOLDER_DISMISS_REGISTER_ID = "_placeholderDismiss";
 //#endregion
-//#region src/common/for.ts
-function forIn(obj, cb) {
-	for (const key in obj) cb(key, obj[key]);
-}
-function forOf(list, cb) {
-	assertValidList(list);
-	if (list) {
-		let i = 0;
-		for (const item of list) cb(item, i++);
-	}
-}
-function forTo(to, from, step, cb) {
-	assertValidRangeBound("to", to);
-	assertValidRangeStart("from", from);
-	assertValidRangeStart("step", step);
-	const start = from || 0;
-	const delta = step || 1;
-	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
-}
-function forUntil(until, from, step, cb) {
-	assertValidRangeBound("until", until);
-	assertValidRangeStart("from", from);
-	assertValidRangeStart("step", step);
-	const start = from || 0;
-	const delta = step || 1;
-	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
-}
-//#endregion
 //#region src/common/opt.ts
 function reduce(opt, cb, acc) {
 	if (opt) {
@@ -581,15 +553,57 @@ var State$1 = class {
 	buf = [];
 	strs = /* @__PURE__ */ new Map();
 	refs = /* @__PURE__ */ new WeakMap();
-	pendingAssignments = /* @__PURE__ */ new Set();
+	deferredRefs = /* @__PURE__ */ new Set();
 	boundary;
 	channel = void 0;
 	channelDeps = null;
-	mutated = [];
+	queuedCalls = [];
+	queuedReadyCalls = [];
+	scopeRef(scope, scopeId) {
+		return this.refs.get(scope) || newScopeReference(this, scope, scopeId);
+	}
+	writeScopeProps(props, ref) {
+		return writeObjectProps(this, props, ref);
+	}
+	scopesCursor(scopeId) {
+		return scopeId + ",";
+	}
+	writeTrailing(scopesIndex) {
+		const { buf } = this;
+		if (~scopesIndex) {
+			buf[scopesIndex] = "_([" + buf[scopesIndex];
+			buf.push("])");
+		}
+		writeDeferred(this);
+		return ",0)";
+	}
+	wrapPayload(result, extras) {
+		const arrow = this.wroteUndefined ? "(_,$)=>" : "_=>";
+		this.wroteUndefined = false;
+		return extras ? arrow + result : arrow + "[" + result + "]";
+	}
+	writeScopedRegistration(val, parent, accessor, registered) {
+		const ref = new Reference(parent, accessor, this.flushId, this.buf.length);
+		ref.channel = this.channel;
+		this.refs.set(val, ref);
+		ref.debug = DEBUG.get(val);
+		const scope = registered.scope;
+		const scopeId = scope[K_SCOPE_ID];
+		trackScope(this, scope, scopeId);
+		const locals = registered.locals?.(this.boundary.state.scope);
+		if (locals) {
+			this.buf.push(registered.access + "(_(" + scopeId + ")");
+			for (const local of locals) {
+				this.buf.push(",");
+				writePlainObject(this, local, newArgReference(this, ref, local));
+			}
+		} else this.buf.push("_(" + scopeId + "," + quoteRegisterId(registered.id));
+		this.buf.push(")");
+	}
 };
 var Reference = class {
 	assignments = null;
-	calls = null;
+	deferredMembers = null;
 	scopeId = void 0;
 	channel = void 0;
 	parent;
@@ -625,111 +639,86 @@ function setDebugSlotName(obj, accessor, name) {
 		slots: { [accessor]: name }
 	});
 }
-var Serializer = class {
-	#state = new State$1();
-	pending(channel) {
-		return hasMatchingMutations(this.#state.mutated, channel?.readyId);
-	}
-	pendingReadyChannel() {
-		for (const mutation of this.#state.mutated) if (mutation.channel?.readyId) return mutation.channel;
-	}
-	stringifyScopes(flushes, boundary, channel) {
-		try {
-			this.#state.boundary = boundary;
-			this.#state.channel = channel;
-			return writeScopesRoot(this.#state, flushes);
-		} catch (err) {
-			abortRender(boundary, err);
-			return "";
-		} finally {
-			this.#state.flushId++;
-			this.#state.buf = [];
-		}
-	}
-	written(val) {
-		return this.#state.refs.has(val);
-	}
-	takeChannelDeps() {
-		const deps = this.#state.channelDeps;
-		this.#state.channelDeps = null;
-		return deps;
-	}
-	writeCall(value, object, property, channel) {
-		this.#state.mutated.push({
-			value,
-			object,
-			property,
-			channel
-		});
+function stringifyScopes(state, flushes, boundary, channel) {
+	try {
+		state.boundary = boundary;
+		state.channel = channel;
+		return writeScopesRoot(state, flushes);
+	} catch (err) {
+		abortRender(boundary, err);
+		return "";
+	} finally {
+		state.flushId++;
+		state.buf = [];
 	}
-	dropCall(value, object, property) {
-		const { mutated } = this.#state;
-		for (let i = 0; i < mutated.length; i++) {
-			const mutation = mutated[i];
-			if (mutation.value === value && mutation.object === object && mutation.property === property) {
-				mutated.splice(i, 1);
-				return true;
-			}
+}
+function pendingReadyChannel(state) {
+	const calls = state.queuedReadyCalls;
+	return calls.length ? calls[0].channel : void 0;
+}
+function takeChannelDeps(state) {
+	const deps = state.channelDeps;
+	state.channelDeps = null;
+	return deps;
+}
+function queueCall(state, value, object, method, channel) {
+	(channel?.readyId ? state.queuedReadyCalls : state.queuedCalls).push({
+		method,
+		value,
+		object,
+		channel,
+		valueId: null
+	});
+}
+function dropQueuedCall(state, value, object, method, channel) {
+	const queuedCalls = channel?.readyId ? state.queuedReadyCalls : state.queuedCalls;
+	for (let i = 0; i < queuedCalls.length; i++) {
+		const call = queuedCalls[i];
+		if (call.value === value && call.object === object && call.method === method) {
+			queuedCalls.splice(i, 1);
+			return true;
 		}
-		return false;
 	}
-};
-function register(id, val, scope, locals) {
+	return false;
+}
+function register(id, val, scope, locals, access = "_._" + toAccess(toObjectKey(id))) {
 	REGISTRY.set(val, {
 		id,
 		scope,
 		locals,
-		access: "_._" + toAccess(toObjectKey(id))
+		access
 	});
 	return val;
 }
-function getRegistered(val) {
-	const registered = REGISTRY.get(val);
-	if (registered) return {
-		id: registered.id,
-		scope: registered.scope
-	};
-}
 function writeScopesRoot(state, flushes) {
 	const { buf } = state;
 	let nextSlotId = -1;
-	let fillIndex = -1;
+	let scopesIndex = -1;
 	for (const flush of flushes) {
 		const scopeId = flush[0];
 		const scope = flush[1];
-		const ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId);
+		const ref = state.scopeRef(scope, scopeId);
 		const openIndex = buf.push("") - 1;
-		if (writeObjectProps(state, flush[2], ref)) {
-			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
-			if (fillIndex === -1) fillIndex = openIndex;
+		if (state.writeScopeProps(flush[2], ref)) {
+			buf[openIndex] = nextSlotId === -1 ? state.scopesCursor(scopeId) + "{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
+			if (scopesIndex === -1) scopesIndex = openIndex;
 			nextSlotId = scopeId + 1;
 			buf.push("}");
 		} else buf.pop();
 	}
-	if (nextSlotId !== -1) buf.push("]");
 	let extras = "";
-	if (state.pendingAssignments.size || hasChannelMutations(state)) {
-		extras = ",0)";
-		if (fillIndex !== -1) {
-			buf[fillIndex] = "_(" + buf[fillIndex];
-			buf.push(")");
-		}
-		writeAssigned(state);
-	}
+	if (state.deferredRefs.size || hasChannelCalls(state)) extras = state.writeTrailing(scopesIndex);
 	let result = extras && "(";
 	for (const chunk of buf) result += chunk;
 	result += extras;
 	if (!result) return "";
-	if (state.wroteUndefined) {
-		state.wroteUndefined = false;
-		return "(_,$)=>" + result;
-	} else return "_=>" + result;
+	return state.wrapPayload(result, extras);
 }
-function writeAssigned(state) {
+function writeDeferred(state) {
 	let sep = state.buf.length ? "," : "";
-	if (state.pendingAssignments.size) {
-		const pending = state.pendingAssignments;
-		state.pendingAssignments = /* @__PURE__ */ new Set();
+	if (state.deferredRefs.size) {
+		const pending = state.deferredRefs;
+		state.deferredRefs = /* @__PURE__ */ new Set();
 		let buf = "";
 		let hasCalls = false;
 		for (const ref of pending) {
@@ -738,77 +727,88 @@ function writeAssigned(state) {
 				ref.assignments = null;
 				sep = ",";
 			}
-			hasCalls ||= ref.calls !== null;
+			hasCalls ||= ref.deferredMembers !== null;
 		}
 		if (buf) state.buf.push(buf);
 		if (hasCalls) for (const ref of pending) {
-			if (!ref.calls) continue;
-			for (const { method, args } of ref.calls) {
-				state.buf.push((state.buf.length ? "," : "") + ref.id + "." + method + "(");
-				for (let a = 0; a < args.length; a++) {
-					if (a) state.buf.push(",");
-					writeCallArg(state, args[a]);
-				}
-				state.buf.push(")");
+			const members = ref.deferredMembers;
+			if (members) {
+				writeDeferredMembers(state, ref.id, members);
+				ref.deferredMembers = null;
 			}
-			ref.calls = null;
 		}
 	}
-	if (hasChannelMutations(state)) {
+	const readyId = state.channel?.readyId;
+	let calls = state.queuedCalls;
+	if (readyId) {
+		calls = [];
 		const remaining = [];
-		for (const mutation of state.mutated) {
-			if (!mutationMatchesReadyId(mutation, state.channel?.readyId)) {
-				remaining.push(mutation);
-				continue;
+		for (const call of state.queuedReadyCalls) (call.channel.readyId === readyId ? calls : remaining).push(call);
+		state.queuedReadyCalls = remaining;
+	} else if (calls.length) state.queuedCalls = [];
+	for (const call of calls) {
+		const objectStartIndex = state.buf.push(state.buf.length === 0 ? "" : ",");
+		if (writeProp(state, call.object, null, "")) {
+			const objectRef = state.refs.get(call.object);
+			if (!objectRef.id && !isAncestorChannelRef(state, objectRef)) {
+				objectRef.id = nextRefAccess(state);
+				state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex];
+				state.buf.push(")");
+			} else if (objectRef.id && state.buf[objectStartIndex] !== objectRef.id) {
+				state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex];
+				state.buf.push(")");
 			}
-			const hasSeen = state.refs.get(mutation.object)?.id;
-			const objectStartIndex = state.buf.push(state.buf.length === 0 ? "" : ",");
-			if (writeProp(state, mutation.object, null, "")) {
-				const objectRef = state.refs.get(mutation.object);
-				if (objectRef && objectRef.scopeId === void 0) {
-					if (!objectRef.id && !isAncestorChannelRef(state, objectRef)) {
-						objectRef.id = nextRefAccess(state);
-						state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex];
-						state.buf.push(")");
-					} else if (!hasSeen) {
-						state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex];
-						state.buf.push(")");
-					}
-				}
-			} else state.buf.push("void 0");
-			const valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
-			if (mutation.value === void 0) {} else if (writeProp(state, mutation.value, null, "")) {
-				const valueRef = typeof mutation.value === "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
-				if (valueRef && !valueRef.id && valueRef.scopeId === void 0 && !isAncestorChannelRef(state, valueRef)) {
-					valueRef.id = mutation.valueId || nextRefAccess(state);
-					state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex];
-				}
-			} else state.buf.push("void 0");
-			state.buf.push(")");
-		}
-		state.mutated = remaining;
+		} else state.buf.push("void 0");
+		state.buf.push("." + call.method + "(");
+		if (call.value !== void 0) writeCallArg(state, call.value, call.valueId);
+		state.buf.push(")");
+	}
+	if (state.deferredRefs.size) writeDeferred(state);
+}
+function writeDeferredMembers(state, id, { collection, first, rest }) {
+	if (collection instanceof Map) {
+		writeDeferredEntry(state, id, first);
+		for (const entry of rest) writeDeferredEntry(state, id, entry);
+	} else {
+		writeDeferredMember(state, id, first);
+		for (const member of rest) writeDeferredMember(state, id, member);
 	}
-	if (state.pendingAssignments.size) writeAssigned(state);
 }
-function writeCallArg(state, val) {
+function writeDeferredEntry(state, id, [key, value]) {
+	state.buf.push("," + id + ".set(");
+	if (key !== void 0 || value !== void 0) writeCallArg(state, key, null);
+	if (value !== void 0) {
+		state.buf.push(",");
+		writeCallArg(state, value, null);
+	}
+	state.buf.push(")");
+}
+function writeDeferredMember(state, id, member) {
+	state.buf.push("," + id + ".add(");
+	if (member !== void 0) writeCallArg(state, member, null);
+	state.buf.push(")");
+}
+function writeCallArg(state, val, valueId) {
+	const startIndex = state.buf.length;
 	if (val === void 0) {
 		state.wroteUndefined = true;
 		state.buf.push("$");
 	} else if (writeProp(state, val, null, "")) {
-		const ref = state.refs.get(val) || state.strs.get(val);
-		if (ref) ensureId(state, ref);
+		const ref = typeof val === "string" ? state.strs.get(val) : state.refs.get(val);
+		if (ref && !ref.id && ref.scopeId === void 0 && !isAncestorChannelRef(state, ref)) {
+			ref.id = valueId || nextRefAccess(state);
+			state.buf[startIndex] = ref.id + "=" + state.buf[startIndex];
+		}
 	} else state.buf.push("void 0");
 }
-function hasChannelMutations(state) {
-	return hasMatchingMutations(state.mutated, state.channel?.readyId);
+function hasChannelCalls(state) {
+	return hasMatchingCalls(state, state.channel?.readyId);
 }
-function hasMatchingMutations(mutated, readyId) {
-	for (const mutation of mutated) if (mutationMatchesReadyId(mutation, readyId)) return true;
+function hasMatchingCalls(state, readyId) {
+	if (!readyId) return state.queuedCalls.length > 0;
+	for (const call of state.queuedReadyCalls) if (call.channel.readyId === readyId) return true;
 	return false;
 }
-function mutationMatchesReadyId(mutation, readyId) {
-	return mutation.channel?.readyId ? mutation.channel.readyId === readyId : !readyId;
-}
 function writeProp(state, val, parent, accessor) {
 	switch (typeof val) {
 		case "string": return writeString(state, val, parent, accessor);
@@ -831,8 +831,8 @@ function writeReferenceOr(state, write, val, parent, accessor) {
 			return false;
 		}
 		if (parent && isCircular(parent, ref)) {
-			ensureId(state, ref);
-			state.pendingAssignments.add(ref);
+			ensureRefAccess(state, ref);
+			state.deferredRefs.add(ref);
 			addAssignment(ref, accessId(state, parent) + toAccess(accessor));
 			return false;
 		}
@@ -866,23 +866,8 @@ function quoteRegisterId(id) {
 }
 function writeRegistered(state, val, parent, accessor, registered) {
 	const { scope } = registered;
-	if (scope) {
-		const ref = new Reference(parent, accessor, state.flushId, state.buf.length);
-		ref.channel = state.channel;
-		state.refs.set(val, ref);
-		ref.debug = DEBUG.get(val);
-		const scopeId = scope[K_SCOPE_ID];
-		trackScope(state, scope, scopeId);
-		const locals = registered.locals?.(state.boundary.state.scope);
-		if (locals) {
-			state.buf.push(registered.access + "(_(" + scopeId + ")");
-			for (const local of locals) {
-				state.buf.push(",");
-				writePlainObject(state, local, newArgReference(state, ref, local));
-			}
-		} else state.buf.push("_(" + scopeId + "," + quoteRegisterId(registered.id));
-		state.buf.push(")");
-	} else state.buf.push(registered.access);
+	if (scope) state.writeScopedRegistration(val, parent, accessor, registered);
+	else state.buf.push(registered.access);
 	return true;
 }
 const STRING_DEDUP_LENGTH = 12;
@@ -1076,7 +1061,7 @@ function writePromise(state, val, ref) {
 	const pId = nextRefAccess(state);
 	const handle = newAsyncHandle(state, ref, pId);
 	state.buf.push("(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()");
-	val.then((v) => writeAsyncCall(state, boundary, handle, "f", v, channel, pId), (v) => writeAsyncCall(state, boundary, handle, "r", v, channel, pId));
+	val.then((v) => queueAsyncCall(state, boundary, handle, "f", v, channel, pId), (v) => queueAsyncCall(state, boundary, handle, "r", v, channel, pId));
 	boundary.startAsync();
 	return true;
 }
@@ -1095,14 +1080,18 @@ function writeMap(state, val, ref) {
 	const items = [];
 	let assignments;
 	let needsId;
-	let deferring = false;
 	let i = 0;
+	const entries = val.entries();
 	if (val.size < 25) {
-		for (let [itemKey, itemValue] of val) {
-			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue))) deferring = true;
-			if (deferring) {
-				deferCall(state, ref, "set", [itemKey, itemValue]);
-				continue;
+		for (const entry of entries) {
+			let [itemKey, itemValue] = entry;
+			if (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) {
+				deferMembers(state, ref, val, entry, entries);
+				if (!i) {
+					state.buf.push("new Map");
+					return true;
+				}
+				break;
 			}
 			if (itemKey === val) {
 				itemKey = void 0;
@@ -1112,16 +1101,20 @@ function writeMap(state, val, ref) {
 				itemValue = void 0;
 				(assignments ||= []).push("a[" + i + "][1]");
 			}
-			needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue);
+			needsId ||= isReusableMember(itemKey) || isReusableMember(itemValue);
 			i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
 		}
 		writeArrayArg(state, ref, items, assignments && "((m,a)=>(" + assignmentsToString(assignments, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map,", "new Map(", needsId);
 	} else {
-		for (let [itemKey, itemValue] of val) {
-			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue))) deferring = true;
-			if (deferring) {
-				deferCall(state, ref, "set", [itemKey, itemValue]);
-				continue;
+		for (const entry of entries) {
+			let [itemKey, itemValue] = entry;
+			if (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) {
+				deferMembers(state, ref, val, entry, entries);
+				if (!i) {
+					state.buf.push("new Map");
+					return true;
+				}
+				break;
 			}
 			if (itemKey === val) {
 				itemKey = 0;
@@ -1131,7 +1124,7 @@ function writeMap(state, val, ref) {
 				itemValue = 0;
 				(assignments ||= []).push("a[" + (i + 1) + "]");
 			}
-			needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue);
+			needsId ||= isReusableMember(itemKey) || isReusableMember(itemValue);
 			i = items.push(itemKey, itemValue);
 		}
 		writeArrayArg(state, ref, items, assignments && "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignmentsToString(assignments, "new Map") + "))(", "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(", needsId);
@@ -1146,18 +1139,21 @@ function writeSet(state, val, ref) {
 	const items = [];
 	let assignments;
 	let needsId;
-	let deferring = false;
 	let i = 0;
-	for (let item of val) {
-		if (!deferring && item !== val && isAncestorMember(state, ref, item)) deferring = true;
-		if (deferring) {
-			deferCall(state, ref, "add", [item]);
-			continue;
+	const members = val.values();
+	for (let item of members) {
+		if (item !== val && isAncestorMember(state, ref, item)) {
+			deferMembers(state, ref, val, item, members);
+			if (!i) {
+				state.buf.push("new Set");
+				return true;
+			}
+			break;
 		}
 		if (item === val) {
 			item = 0;
 			(assignments ||= []).push("i[" + i + "]");
-		} else needsId ||= isDedupedMember(item);
+		} else needsId ||= isReusableMember(item);
 		i = items.push(item);
 	}
 	writeArrayArg(state, ref, items, assignments && "((s,i)=>(" + assignmentsToString(assignments, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId);
@@ -1168,13 +1164,14 @@ function isAncestorMember(state, container, member) {
 	const ref = state.refs.get(member);
 	return ref !== void 0 && isCircular(container, ref);
 }
-function deferCall(state, ref, method, args) {
-	ensureId(state, ref);
-	(ref.calls ||= []).push({
-		method,
-		args
-	});
-	state.pendingAssignments.add(ref);
+function deferMembers(state, ref, collection, first, rest) {
+	ensureRefAccess(state, ref);
+	ref.deferredMembers = {
+		collection,
+		first,
+		rest
+	};
+	state.deferredRefs.add(ref);
 }
 function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 	if (assignsPrefix || needsId) {
@@ -1190,7 +1187,7 @@ function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 function newArgReference(state, parent, val) {
 	for (const key in val) {
 		const member = val[key];
-		if (isDedupedMember(member) && !(typeof member === "string" ? state.strs.has(member) : state.refs.has(member))) {
+		if (isReusableMember(member) && !(typeof member === "string" ? state.strs.has(member) : state.refs.has(member))) {
 			const ref = new Reference(parent, null, state.flushId, null, nextRefAccess(state));
 			state.buf.push(ref.id + "=");
 			return ref;
@@ -1198,7 +1195,7 @@ function newArgReference(state, parent, val) {
 	}
 	return new Reference(parent, null, state.flushId, state.buf.length);
 }
-function isDedupedMember(val) {
+function isReusableMember(val) {
 	switch (typeof val) {
 		case "object": return val !== null && val[K_SCOPE_ID] === void 0;
 		case "function":
@@ -1269,7 +1266,7 @@ function writeAggregateError(state, val, ref) {
 	if (inlined) {
 		const errorsRef = state.refs.get(val.errors);
 		if (errorsRef?.id) {
-			state.pendingAssignments.add(errorsRef);
+			state.deferredRefs.add(errorsRef);
 			addAssignment(errorsRef, accessId(state, ref) + toAccess("errors"));
 		}
 	}
@@ -1329,7 +1326,7 @@ function writeRequest(state, val, ref) {
 	}
 	const seenHeaders = state.refs.get(val.headers);
 	if (seenHeaders) {
-		options += sep + "headers:" + ensureId(state, seenHeaders);
+		options += sep + "headers:" + ensureRefAccess(state, seenHeaders);
 		sep = ",";
 	} else {
 		state.refs.set(val.headers, new Reference(ref, "headers", state.flushId, null));
@@ -1379,7 +1376,7 @@ function writeResponse(state, val, ref) {
 		sep = ",";
 	}
 	const seenHeaders = state.refs.get(val.headers);
-	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders);
+	if (seenHeaders) options += sep + "headers:" + ensureRefAccess(state, seenHeaders);
 	else {
 		state.refs.set(val.headers, new Reference(ref, "headers", state.flushId, null));
 		const headers = stringEntriesToHeadersInit(val.headers);
@@ -1419,15 +1416,15 @@ function writeReadableStream(state, val, ref) {
 	const iterId = nextRefAccess(state);
 	const handle = newAsyncHandle(state, ref, iterId);
 	const onFulfilled = ({ value, done }) => {
-		if (done) writeAsyncCall(state, boundary, handle, "r", value, channel);
+		if (done) queueAsyncCall(state, boundary, handle, "r", value, channel);
 		else if (!boundary.aborted) {
 			reader.read().then(onFulfilled, onRejected);
 			boundary.startAsync();
-			writeAsyncCall(state, boundary, handle, "f", value, channel);
+			queueAsyncCall(state, boundary, handle, "f", value, channel);
 		}
 	};
 	const onRejected = (reason) => {
-		writeAsyncCall(state, boundary, handle, "j", reason, channel);
+		queueAsyncCall(state, boundary, handle, "j", reason, channel);
 	};
 	state.buf.push("new ReadableStream({start(c){(async(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()]))=>{for(i of a)v=await i,i==l?c.close():c.enqueue(v)})(" + iterId + "={}).catch(e=>c.error(e))}})");
 	reader.read().then(onFulfilled, onRejected);
@@ -1448,7 +1445,7 @@ function writeGenerator(state, iter, ref) {
 			returnValue = value;
 			break;
 		}
-		needsId ||= isDedupedMember(value);
+		needsId ||= isReusableMember(value);
 		yields.push(value);
 	}
 	if (returnValue === void 0 && !yields.length) {
@@ -1468,9 +1465,9 @@ function writeGenerator(state, iter, ref) {
 		writeProp(state, returnValue, holder, "v");
 	} else if (returnValue !== void 0) {
 		state.buf.push(",");
-		if (writeProp(state, returnValue, ref, "") && isDedupedMember(returnValue)) {
+		if (writeProp(state, returnValue, ref, "") && isReusableMember(returnValue)) {
 			const retRef = typeof returnValue === "string" ? state.strs.get(returnValue) : state.refs.get(returnValue);
-			if (retRef) ensureId(state, retRef);
+			if (retRef) ensureRefAccess(state, retRef);
 		}
 	}
 	state.buf.push(")");
@@ -1485,15 +1482,15 @@ function writeAsyncGenerator(state, iter, ref) {
 	const iterId = nextRefAccess(state);
 	const handle = newAsyncHandle(state, ref, iterId);
 	const onFulfilled = ({ value, done }) => {
-		if (done) writeAsyncCall(state, boundary, handle, "r", value, channel);
+		if (done) queueAsyncCall(state, boundary, handle, "r", value, channel);
 		else if (!boundary.aborted) {
 			iter.next().then(onFulfilled, onRejected);
 			boundary.startAsync();
-			writeAsyncCall(state, boundary, handle, "f", value, channel);
+			queueAsyncCall(state, boundary, handle, "f", value, channel);
 		}
 	};
 	const onRejected = (reason) => {
-		writeAsyncCall(state, boundary, handle, "j", reason, channel);
+		queueAsyncCall(state, boundary, handle, "j", reason, channel);
 	};
 	state.buf.push("(async function*(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()])){for(i of a)v=await i,i!=l&&(yield v);return v})(" + iterId + "={})");
 	iter.next().then(onFulfilled, onRejected);
@@ -1532,12 +1529,12 @@ function writeMaybeIterableProps(state, val, ref) {
 	}
 	return sep;
 }
-function writeAsyncCall(state, boundary, handle, method, value, channel, valueId = null) {
+function queueAsyncCall(state, boundary, handle, method, value, channel, valueId = null) {
 	if (boundary.aborted) return;
-	state.mutated.push({
+	(channel?.readyId ? state.queuedReadyCalls : state.queuedCalls).push({
+		method,
 		value,
 		object: handle,
-		property: method,
 		channel,
 		valueId
 	});
@@ -1731,9 +1728,9 @@ function writeRef(state, ref) {
 		ref.pos = state.buf.length;
 		ref.flushId = state.flushId;
 		state.buf.push(ref.path);
-	} else state.buf.push(ensureId(state, ref));
+	} else state.buf.push(ensureRefAccess(state, ref));
 }
-function ensureId(state, ref) {
+function ensureRefAccess(state, ref) {
 	if (ref.scopeId !== void 0) {
 		trackChannel(state, ref);
 		return "_(" + ref.scopeId + ")";
@@ -1742,13 +1739,13 @@ function ensureId(state, ref) {
 		trackChannel(state, ref);
 		return ref.id;
 	}
-	return assignId(state, ref);
+	return claimRefAccess(state, ref);
 }
 function accessId(state, ref) {
-	const id = ensureId(state, ref);
+	const id = ensureRefAccess(state, ref);
 	return id === ref.id || ref.scopeId !== void 0 ? id : "(" + id + ")";
 }
-function assignId(state, ref) {
+function claimRefAccess(state, ref) {
 	const { pos } = ref;
 	if (pos !== null && ref.flushId === state.flushId) {
 		ref.id = nextRefAccess(state);
@@ -1845,10 +1842,10 @@ function patchIteratorNext(proto) {
 //#endregion
 //#region src/html/attrs.ts
 function _attr_class(value) {
-	return stringAttr("class", toDelimitedString(value, " ", stringifyClassObject));
+	return stringAttr("class", toDelimitedString(value, " ", stringifyClassEntry));
 }
 function _attr_style(value) {
-	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
+	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleEntry));
 }
 function _attr_option_value(value) {
 	const valueAttr = _attr("value", value);
@@ -1896,7 +1893,7 @@ function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeT
 }
 function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
 	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
-	return isNotVoid(checked) ? " checked" : "";
+	return isNotNullishOrFalse(checked) ? " checked" : "";
 }
 function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
 	const valueAttr = _attr("value", value);
@@ -1915,7 +1912,7 @@ function getCheckedValueRef(checkedValue) {
 	}
 }
 function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
-	const normalizedOpen = isNotVoid(open);
+	const normalizedOpen = isNotNullishOrFalse(open);
 	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
 	return normalizedOpen ? " open" : "";
 }
@@ -1927,7 +1924,7 @@ function _style_html(decls) {
 	return `<style${_attr_nonce()} class=${id}>.${id}~*{${decls}}</style>`;
 }
 function _attr(name, value) {
-	return isVoid(value) ? "" : nonVoidAttr(name, value);
+	return isNullishOrFalse(value) ? "" : stringifyAttr(name, value);
 }
 function _attr_and(name, value, attr) {
 	return value ? attr : _attr(name, value);
@@ -1984,14 +1981,14 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 				break;
 			default:
 				if (name) assertValidAttrName(name);
-				if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) {
+				if (name && !(isNullishOrFalse(value) || skip.test(name) || name === "content" && tagName !== "meta")) {
 					if (isEventHandler(name)) {
 						if (!events) {
 							events = {};
 							writeScope(scopeId, { [EventAttributes + nodeAccessor]: events });
 						}
-						events[getEventHandlerName(name)] = value;
-					} else result += nonVoidAttr(name, value);
+						events[getEventType(name)] = value;
+					} else result += stringifyAttr(name, value);
 				}
 		}
 	}
@@ -2004,7 +2001,7 @@ function _attrs_content(data, nodeAccessor, scopeId, tagName, markerGuard) {
 function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
 	const partial = {};
 	for (const name in data) {
-		const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+		const key = isEventHandler(name) ? `on-${getEventType(name)}` : name;
 		if (!skip[key]) partial[key] = data[name];
 	}
 	assertExclusiveAttrs({
@@ -2038,7 +2035,7 @@ function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, s
 function stringAttr(name, value) {
 	return value && " " + name + attrAssignment(value);
 }
-function nonVoidAttr(name, value) {
+function stringifyAttr(name, value) {
 	assertValidAttrValue(name, value);
 	switch (typeof value) {
 		case "string": return " " + name + attrAssignment(value);
@@ -2073,18 +2070,7 @@ function normalizedValueMatches(a, b) {
 	return false;
 }
 function normalizeStrAttrValue(value) {
-	return isNotVoid(value) && value !== true ? value + "" : "";
-}
-//#endregion
-//#region src/html/for.ts
-function forOfBy(by, item, index) {
-	return by ? typeof by === "string" ? item[by] : by(item, index) : index;
-}
-function forInBy(by, name, value) {
-	return by ? by(name, value) : name;
-}
-function forStepBy(by, index) {
-	return by ? by(index) : index;
+	return isNotNullishOrFalse(value) && value !== true ? value + "" : "";
 }
 //#endregion
 //#region src/html/inlined-runtimes.debug.ts
@@ -2229,13 +2215,13 @@ function _peek_scope_id() {
 	return $chunk.boundary.state.scopeId;
 }
 const kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb, cbValue) {
+function withContext(key, value, cb, cbValue, cbValue2) {
 	const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
 	const prev = ctx[key];
 	ctx[kPendingContexts]++;
 	ctx[key] = value;
 	try {
-		return cb(cbValue);
+		return cb(cbValue, cbValue2);
 	} finally {
 		ctx[kPendingContexts]--;
 		ctx[key] = prev;
@@ -2248,15 +2234,15 @@ function captureContext(chunk) {
 	};
 }
 const kBranchId = Symbol("Branch Id");
-const kIsAsync = Symbol("Is Async");
+const kAsyncContent = Symbol("Async Content");
 function isInResumedBranch() {
 	return $chunk?.context?.[kBranchId] !== void 0;
 }
-function withBranchId(branchId, cb, cbValue) {
-	return withContext(kBranchId, branchId, cb, cbValue);
+function withBranchId(branchId, cb, cbValue, cbValue2) {
+	return withContext(kBranchId, branchId, cb, cbValue, cbValue2);
 }
-function withIsAsync(async, cb, value) {
-	return withContext(kIsAsync, async, cb, value);
+function withAsyncContent(async, cb, value) {
+	return withContext(kAsyncContent, async, cb, value);
 }
 function _html(html) {
 	$chunk.writeHTML(html);
@@ -2274,9 +2260,8 @@ function mayDrop(written) {
 	return false;
 }
 function _script(scopeId, registryId, markerGuard) {
-	if (markerGuard === 0 && ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync])) _resume_branch(scopeId);
-	$chunk.boundary.state.needsMainRuntime = true;
-	$chunk.writeEffect(scopeId, registryId);
+	if (markerGuard === 0 && ($chunk.channel.readyId || $chunk.context?.[kAsyncContent])) _resume_branch(scopeId);
+	$chunk.boundary.state.queueEffect(scopeId, registryId);
 }
 function _trailers(html) {
 	$chunk.boundary.state.trailerHTML += html;
@@ -2296,27 +2281,27 @@ function _hoist(scopeId, id) {
 	getter[Symbol.iterator] = _hoist_read_error;
 	return _resume(getter, id, scopeId);
 }
-function _el_resume(scopeId, accessor, shouldResume) {
-	if (shouldResume === 0) return "";
+function _el_resume(scopeId, accessor, markerGuard) {
+	if (markerGuard === 0) return "";
 	const { state } = $chunk.boundary;
-	state.needsMainRuntime = true;
+	state.needsWalkerRuntime = true;
 	return state.mark("$", scopeId + " " + accessor);
 }
-function _text_resume(scopeId, accessor, val, shouldResume) {
-	return markText(scopeId, accessor, _escape(val), shouldResume);
+function _text_resume(scopeId, accessor, val, markerGuard) {
+	return markText(scopeId, accessor, _escape(val), markerGuard);
 }
-function _html_resume(scopeId, accessor, val, shouldResume) {
+function _html_resume(scopeId, accessor, val, markerGuard) {
 	const html = _unescaped(val);
-	if (shouldResume === 0 || !~html.indexOf("<")) return markText(scopeId, accessor, html, shouldResume);
+	if (markerGuard === 0 || !~html.indexOf("<")) return markText(scopeId, accessor, html, markerGuard);
 	const { state } = $chunk.boundary;
-	state.needsMainRuntime = true;
+	state.needsWalkerRuntime = true;
 	return state.mark("&", "") + html + state.mark("'", scopeId + " " + accessor);
 }
-function markText(scopeId, accessor, text, shouldResume) {
-	if (shouldResume === 0) return text;
+function markText(scopeId, accessor, text, markerGuard) {
+	if (markerGuard === 0) return text;
 	const { state } = $chunk.boundary;
-	state.needsMainRuntime = true;
-	return text ? (shouldResume === 2 ? "<!>" : "") + text + state.mark("$", scopeId + " " + accessor) : state.mark("%", scopeId + " " + accessor);
+	state.needsWalkerRuntime = true;
+	return text ? (markerGuard === 2 ? "<!>" : "") + text + state.mark("$", scopeId + " " + accessor) : state.mark("%", scopeId + " " + accessor);
 }
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
@@ -2327,7 +2312,7 @@ function _attr_content(nodeAccessor, scopeId, content, markerGuard) {
 	const render = normalizeServerRender(content);
 	const branchId = _peek_scope_id();
 	if (render) try {
-		_set_scope_reason(shouldResume ? CLIENT_ALL : 0);
+		_set_scope_reason(shouldResume ? ALL_GROUPS : 0);
 		if (shouldResume) withBranchId(branchId, render);
 		else render();
 	} finally {
@@ -2353,137 +2338,21 @@ function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId, node
 	if (nodeAccessor !== void 0) writeScope(parentScopeId, { [BranchScopes + nodeAccessor]: childScope });
 }
 function writeScopePassive(scopeId, partialScope) {
-	const target = $chunk.serializeState;
+	const target = $chunk.channel;
 	const scope = _scope_with_id(scopeId);
-	const passive = target.passiveScopes ||= {};
 	Object.assign(scope, partialScope);
-	passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope);
+	$chunk.boundary.state.queuePassiveScope(target, scopeId, partialScope);
 	return scope;
 }
-function _show_start(display, markerGuard, branchExprGuard, parentEndTag) {
-	if (display) {
-		if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-	} else $chunk.writeHTML("<t hidden>");
-}
-function _show_end(scopeId, accessor, display, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	const branchId = _scope_id();
-	const wrap = !display;
-	if (wrap) $chunk.writeHTML("</t>");
-	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
-}
-function _for_of(list, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	forBranches(by, (each) => each ? forOf(list, (item, index) => {
-		const itemKey = forOfBy(by, item, index);
-		each(itemKey, itemKey === index, () => cb(item, index));
-	}) : forOf(list, cb), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
-}
-function _for_in(obj, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	forBranches(by, (each) => each ? forIn(obj, (key, value) => {
-		each(forInBy(by, key, value), false, () => cb(key, value));
-	}) : forIn(obj, cb), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
-}
-function _for_to(to, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	forBranches(by, (each) => {
-		let index = 0;
-		return each ? forTo(to, from, step, (value) => {
-			const itemKey = forStepBy(by, value);
-			each(itemKey, itemKey === index++, () => cb(value));
-		}) : forTo(to, from, step, cb);
-	}, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
-}
-function _for_until(to, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	forBranches(by, (each) => {
-		let index = 0;
-		return each ? forUntil(to, from, step, (value) => {
-			const itemKey = forStepBy(by, value);
-			each(itemKey, itemKey === index++, () => cb(value));
-		}) : forUntil(to, from, step, cb);
-	}, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
-}
-function forBranches(by, iterate, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	if (by) {
-		const run = iterate;
-		const seenKeys = /* @__PURE__ */ new Set();
-		iterate = (each) => run((itemKey, sameAsIndex, render) => {
-			assertValidLoopKey(itemKey, seenKeys);
-			if (each) each(itemKey, sameAsIndex, render);
-			else render();
-		});
-	}
-	if (branchGuard === 0) {
-		iterate(0);
-		writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, "");
-		return;
-	}
-	const { state } = $chunk.boundary;
-	const resumeKeys = markerGuard !== 0;
-	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
-	let flushBranchIds = "";
-	let loopScopes;
-	iterate((itemKey, sameAsIndex, render) => {
-		const branchId = _peek_scope_id();
-		if (resumeMarker) {
-			if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-			else {
-				$chunk.writeHTML(state.mark("[", flushBranchIds));
-				flushBranchIds = branchId + "";
-			}
-		}
-		withBranchId(branchId, () => {
-			render();
-			const branchScope = writeScope(branchId, resumeKeys && !sameAsIndex ? { [LoopKey]: itemKey } : {});
-			if (!resumeMarker) loopScopes = push(loopScopes, branchScope);
-		});
-	});
-	if (loopScopes) writeScope(scopeId, { [BranchScopes + accessor]: loopScopes });
-	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
-}
-function _if(cb, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
-	const resumeBranch = branchGuard !== 0;
-	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
-	const branchId = _peek_scope_id();
-	const chunk = $chunk;
-	const beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0;
-	const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
-	const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
-	if (beforeBranch !== void 0) applyBranchStart(chunk, beforeBranch, shouldWriteBranch);
-	if (shouldWriteBranch && (branchIndex || !resumeMarker)) writeScope(scopeId, {
-		[ConditionalRenderer + accessor]: branchIndex || void 0,
-		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
-	});
-	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
-}
-function deferBranchStart(chunk) {
-	const beforeBranch = chunk.html;
-	chunk.html = "";
-	return beforeBranch;
-}
-function applyBranchStart(chunk, beforeBranch, rendered) {
-	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
-}
-function resumesMarker(markerGuard, branchExprGuard, parentEndTag) {
-	return markerGuard !== 0 && (!parentEndTag || branchExprGuard !== 0);
-}
-function writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, branchIds) {
-	const endTag = parentEndTag || "";
-	if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) {
-		const { state } = $chunk.boundary;
-		const mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
-		$chunk.writeHTML(mark + endTag);
-	} else if (markerGuard !== 0) $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
-	else $chunk.writeHTML(endTag);
-}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
-	const target = $chunk.serializeState;
+	const target = $chunk.channel;
 	const scope = scopeWithId(state, scopeId);
-	const pending = target.writeScopes[scopeId];
-	state.needsMainRuntime = true;
+	state.needsWalkerRuntime = true;
 	countResumeWrite($chunk);
+	writeAsyncVisits($chunk);
 	Object.assign(scope, partialScope);
-	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
-	else target.writeScopes[scopeId] = partialScope;
-	target.flushScopes = true;
+	state.queueScope(target, scopeId, partialScope);
 	return scope;
 };
 writeScope = ((writeScope) => (scopeId, partialScope, file, loc, vars) => {
@@ -2505,18 +2374,18 @@ function scopeWithId(state, scopeId) {
 }
 function _subscribe(subscribers, scope, resumeId, markerGuard) {
 	if (subscribers) {
-		const { boundary, serializeState } = $chunk;
+		const { boundary, channel } = $chunk;
 		const { serializer } = boundary.state;
-		if (!serializeState.readyId && !serializer.written(subscribers)) subscribers.add(scope);
+		if (!channel.readyId && !serializer.refs.has(subscribers)) subscribers.add(scope);
 		else if (resumeId) _script(scope[K_SCOPE_ID], resumeId, markerGuard);
-		else serializer.writeCall(scope, subscribers, "add", serializeState);
-		if (boundary.withinCatch) (boundary.subscribed ||= []).push(subscribers, scope, serializeState);
+		else queueCall(serializer, scope, subscribers, "add", channel);
+		if (boundary.withinCatch) (boundary.subscribed ||= []).push(subscribers, scope, channel);
 	}
 	return scope;
 }
-const CLIENT_ALL = 715827883;
-function maskGroup(mask, group) {
-	return mask === 715827883 ? 1 : typeof mask === "number" ? group < 15 ? mask >>> 1 + 2 * group & 3 : 0 : mask[group] ?? 0;
+const ALL_GROUPS = 715827883;
+function getGroupReason(reason, group) {
+	return reason === 715827883 ? 1 : typeof reason === "number" ? group < 15 ? reason >>> 1 + 2 * group & 3 : 0 : reason[group] ?? 0;
 }
 function _set_scope_reason(reason) {
 	$chunk.boundary.state.scopeReason = reason;
@@ -2526,18 +2395,18 @@ function _scope_reason() {
 	$chunk.boundary.state.scopeReason = void 0;
 	return reason;
 }
-function _write_if(condition, key) {
-	return condition && maskGroup(condition, key) ? 1 : void 0;
+function _write_if(reason, group) {
+	return reason && getGroupReason(reason, group) ? 1 : void 0;
 }
-function _write_guard(condition, key) {
-	return _write_if(condition, key) || 0;
+function _write_guard(reason, group) {
+	return _write_if(reason, group) || 0;
 }
 function writeWaitReady(readyId, renderer, input) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const body = new Chunk(boundary, null, chunk.context, {
 		readyId,
-		parent: chunk.serializeState,
+		parent: chunk.channel,
 		resumes: "",
 		writeScopes: {},
 		flushScopes: false
@@ -2549,209 +2418,58 @@ function writeWaitReady(readyId, renderer, input) {
 		body.deferOwnReady();
 		chunk.deferredReady = push(chunk.deferredReady, body);
 	} else {
-		bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
+		bodyEnd.next = chunk.forkRest(boundary);
 		chunk.next = body;
 	}
 }
-function _await(scopeId, accessor, promise, content, markerGuard) {
-	const resumeMarker = markerGuard !== 0;
-	if (!isPromise(promise)) {
-		if (resumeMarker) {
-			const branchId = _peek_scope_id();
-			$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-			withBranchId(branchId, content, promise);
-			$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
-		} else content(promise);
-		return;
-	}
-	const chunk = $chunk;
-	const { boundary } = chunk;
-	const startId = _peek_scope_id();
-	const after = chunk.next = $chunk = chunk.fork(boundary, chunk.next);
-	chunk.async = true;
-	captureContext(chunk);
-	boundary.startAsync();
-	promise.then((value) => {
-		if (chunk.async) {
-			chunk.async = false;
-			if (!boundary.aborted) {
-				const { state } = boundary;
-				chunk.render(() => {
-					if (resumeMarker) {
-						const branchId = _peek_scope_id();
-						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
-						withBranchId(branchId, () => withIsAsync({ parent: getAsyncContent(chunk) }, content, value));
-						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
-					} else {
-						const renderedSince = _peek_scope_id() !== startId;
-						const async = { parent: getAsyncContent(chunk) };
-						withIsAsync(async, content, value);
-						async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "";
-						if (async.resumed) $chunk.writeHTML(async.visit);
-						async.end = $chunk;
-					}
-				});
-				if (!chunk.async && boundary.pendingReorders?.delete(chunk)) state.reorder(chunk);
-				boundary.endAsync();
-			}
-		}
-	}, (err) => {
-		chunk.async = false;
-		boundary.abort(err);
-	});
+function deferBranchStart(chunk) {
+	const beforeBranch = chunk.html;
+	chunk.html = "";
+	return beforeBranch;
 }
-function _try(scopeId, accessor, content, placeholderContent, catchContent, placeholderId, catchId) {
-	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
-	const branchId = _peek_scope_id();
-	const chunk = $chunk;
-	const { boundary } = chunk;
-	const { state } = boundary;
-	const { resumeWrites } = boundary;
-	const beforeBranch = deferBranchStart(chunk);
-	const renderers = () => writeTryRenderers(branchId, catchContent && _resume(catchContent, catchId), placeholderContent && _resume(placeholderContent, placeholderId));
-	const renderersWritten = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, branchId, renderers);
-	const rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
-	applyBranchStart(chunk, beforeBranch, rendered);
-	if (!rendered) return;
-	if (!renderersWritten) renderers();
-	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
-}
-function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
-	const chunk = $chunk;
-	const { boundary } = chunk;
-	const body = chunk.fork(boundary, null);
-	if (body === body.render(content)) {
-		chunk.append(body);
-		return;
-	}
-	chunk.next = $chunk = chunk.fork(boundary, chunk.next);
-	captureContext(chunk);
-	chunk.placeholder = {
-		body,
-		render: placeholder,
-		branchId,
-		scopeId,
-		placeholderBranchId
-	};
-}
-function tryBoundary(content, catchContent, branchId, renderers) {
-	const chunk = $chunk;
-	const { boundary } = chunk;
-	const { state } = boundary;
-	const catchBoundary = new Boundary(state, void 0, boundary);
-	if (catchContent) catchBoundary.withinCatch = true;
-	const body = chunk.fork(catchBoundary, null);
-	const bodyEnd = body.render(() => withBranchId(branchId, content));
-	if (catchBoundary.aborted) {
-		if (!catchContent) throw catchBoundary.reason;
-		catchContent(catchBoundary.reason);
-		return true;
-	}
-	if (body === bodyEnd) {
-		chunk.append(body);
-		return false;
-	}
-	const renderersAtSettle = !catchBoundary.resumeWrites;
-	const bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
-	chunk.next = body;
-	boundary.startAsync();
-	const reorderId = catchContent ? state.nextReorderId() : "";
-	if (reorderId) {
-		chunk.catchRange = {
-			id: reorderId,
-			end: bodyEnd
-		};
-		captureContext(chunk);
-	}
-	catchBoundary.onNext = () => {
-		if (boundary.aborted) return;
-		if (catchBoundary.aborted) {
-			if (!reorderId) {
-				boundary.abort(catchBoundary.reason);
-				return;
-			}
-			const streamed = !chunk.catchRange;
-			const catchChunk = chunk.fork(boundary, null);
-			chunk.catchRange = null;
-			if (!renderersAtSettle) catchChunk.render(clearTryRenderers, branchId);
-			const inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
-			if (boundary.aborted) return;
-			if (bodyEnd.consumed || !inOrder) catchChunk.reorderBranch = branchId;
-			if (bodyEnd.consumed) {
-				catchChunk.reorderId = reorderId;
-				state.reorder(catchChunk);
-			} else {
-				let reorder = null;
-				if (!inOrder) reorder = catchChunk;
-				else if (streamed) reorder = chunk.fork(boundary, null);
-				if (reorder) reorder.reorderId = reorderId;
-				const endMarker = state.mark("!", reorderId);
-				let cut = body;
-				while (cut.consumed) cut = cut.next;
-				cut.async = false;
-				cut.next = inOrder ? catchChunk : bodyNext;
-				cut.html = streamed ? endMarker : inOrder ? "" : state.mark("!^", reorderId) + endMarker;
-				cut.scripts = cut.effects = cut.lastEffect = "";
-				cut.placeholder = cut.reorderId = cut.catchRange = null;
-				cut.deferredReorder = reorder;
-				if (inOrder) catchChunk.next = bodyNext;
-			}
-			boundary.endAsync();
-		} else if (!catchBoundary.count) {
-			if (renderersAtSettle && catchBoundary.resumeWrites) bodyEnd.render(renderers);
-			chunk.catchRange = null;
-			boundary.endAsync();
-		} else boundary.onNext();
-	};
-	return renderersAtSettle;
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
 }
 function unsubscribe(subscribed, serializer) {
 	for (let i = 0; i < subscribed.length; i += 3) {
 		const subscribers = subscribed[i];
 		const scope = subscribed[i + 1];
-		if (!serializer.written(subscribers)) subscribers.delete(scope);
-		else if (!serializer.dropCall(scope, subscribers, "add")) serializer.writeCall(scope, subscribers, "delete", subscribed[i + 2]);
+		if (!serializer.refs.has(subscribers)) subscribers.delete(scope);
+		else {
+			const channel = subscribed[i + 2];
+			if (!dropQueuedCall(serializer, scope, subscribers, "add", channel)) queueCall(serializer, scope, subscribers, "delete", channel);
+		}
 	}
 }
-function clearTryRenderers(branchId) {
-	writeScope(branchId, {
-		[CatchContent]: 0,
-		[PlaceholderContent]: _scope_with_id(branchId)["#PlaceholderContent"] && 0
-	});
-}
-function writeTryRenderers(branchId, catchContent, placeholderContent) {
-	writeScope(branchId, {
-		[CatchContent]: catchContent,
-		[PlaceholderContent]: placeholderContent
-	});
-}
 const NOOP$2 = () => {};
 function countResumeWrite(chunk) {
 	for (let boundary = chunk.boundary; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+}
+function writeAsyncVisits(chunk) {
 	for (let async = getAsyncContent(chunk); async && !async.resumed; async = async.parent) {
 		async.resumed = true;
 		async.end?.writeHTML(async.visit);
 	}
 }
 function getAsyncContent(chunk) {
-	return chunk.context?.[kIsAsync];
+	return chunk.context?.[kAsyncContent];
 }
 var State = class {
 	tagId = 1;
 	scopeId = 1;
 	reorderId = 1;
 	readyGate = 1;
-	hasGlobals = false;
-	needsMainRuntime = false;
-	hasMainRuntime = false;
-	hasReadyRuntime = false;
+	hasWrittenGlobals = false;
+	needsWalkerRuntime = false;
+	hasWalkerRuntime = false;
+	hasWrittenReady = false;
 	hasReorderRuntime = false;
 	hasWrittenResume = false;
 	walkOnNextFlush = false;
 	trailerHTML = "";
 	resumes = "";
 	nonceAttr = "";
-	serializer = new Serializer();
+	serializer = new State$1();
 	writeReorders = null;
 	scopes = /* @__PURE__ */ new Map();
 	scope = (scopeId) => scopeWithId(this, scopeId);
@@ -2764,7 +2482,7 @@ var State = class {
 		this.$global = $global;
 		if ($global.cspNonce) this.nonceAttr = " nonce" + attrAssignment($global.cspNonce);
 	}
-	flushChunk(html, scripts, pending) {
+	joinFlush(html, scripts, pending) {
 		const { $global, nonceAttr } = this;
 		const { __flush__ } = $global;
 		if (scripts) html += "<script" + nonceAttr + ">" + scripts + "<\/script>";
@@ -2777,6 +2495,32 @@ var State = class {
 	walkScript() {
 		return this.runtimePrefix + ".w()";
 	}
+	addResumes(channel, resumes) {
+		channel.resumes = concatSequence(channel.resumes, resumes);
+	}
+	queueScope(target, scopeId, partialScope) {
+		const pending = target.writeScopes[scopeId];
+		if (pending && pending !== partialScope) Object.assign(pending, partialScope);
+		else target.writeScopes[scopeId] = partialScope;
+		target.flushScopes = true;
+	}
+	queuePassiveScope(target, scopeId, partialScope) {
+		const passive = target.passiveScopes ||= {};
+		passive[scopeId] = Object.assign(passive[scopeId] || {}, partialScope);
+	}
+	queueEffect(scopeId, registryId) {
+		this.needsWalkerRuntime = true;
+		$chunk.writeEffect(scopeId, registryId);
+	}
+	serializeFlush(boundary) {
+		flushSerializer(boundary, this);
+	}
+	runtimeScript() {
+		return WALKER_RUNTIME_CODE + "(\"" + this.$global.runtimeId + "\")(\"" + this.$global.renderId + "\")";
+	}
+	keepsTryMarks(chunk, resumeWrites) {
+		return chunk !== $chunk || chunk.boundary.resumeWrites !== resumeWrites;
+	}
 	resumeScript(resumes) {
 		if (this.hasWrittenResume) return this.runtimePrefix + ".r.push(" + resumes + ")";
 		this.hasWrittenResume = true;
@@ -2793,16 +2537,16 @@ var State = class {
 	reorder(chunk) {
 		if (this.writeReorders) this.writeReorders.push(chunk);
 		else {
-			this.needsMainRuntime = true;
+			this.needsWalkerRuntime = true;
 			this.writeReorders = [chunk];
 		}
 	}
-	writeReady(id, resumes) {
+	readyScript(id, resumes) {
 		const readyKey = toObjectKey(id);
 		if (this.readyIds?.has(id)) return this.readyAccess(readyKey) + ".push(" + resumes + ")";
 		(this.readyIds ||= /* @__PURE__ */ new Set()).add(id);
-		if (this.hasReadyRuntime) return this.readyAccess(readyKey) + "=[" + resumes + "]";
-		this.hasReadyRuntime = true;
+		if (this.hasWrittenReady) return this.readyAccess(readyKey) + "=[" + resumes + "]";
+		this.hasWrittenReady = true;
 		return this.runtimePrefix + ".b={" + readyKey + ":[" + resumes + "]}";
 	}
 	readyAccess(readyKey) {
@@ -2862,7 +2606,7 @@ var Boundary = class {
 		this.abort(event.target.reason);
 	}
 	flush() {
-		if (!this.aborted) flushSerializer(this, this.state);
+		if (!this.aborted) this.state.serializeFlush(this);
 		return this.count ? 1 : this.aborted ? 2 : 0;
 	}
 	startAsync() {
@@ -2893,21 +2637,25 @@ var Chunk = class Chunk {
 	boundary;
 	next;
 	context;
-	serializeState;
-	constructor(boundary, next, context, serializeState) {
+	channel;
+	constructor(boundary, next, context, channel) {
 		this.boundary = boundary;
 		this.next = next;
 		this.context = context;
-		this.serializeState = serializeState;
+		this.channel = channel;
 	}
 	fork(boundary, next) {
-		return new Chunk(boundary, next, this.context, this.serializeState);
+		return new Chunk(boundary, next, this.context, this.channel);
+	}
+	forkRest(boundary) {
+		return $chunk = this.fork(boundary, this.next);
 	}
 	writeHTML(html) {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
 		countResumeWrite(this);
+		writeAsyncVisits(this);
 		if (this.lastEffect === registryId) this.effects = concatEffects(this.effects, scopeId + "");
 		else {
 			this.lastEffect = registryId;
@@ -2935,7 +2683,7 @@ var Chunk = class Chunk {
 		return deferredReady;
 	}
 	deferOwnReady() {
-		if (this.serializeState.readyId && (this.effects || this.scripts || this.serializeState.flushScopes)) {
+		if (this.channel.readyId && (this.effects || this.scripts || this.channel.flushScopes)) {
 			const deferred = this.fork(this.boundary, null);
 			deferred.effects = this.effects;
 			deferred.scripts = this.scripts;
@@ -2985,12 +2733,12 @@ var Chunk = class Chunk {
 		this.writeHTML(state.mark("!^", reorderId));
 		const { effects } = this;
 		const beforeBranch = deferBranchStart(this);
-		if (this.render(() => withBranchId(placeholderBranchId, placeholder.render)) !== this) this.boundary.abort(/* @__PURE__ */ new Error("An @placeholder cannot contain async content."));
+		if (this.render(withBranchId, placeholderBranchId, placeholder.render) !== this) this.boundary.abort(/* @__PURE__ */ new Error("An @placeholder cannot contain async content."));
 		if (this.boundary.aborted) return true;
 		const stateful = this.effects !== effects;
 		applyBranchStart(this, beforeBranch, stateful);
 		if (stateful) {
-			this.render(() => writeScope(branchId, { [PlaceholderBranch]: scopeWithId(state, placeholderBranchId) }));
+			this.render(writeScope, branchId, { [PlaceholderBranch]: scopeWithId(state, placeholderBranchId) });
 			this.writeHTML(state.mark("]", scopeId + " " + (PlaceholderBranch + branchId) + " " + placeholderBranchId));
 			dismissChunk(end, body).writeEffect(branchId, PLACEHOLDER_DISMISS_REGISTER_ID);
 		}
@@ -3024,12 +2772,12 @@ var Chunk = class Chunk {
 		let heldEffects = this.heldEffects;
 		let deferredReady;
 		this.heldEffects = null;
-		if (this.serializeState.readyId && this.effects) followHeldEffects(this);
+		if (this.channel.readyId && this.effects) followHeldEffects(this);
 		while (cur.next && !cur.async) {
 			cur.markCatchRange();
 			cur.queueDeferredReorder();
 			html += cur.html;
-			if (cur.serializeState.readyId) deferredReady = push(deferredReady, cur);
+			if (cur.channel.readyId) deferredReady = push(deferredReady, cur);
 			else {
 				if (cur.effects) {
 					if (effectsEnd && effectsEnd.boundary !== cur.boundary) {
@@ -3047,7 +2795,7 @@ var Chunk = class Chunk {
 		}
 		cur.deferOwnReady();
 		if (effects) {
-			if (cur.serializeState.readyId) heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects);
+			if (cur.channel.readyId) heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects);
 			else if (effectsEnd.boundary !== cur.boundary) {
 				heldEffects = holdEffectsOn(heldEffects, effectsEnd, effects);
 				if (isWithin(cur.boundary, effectsEnd.boundary)) cur.lastEffect ||= effectsEnd.lastEffect;
@@ -3062,11 +2810,11 @@ var Chunk = class Chunk {
 		cur.scripts = concatScripts(scripts, cur.scripts);
 		return cur;
 	}
-	render(content, val) {
+	render(content, val, val2) {
 		const prev = $chunk;
 		$chunk = this;
 		try {
-			content(val);
+			content(val, val2);
 			return $chunk;
 		} catch (err) {
 			this.boundary.abort(err);
@@ -3076,8 +2824,8 @@ var Chunk = class Chunk {
 		}
 	}
 	flushReadyScripts(boundary, reservations, holdEffects) {
-		const { serializeState } = this;
-		const { readyId } = serializeState;
+		const { channel } = this;
+		const { readyId } = channel;
 		let scripts = "";
 		const held = this.takeDeferredReady();
 		if (held) for (const chunk of Array.isArray(held) ? held : [held]) {
@@ -3087,46 +2835,46 @@ var Chunk = class Chunk {
 		}
 		if (readyId && !this.async) {
 			const { state } = boundary;
-			flushSerializer(boundary, serializeState);
-			const deps = state.serializer.takeChannelDeps();
+			flushSerializer(boundary, channel);
+			const deps = takeChannelDeps(state.serializer);
 			const effects = holdEffects ? "" : this.effects;
-			const { resumes } = serializeState;
+			const { resumes } = channel;
 			const chunkScripts = this.scripts;
-			serializeState.resumes = this.scripts = "";
+			channel.resumes = this.scripts = "";
 			if (effects) this.effects = this.lastEffect = "";
 			if (resumes || effects) {
-				state.needsMainRuntime = true;
+				state.needsWalkerRuntime = true;
 				const batch = concatSequence(depsMarker(deps), concatSequence(resumes, effects && `"${effects}"`));
 				if (reservations) {
 					const gate = state.readyGate++;
-					reservations.push(state.writeReady(readyId, gate + ""));
+					reservations.push(state.readyScript(readyId, gate + ""));
 					scripts = concatScripts(scripts, "(b=>b.splice(b.indexOf(" + gate + "),1," + batch + "))(" + state.readyAccess(toObjectKey(readyId)) + ")");
-				} else scripts = concatScripts(scripts, state.writeReady(readyId, batch));
+				} else scripts = concatScripts(scripts, state.readyScript(readyId, batch));
 			}
 			scripts = concatScripts(scripts, chunkScripts);
 		}
 		return scripts;
 	}
-	flushScript(boundary) {
+	flush(boundary) {
 		const { state } = boundary;
-		const { $global, runtimePrefix } = state;
+		const { runtimePrefix } = state;
 		let needsWalk = state.walkOnNextFlush;
 		if (needsWalk) state.walkOnNextFlush = false;
 		flushSerializer(boundary, state);
 		let readyResumeScripts = this.flushReadyScripts(boundary, void 0, this.async);
-		for (let channel; !boundary.aborted && (channel = state.serializer.pendingReadyChannel());) {
-			const resumes = state.serializer.stringifyScopes([], boundary, channel);
-			const deps = state.serializer.takeChannelDeps();
-			state.needsMainRuntime = true;
-			readyResumeScripts = concatScripts(readyResumeScripts, state.writeReady(channel.readyId, concatSequence(depsMarker(deps), resumes)));
+		for (let channel; !boundary.aborted && (channel = pendingReadyChannel(state.serializer));) {
+			const resumes = stringifyScopes(state.serializer, [], boundary, channel);
+			const deps = takeChannelDeps(state.serializer);
+			state.needsWalkerRuntime = true;
+			readyResumeScripts = concatScripts(readyResumeScripts, state.readyScript(channel.readyId, concatSequence(depsMarker(deps), resumes)));
 		}
 		if (readyResumeScripts) needsWalk = true;
 		const effects = this.async ? "" : joinHeldEffects(this.takeHeldEffects(), this.effects);
 		let { html, scripts } = this;
 		if (html && state.hasReorderRuntime) html = state.mark("*", "") + html;
-		if (state.needsMainRuntime && !state.hasMainRuntime) {
-			state.hasMainRuntime = true;
-			scripts = concatScripts(scripts, WALKER_RUNTIME_CODE + "(\"" + $global.runtimeId + "\")(\"" + $global.renderId + "\")");
+		if (state.needsWalkerRuntime && !state.hasWalkerRuntime) {
+			state.hasWalkerRuntime = true;
+			scripts = concatScripts(scripts, state.runtimeScript());
 		}
 		scripts = concatScripts(scripts, readyResumeScripts);
 		if (effects) {
@@ -3203,10 +2951,10 @@ var Chunk = class Chunk {
 	}
 	flushHTML(boundary) {
 		const { state } = boundary;
-		this.flushScript(boundary);
+		this.flush(boundary);
 		const { html, scripts } = this;
 		this.html = this.scripts = "";
-		return state.flushChunk(html, scripts, boundary.count);
+		return state.joinFlush(html, scripts, boundary.count);
 	}
 };
 function renderReorderPlaceholders(reorder, reorders) {
@@ -3228,7 +2976,7 @@ function followHeldEffects(chunk) {
 	}
 }
 function lastHeldOf(held, cur) {
-	return cur.serializeState === held.serializeState && cur.boundary === held.boundary ? cur : held;
+	return cur.channel === held.channel && cur.boundary === held.boundary ? cur : held;
 }
 function holdEffectsOn(heldEffects, chunk, effects) {
 	chunk.effects = effects;
@@ -3239,7 +2987,7 @@ function isWithin(boundary, outer) {
 	return !!boundary;
 }
 function holdReorderEffects(head, boundary, effects) {
-	if (!head.serializeState.readyId) {
+	if (!head.channel.readyId) {
 		if (head.effects) head.heldEffects = holdEffectsOn(head.heldEffects, head.fork(head.boundary, null), head.effects);
 		head.effects = head.lastEffect = "";
 	}
@@ -3251,13 +2999,12 @@ function joinHeldEffects(heldEffects, effects) {
 function joinUncaught(joined, held) {
 	return held.boundary.aborted ? joined : concatEffects(joined, held.effects);
 }
-function flushSerializer(boundary, serializeState) {
+function flushSerializer(boundary, channel) {
 	const { state } = boundary;
 	const { serializer } = state;
-	const pending = serializer.pending(serializeState);
-	if (serializeState.flushScopes || pending) {
-		const { writeScopes, passiveScopes } = serializeState;
-		const isBlockingState = serializeState !== state;
+	const pending = hasMatchingCalls(serializer, channel.readyId);
+	if (channel.flushScopes || pending) {
+		const { writeScopes, passiveScopes } = channel;
 		const flushes = [];
 		if (passiveScopes) for (const key in passiveScopes) {
 			const props = writeScopes[key];
@@ -3266,8 +3013,8 @@ function flushSerializer(boundary, serializeState) {
 				delete passiveScopes[key];
 			}
 		}
-		if (!isBlockingState && !state.hasGlobals) {
-			state.hasGlobals = true;
+		if (!channel.readyId && !state.hasWrittenGlobals) {
+			state.hasWrittenGlobals = true;
 			const globals = getFilteredGlobals(state.$global);
 			if (globals) flushes.push([
 				0,
@@ -3285,11 +3032,11 @@ function flushSerializer(boundary, serializeState) {
 			]);
 		}
 		if (flushes.length || pending) {
-			if (isBlockingState && !state.hasGlobals) flushSerializerGlobals(boundary);
-			serializeState.resumes = concatSequence(serializeState.resumes, serializer.stringifyScopes(flushes, boundary, serializeState));
+			if (channel.readyId && !state.hasWrittenGlobals) flushSerializerGlobals(boundary);
+			state.addResumes(channel, stringifyScopes(serializer, flushes, boundary, channel));
 		}
-		serializeState.writeScopes = {};
-		serializeState.flushScopes = false;
+		channel.writeScopes = {};
+		channel.flushScopes = false;
 		if (pending) state.walkOnNextFlush = true;
 	}
 }
@@ -3297,9 +3044,9 @@ function flushSerializerGlobals(boundary) {
 	const { state } = boundary;
 	const globals = getFilteredGlobals(state.$global);
 	if (globals) {
-		state.hasGlobals = true;
-		state.needsMainRuntime = true;
-		state.resumes = concatSequence(state.resumes, state.serializer.stringifyScopes([[
+		state.hasWrittenGlobals = true;
+		state.needsWalkerRuntime = true;
+		state.resumes = concatSequence(state.resumes, stringifyScopes(state.serializer, [[
 			0,
 			globals,
 			globals
@@ -3457,7 +3204,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, m
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
-				_set_scope_reason(shouldResume ? CLIENT_ALL : 0);
+				_set_scope_reason(shouldResume ? ALL_GROUPS : 0);
 				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
@@ -3489,10 +3236,10 @@ function _content_resume(id, fn, scopeId, locals) {
 	return _resume(_content(id, fn, scopeId), id, scopeId, locals);
 }
 const patchDynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (patch) => {
-	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume, tagVar) => {
+	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, markerGuard, tagVar) => {
 		const patched = patch(tag, scopeId, accessor);
 		if (patched !== tag) patched["id"] = tag;
-		return originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, resume, tagVar);
+		return originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, markerGuard, tagVar);
 	};
 })(_dynamic_tag);
 //#endregion
@@ -3777,7 +3524,7 @@ function writeLoadAsset(assetId, flush, triggers) {
 	const g = $global();
 	writeAsset(g, addAsset(g, assetId, flush, triggers));
 }
-function withPageAssets(template, runtime, assetId, runtimeId) {
+function withPageAssets(template, flush, assetId, runtimeId) {
 	return Object.assign((input) => {
 		const g = $global();
 		if (runtimeId) {
@@ -3786,7 +3533,7 @@ function withPageAssets(template, runtime, assetId, runtimeId) {
 				g.runtimeId = runtimeId;
 			} else if (g.runtimeId !== runtimeId) console.error(`A page entry compiled with runtimeId "${runtimeId}" is nested in a render using runtimeId "${g.runtimeId}", so its content cannot resume.`);
 		}
-		const asset = addAsset(g, assetId, runtime);
+		const asset = addAsset(g, assetId, flush);
 		if (g.__flush__) {
 			writeAsset(g, asset);
 			return writeWaitReady(assetId, template, input);
@@ -3886,6 +3633,326 @@ function toObjectExpression(options) {
 const SET_SCOPE_REGISTER_ID = "$compat_setScope";
 const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
+//#region src/common/for.ts
+function forIn(obj, cb) {
+	for (const key in obj) cb(key, obj[key]);
+}
+function forOf(list, cb) {
+	assertValidList(list);
+	if (list) {
+		let i = 0;
+		for (const item of list) cb(item, i++);
+	}
+}
+function forTo(to, from, step, cb) {
+	assertValidRangeBound("to", to);
+	assertOptionalRangeNumber("from", from);
+	assertOptionalRangeNumber("step", step);
+	const start = from || 0;
+	const delta = step || 1;
+	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
+}
+function forUntil(until, from, step, cb) {
+	assertValidRangeBound("until", until);
+	assertOptionalRangeNumber("from", from);
+	assertOptionalRangeNumber("step", step);
+	const start = from || 0;
+	const delta = step || 1;
+	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
+}
+//#endregion
+//#region src/html/for.ts
+function forOfBy(by, item, index) {
+	return by ? typeof by === "string" ? item[by] : by(item, index) : index;
+}
+function forInBy(by, name, value) {
+	return by ? by(name, value) : name;
+}
+function forStepBy(by, index) {
+	return by ? by(index) : index;
+}
+//#endregion
+//#region src/html/control-flow.ts
+function _show_start(display, markerGuard, branchExprGuard, parentEndTag) {
+	if (display) {
+		if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) $chunk.writeHTML($chunk.boundary.state.mark("[", ""));
+	} else $chunk.writeHTML("<t hidden>");
+}
+function _show_end(scopeId, accessor, display, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	const branchId = _scope_id();
+	const wrap = !display;
+	if (wrap) $chunk.writeHTML("</t>");
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, wrap || singleNode ? 1 : void 0, " " + branchId);
+}
+function _for_of(list, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	forBranches(by, cb, iterateForOf(list, cb, by), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
+}
+function iterateForOf(list, cb, by) {
+	return (each) => each ? forOf(list, (item, index) => {
+		const itemKey = forOfBy(by, item, index);
+		each(itemKey, itemKey === index, item, index);
+	}) : forOf(list, cb);
+}
+function _for_in(obj, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	forBranches(by, cb, iterateForIn(obj, cb, by), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
+}
+function iterateForIn(obj, cb, by) {
+	return (each) => each ? forIn(obj, (key, value) => {
+		each(forInBy(by, key, value), false, key, value);
+	}) : forIn(obj, cb);
+}
+function _for_to(to, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	forBranches(by, cb, iterateForTo(to, from, step, cb, by), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
+}
+function iterateForTo(to, from, step, cb, by) {
+	return (each) => {
+		let index = 0;
+		return each ? forTo(to, from, step, (value) => {
+			const itemKey = forStepBy(by, value);
+			each(itemKey, itemKey === index++, value);
+		}) : forTo(to, from, step, cb);
+	};
+}
+function _for_until(until, from, step, cb, by, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	forBranches(by, cb, iterateForUntil(until, from, step, cb, by), scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode);
+}
+function iterateForUntil(until, from, step, cb, by) {
+	return (each) => {
+		let index = 0;
+		return each ? forUntil(until, from, step, (value) => {
+			const itemKey = forStepBy(by, value);
+			each(itemKey, itemKey === index++, value);
+		}) : forUntil(until, from, step, cb);
+	};
+}
+function checkLoopKeys(cb, iterate) {
+	const seenKeys = /* @__PURE__ */ new Set();
+	return (each) => iterate((itemKey, sameAsIndex, a, b) => {
+		assertValidLoopKey(itemKey, seenKeys);
+		if (each) each(itemKey, sameAsIndex, a, b);
+		else cb(a, b);
+	});
+}
+function forBranches(by, cb, iterate, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	if (by) iterate = checkLoopKeys(cb, iterate);
+	if (branchGuard === 0) {
+		iterate(0);
+		writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, "");
+		return;
+	}
+	const { state } = $chunk.boundary;
+	const resumeKeys = markerGuard !== 0;
+	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
+	let flushBranchIds = "";
+	let loopScopes;
+	iterate((itemKey, sameAsIndex, a, b) => {
+		const branchId = _peek_scope_id();
+		if (resumeMarker) {
+			if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
+			else {
+				$chunk.writeHTML(state.mark("[", flushBranchIds));
+				flushBranchIds = branchId + "";
+			}
+		}
+		withBranchId(branchId, cb, a, b);
+		const branchScope = writeScope(branchId, resumeKeys && !sameAsIndex ? { [LoopKey]: itemKey } : {});
+		if (!resumeMarker) loopScopes = push(loopScopes, branchScope);
+	});
+	if (loopScopes) writeScope(scopeId, { [BranchScopes + accessor]: loopScopes });
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+}
+function _if(cb, scopeId, accessor, branchGuard, markerGuard, branchExprGuard, parentEndTag, singleNode) {
+	const resumeBranch = branchGuard !== 0;
+	const resumeMarker = resumesMarker(markerGuard, branchExprGuard, parentEndTag);
+	const branchId = _peek_scope_id();
+	const chunk = $chunk;
+	const beforeBranch = resumeMarker && resumeBranch && !singleNode ? deferBranchStart(chunk) : void 0;
+	const branchIndex = resumeBranch ? withBranchId(branchId, cb) : cb();
+	const shouldWriteBranch = resumeBranch && branchIndex !== void 0;
+	if (beforeBranch !== void 0) applyBranchStart(chunk, beforeBranch, shouldWriteBranch);
+	if (shouldWriteBranch && (branchIndex || !resumeMarker)) writeScope(scopeId, {
+		[ConditionalRenderer + accessor]: branchIndex || void 0,
+		[BranchScopes + accessor]: resumeMarker ? void 0 : writeScope(branchId, {})
+	});
+	writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, shouldWriteBranch ? " " + branchId : "");
+}
+function resumesMarker(markerGuard, branchExprGuard, parentEndTag) {
+	return markerGuard !== 0 && (!parentEndTag || branchExprGuard !== 0);
+}
+function writeBranchEnd(scopeId, accessor, branchExprGuard, markerGuard, parentEndTag, singleNode, branchIds) {
+	const endTag = parentEndTag || "";
+	if (resumesMarker(markerGuard, branchExprGuard, parentEndTag)) {
+		const { state } = $chunk.boundary;
+		const mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
+		$chunk.writeHTML(mark + endTag);
+	} else if (markerGuard !== 0) $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
+	else $chunk.writeHTML(endTag);
+}
+function _await(scopeId, accessor, promise, content, markerGuard) {
+	const resumeMarker = markerGuard !== 0;
+	if (!isPromise(promise)) {
+		if (resumeMarker) {
+			const branchId = _peek_scope_id();
+			$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
+			withBranchId(branchId, content, promise);
+			$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+		} else content(promise);
+		return;
+	}
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const startId = _peek_scope_id();
+	const after = chunk.next = chunk.forkRest(boundary);
+	chunk.async = true;
+	captureContext(chunk);
+	boundary.startAsync();
+	promise.then((value) => {
+		if (chunk.async) {
+			chunk.async = false;
+			if (!boundary.aborted) {
+				const { state } = boundary;
+				chunk.render(() => {
+					if (resumeMarker) {
+						const branchId = _peek_scope_id();
+						$chunk.writeHTML($chunk.boundary.state.mark("[", ""));
+						withBranchId(branchId, () => withAsyncContent({ parent: getAsyncContent(chunk) }, content, value));
+						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+					} else {
+						const renderedSince = _peek_scope_id() !== startId;
+						const async = { parent: getAsyncContent(chunk) };
+						withAsyncContent(async, content, value);
+						async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "";
+						if (async.resumed) $chunk.writeHTML(async.visit);
+						async.end = $chunk;
+					}
+				});
+				if (!chunk.async && boundary.pendingReorders?.delete(chunk)) state.reorder(chunk);
+				boundary.endAsync();
+			}
+		}
+	}, (err) => {
+		chunk.async = false;
+		boundary.abort(err);
+	});
+}
+function _try(scopeId, accessor, content, placeholderContent, catchContent, placeholderId, catchId) {
+	const placeholderBranchId = placeholderContent ? _scope_id() : 0;
+	const branchId = _peek_scope_id();
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const { state } = boundary;
+	const { resumeWrites } = boundary;
+	const beforeBranch = deferBranchStart(chunk);
+	const renderers = () => writeTryRenderers(branchId, catchContent && _resume(catchContent, catchId), placeholderContent && _resume(placeholderContent, placeholderId));
+	const writesRenderers = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, branchId, renderers);
+	const keepsMarks = state.keepsTryMarks(chunk, resumeWrites);
+	applyBranchStart(chunk, beforeBranch, keepsMarks);
+	if (!keepsMarks) return;
+	if (!writesRenderers) renderers();
+	$chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId));
+}
+function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const body = chunk.fork(boundary, null);
+	if (body === body.render(content)) {
+		chunk.append(body);
+		return;
+	}
+	chunk.next = chunk.forkRest(boundary);
+	captureContext(chunk);
+	chunk.placeholder = {
+		body,
+		render: placeholder,
+		branchId,
+		scopeId,
+		placeholderBranchId
+	};
+}
+function tryBoundary(content, catchContent, branchId, renderers) {
+	const chunk = $chunk;
+	const { boundary } = chunk;
+	const { state } = boundary;
+	const bodyBoundary = new Boundary(state, void 0, boundary);
+	if (catchContent) bodyBoundary.withinCatch = true;
+	const body = chunk.fork(bodyBoundary, null);
+	const bodyEnd = body.render(withBranchId, branchId, content);
+	if (bodyBoundary.aborted) {
+		if (!catchContent) throw bodyBoundary.reason;
+		catchContent(bodyBoundary.reason);
+		return true;
+	}
+	if (body === bodyEnd) {
+		chunk.append(body);
+		return false;
+	}
+	const renderersAtSettle = !bodyBoundary.resumeWrites;
+	const bodyNext = bodyEnd.next = chunk.forkRest(boundary);
+	chunk.next = body;
+	boundary.startAsync();
+	const reorderId = catchContent ? state.nextReorderId() : "";
+	if (reorderId) {
+		chunk.catchRange = {
+			id: reorderId,
+			end: bodyEnd
+		};
+		captureContext(chunk);
+	}
+	bodyBoundary.onNext = () => {
+		if (boundary.aborted) return;
+		if (bodyBoundary.aborted) {
+			if (!reorderId) {
+				boundary.abort(bodyBoundary.reason);
+				return;
+			}
+			const streamed = !chunk.catchRange;
+			const catchChunk = chunk.fork(boundary, null);
+			chunk.catchRange = null;
+			if (!renderersAtSettle) catchChunk.render(clearTryRenderers, branchId);
+			const inOrder = catchChunk === catchChunk.render(catchContent, bodyBoundary.reason);
+			if (boundary.aborted) return;
+			if (bodyEnd.consumed || !inOrder) catchChunk.reorderBranch = branchId;
+			if (bodyEnd.consumed) {
+				catchChunk.reorderId = reorderId;
+				state.reorder(catchChunk);
+			} else {
+				let reorder = null;
+				if (!inOrder) reorder = catchChunk;
+				else if (streamed) reorder = chunk.fork(boundary, null);
+				if (reorder) reorder.reorderId = reorderId;
+				const endMarker = state.mark("!", reorderId);
+				let cut = body;
+				while (cut.consumed) cut = cut.next;
+				cut.async = false;
+				cut.next = inOrder ? catchChunk : bodyNext;
+				cut.html = streamed ? endMarker : inOrder ? "" : state.mark("!^", reorderId) + endMarker;
+				cut.scripts = cut.effects = cut.lastEffect = "";
+				cut.placeholder = cut.reorderId = cut.catchRange = null;
+				cut.deferredReorder = reorder;
+				if (inOrder) catchChunk.next = bodyNext;
+			}
+			boundary.endAsync();
+		} else if (!bodyBoundary.count) {
+			if (renderersAtSettle && bodyBoundary.resumeWrites) bodyEnd.render(renderers);
+			chunk.catchRange = null;
+			boundary.endAsync();
+		} else boundary.onNext();
+	};
+	return renderersAtSettle;
+}
+function clearTryRenderers(branchId) {
+	writeScope(branchId, {
+		[CatchContent]: 0,
+		[PlaceholderContent]: _scope_with_id(branchId)["#PlaceholderContent"] && 0
+	});
+}
+function writeTryRenderers(branchId, catchContent, placeholderContent) {
+	writeScope(branchId, {
+		[CatchContent]: catchContent,
+		[PlaceholderContent]: placeholderContent
+	});
+}
+//#endregion
 //#region src/html/compat.ts
 const K_TAGS_API_STATE = Symbol();
 const COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap();
@@ -3934,7 +4001,7 @@ const compat = {
 		return function toJSON() {
 			let compatRegistered = COMPAT_REGISTRY.get(this);
 			if (!compatRegistered) {
-				const registered = getRegistered(this);
+				const registered = REGISTRY.get(this);
 				if (registered) {
 					const scopeId = registered.scope ? getScopeId(registered.scope) : void 0;
 					if (scopeId !== void 0) _script(scopeId, SET_SCOPE_REGISTER_ID);
@@ -3978,7 +4045,7 @@ const compat = {
 		let html = "";
 		let scripts = "";
 		if (reorders) for (const reorder of reorders) state.reorder(reorder);
-		if (boundary.flush() === 0) ({html, scripts} = chunk.flushScript(boundary));
+		if (boundary.flush() === 0) ({html, scripts} = chunk.flush(boundary));
 		if (boundary.aborted) throw boundary.reason;
 		if (boundary.count) throw new Error("Cannot serialize promise across tags/class compat layer.");
 		return {
@@ -4015,7 +4082,7 @@ const compat = {
 			}
 		});
 		head.render(() => {
-			_set_scope_reason(willRerender ? CLIENT_ALL : 0);
+			_set_scope_reason(willRerender ? ALL_GROUPS : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {
@@ -4063,7 +4130,7 @@ const compat = {
 	registerClassFunctions(input) {
 		for (const key in input) {
 			const value = input[key];
-			if (typeof value === "function" && !getRegistered(value)) register(RENDER_BODY_ID, value);
+			if (typeof value === "function" && !REGISTRY.has(value)) register(RENDER_BODY_ID, value);
 		}
 	},
 	registerClassFunction($global, id, fn, hostId) {