marko 6.4.2 → 6.4.3

package/dist/common/constants/accessor-prop.d.ts

@@ -4,6 +4,7 @@ export declare const AbortControllers = "A";
 export declare const AbortScopes = "B";
 export declare const AwaitCounter = "O";
 export declare const BranchAccessor = "C";
+export declare const BranchRenders = "BR";
 export declare const BranchScopes = "D";
 export declare const CatchContent = "E";
 export declare const ClosestBranch = "F";

package/dist/common/constants/accessor-prop.debug.d.ts

@@ -4,6 +4,7 @@ export declare const AbortControllers = "#AbortControllers";
 export declare const AbortScopes = "#AbortScopes";
 export declare const AwaitCounter = "#AwaitCounter";
 export declare const BranchAccessor = "#BranchAccessor";
+export declare const BranchRenders = "#BranchRenders";
 export declare const BranchScopes = "#BranchScopes";
 export declare const CatchContent = "#CatchContent";
 export declare const ClosestBranch = "#ClosestBranch";

package/dist/common/types.d.ts

@@ -21,6 +21,7 @@ export interface BranchScope extends Scope {
     [AccessorProp.PlaceholderBranch]: BranchScope | undefined | 0;
     [AccessorProp.TryBranch]: BranchScope | undefined;
     [AccessorProp.PendingRenders]: PendingRender[] | 0 | undefined;
+    [AccessorProp.BranchRenders]: PendingRender | undefined;
     [AccessorProp.DetachedAwait]: Renderer | 0 | undefined;
     [AccessorProp.PendingScopes]: Scope[] | void;
 }

package/dist/debug/dom/catch.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/catch.feat.ts
 const handlePendingTry = (fn, scope, branch) => {
 	while (branch) {

package/dist/debug/dom/catch.feat.mjs

@@ -1,4 +1,4 @@
-import { In as ParentBranch, Ln as PendingEffectScopes, On as Pending, Rn as PendingEffects, b as runPendingEffects, cn as queueAsyncRender, jn as ClosestBranch, kn as Scope, ln as queueEffect, on as installCatch, y as renderCatch, zn as PendingRenders } from "../dom-Cii0IA92.mjs";
+import { Hn as PendingEffectScopes, In as ClosestBranch, Mn as Pending, Nn as Scope, Un as PendingEffects, Vn as ParentBranch, Wn as PendingRenders, b as renderCatch, fn as queueAsyncRender, pn as queueEffect, un as installCatch, x as runPendingEffects } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/catch.feat.ts
 const handlePendingTry = (fn, scope, branch) => {
 	while (branch) {

package/dist/debug/dom/controllable-input.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/controllable-input.feat.ts
 require_control_flow.controllableScripts[0] = require_control_flow._attr_input_checked_script;
 require_control_flow.controllableScripts[1] = require_control_flow._attr_input_checkedValue_script;

package/dist/debug/dom/controllable-input.feat.mjs

@@ -1,4 +1,4 @@
-import { D as _attr_input_checkedValue_script, P as _attr_input_value_script, U as controllableScripts, k as _attr_input_checked_script } from "../dom-Cii0IA92.mjs";
+import { A as _attr_input_checked_script, F as _attr_input_value_script, O as _attr_input_checkedValue_script, W as controllableScripts } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/controllable-input.feat.ts
 controllableScripts[0] = _attr_input_checked_script;
 controllableScripts[1] = _attr_input_checkedValue_script;

package/dist/debug/dom/controllable-open.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/controllable-open.feat.ts
 require_control_flow.controllableScripts[4] = require_control_flow._attr_details_or_dialog_open_script;
 //#endregion

package/dist/debug/dom/controllable-open.feat.mjs

@@ -1,4 +1,4 @@
-import { C as _attr_details_or_dialog_open_script, U as controllableScripts } from "../dom-Cii0IA92.mjs";
+import { W as controllableScripts, w as _attr_details_or_dialog_open_script } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/controllable-open.feat.ts
 controllableScripts[4] = _attr_details_or_dialog_open_script;
 //#endregion

package/dist/debug/dom/controllable-select.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/controllable-select.feat.ts
 require_control_flow.controllableScripts[3] = require_control_flow._attr_select_value_script;
 //#endregion

package/dist/debug/dom/controllable-select.feat.mjs

@@ -1,4 +1,4 @@
-import { L as _attr_select_value_script, U as controllableScripts } from "../dom-Cii0IA92.mjs";
+import { R as _attr_select_value_script, W as controllableScripts } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/controllable-select.feat.ts
 controllableScripts[3] = _attr_select_value_script;
 //#endregion

package/dist/debug/dom/controllable-textarea.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/controllable-textarea.feat.ts
 require_control_flow.controllableScripts[2] = require_control_flow._attr_input_value_script;
 //#endregion

package/dist/debug/dom/controllable-textarea.feat.mjs

@@ -1,4 +1,4 @@
-import { P as _attr_input_value_script, U as controllableScripts } from "../dom-Cii0IA92.mjs";
+import { F as _attr_input_value_script, W as controllableScripts } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/controllable-textarea.feat.ts
 controllableScripts[2] = _attr_input_value_script;
 //#endregion

package/dist/debug/dom/controllable.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 require("./controllable-input.feat.js");
 require("./controllable-open.feat.js");
 require("./controllable-select.feat.js");

package/dist/debug/dom/controllable.feat.mjs

@@ -1,4 +1,4 @@
-import { B as _controllable_select, H as controllableRenders, R as _controllable_input, V as _controllable_textarea, z as _controllable_open } from "../dom-Cii0IA92.mjs";
+import { B as _controllable_open, H as _controllable_textarea, U as controllableRenders, V as _controllable_select, z as _controllable_input } from "../dom-uEY0J_H9.mjs";
 import "./controllable-input.feat.mjs";
 import "./controllable-open.feat.mjs";
 import "./controllable-select.feat.mjs";

package/dist/debug/dom/dynamic-tag-script.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/dynamic-tag-script.feat.ts
 require_control_flow._resumed[require_control_flow.DYNAMIC_TAG_SCRIPT_REGISTER_ID] = require_control_flow.withBranches(require_control_flow.dynamicTagScript);
 //#endregion

package/dist/debug/dom/dynamic-tag-script.feat.mjs

@@ -1,4 +1,4 @@
-import { Cn as withBranches, St as _resumed, g as dynamicTagScript, tn as DYNAMIC_TAG_SCRIPT_REGISTER_ID } from "../dom-Cii0IA92.mjs";
+import { Dn as withBranches, _ as dynamicTagScript, rn as DYNAMIC_TAG_SCRIPT_REGISTER_ID, wt as _resumed } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/dynamic-tag-script.feat.ts
 _resumed[DYNAMIC_TAG_SCRIPT_REGISTER_ID] = withBranches(dynamicTagScript);
 //#endregion

package/dist/debug/dom/dynamic-tag-var.feat.js

@@ -1,5 +1,9 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/dynamic-tag-var.feat.ts
-require_control_flow.installDynamicTagVar((branch) => branch[require_control_flow.TagVariable](() => require_control_flow._el_read(branch[require_control_flow.StartNode])));
+require_control_flow.installBranchRenders();
+require_control_flow.installDynamicTagVar((scope, branch, scopeKey, renderer) => {
+	branch[require_control_flow.BranchRenders] = require_control_flow.createBranchRenders(scope, scopeKey);
+	if (typeof renderer === "string") branch[require_control_flow.TagVariable](() => require_control_flow._el_read(branch[require_control_flow.StartNode]));
+});
 //#endregion

package/dist/debug/dom/dynamic-tag-var.feat.mjs

@@ -1,4 +1,8 @@
-import { Hn as TagVariable, Pt as _el_read, Vn as StartNode, _ as installDynamicTagVar } from "../dom-Cii0IA92.mjs";
+import { Fn as BranchRenders, It as _el_read, Kn as StartNode, cn as createBranchRenders, ln as installBranchRenders, qn as TagVariable, v as installDynamicTagVar } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/dynamic-tag-var.feat.ts
-installDynamicTagVar((branch) => branch[TagVariable](() => _el_read(branch[StartNode])));
+installBranchRenders();
+installDynamicTagVar((scope, branch, scopeKey, renderer) => {
+	branch[BranchRenders] = createBranchRenders(scope, scopeKey);
+	if (typeof renderer === "string") branch[TagVariable](() => _el_read(branch[StartNode]));
+});
 //#endregion

package/dist/debug/dom/lazy.feat.js

@@ -1,4 +1,4 @@
 "use strict";
 //#region src/dom/lazy.feat.ts
-require("../dom-BLbR0hEx.js").withLazy();
+require("../dom-C7F3yZTh.js").withLazy();
 //#endregion

package/dist/debug/dom/lazy.feat.mjs

@@ -1,4 +1,4 @@
-import { kt as withLazy } from "../dom-Cii0IA92.mjs";
+import { jt as withLazy } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/lazy.feat.ts
 withLazy();
 //#endregion

package/dist/debug/dom/placeholder.feat.js

@@ -1,5 +1,5 @@
 "use strict";
-const require_control_flow = require("../dom-BLbR0hEx.js");
+const require_control_flow = require("../dom-C7F3yZTh.js");
 //#region src/dom/placeholder.feat.ts
 require_control_flow._resumed[require_control_flow.PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/dom/placeholder.feat.mjs

@@ -1,4 +1,4 @@
-import { Bn as PlaceholderBranch, St as _resumed, Zt as destroyBranch, nn as PLACEHOLDER_DISMISS_REGISTER_ID } from "../dom-Cii0IA92.mjs";
+import { $t as destroyBranch, Gn as PlaceholderBranch, in as PLACEHOLDER_DISMISS_REGISTER_ID, wt as _resumed } from "../dom-uEY0J_H9.mjs";
 //#region src/dom/placeholder.feat.ts
 _resumed[PLACEHOLDER_DISMISS_REGISTER_ID] = (tryBranch) => {
 	if (tryBranch["#PlaceholderBranch"]) {

package/dist/debug/{dom-BLbR0hEx.js → dom-C7F3yZTh.js}

@@ -23,6 +23,7 @@ const AbortControllers = "#AbortControllers";
 const AbortScopes = "#AbortScopes";
 const AwaitCounter = "#AwaitCounter";
 const BranchAccessor = "#BranchAccessor";
+const BranchRenders = "#BranchRenders";
 const BranchScopes = "#BranchScopes";
 const CatchContent = "#CatchContent";
 const ClosestBranch = "#ClosestBranch";
@@ -342,16 +343,19 @@ let rendering;
 let runId = 2;
 let pendingEffects = [];
 let pendingRenders = [];
-const scopeKeyOffset = 1e6;
+const ranRenders = /*@__PURE__*/ new WeakMap();
 function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	let render;
 	if (signalKey >= 0 && (render = scope[signalKey])) {
 		render[Value] = value;
-		if (render["gen"] === runId || catchEnabled && render["pending"]) return;
+		if (render["gen"] === runId || catchEnabled && render["pending"]) {
+			if (!render["pending"] && ranRenders.get(render) === runId) console.error("A render was queued again after it ran in this update, so its latest value is dropped. This is a bug in Marko.");
+			return;
+		}
 		render["gen"] = runId;
 	} else {
 		render = {
-			["key"]: scopeKey * scopeKeyOffset + signalKey,
+			["key"]: scopeKey * 1e6 + signalKey,
 			[Scope]: scope,
 			[Signal]: signal,
 			[Value]: value,
@@ -361,7 +365,7 @@ function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	}
 	queuePendingRender(render);
 }
-function queuePendingRender(render) {
+let queuePendingRender = (render) => {
 	let i = pendingRenders.push(render) - 1;
 	while (i) {
 		const parentIndex = i - 1 >> 1;
@@ -371,6 +375,34 @@ function queuePendingRender(render) {
 		i = parentIndex;
 	}
 	pendingRenders[i] = render;
+};
+function createBranchRenders(scope, scopeKey) {
+	return {
+		["key"]: scopeKey * 1e6 - 1,
+		[Scope]: scope,
+		[Signal]: runBranchRenders,
+		[Value]: [],
+		["gen"]: 0
+	};
+}
+function installBranchRenders() {
+	const queue = queuePendingRender;
+	queuePendingRender = (render) => {
+		const branchRenders = render[Scope][ClosestBranch]?.[BranchRenders];
+		if (branchRenders) {
+			if (branchRenders["gen"] !== runId && !branchRenders["pending"]) branchRenders[Value] = [];
+			branchRenders["gen"] = runId;
+			const renders = branchRenders[Value];
+			if (!renders.length) queuePendingRender(branchRenders);
+			const prev = pendingRenders;
+			pendingRenders = renders;
+			queue(render);
+			pendingRenders = prev;
+		} else queue(render);
+	};
+}
+function runBranchRenders(_scope, renders) {
+	runRenders(renders);
 }
 function queueEffect(scope, fn) {
 	pendingEffects.push(fn, scope);
@@ -422,26 +454,27 @@ function installCatch(catchEffects, wrapRender) {
 	runEffects = catchEffects;
 	runRender = wrapRender(runRender);
 }
-function runRenders() {
-	while (pendingRenders.length) {
-		const render = pendingRenders[0];
-		const item = pendingRenders.pop();
+function runRenders(renders = pendingRenders) {
+	while (renders.length) {
+		const render = renders[0];
+		const item = renders.pop();
 		if (render !== item) {
 			let i = 0;
-			const mid = pendingRenders.length >> 1;
-			const key = (pendingRenders[0] = item)["key"];
+			const mid = renders.length >> 1;
+			const key = (renders[0] = item)["key"];
 			while (i < mid) {
 				let bestChild = (i << 1) + 1;
 				const right = bestChild + 1;
-				if (right < pendingRenders.length && pendingRenders[right]["key"] - pendingRenders[bestChild]["key"] < 0) bestChild = right;
-				if (pendingRenders[bestChild]["key"] - key >= 0) break;
+				if (right < renders.length && renders[right]["key"] - renders[bestChild]["key"] < 0) bestChild = right;
+				if (renders[bestChild]["key"] - key >= 0) break;
 				else {
-					pendingRenders[i] = pendingRenders[bestChild];
+					renders[i] = renders[bestChild];
 					i = bestChild;
 				}
 			}
-			pendingRenders[i] = item;
+			renders[i] = item;
 		}
+		ranRenders.set(render, runId);
 		runRender(render);
 	}
 }
@@ -685,9 +718,9 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	const scopeAccessor = BranchScopes$1 + ownerLoopNodeAccessor;
 	const ownerSignal = (ownerScope) => {
 		const scopes = toArray(ownerScope[scopeAccessor]);
-		if (scopes.length) queueRender(ownerScope, () => {
+		queueRender(ownerScope, () => {
 			for (const scope of scopes) if (scope["#Gen"] > 0 && scope["#Gen"] < runId) fn(scope);
-		}, -1, 0, scopes[0]["#Id"]);
+		}, -1);
 	};
 	ownerSignal._ = fn;
 	return ownerSignal;
@@ -697,8 +730,7 @@ function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccess
 	const mapAccessor = KeyedScopes + ownerLoopNodeAccessor;
 	const prevKeyProp = `${PreviousKey}${ownerValueAccessor}`;
 	const ownerSignal = (ownerScope) => {
-		const scopes = toArray(ownerScope[scopeAccessor]);
-		if (ownerScope["#Gen"] < runId && scopes.length) {
+		if (ownerScope["#Gen"] < runId) {
 			const nextKey = ownerScope[ownerValueAccessor];
 			queueRender(ownerScope, () => {
 				const map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
@@ -711,7 +743,7 @@ function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccess
 					}
 				} else for (const scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
 				if (map) map[prevKeyProp] = nextKey;
-			}, -1, 0, scopes[0]["#Id"]);
+			}, -1);
 		}
 	};
 	ownerSignal._ = fn;
@@ -1993,6 +2025,7 @@ function patchDynamicTag(fn) {
 	_dynamic_tag = fn(_dynamic_tag);
 }
 let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagVar, inputIsArgs) => {
+	const scopeOffsetAccessor = getTagVar && getDebugKey(+nodeAccessor.slice(nodeAccessor.lastIndexOf("/") + 1) + 1, "#scopeOffset");
 	const childScopeAccessor = BranchScopes$1 + nodeAccessor;
 	const rendererAccessor = ConditionalRenderer + nodeAccessor;
 	return (scope, newRenderer, getInput) => {
@@ -2003,7 +2036,7 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 			if (getTagVar) {
 				if (scope[childScopeAccessor]) {
 					scope[childScopeAccessor][TagVariable] = (value) => getTagVar()(scope, value);
-					if (typeof normalizedRenderer === "string") bindNativeTagVar?.(scope[childScopeAccessor]);
+					bindTagVar(scope, scope[childScopeAccessor], scope[scopeOffsetAccessor], normalizedRenderer);
 				} else getTagVar()(scope, void 0);
 			}
 			if (typeof renderer === "string") {
@@ -2012,7 +2045,10 @@ let _dynamic_tag = /*@__PURE__*/ withBranches((nodeAccessor, getContent, getTagV
 					setConditionalRenderer(scope[childScopeAccessor], `#${renderer.toLowerCase()}/0`, content, createAndSetupBranch);
 					if (content["accessor"]) subscribeToScopeSet(content[Owner], content[Accessor], scope[childScopeAccessor][`BranchScopes:#${renderer.toLowerCase()}/0`]);
 				}
-			} else if (renderer?.["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
+			} else if (renderer) {
+				setupBranch(renderer, scope[childScopeAccessor]);
+				if (renderer["accessor"]) subscribeToScopeSet(renderer[Owner], renderer[Accessor], scope[childScopeAccessor]);
+			}
 		}
 		if (normalizedRenderer) {
 			const childScope = scope[childScopeAccessor];
@@ -2048,9 +2084,9 @@ const _dynamic_tag_content = /*@__PURE__*/ withBranches((nodeAccessor) => {
 		renderer?.[LocalClosures]?.(scope[childScopeAccessor]);
 	};
 });
-let bindNativeTagVar;
+let bindTagVar;
 function installDynamicTagVar(bind) {
-	bindNativeTagVar = bind;
+	bindTagVar = bind;
 }
 function dynamicTagScript(branch) {
 	_attrs_script(branch, `#${branch[Renderer].toLowerCase()}/0`);
@@ -2203,7 +2239,6 @@ function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentSco
 	if (typeof tagNameOrRenderer === "string") assertValidTagName(tagNameOrRenderer);
 	const branch = createBranch($global, tagNameOrRenderer, parentScope, parentNode);
 	if (typeof tagNameOrRenderer === "string") branch[`#${tagNameOrRenderer.toLowerCase()}/0`] = branch[StartNode] = branch[EndNode] = document.createElementNS(tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI, tagNameOrRenderer);
-	else setupBranch(tagNameOrRenderer, branch);
 	return branch;
 }
 function bySecondArg(_item, index) {
@@ -2231,6 +2266,12 @@ Object.defineProperty(exports, "AwaitCounter", {
 		return AwaitCounter;
 	}
 });
+Object.defineProperty(exports, "BranchRenders", {
+	enumerable: true,
+	get: function() {
+		return BranchRenders;
+	}
+});
 Object.defineProperty(exports, "Clone", {
 	enumerable: true,
 	get: function() {
@@ -2897,6 +2938,12 @@ Object.defineProperty(exports, "addAwaitCounter", {
 		return addAwaitCounter;
 	}
 });
+Object.defineProperty(exports, "bindTagVar", {
+	enumerable: true,
+	get: function() {
+		return bindTagVar;
+	}
+});
 Object.defineProperty(exports, "controllableRenders", {
 	enumerable: true,
 	get: function() {
@@ -2921,6 +2968,12 @@ Object.defineProperty(exports, "createBranch", {
 		return createBranch;
 	}
 });
+Object.defineProperty(exports, "createBranchRenders", {
+	enumerable: true,
+	get: function() {
+		return createBranchRenders;
+	}
+});
 Object.defineProperty(exports, "destroyBranch", {
 	enumerable: true,
 	get: function() {
@@ -2987,6 +3040,12 @@ Object.defineProperty(exports, "insertChildNodes", {
 		return insertChildNodes;
 	}
 });
+Object.defineProperty(exports, "installBranchRenders", {
+	enumerable: true,
+	get: function() {
+		return installBranchRenders;
+	}
+});
 Object.defineProperty(exports, "installCatch", {
 	enumerable: true,
 	get: function() {
@@ -3083,6 +3142,12 @@ Object.defineProperty(exports, "runPendingEffects", {
 		return runPendingEffects;
 	}
 });
+Object.defineProperty(exports, "setParentBranch", {
+	enumerable: true,
+	get: function() {
+		return setParentBranch;
+	}
+});
 Object.defineProperty(exports, "setupBranch", {
 	enumerable: true,
 	get: function() {