marko 6.1.23 → 6.1.24

package/dist/common/accessor.d.ts

@@ -9,6 +9,7 @@ export declare enum AccessorPrefix {
     DynamicHTMLLastChild = "H",
     EventAttributes = "I",
     Getter = "J",
+    KeyedScopes = "O",
     Lifecycle = "K",
     Promise = "L",
     TagVariableChange = "M"
@@ -65,6 +66,9 @@ export declare enum ClosureSignalProp {
     SignalIndexAccessor = "b",
     Index = "c"
 }
+export declare enum KeyedScopesProp {
+    PreviousKey = "_"
+}
 export declare enum LoadSignalValue {
     Value = "a",
     Signal = "b"

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

@@ -9,6 +9,7 @@ export declare enum AccessorPrefix {
     DynamicHTMLLastChild = "DynamicHTMLLastChild:",
     EventAttributes = "EventAttributes:",
     Getter = "Getter:",
+    KeyedScopes = "KeyedScopes:",
     Lifecycle = "Lifecycle:",
     Promise = "Promise:",
     TagVariableChange = "TagVariableChange:"
@@ -65,6 +66,9 @@ export declare enum ClosureSignalProp {
     SignalIndexAccessor = "signalIndexAccessor",
     Index = "index"
 }
+export declare enum KeyedScopesProp {
+    PreviousKey = "PreviousKey:"
+}
 export declare enum LoadSignalValue {
     Value = "value",
     Signal = "signal"

package/dist/common/types.d.ts

@@ -41,7 +41,7 @@ export interface AwaitCounter {
     i: number;
     c: () => void | 1;
 }
-export { AccessorPrefix, AccessorProp, ClosureSignalProp, PendingRenderProp, RendererProp, } from "./accessor.debug";
+export { AccessorPrefix, AccessorProp, ClosureSignalProp, KeyedScopesProp, PendingRenderProp, RendererProp, } from "./accessor.debug";
 export declare enum NodeType {
     Element = 1,
     Text = 3,

package/dist/debug/dom.js

@@ -436,6 +436,44 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	ownerSignal._ = fn;
 	return ownerSignal;
 }
+function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccessor, fn) {
+	const scopeAccessor = "BranchScopes:" + ownerLoopNodeAccessor;
+	const mapAccessor = "KeyedScopes:" + ownerLoopNodeAccessor;
+	const prevKeyProp = `PreviousKey:${ownerValueAccessor}`;
+	const ownerSignal = (ownerScope) => {
+		const scopes = toArray(ownerScope[scopeAccessor]);
+		if (ownerScope["#Gen"] < runId && scopes.length) {
+			const nextKey = ownerScope[ownerValueAccessor];
+			queueRender(ownerScope, () => {
+				const map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
+				if (map && prevKeyProp in map) {
+					const prevScope = map.get(map[prevKeyProp]);
+					const nextScope = map.get(nextKey);
+					if (prevScope !== nextScope) {
+						runLiveBranch(prevScope, fn);
+						runLiveBranch(nextScope, fn);
+					}
+				} else for (const scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
+				if (map) map[prevKeyProp] = nextKey;
+			}, -1, 0, scopes[0]["#Id"]);
+		}
+	};
+	ownerSignal._ = fn;
+	return ownerSignal;
+}
+function keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor) {
+	const map = ownerScope[mapAccessor] ||= /* @__PURE__ */ new Map();
+	if (!map.size) for (const scope of toArray(ownerScope[scopeAccessor])) {
+		const key = scope["#LoopKey"] ?? scope[keyValueAccessor];
+		if (key === void 0) return ownerScope[mapAccessor] = null;
+		scope["#LoopKey"] = key;
+		map.set(key, scope);
+	}
+	return map;
+}
+function runLiveBranch(scope, fn) {
+	if (scope && scope["#Gen"] > 0 && scope["#Gen"] < runId) fn(scope);
+}
 function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	const scopeAccessor = "BranchScopes:" + ownerConditionalNodeAccessor;
 	const branchAccessor = "ConditionalRenderer:" + ownerConditionalNodeAccessor;
@@ -1597,12 +1635,14 @@ const _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], c
 function loop(forEach) {
 	return (nodeAccessor, template, walks, setup, params) => {
 		const scopesAccessor = "BranchScopes:" + nodeAccessor;
+		const keyedScopesAccessor = "KeyedScopes:" + nodeAccessor;
 		const renderer = _content("", template, walks, setup)();
 		enableBranches();
 		return (scope, value) => {
 			const referenceNode = scope[nodeAccessor];
 			const oldScopes = toArray(scope[scopesAccessor]);
 			const newScopes = scope[scopesAccessor] = [];
+			scope[keyedScopesAccessor] = null;
 			const oldLen = oldScopes.length;
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
@@ -2186,6 +2226,7 @@ exports._enable_catch = _enable_catch;
 exports._for_closure = _for_closure;
 exports._for_in = _for_in;
 exports._for_of = _for_of;
+exports._for_selector = _for_selector;
 exports._for_to = _for_to;
 exports._for_until = _for_until;
 exports._hoist = _hoist;

package/dist/debug/dom.mjs

@@ -434,6 +434,44 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	ownerSignal._ = fn;
 	return ownerSignal;
 }
+function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccessor, fn) {
+	const scopeAccessor = "BranchScopes:" + ownerLoopNodeAccessor;
+	const mapAccessor = "KeyedScopes:" + ownerLoopNodeAccessor;
+	const prevKeyProp = `PreviousKey:${ownerValueAccessor}`;
+	const ownerSignal = (ownerScope) => {
+		const scopes = toArray(ownerScope[scopeAccessor]);
+		if (ownerScope["#Gen"] < runId && scopes.length) {
+			const nextKey = ownerScope[ownerValueAccessor];
+			queueRender(ownerScope, () => {
+				const map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
+				if (map && prevKeyProp in map) {
+					const prevScope = map.get(map[prevKeyProp]);
+					const nextScope = map.get(nextKey);
+					if (prevScope !== nextScope) {
+						runLiveBranch(prevScope, fn);
+						runLiveBranch(nextScope, fn);
+					}
+				} else for (const scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
+				if (map) map[prevKeyProp] = nextKey;
+			}, -1, 0, scopes[0]["#Id"]);
+		}
+	};
+	ownerSignal._ = fn;
+	return ownerSignal;
+}
+function keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor) {
+	const map = ownerScope[mapAccessor] ||= /* @__PURE__ */ new Map();
+	if (!map.size) for (const scope of toArray(ownerScope[scopeAccessor])) {
+		const key = scope["#LoopKey"] ?? scope[keyValueAccessor];
+		if (key === void 0) return ownerScope[mapAccessor] = null;
+		scope["#LoopKey"] = key;
+		map.set(key, scope);
+	}
+	return map;
+}
+function runLiveBranch(scope, fn) {
+	if (scope && scope["#Gen"] > 0 && scope["#Gen"] < runId) fn(scope);
+}
 function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	const scopeAccessor = "BranchScopes:" + ownerConditionalNodeAccessor;
 	const branchAccessor = "ConditionalRenderer:" + ownerConditionalNodeAccessor;
@@ -1595,12 +1633,14 @@ const _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], c
 function loop(forEach) {
 	return (nodeAccessor, template, walks, setup, params) => {
 		const scopesAccessor = "BranchScopes:" + nodeAccessor;
+		const keyedScopesAccessor = "KeyedScopes:" + nodeAccessor;
 		const renderer = _content("", template, walks, setup)();
 		enableBranches();
 		return (scope, value) => {
 			const referenceNode = scope[nodeAccessor];
 			const oldScopes = toArray(scope[scopesAccessor]);
 			const newScopes = scope[scopesAccessor] = [];
+			scope[keyedScopesAccessor] = null;
 			const oldLen = oldScopes.length;
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
@@ -2122,4 +2162,4 @@ function getSelectorOrResolve(selector, resolve) {
 	return document.querySelector(selector) || (console.warn(`A lazy load trigger could not find an element matching "${selector}". The module was loaded immediately.`), resolve());
 }
 //#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, _dynamic_tag_content, _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, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _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, ready, 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, _dynamic_tag_content, _el, _el_read, _enable_catch, _for_closure, _for_in, _for_of, _for_selector, _for_to, _for_until, _hoist, _hoist_resume, _html, _id, _if, _if_closure, _let, _let_change, _lifecycle, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _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, ready, run };

package/dist/dom/signals.d.ts

@@ -6,6 +6,7 @@ export declare function _let_change<T>(id: EncodedAccessor, fn?: SignalFn): (sco
 export declare function _const<T>(valueAccessor: EncodedAccessor, fn?: SignalFn): Signal<T>;
 export declare function _or(id: number, fn: SignalFn, defaultPending?: number, scopeIdAccessor?: EncodedAccessor): Signal<never>;
 export declare function _for_closure(ownerLoopNodeAccessor: EncodedAccessor, fn: SignalFn): SignalFn;
+export declare function _for_selector(ownerLoopNodeAccessor: EncodedAccessor, ownerValueAccessor: EncodedAccessor, keyValueAccessor: EncodedAccessor, fn: SignalFn): SignalFn;
 export declare function _if_closure(ownerConditionalNodeAccessor: EncodedAccessor, branch: number, fn: SignalFn): SignalFn;
 export declare function subscribeToScopeSet(ownerScope: Scope, accessor: Accessor, scope: Scope): void;
 export declare function _closure(...closureSignals: ReturnType<typeof _closure_get>[]): (scope: Scope) => void;

package/dist/dom.d.ts

@@ -13,5 +13,5 @@ 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 { _child_setup, _closure, _closure_get, _const, _el_read, _for_closure, _for_selector, _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

@@ -303,6 +303,36 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	};
 	return ownerSignal._ = fn, ownerSignal;
 }
+function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccessor, fn) {
+	ownerLoopNodeAccessor = decodeAccessor(ownerLoopNodeAccessor), ownerValueAccessor = decodeAccessor(ownerValueAccessor), keyValueAccessor !== "M" && (keyValueAccessor = decodeAccessor(keyValueAccessor));
+	let scopeAccessor = "A" + ownerLoopNodeAccessor, mapAccessor = "O" + ownerLoopNodeAccessor, prevKeyProp = `_${ownerValueAccessor}`, ownerSignal = (ownerScope) => {
+		let scopes = toArray(ownerScope[scopeAccessor]);
+		if (ownerScope.H < runId && scopes.length) {
+			let nextKey = ownerScope[ownerValueAccessor];
+			queueRender(ownerScope, () => {
+				let map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
+				if (map && prevKeyProp in map) {
+					let prevScope = map.get(map[prevKeyProp]), nextScope = map.get(nextKey);
+					prevScope !== nextScope && (runLiveBranch(prevScope, fn), runLiveBranch(nextScope, fn));
+				} else for (let scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
+				map && (map[prevKeyProp] = nextKey);
+			}, -1, 0, scopes[0].L);
+		}
+	};
+	return ownerSignal._ = fn, ownerSignal;
+}
+function keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor) {
+	let map = ownerScope[mapAccessor] ||= /* @__PURE__ */ new Map();
+	if (!map.size) for (let scope of toArray(ownerScope[scopeAccessor])) {
+		let key = scope.M ?? scope[keyValueAccessor];
+		if (key === void 0) return ownerScope[mapAccessor] = null;
+		scope.M = key, map.set(key, scope);
+	}
+	return map;
+}
+function runLiveBranch(scope, fn) {
+	scope && scope.H > 0 && scope.H < runId && fn(scope);
+}
 function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	ownerConditionalNodeAccessor = decodeAccessor(ownerConditionalNodeAccessor);
 	let scopeAccessor = "A" + ownerConditionalNodeAccessor, branchAccessor = "D" + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
@@ -1006,9 +1036,11 @@ function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch)
 function loop(forEach) {
 	return (nodeAccessor, template, walks, setup, params) => {
 		nodeAccessor = decodeAccessor(nodeAccessor);
-		let scopesAccessor = "A" + nodeAccessor, renderer = _content("", template, walks, setup)();
+		let scopesAccessor = "A" + nodeAccessor, keyedScopesAccessor = "O" + nodeAccessor, renderer = _content("", template, walks, setup)();
 		return enableBranches(), (scope, value) => {
-			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [], oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
+			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [];
+			scope[keyedScopesAccessor] = null;
+			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
 			forEach(value, (key, args) => {
 				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope.M ?? i, scope), /* @__PURE__ */ new Map())).get(key);
 				branch ? hasPotentialMoves = oldScopesByKey.delete(key) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
@@ -1283,4 +1315,4 @@ exports.$signal = $signal, exports.$signalReset = $signalReset, exports._assert_
 	get: function() {
 		return _dynamic_tag;
 	}
-}), exports._dynamic_tag_content = _dynamic_tag_content, exports._el = _el, exports._el_read = _el_read, exports._enable_catch = _enable_catch, exports._for_closure = _for_closure, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_resume = _hoist_resume, exports._html = _html, exports._id = _id, exports._if = _if, exports._if_closure = _if_closure, exports._let = _let, exports._let_change = _let_change, exports._lifecycle = _lifecycle, exports._load_event_trigger = _load_event_trigger, exports._load_idle_trigger = _load_idle_trigger, exports._load_media_trigger = _load_media_trigger, exports._load_race_trigger = _load_race_trigger, exports._load_setup = _load_setup, exports._load_signal = _load_signal, exports._load_template = _load_template, exports._load_visible_trigger = _load_visible_trigger, exports._on = _on, exports._or = _or, exports._resume = _resume, exports._resume_dynamic_tag = _resume_dynamic_tag, exports._return = _return, exports._return_change = _return_change, exports._script = _script, exports._template = _template, exports._text = _text, exports._text_content = _text_content, exports._to_text = _to_text, exports._try = _try, exports._var = _var, exports._var_change = _var_change, exports._var_resume = _var_resume, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forOf = forOf, exports.forTo = forTo, exports.forUntil = forUntil, exports.init = init, exports.initEmbedded = initEmbedded, exports.ready = ready, exports.run = run;
+}), exports._dynamic_tag_content = _dynamic_tag_content, exports._el = _el, exports._el_read = _el_read, exports._enable_catch = _enable_catch, exports._for_closure = _for_closure, exports._for_in = _for_in, exports._for_of = _for_of, exports._for_selector = _for_selector, exports._for_to = _for_to, exports._for_until = _for_until, exports._hoist = _hoist, exports._hoist_resume = _hoist_resume, exports._html = _html, exports._id = _id, exports._if = _if, exports._if_closure = _if_closure, exports._let = _let, exports._let_change = _let_change, exports._lifecycle = _lifecycle, exports._load_event_trigger = _load_event_trigger, exports._load_idle_trigger = _load_idle_trigger, exports._load_media_trigger = _load_media_trigger, exports._load_race_trigger = _load_race_trigger, exports._load_setup = _load_setup, exports._load_signal = _load_signal, exports._load_template = _load_template, exports._load_visible_trigger = _load_visible_trigger, exports._on = _on, exports._or = _or, exports._resume = _resume, exports._resume_dynamic_tag = _resume_dynamic_tag, exports._return = _return, exports._return_change = _return_change, exports._script = _script, exports._template = _template, exports._text = _text, exports._text_content = _text_content, exports._to_text = _to_text, exports._try = _try, exports._var = _var, exports._var_change = _var_change, exports._var_resume = _var_resume, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forOf = forOf, exports.forTo = forTo, exports.forUntil = forUntil, exports.init = init, exports.initEmbedded = initEmbedded, exports.ready = ready, exports.run = run;

package/dist/dom.mjs

@@ -302,6 +302,36 @@ function _for_closure(ownerLoopNodeAccessor, fn) {
 	};
 	return ownerSignal._ = fn, ownerSignal;
 }
+function _for_selector(ownerLoopNodeAccessor, ownerValueAccessor, keyValueAccessor, fn) {
+	ownerLoopNodeAccessor = decodeAccessor(ownerLoopNodeAccessor), ownerValueAccessor = decodeAccessor(ownerValueAccessor), keyValueAccessor !== "M" && (keyValueAccessor = decodeAccessor(keyValueAccessor));
+	let scopeAccessor = "A" + ownerLoopNodeAccessor, mapAccessor = "O" + ownerLoopNodeAccessor, prevKeyProp = `_${ownerValueAccessor}`, ownerSignal = (ownerScope) => {
+		let scopes = toArray(ownerScope[scopeAccessor]);
+		if (ownerScope.H < runId && scopes.length) {
+			let nextKey = ownerScope[ownerValueAccessor];
+			queueRender(ownerScope, () => {
+				let map = keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor);
+				if (map && prevKeyProp in map) {
+					let prevScope = map.get(map[prevKeyProp]), nextScope = map.get(nextKey);
+					prevScope !== nextScope && (runLiveBranch(prevScope, fn), runLiveBranch(nextScope, fn));
+				} else for (let scope of toArray(ownerScope[scopeAccessor])) runLiveBranch(scope, fn);
+				map && (map[prevKeyProp] = nextKey);
+			}, -1, 0, scopes[0].L);
+		}
+	};
+	return ownerSignal._ = fn, ownerSignal;
+}
+function keyedScopes(ownerScope, scopeAccessor, mapAccessor, keyValueAccessor) {
+	let map = ownerScope[mapAccessor] ||= /* @__PURE__ */ new Map();
+	if (!map.size) for (let scope of toArray(ownerScope[scopeAccessor])) {
+		let key = scope.M ?? scope[keyValueAccessor];
+		if (key === void 0) return ownerScope[mapAccessor] = null;
+		scope.M = key, map.set(key, scope);
+	}
+	return map;
+}
+function runLiveBranch(scope, fn) {
+	scope && scope.H > 0 && scope.H < runId && fn(scope);
+}
 function _if_closure(ownerConditionalNodeAccessor, branch, fn) {
 	ownerConditionalNodeAccessor = decodeAccessor(ownerConditionalNodeAccessor);
 	let scopeAccessor = "A" + ownerConditionalNodeAccessor, branchAccessor = "D" + ownerConditionalNodeAccessor, ownerSignal = (scope) => {
@@ -1005,9 +1035,11 @@ function setConditionalRenderer(scope, nodeAccessor, newRenderer, createBranch)
 function loop(forEach) {
 	return (nodeAccessor, template, walks, setup, params) => {
 		nodeAccessor = decodeAccessor(nodeAccessor);
-		let scopesAccessor = "A" + nodeAccessor, renderer = _content("", template, walks, setup)();
+		let scopesAccessor = "A" + nodeAccessor, keyedScopesAccessor = "O" + nodeAccessor, renderer = _content("", template, walks, setup)();
 		return enableBranches(), (scope, value) => {
-			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [], oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
+			let referenceNode = scope[nodeAccessor], oldScopes = toArray(scope[scopesAccessor]), newScopes = scope[scopesAccessor] = [];
+			scope[keyedScopesAccessor] = null;
+			let oldLen = oldScopes.length, parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.S.parentNode : referenceNode, oldScopesByKey, hasPotentialMoves;
 			forEach(value, (key, args) => {
 				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope.M ?? i, scope), /* @__PURE__ */ new Map())).get(key);
 				branch ? hasPotentialMoves = oldScopesByKey.delete(key) : branch = createAndSetupBranch(scope.$, renderer, scope, parentNode), branch.M = key, newScopes.push(branch), params?.(branch, args);
@@ -1278,4 +1310,4 @@ function getSelectorOrResolve(selector, resolve) {
 	return document.querySelector(selector) || resolve();
 }
 //#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, _dynamic_tag_content, _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, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _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, ready, 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, _dynamic_tag_content, _el, _el_read, _enable_catch, _for_closure, _for_in, _for_of, _for_selector, _for_to, _for_until, _hoist, _hoist_resume, _html, _id, _if, _if_closure, _let, _let_change, _lifecycle, _load_event_trigger, _load_idle_trigger, _load_media_trigger, _load_race_trigger, _load_setup, _load_signal, _load_template, _load_visible_trigger, _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, ready, run };

package/dist/translator/index.js

@@ -96,6 +96,7 @@ let AccessorPrefix$1 = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["DynamicHTMLLastChild"] = "DynamicHTMLLastChild:";
 	AccessorPrefix["EventAttributes"] = "EventAttributes:";
 	AccessorPrefix["Getter"] = "Getter:";
+	AccessorPrefix["KeyedScopes"] = "KeyedScopes:";
 	AccessorPrefix["Lifecycle"] = "Lifecycle:";
 	AccessorPrefix["Promise"] = "Promise:";
 	AccessorPrefix["TagVariableChange"] = "TagVariableChange:";
@@ -1073,6 +1074,7 @@ let AccessorPrefix = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["DynamicHTMLLastChild"] = "H";
 	AccessorPrefix["EventAttributes"] = "I";
 	AccessorPrefix["Getter"] = "J";
+	AccessorPrefix["KeyedScopes"] = "O";
 	AccessorPrefix["Lifecycle"] = "K";
 	AccessorPrefix["Promise"] = "L";
 	AccessorPrefix["TagVariableChange"] = "M";
@@ -2250,6 +2252,7 @@ const pureDOMFunctions = new Set([
 	"_closure_get",
 	"_or",
 	"_for_closure",
+	"_for_selector",
 	"_for_in",
 	"_for_of",
 	"_for_to",
@@ -2824,7 +2827,79 @@ function forEachIdentifierPath(nodePath, cb) {
 	}
 }
 //#endregion
+//#region src/translator/util/for-selector.ts
+const forSelectorsBySection = /* @__PURE__ */ new WeakMap();
+const forSelectorValues = /* @__PURE__ */ new WeakSet();
+function getForSelectorKey(bodySection, closure) {
+	const selectors = forSelectorsBySection.get(bodySection);
+	if (selectors?.closures.has(getCanonicalBinding(closure))) return selectors.keyBinding;
+}
+function isForSelectorValue(binding) {
+	return forSelectorValues.has(binding);
+}
+function detectForSelector(bodySection, keyBinding) {
+	let closures;
+	for (const expr of keyBinding.reads) {
+		if (expr.section !== bodySection) continue;
+		forEach(expr.referencedBindings, (closure) => {
+			const canonical = getCanonicalBinding(closure);
+			if (closure.type !== 6 && isDirectClosure(bodySection, closure) && !closures?.has(canonical) && onlyComparesKey(closure, canonical, bodySection, keyBinding)) {
+				(closures ||= /* @__PURE__ */ new Set()).add(canonical);
+				forSelectorValues.add(closure);
+			}
+		});
+	}
+	if (closures) forSelectorsBySection.set(bodySection, {
+		keyBinding,
+		closures
+	});
+}
+function onlyComparesKey(closure, canonical, bodySection, keyBinding) {
+	let found = false;
+	for (let chain = closure; chain; chain = chain.upstreamAlias) for (const expr of chain.reads) {
+		if (expr.section !== bodySection) continue;
+		let other = false;
+		forEach(getExpressionReads(expr), (read) => {
+			const resolved = read.extra.read;
+			const at = resolved && resolvesTo(resolved, canonical);
+			if (!at) return;
+			if (at === 2 || resolved.getter || !readsKey(read.comparedTo?.extra?.read, keyBinding)) other = true;
+			else found = true;
+		});
+		if (other) return false;
+	}
+	return found;
+}
+function resolvesTo(read, canonical) {
+	let binding = read.binding;
+	let through = 0;
+	forEach(read.props, (prop) => {
+		if (binding) {
+			if (getCanonicalBinding(binding) === canonical) through = 2;
+			binding = binding.propertyAliases.get(prop);
+		}
+	});
+	return binding && getCanonicalBinding(binding) === canonical ? 1 : through;
+}
+function readsKey(read, keyBinding) {
+	if (!read || read.getter) return false;
+	let binding = read.binding;
+	forEach(read.props, (prop) => {
+		binding = binding?.propertyAliases.get(prop);
+	});
+	return !!binding && getCanonicalBinding(binding) === getCanonicalBinding(keyBinding);
+}
+//#endregion
 //#region src/translator/util/to-property-name.ts
+function getMemberExpressionPropString(expr) {
+	switch (expr.property.type) {
+		case "StringLiteral": return expr.property.value;
+		case "NumericLiteral": return "" + expr.property.value;
+		case "Identifier":
+			if (expr.computed) return;
+			return expr.property.name;
+	}
+}
 function isValidPropertyIdentifier(name) {
 	return /^[a-z_$][a-z0-9_$]*$/i.test(name);
 }
@@ -2974,6 +3049,8 @@ function getSignal(section, referencedBindings, name) {
 			export: !!exportName,
 			hasSideEffect: !!(referencedBindings && (Array.isArray(referencedBindings) || referencedBindings.type === 0 || referencedBindings.type === 1 || referencedBindings.section !== section || referencedBindings.closureSections || referencedBindings.hoists)),
 			hasDynamicSubscribers: false,
+			forcePersist: false,
+			inline: void 0,
 			extraArgs: void 0,
 			prependStatements: void 0,
 			buildAssignment: void 0
@@ -2981,8 +3058,18 @@ function getSignal(section, referencedBindings, name) {
 		if (isOutputHTML()) return signal;
 		else if (!referencedBindings) signal.build = () => getSignalFn(signal);
 		else if (Array.isArray(referencedBindings)) {
-			subscribe(referencedBindings, signal);
-			signal.build = () => {
+			const collapseSource = collapsedIntersectionSource.get(referencedBindings);
+			subscribe(collapseSource || referencedBindings, signal);
+			if (collapseSource) {
+				const sourceSignal = getSignal(section, collapseSource);
+				forEach(referencedBindings, (member) => {
+					const memberSignal = getSignal(section, member);
+					const inline = member.type === 5 && !member.upstreamAlias && member.reads.size === 1 && sourceSignal.values.find((v) => v.signal === memberSignal);
+					if (inline) memberSignal.inline = inline;
+					else memberSignal.hasSideEffect = memberSignal.forcePersist = true;
+				});
+				signal.build = () => getSignalFn(signal);
+			} else signal.build = () => {
 				const { id, scopeOffset } = intersectionMeta.get(referencedBindings);
 				return callRuntime("_or", _marko_compiler.types.numericLiteral(id), getSignalFn(signal), scopeOffset || referencedBindings.length > 2 ? _marko_compiler.types.numericLiteral(referencedBindings.length - 1) : void 0, scopeOffset && getScopeAccessorLiteral(scopeOffset, true));
 			};
@@ -3010,7 +3097,8 @@ function initValue(binding, isLet = false) {
 	signal.build = () => {
 		if (isPureMemberForwarder(binding)) return;
 		const fn = getSignalFn(signal);
-		if (binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0 || !signal.hasSideEffect || !signalHasStatements(signal)) return fn;
+		const isDirectAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
+		if (!signal.forcePersist && (isDirectAlias || !signal.hasSideEffect || !signalHasStatements(signal))) return fn;
 		return callRuntime(isLet ? signal.extraArgs ? "_let_change" : "_let" : "_const", getScopeAccessorLiteral(binding, true, isLet), fn);
 	};
 	for (const alias of binding.aliases) if (alias.type !== 6) initValue(alias);
@@ -3018,7 +3106,7 @@ function initValue(binding, isLet = false) {
 	return signal;
 }
 function signalHasStatements(signal) {
-	if (signal.extraArgs || signal.render.length || signal.effect.length || signal.values.length || signal.intersection) return true;
+	if (signal.extraArgs || signal.forcePersist || signal.render.length || signal.effect.length || signal.values.length || signal.intersection) return true;
 	const binding = signal.referencedBindings;
 	if (binding) {
 		if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 || binding.section === signal.section && (binding.hoists || binding.aliases.size || hasNonConstantPropertyAlias(binding)))) return true;
@@ -3026,7 +3114,7 @@ function signalHasStatements(signal) {
 	return false;
 }
 function isPureMemberForwarder(binding) {
-	if (binding.property === void 0 || binding.reads.size || binding.exposed || binding.aliases.size || binding.assignmentSections || getSerializeReason(binding.section, binding) || getSignal(binding.section, binding).hasSideEffect) return false;
+	if (binding.property === void 0 || binding.reads.size || binding.exposed || binding.aliases.size || binding.assignmentSections || isForSelectorValue(binding) || getSerializeReason(binding.section, binding) || getSignal(binding.section, binding).hasSideEffect) return false;
 	for (const alias of binding.propertyAliases.values()) if (alias.type !== 6) return true;
 	return false;
 }
@@ -3078,12 +3166,15 @@ function getSignalFn(signal) {
 		for (const [key, alias] of binding.propertyAliases) if (alias.type !== 6) pushMemberForwards(signal.render, toMemberExpression(createScopeReadExpression(binding), key, binding.nullable), alias);
 		if (assertsHoists) signal.render.push(_marko_compiler.types.expressionStatement(callRuntime("_assert_hoist", createScopeReadExpression(binding))));
 	}
-	for (const value of signal.values) if (signalHasStatements(value.signal)) signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
-		scopeIdentifier,
-		value.value,
-		...getTranslatedExtraArgs(value.signal)
-	])));
-	else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
+	for (const value of signal.values) {
+		if (value.signal.inline) continue;
+		if (signalHasStatements(value.signal)) signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
+			scopeIdentifier,
+			value.value,
+			...getTranslatedExtraArgs(value.signal)
+		])));
+		else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
+	}
 	forEach(signal.intersection, (intersection) => {
 		signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(intersection.identifier, [scopeIdentifier])));
 	});
@@ -3845,10 +3936,14 @@ var for_default = {
 		addSerializeExpr(tagSection, tagExtra, kStatefulReason$1);
 		if (paramsBinding) {
 			setBindingDownstream(paramsBinding, tagExtra);
-			const keyBinding = paramsBinding.propertyAliases.get(forType === "of" ? "1" : "0");
-			if (keyBinding && !getKnownAttrValues(tag.node).by) {
-				keyBinding.type = 6;
-				keyBinding.scopeAccessor = getAccessorProp().LoopKey;
+			const byAttr = getKnownAttrValues(tag.node).by;
+			const keyBinding = getLoopKeyBinding(byAttr, paramsBinding, forType);
+			if (keyBinding) {
+				if (!byAttr) {
+					keyBinding.type = 6;
+					keyBinding.scopeAccessor = getAccessorProp().LoopKey;
+				}
+				onFinalizeReferences(() => detectForSelector(bodySection, keyBinding));
 			}
 		}
 		bodySection.sectionAccessor = {
@@ -3935,7 +4030,9 @@ var for_default = {
 				const { node } = tag;
 				const { referencedBindings } = node.extra;
 				const nodeRef = getOptimizedOnlyChildNodeBinding(tag, tagSection);
-				setClosureSignalBuilder(tag, (_closure, render) => {
+				setClosureSignalBuilder(tag, (closure, render) => {
+					const selectorKeyBinding = getForSelectorKey(bodySection, closure);
+					if (selectorKeyBinding) return callRuntime("_for_selector", getScopeAccessorLiteral(nodeRef, true), getScopeAccessorLiteral(closure, true), getScopeAccessorLiteral(selectorKeyBinding, true), render);
 					return callRuntime("_for_closure", getScopeAccessorLiteral(nodeRef, true), render);
 				});
 				const forType = getForType(node);
@@ -4009,6 +4106,40 @@ function getForType(tag) {
 		case "until": return attr.name;
 	}
 }
+function getLoopKeyBinding(byAttr, paramsBinding, forType) {
+	if (!paramsBinding) return;
+	if (byAttr) {
+		const keyChain = getByKeyChain(byAttr);
+		if (!keyChain) return;
+		let keyBinding = paramsBinding.propertyAliases.get("0");
+		for (const property of keyChain) keyBinding = keyBinding?.propertyAliases.get(property);
+		return keyBinding;
+	}
+	return paramsBinding.propertyAliases.get(forType === "of" ? "1" : "0");
+}
+function getByKeyChain(byAttr) {
+	if (byAttr.type === "StringLiteral") return [byAttr.value];
+	if (byAttr.type === "ArrowFunctionExpression" || byAttr.type === "FunctionExpression") {
+		const itemParam = byAttr.params[0];
+		let body = byAttr.body;
+		if (body.type === "BlockStatement") {
+			const [statement] = body.body;
+			body = body.body.length === 1 && statement.type === "ReturnStatement" ? statement.argument : void 0;
+		}
+		if (itemParam?.type === "Identifier" && body) return getStaticMemberChain(body, itemParam.name);
+	}
+}
+function getStaticMemberChain(node, rootName) {
+	const chain = [];
+	let cur = node;
+	while (cur.type === "MemberExpression" || cur.type === "OptionalMemberExpression") {
+		const property = getMemberExpressionPropString(cur);
+		if (property === void 0) return;
+		chain.push(property);
+		cur = cur.object;
+	}
+	if (cur.type === "Identifier" && cur.name === rootName) return chain.reverse();
+}
 function forTypeToRuntime(type) {
 	switch (type) {
 		case "of": return "forOf";
@@ -6721,7 +6852,11 @@ function finalizeReferences() {
 	forEachSection((section) => {
 		const { id, bindings } = section;
 		const isOwnedBinding = ({ section }) => section.id === id;
-		let intersections = intersectionsBySection.get(section) || [];
+		let intersections = (intersectionsBySection.get(section) || []).filter((intersection) => {
+			const collapseSource = getCollapsibleIntersectionSource(intersection, section);
+			if (collapseSource) collapsedIntersectionSource.set(intersection, collapseSource);
+			return !collapseSource;
+		});
 		if (intersections.length) {
 			const anchors = /* @__PURE__ */ new Map();
 			for (const intersection of intersections) for (let i = intersection.length; i--;) if (isOwnedBinding(intersection[i])) {
@@ -6754,6 +6889,7 @@ function finalizeReferences() {
 	});
 	const programSection = (0, _marko_compiler_babel_utils.getProgram)().node.extra.section;
 	if (programSection.returnValueExpr) programSection.returnSerializeReason = getSerializeSourcesForExpr(programSection.returnValueExpr);
+	for (const finalize of getReferenceFinalizers()) finalize();
 	readsByExpression.clear();
 	fnReadsByExpression.clear();
 }
@@ -6769,6 +6905,19 @@ function getMaxOwnSourceOffset(intersection, section) {
 	return scopeOffset;
 }
 const intersectionMeta = /* @__PURE__ */ new WeakMap();
+const collapsedIntersectionSource = /* @__PURE__ */ new WeakMap();
+function getCollapsibleIntersectionSource(intersection, section) {
+	let sources;
+	for (const member of intersection) {
+		if (!member.sources) return void 0;
+		const isDirectAlias = member.upstreamAlias && member.property === void 0 && member.excludeProperties === void 0;
+		if (member.section !== section || isDirectAlias) return void 0;
+		sources = mergeSources(sources, member.sources);
+	}
+	if (!sources || sources.state && sources.param) return;
+	const source = sources.state || sources.param;
+	return source && !Array.isArray(source) && source.section === section && !source.scopeOffset ? source : void 0;
+}
 function setBindingDownstream(binding, expr) {
 	getBindingValueExprs().set(binding, expr || false);
 	if (expr && expr !== true) forEach(expr, (expr) => {
@@ -6878,13 +7027,21 @@ const propsUtil = new Sorted(function compareProps(a, b) {
 });
 const [getReadsByExpression] = createProgramState(() => /* @__PURE__ */ new Map());
 const [getFunctionReadsByExpression] = createProgramState(() => /* @__PURE__ */ new Map());
+const [getReferenceFinalizers] = createProgramState(() => []);
+function onFinalizeReferences(finalize) {
+	getReferenceFinalizers().push(finalize);
+}
+function getExpressionReads(exprExtra) {
+	return getReadsByExpression().get(exprExtra);
+}
 function addRead(exprExtra, extra, binding, section, getter) {
 	const readsByExpression = getReadsByExpression();
 	const read = {
 		binding,
 		extra,
 		getter,
-		ownVar: false
+		ownVar: false,
+		comparedTo: void 0
 	};
 	binding.reads.add(exprExtra);
 	exprExtra.section = section;
@@ -6914,6 +7071,8 @@ function addReadToExpression(root, binding, getter) {
 	const section = getOrCreateSection(exprRoot);
 	const exprExtra = exprRoot.node.extra ??= { section };
 	const read = addRead(exprExtra, node.extra ??= {}, binding, section, getter);
+	const { parent } = root;
+	if (parent.type === "BinaryExpression" && (parent.operator === "===" || parent.operator === "!==")) read.comparedTo = parent.left === node ? parent.right : parent.left;
 	if (!getter && binding.type === 5) {
 		const babelBinding = root.scope.getBinding(binding.name);
 		read.ownVar = !!babelBinding && babelBinding.kind !== "param" && isReferenceInOwnBody(babelBinding.path, root);
@@ -7020,13 +7179,16 @@ function getReadReplacement(node, signal) {
 		let replacement;
 		if (read.props === void 0) {
 			if (read.getter?.invoked) return;
-			if (isOutputDOM()) if (signal?.referencedBindings === readBinding && !signal.hasSideEffect) replacement = getSignalValueIdentifier(signal);
-			else if (read.getter?.hoisted) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, read.getter.hoisted), [getScopeExpression(extra.section, read.getter.hoisted)]);
-			else if (readBinding.type === 0) {
-				if (read.getter) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, readBinding.section), [getScopeExpression(extra.section, readBinding.section)]);
-			} else if (!isOptimize() && read.ownVar) replacement = callRuntime("_assert_init", extra.section ? getScopeExpression(extra.section, readBinding.section) : scopeIdentifier, getScopeAccessorLiteral(readBinding));
-			else replacement = createScopeReadExpression(readBinding, extra.section);
-			else if (node.type !== "Identifier") replacement = _marko_compiler.types.identifier(readBinding.name);
+			if (isOutputDOM()) {
+				const inlined = getSignals(extra.section).get(readBinding)?.inline?.value;
+				if (inlined) replacement = _marko_compiler.types.cloneNode(inlined, true);
+				else if (signal?.referencedBindings === readBinding && !signal.hasSideEffect) replacement = getSignalValueIdentifier(signal);
+				else if (read.getter?.hoisted) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, read.getter.hoisted), [getScopeExpression(extra.section, read.getter.hoisted)]);
+				else if (readBinding.type === 0) {
+					if (read.getter) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, readBinding.section), [getScopeExpression(extra.section, readBinding.section)]);
+				} else if (!isOptimize() && read.ownVar) replacement = callRuntime("_assert_init", extra.section ? getScopeExpression(extra.section, readBinding.section) : scopeIdentifier, getScopeAccessorLiteral(readBinding));
+				else replacement = createScopeReadExpression(readBinding, extra.section);
+			} else if (node.type !== "Identifier") replacement = _marko_compiler.types.identifier(readBinding.name);
 			else if (read.getter?.hoisted) replacement = getBindingGetterIdentifier(readBinding, read.getter.hoisted);
 			else if (readBinding.type === 0) {
 				if (readBinding.getters.has(readBinding.section)) replacement = getBindingGetterIdentifier(readBinding, readBinding.section);
@@ -7237,15 +7399,6 @@ function createGetterRead(binding, props, getter) {
 		getter
 	};
 }
-function getMemberExpressionPropString(expr) {
-	switch (expr.property.type) {
-		case "StringLiteral": return expr.property.value;
-		case "NumericLiteral": return "" + expr.property.value;
-		case "Identifier":
-			if (expr.computed) return;
-			return expr.property.name;
-	}
-}
 function isReferencedExtra(extra) {
 	return !!(extra && !extra.pruned && extra.section);
 }

package/dist/translator/util/for-selector.d.ts

@@ -0,0 +1,5 @@
+import { type Binding } from "./references";
+import { type Section } from "./sections";
+export declare function getForSelectorKey(bodySection: Section, closure: Binding): Binding | undefined;
+export declare function isForSelectorValue(binding: Binding): boolean;
+export declare function detectForSelector(bodySection: Section, keyBinding: Binding): void;

package/dist/translator/util/references.d.ts

@@ -69,6 +69,7 @@ interface Read {
     extra: t.NodeExtra;
     ownVar: boolean;
     getter: Getter | undefined;
+    comparedTo: t.Node | undefined;
 }
 interface ExtraRead {
     binding: Binding;
@@ -122,12 +123,15 @@ export declare const intersectionMeta: WeakMap<Intersection, {
     id: number;
     scopeOffset: Binding | undefined;
 }>;
+export declare const collapsedIntersectionSource: WeakMap<Intersection, Binding>;
 export declare function setBindingDownstream(binding: Binding, expr: boolean | Opt<t.NodeExtra>): void;
 export declare function createSources(state: Sources["state"], param: Sources["param"]): Sources;
 export declare function compareSources(a: Sources, b: Sources): number;
 export declare function mergeSources(a: undefined | Sources, b: undefined | Sources): Sources | undefined;
 export declare const bindingUtil: Sorted<Binding>;
 export declare const propsUtil: Sorted<string>;
+export declare function onFinalizeReferences(finalize: () => void): void;
+export declare function getExpressionReads(exprExtra: ReferencedExtra): Opt<Read>;
 export declare function addRead(exprExtra: ReferencedExtra, extra: t.NodeExtra, binding: Binding, section: Section, getter: Getter | undefined): Read;
 export declare function dropNodes(node: t.Node | t.Node[]): void;
 export declare function getCanonicalBinding(binding: Binding): Binding;

package/dist/translator/util/signals.d.ts

@@ -20,12 +20,17 @@ export interface Signal {
     effectReferencedBindings: ReferencedBindings;
     hasDynamicSubscribers: boolean;
     hasSideEffect: boolean;
+    forcePersist: boolean;
+    inline: {
+        value: t.Expression;
+    } | undefined;
     export: boolean;
     extraArgs: t.Expression[] | undefined;
     prependStatements: t.Statement[] | undefined;
     buildAssignment: ((valueSection: Section, value: t.Expression) => t.Expression | undefined) | undefined;
 }
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
+export declare const getSignals: (section: Section) => Map<unknown, Signal>;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
 export declare const getTryHasPlaceholder: (section: Section) => true | undefined, setTryHasPlaceholder: (section: Section, value: true | undefined) => void;
 export declare function setSectionSerializedValue(section: Section, prop: AccessorProp, expression: t.Expression): void;

package/dist/translator/util/to-property-name.d.ts

@@ -1,4 +1,5 @@
 import { types as t } from "@marko/compiler";
+export declare function getMemberExpressionPropString(expr: t.MemberExpression | t.OptionalMemberExpression): string | undefined;
 export declare function isValidPropertyIdentifier(name: string): boolean;
 export declare function toPropertyName(name: string): t.Identifier | t.NumericLiteral | t.StringLiteral;
 export declare function toObjectProperty(name: string, value: t.Expression): t.ObjectProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.1.23",
+  "version": "6.1.24",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",