@marko/runtime-tags 6.1.11 → 6.1.12

package/dist/common/accessor.d.ts

@@ -24,8 +24,7 @@ export declare enum AccessorProp {
     CatchContent = "E",
     ClosestBranch = "F",
     ClosestBranchId = "G",
-    Creating = "H",
-    Destroyed = "I",
+    Gen = "H",
     DetachedAwait = "V",
     EndNode = "K",
     Id = "L",
@@ -34,6 +33,7 @@ export declare enum AccessorProp {
     ParentBranch = "N",
     PendingEffects = "J",
     PendingRenders = "W",
+    PendingScopes = "Y",
     PlaceholderBranch = "P",
     PlaceholderContent = "Q",
     Renderer = "R",

package/dist/common/accessor.debug.d.ts

@@ -24,8 +24,7 @@ export declare enum AccessorProp {
     CatchContent = "#CatchContent",
     ClosestBranch = "#ClosestBranch",
     ClosestBranchId = "#ClosestBranchId",
-    Creating = "#Creating",
-    Destroyed = "#Destroyed",
+    Gen = "#Gen",
     DetachedAwait = "#DetachedAwait",
     EndNode = "#EndNode",
     Id = "#Id",
@@ -34,6 +33,7 @@ export declare enum AccessorProp {
     ParentBranch = "#ParentBranch",
     PendingEffects = "#PendingEffects",
     PendingRenders = "#PendingRenders",
+    PendingScopes = "#PendingScopes",
     PlaceholderBranch = "#PlaceholderBranch",
     PlaceholderContent = "#PlaceholderContent",
     Renderer = "#Renderer",

package/dist/common/errors.d.ts

@@ -1,8 +1,6 @@
-import { type Scope } from "./types";
 export declare function _el_read_error(): void;
 export declare function _hoist_read_error(): void;
 export declare function _assert_hoist(value: unknown): void;
-export declare function _assert_init(scope: Scope, accessor: string): any;
 export declare function assertExclusiveAttrs(attrs: Record<string, unknown> | undefined, onError?: typeof throwErr): void;
 export declare function assertValidTagName(tagName: string): void;
 declare function throwErr(msg: string): void;

package/dist/common/types.d.ts

@@ -6,7 +6,6 @@ export interface BranchScope extends Scope {
     [AccessorProp.StartNode]: ChildNode;
     [AccessorProp.EndNode]: ChildNode;
     [AccessorProp.ParentBranch]: BranchScope | undefined;
-    [AccessorProp.Destroyed]: 1 | undefined;
     [AccessorProp.AbortScopes]: Set<Scope> | undefined;
     [AccessorProp.BranchScopes]: Set<BranchScope> | undefined;
     [AccessorProp.Renderer]: ClientRenderer | string;
@@ -15,12 +14,13 @@ export interface BranchScope extends Scope {
     [AccessorProp.PlaceholderBranch]: BranchScope | undefined | 0;
     [AccessorProp.PendingRenders]: PendingRender[] | 0 | undefined;
     [AccessorProp.DetachedAwait]: Renderer | 0 | undefined;
+    [AccessorProp.PendingScopes]: Scope[] | void;
 }
 export interface Scope {
     [AccessorProp.Owner]: Scope | undefined;
     [AccessorProp.Global]: Record<string, unknown>;
     [AccessorProp.Id]: number;
-    [AccessorProp.Creating]: 1 | 0 | undefined;
+    [AccessorProp.Gen]: number;
     [AccessorProp.AbortControllers]: Record<string | number, AbortController | void> | undefined;
     [AccessorProp.ClosestBranch]: BranchScope | undefined;
     [AccessorProp.ClosestBranchId]: number | undefined;

package/dist/debug/dom.js

@@ -31,10 +31,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;
@@ -202,16 +198,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++;
 }
@@ -225,13 +239,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);
 };
@@ -290,7 +304,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);
 			}
@@ -325,7 +339,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]);
@@ -336,7 +350,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;
@@ -347,7 +361,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;
@@ -366,7 +380,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);
 		}
 	};
 }
@@ -606,6 +620,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;
@@ -770,7 +785,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;
 	}
@@ -780,7 +795,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) {
@@ -808,7 +823,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);
@@ -834,7 +849,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);
 	}
@@ -845,7 +860,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) {
@@ -871,14 +886,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;
 			}
 		}
@@ -887,7 +902,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;
@@ -935,13 +950,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) {
@@ -1245,7 +1260,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]);
@@ -1286,8 +1301,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")) {
@@ -1550,13 +1565,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;
@@ -1649,13 +1663,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;
@@ -1678,8 +1690,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);
@@ -1903,13 +1914,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();
 	});
 }
@@ -1925,14 +1935,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();
 }
@@ -1941,7 +1948,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);
 	};