marko 6.3.21 → 6.3.23

package/dist/debug/html.js

@@ -28,8 +28,6 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const EventAttributes = "EventAttributes:";
-//#endregion
-//#region src/common/constants/accessor-prop.debug.ts
 const BranchAccessor = "#BranchAccessor";
 const CatchContent = "#CatchContent";
 const ClosestBranchId = "#ClosestBranchId";
@@ -1913,6 +1911,10 @@ function _trailers(html) {
 function _resume(val, id, scopeId) {
 	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
+function _resume_locals(val, id, locals, ownerScopeId) {
+	if (ownerScopeId !== void 0) locals["_"] = _scope_with_id(ownerScopeId);
+	return register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => _el_read_error(), id, scopeId);
 }
@@ -3508,6 +3510,7 @@ exports._if = _if;
 exports._peek_scope_id = _peek_scope_id;
 exports._resume = _resume;
 exports._resume_branch = _resume_branch;
+exports._resume_locals = _resume_locals;
 Object.defineProperty(exports, "_scope", {
 	enumerable: true,
 	get: function() {

package/dist/debug/html.mjs

@@ -26,8 +26,6 @@ const ControlledHandler = "ControlledHandler:";
 const ControlledType = "ControlledType:";
 const ControlledValue = "ControlledValue:";
 const EventAttributes = "EventAttributes:";
-//#endregion
-//#region src/common/constants/accessor-prop.debug.ts
 const BranchAccessor = "#BranchAccessor";
 const CatchContent = "#CatchContent";
 const ClosestBranchId = "#ClosestBranchId";
@@ -1911,6 +1909,10 @@ function _trailers(html) {
 function _resume(val, id, scopeId) {
 	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
+function _resume_locals(val, id, locals, ownerScopeId) {
+	if (ownerScopeId !== void 0) locals["_"] = _scope_with_id(ownerScopeId);
+	return register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => _el_read_error(), id, scopeId);
 }
@@ -3453,4 +3455,4 @@ const compat = {
 };
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/html/writer.d.ts

@@ -38,6 +38,7 @@ export declare function writeScript(script: string): void;
 export declare function _script(scopeId: number, registryId: string): void;
 export declare function _trailers(html: string): void;
 export declare function _resume<T extends WeakKey>(val: T, id: string, scopeId?: number): T;
+export declare function _resume_locals<T extends WeakKey>(val: T, id: string, locals: Record<string, unknown>, ownerScopeId?: number): T;
 export declare function _el(scopeId: number, id: string): () => void;
 export declare function _hoist(scopeId: number, id: string): {
     (): void;

package/dist/html.d.ts

@@ -7,4 +7,4 @@ export { _escape, _escape_comment, _escape_script, _escape_style, _escape_style_
 export { _content, _content_resume, _dynamic_tag } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, } from "./html/for";
 export { _template } from "./html/template";
-export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";
+export { _attr_content, _await, _el, _el_resume, _existing_scope, _for_in, _for_of, _for_to, _for_until, _hoist, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _subscribe, _trailers, _try, _var, $global, } from "./html/writer";

package/dist/html.js

@@ -1291,6 +1291,9 @@ function _trailers(html) {
 function _resume(val, id, scopeId) {
 	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
+function _resume_locals(val, id, locals, ownerScopeId) {
+	return ownerScopeId !== void 0 && (locals._ = _scope_with_id(ownerScopeId)), register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => void 0, id, scopeId);
 }
@@ -2192,4 +2195,4 @@ exports.$global = $global, exports._assert_hoist = _assert_hoist, exports._attr
 	get: function() {
 		return _dynamic_tag;
 	}
-}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, 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_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;
+}), exports._el = _el, exports._el_read_error = _el_read_error, exports._el_resume = _el_resume, exports._escape = _escape, exports._escape_comment = _escape_comment, exports._escape_script = _escape_script, exports._escape_style = _escape_style, exports._escape_style_value = _escape_style_value, exports._existing_scope = _existing_scope, exports._flush_head = _flush_head, 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_read_error = _hoist_read_error, exports._html = _html, exports._id = _id, exports._if = _if, exports._peek_scope_id = _peek_scope_id, exports._resume = _resume, exports._resume_branch = _resume_branch, exports._resume_locals = _resume_locals, exports._scope = writeScope, exports._scope_id = _scope_id, exports._scope_reason = _scope_reason, exports._scope_with_id = _scope_with_id, exports._script = _script, exports._sep = _sep, exports._serialize_guard = _serialize_guard, exports._serialize_if = _serialize_if, exports._set_serialize_reason = _set_serialize_reason, exports._show_end = _show_end, exports._show_start = _show_start, exports._style_html = _style_html, exports._subscribe = _subscribe, exports._template = _template, exports._textarea_value = _textarea_value, exports._to_text = _to_text, exports._trailers = _trailers, exports._try = _try, exports._unescaped = _unescaped, exports._var = _var, exports.attrTag = attrTag, exports.attrTags = attrTags, exports.compat = compat, exports.forIn = forIn, exports.forInBy = forInBy, exports.forOf = forOf, exports.forOfBy = forOfBy, exports.forStepBy = forStepBy, exports.forTo = forTo, exports.forUntil = forUntil, exports.withLoadAssets = withLoadAssets, exports.withPageAssets = withPageAssets;

package/dist/html.mjs

@@ -1290,6 +1290,9 @@ function _trailers(html) {
 function _resume(val, id, scopeId) {
 	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
 }
+function _resume_locals(val, id, locals, ownerScopeId) {
+	return ownerScopeId !== void 0 && (locals._ = _scope_with_id(ownerScopeId)), register(id, val, writeScope(_scope_id(), locals));
+}
 function _el(scopeId, id) {
 	return _resume(() => void 0, id, scopeId);
 }
@@ -2187,4 +2190,4 @@ function toObjectExpression(options) {
 //#region src/html/compat.ts
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };

package/dist/translator/index.js

@@ -3293,8 +3293,15 @@ function writeRegisteredFns() {
 	if (registeredFns) {
 		for (const registeredFn of registeredFns) {
 			let fn;
-			if (registeredFn.referencedBindings || registeredFn.referencesScope) fn = _marko_compiler.types.functionDeclaration(_marko_compiler.types.identifier(registeredFn.id), [scopeIdentifier], _marko_compiler.types.blockStatement(toReturnedFunction(registeredFn.node)));
-			else if (registeredFn.node.type === "FunctionDeclaration" && registeredFn.node.id?.name === registeredFn.id) fn = registeredFn.node;
+			if (registeredFn.referencedBindings || registeredFn.referencesScope || registeredFn.referencedLocals) {
+				let params;
+				let prologue;
+				if (registeredFn.referencedLocals) {
+					params = [localsIdentifier];
+					if (registeredFn.referencedBindings || registeredFn.referencesScope) prologue = [_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(scopeIdentifier, _marko_compiler.types.memberExpression(localsIdentifier, _marko_compiler.types.identifier(getAccessorProp().Owner)))])];
+				} else params = [scopeIdentifier];
+				fn = _marko_compiler.types.functionDeclaration(_marko_compiler.types.identifier(registeredFn.id), params, _marko_compiler.types.blockStatement(toReturnedFunction(registeredFn.node, prologue)));
+			} else if (registeredFn.node.type === "FunctionDeclaration" && registeredFn.node.id?.name === registeredFn.id) fn = registeredFn.node;
 			else fn = _marko_compiler.types.functionDeclaration(_marko_compiler.types.identifier(registeredFn.id), registeredFn.node.params, registeredFn.node.body.type === "BlockStatement" ? registeredFn.node.body : _marko_compiler.types.blockStatement([_marko_compiler.types.returnStatement(registeredFn.node.body)]), registeredFn.node.generator, registeredFn.node.async);
 			statements.push(fn);
 		}
@@ -3302,8 +3309,12 @@ function writeRegisteredFns() {
 		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(...statements);
 	}
 }
-function toReturnedFunction(rawFn) {
+function toReturnedFunction(rawFn, prologue) {
 	const fn = simplifyFunction(rawFn);
+	if (prologue) {
+		if (fn.body.type !== "BlockStatement") fn.body = _marko_compiler.types.blockStatement([_marko_compiler.types.returnStatement(fn.body)]);
+		fn.body.body.unshift(...prologue);
+	}
 	return fn.type === "FunctionDeclaration" ? [fn, _marko_compiler.types.returnStatement(fn.id)] : [_marko_compiler.types.returnStatement(fn)];
 }
 function addHTMLEffectCall(section, referencedBindings) {
@@ -3550,6 +3561,7 @@ function getRegisteredFnExpression$1(node) {
 		const id = extra.name;
 		const referencesScope = extra.referencesScope;
 		const referencedBindings = extra.referencedBindingsInFunction;
+		const referencedLocals = extra.referencedLocalBindingsInFunction;
 		let registeredFns = registeredFnsForProgram.get((0, _marko_compiler_babel_utils.getProgram)().node);
 		if (!registeredFns) registeredFnsForProgram.set((0, _marko_compiler_babel_utils.getProgram)().node, registeredFns = []);
 		registeredFns.push({
@@ -3558,9 +3570,17 @@ function getRegisteredFnExpression$1(node) {
 			registerId: extra.registerId,
 			section: extra.section,
 			referencesScope,
-			referencedBindings
+			referencedBindings,
+			referencedLocals
 		});
-		if (referencesScope || referencedBindings) return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(id), [scopeIdentifier]);
+		if (referencedLocals) {
+			const properties = [];
+			if (referencesScope || referencedBindings) properties.push(_marko_compiler.types.objectProperty(_marko_compiler.types.identifier(getAccessorProp().Owner), scopeIdentifier));
+			forEach(referencedLocals, (binding) => {
+				properties.push(toObjectProperty(getLocalsScopeAccessor(binding), getDeclaredBindingExpression(binding)));
+			});
+			return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(id), [_marko_compiler.types.objectExpression(properties)]);
+		} else if (referencesScope || referencedBindings) return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(id), [scopeIdentifier]);
 		else return _marko_compiler.types.identifier(id);
 	}
 }
@@ -3755,7 +3775,17 @@ function addRegisteredDeclarations(body) {
 }
 function getRegisteredFnExpression(node) {
 	const { extra } = node;
-	if (isRegisteredFnExtra(extra)) return callRuntime("_resume", simplifyFunction(node), _marko_compiler.types.stringLiteral(extra.registerId), (extra.referencedBindingsInFunction || extra.referencesScope) && getScopeIdIdentifier(extra.section));
+	if (isRegisteredFnExtra(extra)) {
+		const referencedLocals = extra.referencedLocalBindingsInFunction;
+		if (referencedLocals) {
+			const localProperties = [];
+			forEach(referencedLocals, (binding) => {
+				localProperties.push(toObjectProperty(getLocalsScopeAccessor(binding), getDeclaredBindingExpression(binding)));
+			});
+			return callRuntime("_resume_locals", simplifyFunction(node), _marko_compiler.types.stringLiteral(extra.registerId), _marko_compiler.types.objectExpression(localProperties), (extra.referencedBindingsInFunction || extra.referencesScope) && getScopeIdIdentifier(extra.section));
+		}
+		return callRuntime("_resume", simplifyFunction(node), _marko_compiler.types.stringLiteral(extra.registerId), (extra.referencedBindingsInFunction || extra.referencesScope) && getScopeIdIdentifier(extra.section));
+	}
 }
 //#endregion
 //#region src/translator/util/body-to-text-literal.ts
@@ -4628,8 +4658,12 @@ var native_tag_default = {
 					flushInto(tag);
 					tag.insertBefore(_marko_compiler.types.expressionStatement(callRuntime("_attr_select_value", getScopeIdIdentifier(tagSection), nodeBinding && getScopeAccessorLiteral(nodeBinding), selectArgs.value, selectArgs.valueChange, _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(tag.node.body.body)), selectArgs.serializeType)));
 				} else if (isTextOnly) {
-					for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
-					else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime(getTextOnlyEscapeHelper(tagName), child.value)}`;
+					const rawTextHelper = getRawTextEscapeHelper(tagName);
+					if (rawTextHelper) {
+						const body = bodyToTextLiteral(tag.node.body);
+						write`${_marko_compiler.types.isStringLiteral(body) ? getHTMLRuntime()[rawTextHelper](body.value) : callRuntime(rawTextHelper, body)}`;
+					} else for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
+					else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime("_escape", child.value)}`;
 				} else tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
 				if (!tagExtra[kSkipEndTag] && !isOpenOnly && !selectArgs) {
 					if (tagName === "head" && getMarkoOpts().linkAssets) write`${callRuntime("_flush_head")}`;
@@ -4975,11 +5009,10 @@ function assertOptionInSelectWithValue(tag) {
 		parent = parent.parentPath;
 	}
 }
-function getTextOnlyEscapeHelper(tagName) {
+function getRawTextEscapeHelper(tagName) {
 	switch (tagName) {
 		case "script": return "_escape_script";
 		case "style": return "_escape_style";
-		default: return "_escape";
 	}
 }
 function buildAttrExpression(value, serialize, dynamic) {
@@ -5678,6 +5711,7 @@ function buildUndefined() {
 //#endregion
 //#region src/translator/visitors/program/index.ts
 let scopeIdentifier;
+let localsIdentifier;
 var program_default = {
 	migrate: {
 		enter(program) {
@@ -5720,6 +5754,7 @@ var program_default = {
 	translate: {
 		enter(program) {
 			scopeIdentifier = isOutputDOM() ? generateUidIdentifier("scope") : null;
+			localsIdentifier = isOutputDOM() ? generateUidIdentifier("locals") : null;
 			{
 				const markoOpts = getMarkoOpts();
 				const { output, entry, runtimeId } = markoOpts;
@@ -5914,7 +5949,9 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
 	const childScopeBinding = tagExtra[kChildScopeBinding];
 	if (getSerializeReason(section, childScopeBinding)) {
 		const peekScopeId = generateUidIdentifier(childScopeBinding?.name);
-		tag.insertBefore(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(peekScopeId, callRuntime("_peek_scope_id"))]));
+		const peekScopeDeclaration = _marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(peekScopeId, callRuntime("_peek_scope_id"))]);
+		if (tagVar) tag.insertBefore(peekScopeDeclaration);
+		else statements.push(peekScopeDeclaration);
 		setBindingSerializedValue(section, childScopeBinding, callRuntime("_existing_scope", peekScopeId));
 		if (tagVar) statements.push(_marko_compiler.types.expressionStatement(callRuntime("_var", getScopeIdIdentifier(section), getScopeAccessorLiteral(tag.node.extra[kChildOffsetScopeBinding$1]), peekScopeId, _marko_compiler.types.stringLiteral(getResumeRegisterId(section, tagVar.extra?.binding, "var")))));
 	}
@@ -6605,6 +6642,17 @@ function trackReferencesForBinding(babelBinding, binding) {
 				invoked
 			});
 		} else if (binding.type !== 4 || refSection !== binding.section) trackReference(ref, binding);
+		else {
+			const fnRoot = getFnRoot(ref);
+			if (fnRoot) {
+				const fnExtra = fnRoot.node.extra ??= {};
+				fnExtra.referencedLocalBindingsInFunction = bindingUtil.add(fnExtra.referencedLocalBindingsInFunction, binding);
+				const refExtra = ref.node.extra ??= {};
+				refExtra.section = refSection;
+				refExtra.read = createRead(binding, void 0);
+				refExtra.read.localFn = fnExtra;
+			}
+		}
 	}
 	for (const ref of constantViolations) {
 		if (ref.type === "MarkoTag") throw ref.get("var").buildCodeFrameError(`Duplicate declaration ${JSON.stringify(binding.name)}`);
@@ -7229,6 +7277,9 @@ function getScopeAccessor(binding, encoded, includeId) {
 	else if (includeId || canonicalBinding.type === 0) return `${canonicalBinding.name}/${canonicalBinding.id}`;
 	return canonicalBinding.scopeAccessor ?? canonicalBinding.name;
 }
+function getLocalsScopeAccessor(binding) {
+	return getScopeAccessor(binding, false, true);
+}
 function getPrefixedScopeAccessor(binding, prefix) {
 	const canonicalBinding = getCanonicalBinding(binding);
 	if (isOptimize()) switch (prefix) {
@@ -7303,6 +7354,11 @@ function getReadReplacement(node, signal) {
 		if (read.props === void 0) {
 			if (read.getter?.invoked) return;
 			if (isOutputDOM()) {
+				if (read.localFn) {
+					if (isRegisteredFnExtra(read.localFn)) return toMemberExpression(localsIdentifier, getLocalsScopeAccessor(readBinding));
+					if (node.type === "Identifier" && node.name !== readBinding.name) node.name = readBinding.name;
+					return;
+				}
 				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);
@@ -9135,7 +9191,7 @@ function isStaticText(node) {
 }
 function getPrevStaticSibling(path) {
 	let prev = path.getPrevSibling();
-	while (prev.node && (prev.isMarkoComment() || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
+	while (prev.node && (getNodeContentType(prev, "endType") === null || prev.isMarkoPlaceholder() && isEmptyPlaceholder(prev.node))) prev = prev.getPrevSibling();
 	return prev.node;
 }
 function isEmptyPlaceholder(placeholder) {

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

@@ -74,6 +74,8 @@ interface ExtraRead {
     props: Opt<string>;
     ownVar: boolean;
     getter: Getter | undefined;
+    /** Set for same-section local reads: the function root that owns the read. */
+    localFn?: ReferencedFunctionExtra;
 }
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
@@ -96,6 +98,7 @@ declare module "@marko/compiler/dist/types" {
     interface FunctionExtra {
         referencesScope?: boolean;
         referencedBindingsInFunction?: ReferencedBindings;
+        referencedLocalBindingsInFunction?: Opt<Binding>;
         constantBindingsInFunction?: ReferencedBindings;
         name?: string;
         registerId?: string;
@@ -139,6 +142,7 @@ export declare function getCanonicalBinding(binding: Binding): Binding;
 export declare function getAllTagReferenceNodes(tag: t.MarkoTag, referenceNodes?: t.Node[]): t.Node[];
 export declare function getScopeAccessorLiteral(binding: Binding, encoded?: boolean, includeId?: boolean): t.NumericLiteral | t.StringLiteral;
 export declare function getScopeAccessor(binding: Binding, encoded?: boolean, includeId?: boolean): string;
+export declare function getLocalsScopeAccessor(binding: Binding): string;
 export declare function getPrefixedScopeAccessor(binding: Binding, prefix: AccessorPrefix): string;
 export declare function getClosureAccessorId(binding: Binding): number;
 export declare function getDebugScopeAccess(binding: Binding): {

package/dist/translator/visitors/program/index.d.ts

@@ -2,6 +2,7 @@ import { types as t } from "@marko/compiler";
 import { type BindingPropTree } from "../../util/binding-prop-tree";
 import { preAnalyze } from "./pre-analyze";
 export declare let scopeIdentifier: t.Identifier;
+export declare let localsIdentifier: t.Identifier;
 export declare function isScopeIdentifier(node: t.Node): node is t.Identifier;
 declare module "@marko/compiler/dist/types" {
     interface ProgramExtra {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.21",
+  "version": "6.3.23",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,14 +48,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.4",
+    "@marko/compiler": "^5.41.9",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.21",
-    "marko": "5.39.27"
+    "@marko/runtime-tags": "npm:marko@6.3.23",
+    "marko": "5.39.28"
   },
   "engines": {
     "node": ">=22"