marko 6.1.2 → 6.1.3

package/dist/debug/dom.js

@@ -263,8 +263,8 @@ function schedule() {
 	}
 }
 function flushAndWaitFrame() {
-	runTask();
 	requestAnimationFrame(triggerMacroTask);
+	runTask();
 }
 function triggerMacroTask() {
 	if (!channel) {
@@ -284,29 +284,41 @@ function triggerMacroTask() {
 //#region src/dom/signals.ts
 function _let(id, fn) {
 	const valueAccessor = id.slice(0, id.lastIndexOf("/"));
-	const valueChangeAccessor = "TagVariableChange:" + valueAccessor;
 	id = +id.slice(id.lastIndexOf("/") + 1);
-	return (scope, value, valueChange) => {
+	return (scope, value) => {
 		if (rendering) {
-			if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope["#Creating"]) {
+			if (scope["#Creating"]) {
 				scope[valueAccessor] = value;
 				fn?.(scope);
 			}
-		} else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
-		else if (scope[valueAccessor] !== (scope[valueAccessor] = value) && fn) {
+		} else if ((scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn)) {
 			schedule();
 			queueRender(scope, fn, id);
 		}
 		return value;
 	};
 }
+function _let_change(id, fn) {
+	const valueAccessor = id.slice(0, id.lastIndexOf("/"));
+	const valueChangeAccessor = "TagVariableChange:" + valueAccessor;
+	const base = _let(id, fn);
+	return (scope, value, valueChange) => {
+		if (rendering) if ((scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope))) {
+			scope[valueAccessor] = value;
+			fn?.(scope);
+		} else base(scope, value);
+		else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
+		else base(scope, value);
+		return value;
+	};
+}
 function _const(valueAccessor, fn) {
-	return (scope, value) => {
-		if (scope["#Creating"] || scope[valueAccessor] !== value) {
+	return ((scope, value) => {
+		if (scope[valueAccessor] !== value || !(valueAccessor in scope)) {
 			scope[valueAccessor] = value;
 			fn?.(scope);
 		}
-	};
+	});
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
@@ -547,7 +559,10 @@ let readyLookup;
 let branchesEnabled;
 let embedEnabled;
 function enableBranches() {
-	branchesEnabled = 1;
+	if (!branchesEnabled) {
+		branchesEnabled = 1;
+		skipDestroyedRenders();
+	}
 }
 const ready = /* @__PURE__ */ ((_) => (id) => {
 	const cb = readyLookup[id];
@@ -1585,12 +1600,17 @@ function runRenders() {
 			}
 			pendingRenders[i] = item;
 		}
-		if (!render["scope"]["#ClosestBranch"]?.["#Destroyed"]) runRender(render);
+		runRender(render);
 	}
 	for (const scope of pendingScopes) scope["#Creating"] = 0;
 	pendingScopes = [];
 }
 let runRender = (render) => render["signal"](render["scope"], render["value"]);
+function skipDestroyedRenders() {
+	runRender = ((runRender) => (render) => {
+		if (!render["scope"]["#ClosestBranch"]?.["#Destroyed"]) runRender(render);
+	})(runRender);
+}
 let catchEnabled;
 function _enable_catch() {
 	if (!catchEnabled) {
@@ -1862,6 +1882,7 @@ exports._id = _id;
 exports._if = _if;
 exports._if_closure = _if_closure;
 exports._let = _let;
+exports._let_change = _let_change;
 exports._lifecycle = _lifecycle;
 exports._on = _on;
 exports._or = _or;

package/dist/debug/dom.mjs

@@ -261,8 +261,8 @@ function schedule() {
 	}
 }
 function flushAndWaitFrame() {
-	runTask();
 	requestAnimationFrame(triggerMacroTask);
+	runTask();
 }
 function triggerMacroTask() {
 	if (!channel) {
@@ -282,29 +282,41 @@ function triggerMacroTask() {
 //#region src/dom/signals.ts
 function _let(id, fn) {
 	const valueAccessor = id.slice(0, id.lastIndexOf("/"));
-	const valueChangeAccessor = "TagVariableChange:" + valueAccessor;
 	id = +id.slice(id.lastIndexOf("/") + 1);
-	return (scope, value, valueChange) => {
+	return (scope, value) => {
 		if (rendering) {
-			if ((scope[valueChangeAccessor] = valueChange) && scope[valueAccessor] !== value || scope["#Creating"]) {
+			if (scope["#Creating"]) {
 				scope[valueAccessor] = value;
 				fn?.(scope);
 			}
-		} else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
-		else if (scope[valueAccessor] !== (scope[valueAccessor] = value) && fn) {
+		} else if ((scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn)) {
 			schedule();
 			queueRender(scope, fn, id);
 		}
 		return value;
 	};
 }
+function _let_change(id, fn) {
+	const valueAccessor = id.slice(0, id.lastIndexOf("/"));
+	const valueChangeAccessor = "TagVariableChange:" + valueAccessor;
+	const base = _let(id, fn);
+	return (scope, value, valueChange) => {
+		if (rendering) if ((scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope))) {
+			scope[valueAccessor] = value;
+			fn?.(scope);
+		} else base(scope, value);
+		else if (scope[valueChangeAccessor]) scope[valueChangeAccessor](value);
+		else base(scope, value);
+		return value;
+	};
+}
 function _const(valueAccessor, fn) {
-	return (scope, value) => {
-		if (scope["#Creating"] || scope[valueAccessor] !== value) {
+	return ((scope, value) => {
+		if (scope[valueAccessor] !== value || !(valueAccessor in scope)) {
 			scope[valueAccessor] = value;
 			fn?.(scope);
 		}
-	};
+	});
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
@@ -545,7 +557,10 @@ let readyLookup;
 let branchesEnabled;
 let embedEnabled;
 function enableBranches() {
-	branchesEnabled = 1;
+	if (!branchesEnabled) {
+		branchesEnabled = 1;
+		skipDestroyedRenders();
+	}
 }
 const ready = /* @__PURE__ */ ((_) => (id) => {
 	const cb = readyLookup[id];
@@ -1583,12 +1598,17 @@ function runRenders() {
 			}
 			pendingRenders[i] = item;
 		}
-		if (!render["scope"]["#ClosestBranch"]?.["#Destroyed"]) runRender(render);
+		runRender(render);
 	}
 	for (const scope of pendingScopes) scope["#Creating"] = 0;
 	pendingScopes = [];
 }
 let runRender = (render) => render["signal"](render["scope"], render["value"]);
+function skipDestroyedRenders() {
+	runRender = ((runRender) => (render) => {
+		if (!render["scope"]["#ClosestBranch"]?.["#Destroyed"]) runRender(render);
+	})(runRender);
+}
 let catchEnabled;
 function _enable_catch() {
 	if (!catchEnabled) {
@@ -1790,4 +1810,4 @@ function mount(input = {}, reference, position) {
 	};
 }
 //#endregion
-export { $signal, $signalReset, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_default as _attr_details_open_default, _attr_details_or_dialog_open_default as _attr_dialog_open_default, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checkedValue, _attr_input_checkedValue_default, _attr_input_checkedValue_script, _attr_input_checked_default, _attr_input_checked_script, _attr_input_value, _attr_input_value as _attr_textarea_value, _attr_input_value_default, _attr_input_value_default as _attr_textarea_value_default, _attr_input_value_script, _attr_input_value_script as _attr_textarea_value_script, _attr_nonce, _attr_select_value, _attr_select_value_default, _attr_select_value_script, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _await_content, _await_promise, _call, _child_setup, _closure, _closure_get, _const, _content, _content_closures, _content_resume, _dynamic_tag, _el, _el_read, _enable_catch, _for_closure, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_resume, _html, _id, _if, _if_closure, _let, _lifecycle, _on, _or, _resume, _resume_dynamic_tag, _return, _return_change, _script, _template, _text, _text_content, _to_text, _try, _var, _var_change, _var_resume, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, init, initEmbedded, run };
+export { $signal, $signalReset, _assert_hoist, _assert_init, _attr, _attr_class, _attr_class_item, _attr_class_items, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_details_or_dialog_open_default as _attr_details_open_default, _attr_details_or_dialog_open_default as _attr_dialog_open_default, _attr_details_or_dialog_open_script as _attr_details_open_script, _attr_details_or_dialog_open_script as _attr_dialog_open_script, _attr_input_checked, _attr_input_checkedValue, _attr_input_checkedValue_default, _attr_input_checkedValue_script, _attr_input_checked_default, _attr_input_checked_script, _attr_input_value, _attr_input_value as _attr_textarea_value, _attr_input_value_default, _attr_input_value_default as _attr_textarea_value_default, _attr_input_value_script, _attr_input_value_script as _attr_textarea_value_script, _attr_nonce, _attr_select_value, _attr_select_value_default, _attr_select_value_script, _attr_style, _attr_style_item, _attr_style_items, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_script, _await_content, _await_promise, _call, _child_setup, _closure, _closure_get, _const, _content, _content_closures, _content_resume, _dynamic_tag, _el, _el_read, _enable_catch, _for_closure, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_resume, _html, _id, _if, _if_closure, _let, _let_change, _lifecycle, _on, _or, _resume, _resume_dynamic_tag, _return, _return_change, _script, _template, _text, _text_content, _to_text, _try, _var, _var_change, _var_resume, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, init, initEmbedded, run };

package/dist/debug/html.js

@@ -177,7 +177,7 @@ function forStepBy(by, index) {
 }
 //#endregion
 //#region src/html/inlined-runtimes.debug.ts
-const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] || (self[runtimeId] = (
+const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] ||= (
   renderId,
   prefix = runtimeId + renderId,
   prefixLen = prefix.length,
@@ -212,7 +212,7 @@ const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] || (self[runtimeId
       }
     },
   })
-), self[runtimeId]))`;
+, self[runtimeId]))`;
 const REORDER_RUNTIME_CODE = `((runtime) => {
   if (runtime.j) return;
   let onNextSibling,
@@ -763,15 +763,16 @@ function writeRegistered(state, val, parent, accessor, registered) {
 	} else state.buf.push(registered.access);
 	return true;
 }
+const STRING_DEDUP_LENGTH = 12;
 function writeString(state, val, parent, accessor) {
-	if (val.length > 30) {
+	if (val.length > STRING_DEDUP_LENGTH) {
 		const ref = state.strs.get(val);
-		if (ref) state.buf.push(ensureId(state, ref));
-		else {
-			state.strs.set(val, new Reference(parent, accessor, state.flush, state.buf.length));
-			state.buf.push(quote(val, 0));
-		}
-	} else state.buf.push(quote(val, 0));
+		if (ref) {
+			state.buf.push(ensureId(state, ref));
+			return true;
+		} else state.strs.set(val, new Reference(parent, accessor, state.flush, state.buf.length));
+	}
+	state.buf.push(quote(val, 0));
 	return true;
 }
 function writeNumber(state, val) {
@@ -893,7 +894,7 @@ function writeArray(state, val, ref) {
 	return true;
 }
 function writeDate(state, val) {
-	state.buf.push("new Date(\"" + val.toISOString() + "\")");
+	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
 function writeRegExp(state, val) {
@@ -915,9 +916,9 @@ function writeMap(state, val, ref) {
 		state.buf.push("new Map");
 		return true;
 	}
-	const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
 	const items = [];
 	let assigns;
+	let needsId;
 	let i = 0;
 	if (val.size < 25) {
 		for (let [itemKey, itemValue] of val) {
@@ -929,12 +930,10 @@ function writeMap(state, val, ref) {
 				itemValue = void 0;
 				(assigns ||= []).push("a[" + i + "][1]");
 			}
+			needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue);
 			i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
 		}
-		if (assigns) state.buf.push("((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map," + arrayRef.id + "=");
-		else state.buf.push("new Map(" + arrayRef.id + "=");
-		writeArray(state, items, arrayRef);
-		state.buf.push(")");
+		writeArrayArg(state, ref, items, assigns && "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map,", "new Map(", needsId);
 	} else {
 		for (let [itemKey, itemValue] of val) {
 			if (itemKey === val) {
@@ -945,12 +944,10 @@ function writeMap(state, val, ref) {
 				itemValue = 0;
 				(assigns ||= []).push("a[" + (i + 1) + "]");
 			}
+			needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue);
 			i = items.push(itemKey, itemValue);
 		}
-		if (assigns) state.buf.push("(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(" + arrayRef.id + "=");
-		else state.buf.push("(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(" + arrayRef.id + "=");
-		writeArray(state, items, arrayRef);
-		state.buf.push(")");
+		writeArrayArg(state, ref, items, assigns && "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(", "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(", needsId);
 	}
 	return true;
 }
@@ -961,20 +958,38 @@ function writeSet(state, val, ref) {
 	}
 	const items = [];
 	let assigns;
+	let needsId;
 	let i = 0;
 	for (let item of val) {
 		if (item === val) {
 			item = 0;
 			(assigns ||= []).push("i[" + i + "]");
-		}
+		} else needsId ||= isDedupedMember(item);
 		i = items.push(item);
 	}
-	const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
-	state.buf.push((assigns ? "((s,i)=>(" + assignsToString(assigns, "s") + ",i.forEach(i=>s.add(i)),s))(new Set," : "new Set(") + arrayRef.id + "=");
-	writeArray(state, items, arrayRef);
-	state.buf.push(")");
+	writeArrayArg(state, ref, items, assigns && "((s,i)=>(" + assignsToString(assigns, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId);
 	return true;
 }
+function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
+	if (assignsPrefix || needsId) {
+		const arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		state.buf.push((assignsPrefix || plainPrefix) + arrayRef.id + "=");
+		writeArray(state, items, arrayRef);
+	} else {
+		state.buf.push(plainPrefix);
+		writeArray(state, items, new Reference(ref, null, state.flush, state.buf.length));
+	}
+	state.buf.push(")");
+}
+function isDedupedMember(val) {
+	switch (typeof val) {
+		case "object": return val !== null;
+		case "function":
+		case "symbol": return true;
+		case "string": return val.length > STRING_DEDUP_LENGTH;
+		default: return false;
+	}
+}
 function writeArrayBuffer(state, val) {
 	let result;
 	if (val.byteLength) {
@@ -1207,22 +1222,16 @@ function writeObjectProps(state, val, ref) {
 		else state.buf.pop();
 	}
 	if (hasSymbolIterator(val)) {
-		const iterArr = [...val];
-		switch (iterArr.length) {
-			case 0:
-				state.buf.push(sep + "*[Symbol.iterator](){}");
-				break;
-			case 1:
-				state.buf.push(sep + "*[Symbol.iterator](){yield " + (iterArr[0] === val ? "this" : ensureId(state, ref)) + "}");
-				break;
-			default: {
-				const iterRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
-				state.buf.push(sep + "*[(" + iterRef.id + "=");
-				writeArray(state, iterArr, iterRef);
-				state.buf.push(",Symbol.iterator)](){yield*" + iterRef.id + "}");
-				break;
-			}
-		}
+		let yieldSelf = "";
+		const iterArr = [];
+		for (const item of val) if (item === val && !(yieldSelf || iterArr.length)) yieldSelf = "yield this;";
+		else iterArr.push(item);
+		if (iterArr.length) {
+			const iterRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+			state.buf.push(sep + "*[(" + iterRef.id + "=");
+			writeArray(state, iterArr, iterRef);
+			state.buf.push(",Symbol.iterator)](){" + yieldSelf + "yield*" + iterRef.id + "}");
+		} else state.buf.push(sep + "*[Symbol.iterator](){" + yieldSelf.slice(0, -1) + "}");
 		sep = ",";
 	}
 	return sep;
@@ -1516,7 +1525,7 @@ function _serialize_if(condition, key) {
 	return condition && (condition === 1 || condition[key]) ? 1 : void 0;
 }
 function _serialize_guard(condition, key) {
-	return condition && (condition === 1 || condition[key]) ? 1 : 0;
+	return _serialize_if(condition, key) || 0;
 }
 function _el_resume(scopeId, accessor, shouldResume) {
 	if (shouldResume === 0) return "";
@@ -1551,127 +1560,58 @@ function withIsAsync(cb, value) {
 	return withContext(kIsAsync, true, cb, value);
 }
 function _for_of(list, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const { state } = $chunk.boundary;
-	const resumeKeys = serializeMarker !== 0;
-	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
-	let flushBranchIds = "";
-	if (serializeBranch !== 0) {
-		let loopScopes;
-		var seenKeys = /* @__PURE__ */ new Set();
-		forOf(list, (item, index) => {
-			const branchId = _peek_scope_id();
-			const itemKey = forOfBy(by, item, index);
-			if (by) {
-				if (seenKeys.has(itemKey)) console.error(`A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`, itemKey);
-				seenKeys.add(itemKey);
-			}
-			if (resumeMarker) if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-			else {
-				$chunk.writeHTML(state.mark("[", flushBranchIds));
-				flushBranchIds = branchId + "";
-			}
-			withBranchId(branchId, () => {
-				cb(item, index);
-				const branchScope = writeScope(branchId, {});
-				if (resumeKeys && itemKey !== index) branchScope["#LoopKey"] = itemKey;
-				if (!resumeMarker) loopScopes = push(loopScopes, referenceScope(branchScope));
-			});
-		});
-		if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
-	} else forOf(list, cb);
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+	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, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
 }
 function _for_in(obj, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const { state } = $chunk.boundary;
-	const resumeKeys = serializeMarker !== 0;
-	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
-	let flushBranchIds = "";
-	if (serializeBranch !== 0) {
-		let loopScopes;
-		var seenKeys = /* @__PURE__ */ new Set();
-		forIn(obj, (key, value) => {
-			const branchId = _peek_scope_id();
-			const itemKey = forInBy(by, key, value);
-			if (by) {
-				if (seenKeys.has(itemKey)) console.error(`A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`, itemKey);
-				seenKeys.add(itemKey);
-			}
-			if (resumeMarker) if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-			else {
-				$chunk.writeHTML(state.mark("[", flushBranchIds));
-				flushBranchIds = branchId + "";
-			}
-			withBranchId(branchId, () => {
-				cb(key, value);
-				const branchScope = writeScope(branchId, {});
-				if (resumeKeys) branchScope["#LoopKey"] = itemKey;
-				if (!resumeMarker) loopScopes = push(loopScopes, referenceScope(branchScope));
-			});
-		});
-		if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
-	} else forIn(obj, cb);
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+	forBranches(by, (each) => each ? forIn(obj, (key, value) => {
+		each(forInBy(by, key, value), false, () => cb(key, value));
+	}) : forIn(obj, cb), scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
 }
 function _for_to(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
-	const { state } = $chunk.boundary;
-	const resumeKeys = serializeMarker !== 0;
-	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
-	let flushBranchIds = "";
-	if (serializeBranch !== 0) {
-		let loopScopes;
-		var seenKeys = /* @__PURE__ */ new Set();
-		forTo(to, from, step, (i) => {
-			const branchId = _peek_scope_id();
-			const itemKey = forStepBy(by, i);
-			if (by) {
-				if (seenKeys.has(itemKey)) console.error(`A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`, itemKey);
-				seenKeys.add(itemKey);
-			}
-			if (resumeMarker) if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-			else {
-				$chunk.writeHTML(state.mark("[", flushBranchIds));
-				flushBranchIds = branchId + "";
-			}
-			withBranchId(branchId, () => {
-				cb(i);
-				const branchScope = writeScope(branchId, {});
-				if (resumeKeys && itemKey !== i) branchScope["#LoopKey"] = itemKey;
-				if (!resumeMarker) loopScopes = push(loopScopes, referenceScope(branchScope));
-			});
-		});
-		if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
-	} else forTo(to, from, step, cb);
-	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
+	forBranches(by, (each) => each ? forTo(to, from, step, (i) => {
+		const itemKey = forStepBy(by, i);
+		each(itemKey, itemKey === i, () => cb(i));
+	}) : forTo(to, from, step, cb), scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
 }
 function _for_until(to, from, step, cb, by, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+	forBranches(by, (each) => each ? forUntil(to, from, step, (i) => {
+		const itemKey = forStepBy(by, i);
+		each(itemKey, itemKey === i, () => cb(i));
+	}) : forUntil(to, from, step, cb), scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode);
+}
+function forBranches(by, iterate, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {
+	if (serializeBranch === 0) {
+		iterate(0);
+		writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, "");
+		return;
+	}
 	const { state } = $chunk.boundary;
 	const resumeKeys = serializeMarker !== 0;
 	const resumeMarker = serializeMarker !== 0 && (!parentEndTag || serializeStateful !== 0);
 	let flushBranchIds = "";
-	if (serializeBranch !== 0) {
-		let loopScopes;
-		var seenKeys = /* @__PURE__ */ new Set();
-		forUntil(to, from, step, (i) => {
-			const branchId = _peek_scope_id();
-			const itemKey = forStepBy(by, i);
-			if (by) {
-				if (seenKeys.has(itemKey)) console.error(`A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`, itemKey);
-				seenKeys.add(itemKey);
-			}
-			if (resumeMarker) if (singleNode) flushBranchIds = " " + branchId + flushBranchIds;
-			else {
-				$chunk.writeHTML(state.mark("[", flushBranchIds));
-				flushBranchIds = branchId + "";
-			}
-			withBranchId(branchId, () => {
-				cb(i);
-				const branchScope = writeScope(branchId, {});
-				if (resumeKeys && itemKey !== i) branchScope["#LoopKey"] = itemKey;
-				if (!resumeMarker) loopScopes = push(loopScopes, referenceScope(branchScope));
-			});
+	let loopScopes;
+	var seenKeys = /* @__PURE__ */ new Set();
+	iterate((itemKey, sameAsIndex, render) => {
+		const branchId = _peek_scope_id();
+		if (by) {
+			if (seenKeys.has(itemKey)) console.error(`A <for> tag's \`by\` attribute must return a unique value for each item, but a duplicate was found matching:`, itemKey);
+			seenKeys.add(itemKey);
+		}
+		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, referenceScope(branchScope));
 		});
-		if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
-	} else forUntil(to, from, step, cb);
+	});
+	if (loopScopes) writeScope(scopeId, { ["BranchScopes:" + accessor]: loopScopes });
 	writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, singleNode ? flushBranchIds : flushBranchIds ? " " + flushBranchIds : "");
 }
 function _if(cb, scopeId, accessor, serializeBranch, serializeMarker, serializeStateful, parentEndTag, singleNode) {