marko 6.1.11 → 6.1.12

package/dist/debug/dom.mjs

@@ -29,10 +29,6 @@ function _hoist_read_error() {
 function _assert_hoist(value) {
 	if (typeof value !== "function") throw new Error(`Hoisted values must be functions, received type "${typeof value}".`);
 }
-function _assert_init(scope, accessor) {
-	if (scope["#Creating"] || !(accessor in scope)) throw new ReferenceError(`Cannot access '${accessor}' before initialization`);
-	return scope[accessor];
-}
 function assertExclusiveAttrs(attrs, onError = throwErr) {
 	if (attrs) {
 		let exclusiveAttrs;
@@ -200,16 +196,34 @@ function parseHTML(html, ns) {
 //#endregion
 //#region src/dom/scope.ts
 let nextScopeId = 1e6;
+let collectingScopes;
 function createScope($global, closestBranch) {
 	const scope = {
 		["#Id"]: nextScopeId++,
-		["#Creating"]: 1,
+		["#Gen"]: runId,
 		["#ClosestBranch"]: closestBranch,
 		["$global"]: $global
 	};
-	pendingScopes.push(scope);
+	collectingScopes?.push(scope);
 	return scope;
 }
+function syncGen(scope) {
+	scope["#Gen"] = runId;
+}
+function _assert_init(scope, accessor) {
+	if (scope["#Gen"] === runId || !(accessor in scope)) throw new ReferenceError(`Cannot access '${accessor}' before initialization`);
+	return scope[accessor];
+}
+function collectScopes(fn) {
+	const prev = collectingScopes;
+	collectingScopes = [];
+	try {
+		fn();
+		return collectingScopes;
+	} finally {
+		collectingScopes = prev;
+	}
+}
 function skipScope() {
 	return nextScopeId++;
 }
@@ -223,13 +237,13 @@ function destroyBranch(branch) {
 	destroyNestedScopes(branch);
 }
 function destroyScope(scope) {
-	if (!scope["#Destroyed"]) {
+	if (scope["#Gen"]) {
 		destroyNestedScopes(scope);
 		resetControllers(scope);
 	}
 }
 const destroyNestedScopes = function destroyNestedScopes(scope) {
-	scope["#Destroyed"] = 1;
+	scope["#Gen"] = 0;
 	scope["#BranchScopes"]?.forEach(destroyNestedScopes);
 	scope["#AbortScopes"]?.forEach(resetControllers);
 };
@@ -288,7 +302,7 @@ function _let(id, fn) {
 	id = +id.slice(id.lastIndexOf("/") + 1);
 	return (scope, value) => {
 		if (rendering) {
-			if (scope["#Creating"]) {
+			if (scope["#Gen"] === runId) {
 				scope[valueAccessor] = value;
 				fn?.(scope);
 			}
@@ -323,7 +337,7 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
-		if (scope["#Creating"]) if (id in scope) {
+		if (scope["#Gen"] === runId) if (id in scope) {
 			if (!--scope[id]) fn(scope);
 		} else scope[id] = defaultPending;
 		else queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
@@ -334,7 +348,7 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	const ownerSignal = (ownerScope) => {
 		const scopes = toArray(ownerScope[scopeAccessor]);
 		if (scopes.length) queueRender(ownerScope, () => {
-			for (const scope of scopes) if (!scope["#Creating"] && !scope["#Destroyed"]) fn(scope);
+			for (const scope of scopes) if (scope["#Gen"] > 0 && scope["#Gen"] < runId) fn(scope);
 		}, -1, 0, scopes[0]["#Id"]);
 	};
 	ownerSignal._ = fn;
@@ -345,7 +359,7 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	const branchAccessor = "ConditionalRenderer:" + ownerConditionalNodeAccessor;
 	const ownerSignal = (scope) => {
 		const ifScope = scope[scopeAccessor];
-		if (ifScope && !ifScope["#Creating"] && (scope[branchAccessor] || 0) === branch) queueRender(ifScope, fn, -1);
+		if (ifScope && ifScope["#Gen"] > 0 && ifScope["#Gen"] < runId && (scope[branchAccessor] || 0) === branch) queueRender(ifScope, fn, -1);
 	};
 	ownerSignal._ = fn;
 	return ownerSignal;
@@ -364,7 +378,7 @@ function _closure(...closureSignals) {
 	for (let i = closureSignals.length; i--;) closureSignals[i]["index"] = i;
 	return (scope) => {
 		if (scope[scopeInstances]) {
-			for (const childScope of scope[scopeInstances]) if (!childScope["#Creating"]) queueRender(childScope, closureSignals[childScope[signalIndex] || 0], -1);
+			for (const childScope of scope[scopeInstances]) if (childScope["#Gen"] > 0 && childScope["#Gen"] < runId) queueRender(childScope, closureSignals[childScope[signalIndex] || 0], -1);
 		}
 	};
 }
@@ -604,6 +618,7 @@ function init(runtimeId = "M") {
 				renderId
 			};
 			const initScope = (scope) => {
+				scope["#Gen"] = 1;
 				scope["$global"] = initGlobal();
 				if (branchesEnabled && scope["#ClosestBranchId"]) scope["#ClosestBranch"] = getScope(scope["#ClosestBranchId"]);
 				return scope;
@@ -768,7 +783,7 @@ function _attr_input_checked_default(scope, nodeAccessor, checked) {
 	const el = scope[nodeAccessor];
 	const normalizedChecked = isNotVoid(checked);
 	if (el.defaultChecked !== normalizedChecked) {
-		const restoreValue = scope["#Creating"] ? normalizedChecked : el.checked;
+		const restoreValue = scope["#Gen"] < runId ? el.checked : normalizedChecked;
 		el.defaultChecked = normalizedChecked;
 		if (restoreValue !== normalizedChecked) el.checked = restoreValue;
 	}
@@ -778,7 +793,7 @@ function _attr_input_checked(scope, nodeAccessor, checked, checkedChange) {
 	const normalizedChecked = isNotVoid(checked);
 	scope["ControlledHandler:" + nodeAccessor] = checkedChange;
 	scope["ControlledType:" + nodeAccessor] = checkedChange ? 0 : 5;
-	if (checkedChange && !scope["#Creating"]) el.checked = normalizedChecked;
+	if (checkedChange && scope["#Gen"] < runId) el.checked = normalizedChecked;
 	else _attr_input_checked_default(scope, nodeAccessor, normalizedChecked);
 }
 function _attr_input_checked_script(scope, nodeAccessor) {
@@ -806,7 +821,7 @@ function _attr_input_checkedValue(scope, nodeAccessor, checkedValue, checkedValu
 	const normalizedCheckedValue = scope["ControlledValue:" + nodeAccessor] = multiple ? checkedValue.map(normalizeStrProp) : normalizeStrProp(checkedValue);
 	scope["ControlledHandler:" + nodeAccessor] = checkedValueChange;
 	scope["ControlledType:" + nodeAccessor] = checkedValueChange ? 1 : 5;
-	if (checkedValueChange && !scope["#Creating"]) {
+	if (checkedValueChange && scope["#Gen"] < runId) {
 		el.checked = multiple ? normalizedCheckedValue.includes(normalizeStrProp(value)) : normalizeStrProp(value) === normalizedCheckedValue;
 		_attr(el, "value", value);
 	} else _attr_input_checkedValue_default(scope, nodeAccessor, checkedValue, value);
@@ -832,7 +847,7 @@ function _attr_input_value_default(scope, nodeAccessor, value) {
 	const el = scope[nodeAccessor];
 	const normalizedValue = normalizeAttrValue(value) || "";
 	if (el.defaultValue !== normalizedValue) {
-		const restoreValue = scope["#Creating"] ? normalizedValue : el.value;
+		const restoreValue = scope["#Gen"] < runId ? el.value : normalizedValue;
 		el.defaultValue = normalizedValue;
 		setInputValue(el, restoreValue);
 	}
@@ -843,7 +858,7 @@ function _attr_input_value(scope, nodeAccessor, value, valueChange) {
 	scope["ControlledHandler:" + nodeAccessor] = valueChange;
 	scope["ControlledValue:" + nodeAccessor] = normalizedValue;
 	scope["ControlledType:" + nodeAccessor] = valueChange ? 2 : 5;
-	if (valueChange && !scope["#Creating"]) setInputValue(el, normalizedValue);
+	if (valueChange && scope["#Gen"] < runId) setInputValue(el, normalizedValue);
 	else _attr_input_value_default(scope, nodeAccessor, normalizedValue);
 }
 function _attr_input_value_script(scope, nodeAccessor) {
@@ -869,14 +884,14 @@ function setInputValue(el, value) {
 function _attr_select_value_default(scope, nodeAccessor, value) {
 	let restoreValue;
 	const el = scope[nodeAccessor];
-	const existing = !scope["#Creating"];
+	const live = scope["#Gen"] < runId;
 	const multiple = Array.isArray(value);
 	const normalizedValue = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
 	pendingEffects.unshift(() => {
 		for (const opt of el.options) {
 			const selected = multiple ? normalizedValue.includes(opt.value) : opt.value === normalizedValue;
 			if (opt.defaultSelected !== selected) {
-				if (existing) restoreValue ??= getSelectValue(el, multiple);
+				if (live) restoreValue ??= getSelectValue(el, multiple);
 				opt.defaultSelected = selected;
 			}
 		}
@@ -885,7 +900,7 @@ function _attr_select_value_default(scope, nodeAccessor, value) {
 }
 function _attr_select_value(scope, nodeAccessor, value, valueChange) {
 	const el = scope[nodeAccessor];
-	const existing = !scope["#Creating"];
+	const existing = scope["#Gen"] < runId;
 	const multiple = Array.isArray(value);
 	const normalizedValue = scope["ControlledValue:" + nodeAccessor] = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
 	scope["ControlledHandler:" + nodeAccessor] = valueChange;
@@ -933,13 +948,13 @@ function getSelectValue(el, multiple) {
 	return multiple ? Array.from(el.selectedOptions, (opt) => opt.value) : el.value;
 }
 function _attr_details_or_dialog_open_default(scope, nodeAccessor, open) {
-	if (scope["#Creating"]) scope[nodeAccessor].open = isNotVoid(open);
+	if (scope["#Gen"] === runId) scope[nodeAccessor].open = isNotVoid(open);
 }
 function _attr_details_or_dialog_open(scope, nodeAccessor, open, openChange) {
 	const normalizedOpen = scope["ControlledValue:" + nodeAccessor] = isNotVoid(open);
 	scope["ControlledHandler:" + nodeAccessor] = openChange;
 	scope["ControlledType:" + nodeAccessor] = openChange ? 4 : 5;
-	if (openChange && !scope["#Creating"]) scope[nodeAccessor].open = normalizedOpen;
+	if (openChange && scope["#Gen"] < runId) scope[nodeAccessor].open = normalizedOpen;
 	else _attr_details_or_dialog_open_default(scope, nodeAccessor, normalizedOpen);
 }
 function _attr_details_or_dialog_open_script(scope, nodeAccessor) {
@@ -1243,7 +1258,7 @@ function _await_promise(nodeAccessor, params) {
 				scope[promiseAccessor] = 0;
 				queueAsyncRender(scope, () => {
 					if ((awaitBranch = scope[branchAccessor])["#DetachedAwait"]) {
-						pendingScopes.push(awaitBranch);
+						awaitBranch["#PendingScopes"] = awaitBranch["#PendingScopes"]?.forEach(syncGen);
 						setupBranch(awaitBranch["#DetachedAwait"], awaitBranch);
 						awaitBranch["#DetachedAwait"] = 0;
 						insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]);
@@ -1284,8 +1299,8 @@ function _await_content(nodeAccessor, template, walks, setup) {
 	const branchAccessor = "BranchScopes:" + nodeAccessor;
 	const renderer = _content("", template, walks, setup)();
 	return (scope) => {
-		(scope[branchAccessor] = createBranch(scope["$global"], renderer, scope, scope[nodeAccessor].parentNode))["#DetachedAwait"] = renderer;
-		pendingScopes.pop();
+		const pendingScopes = collectScopes(() => (scope[branchAccessor] = createBranch(scope["$global"], renderer, scope, scope[nodeAccessor].parentNode))["#DetachedAwait"] = renderer);
+		scope[branchAccessor]["#PendingScopes"] = pendingScopes;
 	};
 }
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, "#PlaceholderContent")) {
@@ -1548,13 +1563,12 @@ function byFirstArg(name) {
 }
 //#endregion
 //#region src/dom/queue.ts
-let runId = 1;
-let pendingRenders = [];
+let rendering;
+let runId = 2;
 const caughtError = /* @__PURE__ */ new WeakSet();
 const placeholderShown = /* @__PURE__ */ new WeakSet();
 let pendingEffects = [];
-let pendingScopes = [];
-let rendering;
+let pendingRenders = [];
 const scopeKeyOffset = 1e3;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	let render;
@@ -1647,13 +1661,11 @@ function runRenders() {
 		}
 		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);
+		if (render["scope"]["#ClosestBranch"]?.["#Gen"] !== 0) runRender(render);
 	})(runRender);
 }
 let catchEnabled;
@@ -1676,8 +1688,7 @@ function _enable_catch() {
 				for (; i < effects.length;) {
 					fn = effects[i++];
 					scope = effects[i++];
-					branch = scope["#ClosestBranch"];
-					if (!branch?.["#Destroyed"] && !(checkPending && handlePendingTry(fn, scope, branch))) fn(scope);
+					if ((branch = scope["#ClosestBranch"])?.["#Gen"] !== 0 && !(checkPending && handlePendingTry(fn, scope, branch))) fn(scope);
 				}
 			} else runEffects(effects);
 		})(runEffects);
@@ -1901,13 +1912,12 @@ function _load_setup(nodeAccessor, childScopeAccessor, load) {
 }
 function insertLoaded(renderer, branch, marker, awaitCounter) {
 	const parent = marker.parentNode;
-	branch["#Creating"] = 1;
+	syncGen(branch);
 	renderer["clone"](branch, parent.namespaceURI);
 	setupBranch(renderer, branch);
 	applyLoad(branch, () => {
 		insertBranchBefore(branch, parent, marker);
 		marker.remove();
-		pendingScopes.push(branch);
 		awaitCounter?.c();
 	});
 }
@@ -1923,14 +1933,11 @@ function applyLoad(scope, insert) {
 	scope["#Load"] = 0;
 	if (remaining = values?.size) for (const [promise, entry] of values) promise.then((signal) => {
 		entry["signal"] = signal;
-		if (!--remaining) {
-			scope["#Creating"] = 1;
-			pendingScopes.push(scope);
-			queueAsyncRender(scope, (scope) => {
-				values.forEach((e) => e["signal"]._(scope, e["value"]));
-				insert();
-			});
-		}
+		if (!--remaining) queueAsyncRender(scope, (scope) => {
+			syncGen(scope);
+			values.forEach((e) => e["signal"]._(scope, e["value"]));
+			insert();
+		});
 	}, () => 0);
 	else insert();
 }
@@ -1939,7 +1946,7 @@ function _load_signal(load) {
 	let signal;
 	return (scope, value) => {
 		pending ||= load();
-		if (scope["#Load"] || !("#Load" in scope) && scope["#Creating"]) (scope["#Load"] ||= /* @__PURE__ */ new Map()).set(pending, { ["value"]: value });
+		if (scope["#Load"] || !("#Load" in scope) && scope["#Gen"] === runId) (scope["#Load"] ||= /* @__PURE__ */ new Map()).set(pending, { ["value"]: value });
 		else if (signal) signal(scope, value);
 		else pending.then((mod) => queueAsyncRender(scope, signal = mod._, value), () => 0);
 	};

package/dist/dom/queue.d.ts

@@ -9,11 +9,11 @@ export type PendingRender = {
     [PendingRenderProp.Gen]: number;
     [PendingRenderProp.Pending]?: 0 | 1;
 };
+export declare let rendering: undefined | 0 | 1;
+export declare let runId: number;
 export declare const caughtError: WeakSet<unknown[]>;
 export declare const placeholderShown: WeakSet<unknown[]>;
 export declare let pendingEffects: unknown[];
-export declare let pendingScopes: Scope[];
-export declare let rendering: undefined | 0 | 1;
 export declare function queueRender<T, U extends Scope = Scope>(scope: U, signal: Signal<T, U>, signalKey: number, value?: T, scopeKey?: number): void;
 export declare function queuePendingRender(render: PendingRender): void;
 export declare function queueEffect<S extends Scope, T extends ExecFn<S>>(scope: S, fn: T): void;

package/dist/dom/scope.d.ts

@@ -1,5 +1,8 @@
 import { AccessorProp, type BranchScope, type Scope } from "../common/types";
 export declare function createScope($global: Scope[AccessorProp.Global], closestBranch?: BranchScope): Scope;
+export declare function syncGen(scope: Scope): void;
+export declare function _assert_init(scope: Scope, accessor: string): any;
+export declare function collectScopes(fn: () => void): Scope[];
 export declare function skipScope(): number;
 export declare function findBranchWithKey(scope: Scope, key: string): BranchScope | undefined;
 export declare function destroyBranch(branch: BranchScope): void;

package/dist/dom.d.ts

@@ -1,5 +1,5 @@
 export { attrTag, attrTags } from "./common/attr-tag";
-export { _assert_hoist, _assert_init } from "./common/errors";
+export { _assert_hoist } from "./common/errors";
 export { forIn, forOf, forTo, forUntil } from "./common/for";
 export { _call } from "./common/helpers";
 export { $signal, $signalReset } from "./dom/abort-signal";
@@ -12,5 +12,6 @@ export { _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_rac
 export { _enable_catch, run } from "./dom/queue";
 export { _content, _content_closures, _content_resume } from "./dom/renderer";
 export { _el, _resume, _var_resume, init, initEmbedded, ready, } from "./dom/resume";
+export { _assert_init } from "./dom/scope";
 export { _child_setup, _closure, _closure_get, _const, _el_read, _for_closure, _hoist, _hoist_resume, _id, _if_closure, _let, _let_change, _or, _return, _return_change, _script, _var, _var_change, } from "./dom/signals";
 export { _template } from "./dom/template";

package/dist/dom.js

@@ -4,8 +4,8 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36), defaultDelegator = /* @__PURE__ */ createDelegator(), R = /[^\p{L}\p{N}]/gu, parsers = {}, nextScopeId = 1e6, destroyNestedScopes = function destroyNestedScopes(scope) {
-	scope.I = 1, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(resetControllers);
+}, decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36), defaultDelegator = /* @__PURE__ */ createDelegator(), R = /[^\p{L}\p{N}]/gu, parsers = {}, nextScopeId = 1e6, collectingScopes, destroyNestedScopes = function destroyNestedScopes(scope) {
+	scope.H = 0, scope.D?.forEach(destroyNestedScopes), scope.B?.forEach(resetControllers);
 }, isScheduled, channel, _return = (scope, value) => scope.T?.(value), _var_change = (scope, value) => scope.U?.(value), tagIdsByGlobal = /* @__PURE__ */ new WeakMap(), walker = /* @__PURE__ */ document.createTreeWalker(document), walkInternal = function walkInternal(currentWalkIndex, walkCodes, scope) {
 	let value, currentMultiplier, storedMultiplier = 0, currentScopeIndex = 0;
 	for (; currentWalkIndex < walkCodes.length;) if (value = walkCodes.charCodeAt(currentWalkIndex++), currentMultiplier = storedMultiplier, storedMultiplier = 0, value === 32) {
@@ -49,7 +49,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	};
 }, _for_of = /* @__PURE__ */ loop(([all, by = bySecondArg], cb) => {
 	typeof by == "string" ? forOf(all, (item, i) => cb(item[by], [item, i])) : forOf(all, (item, i) => cb(by(item, i), [item, i]));
-}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), runId = 1, pendingRenders = [], caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3, runEffects = ((effects) => {
+}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], scopeKeyOffset = 1e3, runEffects = ((effects) => {
 	for (let i = 0; i < effects.length;) effects[i++](effects[i++]);
 }), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
@@ -119,9 +119,6 @@ function* attrTagIterator() {
 	yield this, yield* this[rest];
 }
 function _assert_hoist(value) {}
-function _assert_init(scope, accessor) {
-	return scope[accessor];
-}
 //#endregion
 //#region src/common/for.ts
 function forIn(obj, cb) {
@@ -216,11 +213,26 @@ function parseHTML(html, ns) {
 function createScope($global, closestBranch) {
 	let scope = {
 		L: nextScopeId++,
-		H: 1,
+		H: runId,
 		F: closestBranch,
 		$: $global
 	};
-	return pendingScopes.push(scope), scope;
+	return collectingScopes?.push(scope), scope;
+}
+function syncGen(scope) {
+	scope.H = runId;
+}
+function _assert_init(scope, accessor) {
+	return scope[accessor];
+}
+function collectScopes(fn) {
+	let prev = collectingScopes;
+	collectingScopes = [];
+	try {
+		return fn(), collectingScopes;
+	} finally {
+		collectingScopes = prev;
+	}
 }
 function skipScope() {
 	return nextScopeId++;
@@ -234,7 +246,7 @@ function destroyBranch(branch) {
 	branch.N?.D?.delete(branch), destroyNestedScopes(branch);
 }
 function destroyScope(scope) {
-	scope.I || (destroyNestedScopes(scope), resetControllers(scope));
+	scope.H && (destroyNestedScopes(scope), resetControllers(scope));
 }
 function resetControllers(scope) {
 	for (let id in scope.A) $signalReset(scope, id);
@@ -266,7 +278,7 @@ function triggerMacroTask() {
 //#region src/dom/signals.ts
 function _let(id, fn) {
 	let valueAccessor = decodeAccessor(id);
-	return (scope, value) => (rendering ? scope.H && (scope[valueAccessor] = value, fn?.(scope)) : (scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn) && (schedule(), queueRender(scope, fn, id)), value);
+	return (scope, value) => (rendering ? scope.H === runId && (scope[valueAccessor] = value, fn?.(scope)) : (scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn) && (schedule(), queueRender(scope, fn, id)), value);
 }
 function _let_change(id, fn) {
 	let valueAccessor = decodeAccessor(id), valueChangeAccessor = "M" + valueAccessor, base = _let(id, fn);
@@ -279,7 +291,7 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L") {
 	return scopeIdAccessor !== "L" && (scopeIdAccessor = decodeAccessor(scopeIdAccessor)), (scope) => {
-		scope.H ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+		scope.H === runId ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
 function _for_closure(ownerLoopNodeAccessor, fn) {
@@ -287,7 +299,7 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	let scopeAccessor = "A" + ownerLoopNodeAccessor, ownerSignal = (ownerScope) => {
 		let scopes = toArray(ownerScope[scopeAccessor]);
 		scopes.length && queueRender(ownerScope, () => {
-			for (let scope of scopes) !scope.H && !scope.I && fn(scope);
+			for (let scope of scopes) scope.H > 0 && scope.H < runId && fn(scope);
 		}, -1, 0, scopes[0].L);
 	};
 	return ownerSignal._ = fn, ownerSignal;
@@ -296,7 +308,7 @@ function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	ownerConditionalNodeAccessor = decodeAccessor(ownerConditionalNodeAccessor);
 	let scopeAccessor = "A" + ownerConditionalNodeAccessor, branchAccessor = "D" + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
 		let ifScope = scope[scopeAccessor];
-		ifScope && !ifScope.H && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
+		ifScope && ifScope.H > 0 && ifScope.H < runId && (scope[branchAccessor] || 0) === branch && queueRender(ifScope, fn, -1);
 	};
 	return ownerSignal._ = fn, ownerSignal;
 }
@@ -308,7 +320,7 @@ function _closure(...closureSignals) {
 	let [firstSignal] = closureSignals, scopeInstances = firstSignal.a, signalIndex = firstSignal.b;
 	for (let i = closureSignals.length; i--;) closureSignals[i].c = i;
 	return (scope) => {
-		if (scope[scopeInstances]) for (let childScope of scope[scopeInstances]) childScope.H || queueRender(childScope, closureSignals[childScope[signalIndex] || 0], -1);
+		if (scope[scopeInstances]) for (let childScope of scope[scopeInstances]) childScope.H > 0 && childScope.H < runId && queueRender(childScope, closureSignals[childScope[signalIndex] || 0], -1);
 	};
 }
 function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
@@ -440,7 +452,7 @@ function init(runtimeId = "M") {
 			let render = curRenders[renderId] = renders[renderId] || renders(renderId), walk = render.w, scopeLookup = {}, getScope = (id) => scopeLookup[id] || (+id ? initScope(scopeLookup[id] = { L: +id }) : initGlobal()), initGlobal = () => scopeLookup[0] ||= {
 				runtimeId,
 				renderId
-			}, initScope = (scope) => (scope.$ = initGlobal(), branchesEnabled && scope.G && (scope.F = getScope(scope.G)), scope), applyScopes = (partials) => {
+			}, initScope = (scope) => (scope.H = 1, scope.$ = initGlobal(), branchesEnabled && scope.G && (scope.F = getScope(scope.G)), scope), applyScopes = (partials) => {
 				let scopeId = partials[0];
 				for (let i = 1; i < partials.length; i++) {
 					let partial = partials[i];
@@ -527,13 +539,13 @@ function _el(id, accessor) {
 function _attr_input_checked_default(scope, nodeAccessor, checked) {
 	let el = scope[nodeAccessor], normalizedChecked = isNotVoid(checked);
 	if (el.defaultChecked !== normalizedChecked) {
-		let restoreValue = scope.H ? normalizedChecked : el.checked;
+		let restoreValue = scope.H < runId ? el.checked : normalizedChecked;
 		el.defaultChecked = normalizedChecked, restoreValue !== normalizedChecked && (el.checked = restoreValue);
 	}
 }
 function _attr_input_checked(scope, nodeAccessor, checked, checkedChange) {
 	let el = scope[nodeAccessor], normalizedChecked = isNotVoid(checked);
-	scope["E" + nodeAccessor] = checkedChange, scope["F" + nodeAccessor] = checkedChange ? 0 : 5, checkedChange && !scope.H ? el.checked = normalizedChecked : _attr_input_checked_default(scope, nodeAccessor, normalizedChecked);
+	scope["E" + nodeAccessor] = checkedChange, scope["F" + nodeAccessor] = checkedChange ? 0 : 5, checkedChange && scope.H < runId ? el.checked = normalizedChecked : _attr_input_checked_default(scope, nodeAccessor, normalizedChecked);
 }
 function _attr_input_checked_script(scope, nodeAccessor) {
 	let el = scope[nodeAccessor];
@@ -551,7 +563,7 @@ function _attr_input_checkedValue_default(scope, nodeAccessor, checkedValue, val
 }
 function _attr_input_checkedValue(scope, nodeAccessor, checkedValue, checkedValueChange, value) {
 	let el = scope[nodeAccessor], multiple = Array.isArray(checkedValue), normalizedCheckedValue = scope["G" + nodeAccessor] = multiple ? checkedValue.map(normalizeStrProp) : normalizeStrProp(checkedValue);
-	scope["E" + nodeAccessor] = checkedValueChange, scope["F" + nodeAccessor] = checkedValueChange ? 1 : 5, checkedValueChange && !scope.H ? (el.checked = multiple ? normalizedCheckedValue.includes(normalizeStrProp(value)) : normalizeStrProp(value) === normalizedCheckedValue, _attr(el, "value", value)) : _attr_input_checkedValue_default(scope, nodeAccessor, checkedValue, value);
+	scope["E" + nodeAccessor] = checkedValueChange, scope["F" + nodeAccessor] = checkedValueChange ? 1 : 5, checkedValueChange && scope.H < runId ? (el.checked = multiple ? normalizedCheckedValue.includes(normalizeStrProp(value)) : normalizeStrProp(value) === normalizedCheckedValue, _attr(el, "value", value)) : _attr_input_checkedValue_default(scope, nodeAccessor, checkedValue, value);
 }
 function _attr_input_checkedValue_script(scope, nodeAccessor) {
 	let el = scope[nodeAccessor];
@@ -568,13 +580,13 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 function _attr_input_value_default(scope, nodeAccessor, value) {
 	let el = scope[nodeAccessor], normalizedValue = normalizeAttrValue(value) || "";
 	if (el.defaultValue !== normalizedValue) {
-		let restoreValue = scope.H ? normalizedValue : el.value;
+		let restoreValue = scope.H < runId ? el.value : normalizedValue;
 		el.defaultValue = normalizedValue, setInputValue(el, restoreValue);
 	}
 }
 function _attr_input_value(scope, nodeAccessor, value, valueChange) {
 	let el = scope[nodeAccessor], normalizedValue = normalizeAttrValue(value) || "";
-	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && !scope.H ? setInputValue(el, normalizedValue) : _attr_input_value_default(scope, nodeAccessor, normalizedValue);
+	scope["E" + nodeAccessor] = valueChange, scope["G" + nodeAccessor] = normalizedValue, scope["F" + nodeAccessor] = valueChange ? 2 : 5, valueChange && scope.H < runId ? setInputValue(el, normalizedValue) : _attr_input_value_default(scope, nodeAccessor, normalizedValue);
 }
 function _attr_input_value_script(scope, nodeAccessor) {
 	let el = scope[nodeAccessor];
@@ -590,17 +602,17 @@ function setInputValue(el, value) {
 	}
 }
 function _attr_select_value_default(scope, nodeAccessor, value) {
-	let restoreValue, el = scope[nodeAccessor], existing = !scope.H, multiple = Array.isArray(value), normalizedValue = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
+	let restoreValue, el = scope[nodeAccessor], live = scope.H < runId, multiple = Array.isArray(value), normalizedValue = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
 	pendingEffects.unshift(() => {
 		for (let opt of el.options) {
 			let selected = multiple ? normalizedValue.includes(opt.value) : opt.value === normalizedValue;
-			opt.defaultSelected !== selected && (existing && (restoreValue ??= getSelectValue(el, multiple)), opt.defaultSelected = selected);
+			opt.defaultSelected !== selected && (live && (restoreValue ??= getSelectValue(el, multiple)), opt.defaultSelected = selected);
 		}
 		restoreValue !== void 0 && setSelectValue(el, restoreValue, multiple);
 	}, scope);
 }
 function _attr_select_value(scope, nodeAccessor, value, valueChange) {
-	let el = scope[nodeAccessor], existing = !scope.H, multiple = Array.isArray(value), normalizedValue = scope["G" + nodeAccessor] = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
+	let el = scope[nodeAccessor], existing = scope.H < runId, multiple = Array.isArray(value), normalizedValue = scope["G" + nodeAccessor] = multiple ? value.map(normalizeStrProp) : normalizeStrProp(value);
 	scope["E" + nodeAccessor] = valueChange, scope["F" + nodeAccessor] = valueChange ? 3 : 5, valueChange && existing ? pendingEffects.unshift(() => setSelectValue(el, normalizedValue, multiple), scope) : _attr_select_value_default(scope, nodeAccessor, normalizedValue);
 }
 function _attr_select_value_script(scope, nodeAccessor) {
@@ -637,11 +649,11 @@ function getSelectValue(el, multiple) {
 	return multiple ? Array.from(el.selectedOptions, (opt) => opt.value) : el.value;
 }
 function _attr_details_or_dialog_open_default(scope, nodeAccessor, open) {
-	scope.H && (scope[nodeAccessor].open = isNotVoid(open));
+	scope.H === runId && (scope[nodeAccessor].open = isNotVoid(open));
 }
 function _attr_details_or_dialog_open(scope, nodeAccessor, open, openChange) {
 	let normalizedOpen = scope["G" + nodeAccessor] = isNotVoid(open);
-	scope["E" + nodeAccessor] = openChange, scope["F" + nodeAccessor] = openChange ? 4 : 5, openChange && !scope.H ? scope[nodeAccessor].open = normalizedOpen : _attr_details_or_dialog_open_default(scope, nodeAccessor, normalizedOpen);
+	scope["E" + nodeAccessor] = openChange, scope["F" + nodeAccessor] = openChange ? 4 : 5, openChange && scope.H < runId ? scope[nodeAccessor].open = normalizedOpen : _attr_details_or_dialog_open_default(scope, nodeAccessor, normalizedOpen);
 }
 function _attr_details_or_dialog_open_script(scope, nodeAccessor) {
 	let el = scope[nodeAccessor];
@@ -873,7 +885,7 @@ function _await_promise(nodeAccessor, params) {
 			if (thisPromise === scope[promiseAccessor]) {
 				let referenceNode = scope[nodeAccessor];
 				scope[promiseAccessor] = 0, queueAsyncRender(scope, () => {
-					(awaitBranch = scope[branchAccessor]).V && (pendingScopes.push(awaitBranch), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [data]);
+					(awaitBranch = scope[branchAccessor]).V && (awaitBranch.Y = awaitBranch.Y?.forEach(syncGen), setupBranch(awaitBranch.V, awaitBranch), awaitBranch.V = 0, insertBranchBefore(awaitBranch, scope[nodeAccessor].parentNode, scope[nodeAccessor]), referenceNode.remove()), params?.(awaitBranch, [data]);
 					let pendingRenders = awaitBranch.W;
 					if (awaitBranch.W = 0, pendingRenders?.forEach(queuePendingRender), placeholderShown.add(pendingEffects), awaitCounter.c(), awaitCounter.m) {
 						let fnScopes = /* @__PURE__ */ new Map(), effects = awaitCounter.m([]);
@@ -897,7 +909,8 @@ function _await_content(nodeAccessor, template, walks, setup) {
 	nodeAccessor = decodeAccessor(nodeAccessor);
 	let branchAccessor = "A" + nodeAccessor, renderer = _content("", template, walks, setup)();
 	return (scope) => {
-		(scope[branchAccessor] = createBranch(scope.$, renderer, scope, scope[nodeAccessor].parentNode)).V = renderer, pendingScopes.pop();
+		let pendingScopes = collectScopes(() => (scope[branchAccessor] = createBranch(scope.$, renderer, scope, scope[nodeAccessor].parentNode)).V = renderer);
+		scope[branchAccessor].Y = pendingScopes;
 	};
 }
 function addAwaitCounter(scope, tryBranch = findBranchWithKey(scope, "Q")) {
@@ -1069,12 +1082,10 @@ function runRenders() {
 		}
 		runRender(render);
 	}
-	for (let scope of pendingScopes) scope.H = 0;
-	pendingScopes = [];
 }
 function skipDestroyedRenders() {
 	runRender = ((runRender) => (render) => {
-		render.b.F?.I || runRender(render);
+		render.b.F?.H !== 0 && runRender(render);
 	})(runRender);
 }
 function _enable_catch() {
@@ -1089,7 +1100,7 @@ function _enable_catch() {
 		runEffects = ((runEffects) => (effects, checkPending = placeholderShown.has(effects)) => {
 			if (checkPending || caughtError.has(effects)) {
 				let i = 0, fn, scope, branch;
-				for (; i < effects.length;) fn = effects[i++], scope = effects[i++], branch = scope.F, !branch?.I && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope);
+				for (; i < effects.length;) fn = effects[i++], scope = effects[i++], (branch = scope.F)?.H !== 0 && !(checkPending && handlePendingTry(fn, scope, branch)) && fn(scope);
 			} else runEffects(effects);
 		})(runEffects), runRender = ((runRender) => (render) => {
 			try {
@@ -1193,8 +1204,8 @@ function _load_setup(nodeAccessor, childScopeAccessor, load) {
 }
 function insertLoaded(renderer, branch, marker, awaitCounter) {
 	let parent = marker.parentNode;
-	branch.H = 1, renderer.b(branch, parent.namespaceURI), setupBranch(renderer, branch), applyLoad(branch, () => {
-		insertBranchBefore(branch, parent, marker), marker.remove(), pendingScopes.push(branch), awaitCounter?.c();
+	syncGen(branch), renderer.b(branch, parent.namespaceURI), setupBranch(renderer, branch), applyLoad(branch, () => {
+		insertBranchBefore(branch, parent, marker), marker.remove(), awaitCounter?.c();
 	});
 }
 function loadFailed(scope, awaitCounter) {
@@ -1205,16 +1216,16 @@ function loadFailed(scope, awaitCounter) {
 function applyLoad(scope, insert) {
 	let values = scope.X, remaining;
 	if (scope.X = 0, remaining = values?.size) for (let [promise, entry] of values) promise.then((signal) => {
-		entry.b = signal, --remaining || (scope.H = 1, pendingScopes.push(scope), queueAsyncRender(scope, (scope) => {
-			values.forEach((e) => e.b._(scope, e.a)), insert();
-		}));
+		entry.b = signal, --remaining || queueAsyncRender(scope, (scope) => {
+			syncGen(scope), values.forEach((e) => e.b._(scope, e.a)), insert();
+		});
 	}, () => 0);
 	else insert();
 }
 function _load_signal(load) {
 	let pending, signal;
 	return (scope, value) => {
-		pending ||= load(), scope.X || !("X" in scope) && scope.H ? (scope.X ||= /* @__PURE__ */ new Map()).set(pending, { a: value }) : signal ? signal(scope, value) : pending.then((mod) => queueAsyncRender(scope, signal = mod._, value), () => 0);
+		pending ||= load(), scope.X || !("X" in scope) && scope.H === runId ? (scope.X ||= /* @__PURE__ */ new Map()).set(pending, { a: value }) : signal ? signal(scope, value) : pending.then((mod) => queueAsyncRender(scope, signal = mod._, value), () => 0);
 	};
 }
 function _load_visible_trigger(selector, options) {