marko 6.3.20 → 6.3.22

package/dist/translator/index.js

@@ -7,6 +7,15 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -23,21 +32,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 //#endregion
 let package_json = require("../../package.json");
+package_json = __toESM(package_json, 1);
 let _marko_compiler = require("@marko/compiler");
 let _marko_compiler_babel_utils = require("@marko/compiler/babel-utils");
 let node_path = require("node:path");
-node_path = __toESM(node_path);
+node_path = __toESM(node_path, 1);
 let path = require("path");
-path = __toESM(path);
+path = __toESM(path, 1);
 let magic_string = require("magic-string");
-magic_string = __toESM(magic_string);
+magic_string = __toESM(magic_string, 1);
 let fastest_levenshtein = require("fastest-levenshtein");
 let _marko_compiler_internal_babel = require("@marko/compiler/internal/babel");
 let _marko_compiler_modules = require("@marko/compiler/modules");
-_marko_compiler_modules = __toESM(_marko_compiler_modules);
+_marko_compiler_modules = __toESM(_marko_compiler_modules, 1);
 //#region src/translator/util/runtime-info.ts
 var runtime_info_default = {
-	name: package_json.name,
+	name: package_json.default.name,
 	taglibId: "marko-core"
 };
 //#endregion
@@ -93,53 +103,91 @@ var attrs_default = {
 	}]
 };
 //#endregion
-//#region src/common/accessor.debug.ts
-let AccessorPrefix$1 = /* @__PURE__ */ function(AccessorPrefix) {
-	AccessorPrefix["BranchScopes"] = "BranchScopes:";
-	AccessorPrefix["ClosureScopes"] = "ClosureScopes:";
-	AccessorPrefix["ClosureSignalIndex"] = "ClosureSignalIndex:";
-	AccessorPrefix["ConditionalRenderer"] = "ConditionalRenderer:";
-	AccessorPrefix["ControlledHandler"] = "ControlledHandler:";
-	AccessorPrefix["ControlledType"] = "ControlledType:";
-	AccessorPrefix["ControlledValue"] = "ControlledValue:";
-	AccessorPrefix["DynamicHTMLLastChild"] = "DynamicHTMLLastChild:";
-	AccessorPrefix["EventAttributes"] = "EventAttributes:";
-	AccessorPrefix["KeyedScopes"] = "KeyedScopes:";
-	AccessorPrefix["Lifecycle"] = "Lifecycle:";
-	AccessorPrefix["Promise"] = "Promise:";
-	AccessorPrefix["TagVariableChange"] = "TagVariableChange:";
-	return AccessorPrefix;
-}({});
-let AccessorProp$1 = /* @__PURE__ */ function(AccessorProp) {
-	AccessorProp["Global"] = "$global";
-	AccessorProp["Owner"] = "_";
-	AccessorProp["AbortControllers"] = "#AbortControllers";
-	AccessorProp["AbortScopes"] = "#AbortScopes";
-	AccessorProp["AwaitCounter"] = "#AwaitCounter";
-	AccessorProp["BranchAccessor"] = "#BranchAccessor";
-	AccessorProp["BranchScopes"] = "#BranchScopes";
-	AccessorProp["CatchContent"] = "#CatchContent";
-	AccessorProp["ClosestBranch"] = "#ClosestBranch";
-	AccessorProp["ClosestBranchId"] = "#ClosestBranchId";
-	AccessorProp["Gen"] = "#Gen";
-	AccessorProp["DetachedAwait"] = "#DetachedAwait";
-	AccessorProp["EndNode"] = "#EndNode";
-	AccessorProp["Id"] = "#Id";
-	AccessorProp["Load"] = "#Load";
-	AccessorProp["LoopKey"] = "#LoopKey";
-	AccessorProp["LoopIndex"] = "#LoopIndex";
-	AccessorProp["ParentBranch"] = "#ParentBranch";
-	AccessorProp["PendingEffects"] = "#PendingEffects";
-	AccessorProp["PendingRenders"] = "#PendingRenders";
-	AccessorProp["PendingScopes"] = "#PendingScopes";
-	AccessorProp["PlaceholderBranch"] = "#PlaceholderBranch";
-	AccessorProp["PlaceholderContent"] = "#PlaceholderContent";
-	AccessorProp["Renderer"] = "#Renderer";
-	AccessorProp["StartNode"] = "#StartNode";
-	AccessorProp["TagVariable"] = "#TagVariable";
-	AccessorProp["TagVariableChange"] = "#TagVariableChange";
-	return AccessorProp;
-}({});
+//#region src/common/constants/accessor-prefix.debug.ts
+var accessor_prefix_debug_exports = /* @__PURE__ */ __exportAll({
+	BranchScopes: () => BranchScopes$3,
+	ClosureScopes: () => ClosureScopes$1,
+	ClosureSignalIndex: () => ClosureSignalIndex$1,
+	ConditionalRenderer: () => ConditionalRenderer$1,
+	ControlledHandler: () => ControlledHandler$1,
+	ControlledType: () => ControlledType$1,
+	ControlledValue: () => ControlledValue$1,
+	DynamicHTMLLastChild: () => DynamicHTMLLastChild$1,
+	EventAttributes: () => EventAttributes$1,
+	KeyedScopes: () => KeyedScopes$1,
+	Lifecycle: () => Lifecycle$1,
+	Promise: () => Promise$2,
+	TagVariableChange: () => TagVariableChange$3
+});
+const BranchScopes$3 = "BranchScopes:";
+const ClosureScopes$1 = "ClosureScopes:";
+const ClosureSignalIndex$1 = "ClosureSignalIndex:";
+const ConditionalRenderer$1 = "ConditionalRenderer:";
+const ControlledHandler$1 = "ControlledHandler:";
+const ControlledType$1 = "ControlledType:";
+const ControlledValue$1 = "ControlledValue:";
+const DynamicHTMLLastChild$1 = "DynamicHTMLLastChild:";
+const EventAttributes$1 = "EventAttributes:";
+const KeyedScopes$1 = "KeyedScopes:";
+const Lifecycle$1 = "Lifecycle:";
+const Promise$2 = "Promise:";
+const TagVariableChange$3 = "TagVariableChange:";
+//#endregion
+//#region src/common/constants/accessor-prop.debug.ts
+var accessor_prop_debug_exports = /* @__PURE__ */ __exportAll({
+	AbortControllers: () => AbortControllers$1,
+	AbortScopes: () => AbortScopes$1,
+	AwaitCounter: () => AwaitCounter$1,
+	BranchAccessor: () => BranchAccessor$1,
+	BranchScopes: () => BranchScopes$2,
+	CatchContent: () => CatchContent$1,
+	ClosestBranch: () => ClosestBranch$1,
+	ClosestBranchId: () => ClosestBranchId$1,
+	DetachedAwait: () => DetachedAwait$1,
+	EndNode: () => EndNode$1,
+	Gen: () => Gen$1,
+	Global: () => Global$1,
+	Id: () => "#Id",
+	Load: () => Load$1,
+	LoopIndex: () => LoopIndex$1,
+	LoopKey: () => LoopKey$1,
+	Owner: () => "_",
+	ParentBranch: () => ParentBranch$1,
+	PendingEffects: () => PendingEffects$1,
+	PendingRenders: () => PendingRenders$1,
+	PendingScopes: () => PendingScopes$1,
+	PlaceholderBranch: () => PlaceholderBranch$1,
+	PlaceholderContent: () => PlaceholderContent$1,
+	Renderer: () => Renderer$1,
+	StartNode: () => StartNode$1,
+	TagVariable: () => TagVariable$1,
+	TagVariableChange: () => TagVariableChange$2
+});
+const Global$1 = "$global";
+const AbortControllers$1 = "#AbortControllers";
+const AbortScopes$1 = "#AbortScopes";
+const AwaitCounter$1 = "#AwaitCounter";
+const BranchAccessor$1 = "#BranchAccessor";
+const BranchScopes$2 = "#BranchScopes";
+const CatchContent$1 = "#CatchContent";
+const ClosestBranch$1 = "#ClosestBranch";
+const ClosestBranchId$1 = "#ClosestBranchId";
+const Gen$1 = "#Gen";
+const DetachedAwait$1 = "#DetachedAwait";
+const EndNode$1 = "#EndNode";
+const Load$1 = "#Load";
+const LoopKey$1 = "#LoopKey";
+const LoopIndex$1 = "#LoopIndex";
+const ParentBranch$1 = "#ParentBranch";
+const PendingEffects$1 = "#PendingEffects";
+const PendingRenders$1 = "#PendingRenders";
+const PendingScopes$1 = "#PendingScopes";
+const PlaceholderBranch$1 = "#PlaceholderBranch";
+const PlaceholderContent$1 = "#PlaceholderContent";
+const Renderer$1 = "#Renderer";
+const StartNode$1 = "#StartNode";
+const TagVariable$1 = "#TagVariable";
+const TagVariableChange$2 = "#TagVariableChange";
 //#endregion
 //#region src/translator/util/evaluate.ts
 function evaluate(value) {
@@ -335,9 +383,12 @@ function patchIteratorNext(proto) {
 	proto.next[kTouchedIterator] = true;
 }
 //#endregion
+//#region src/translator/util/constants/compile-stage.ts
+const translate$1 = "translate";
+//#endregion
 //#region src/translator/util/get-compile-stage.ts
 function isTranslate() {
-	return getCompileStage() === "translate";
+	return getCompileStage() === translate$1;
 }
 function getCompileStage() {
 	return (0, _marko_compiler_babel_utils.getFile)().___compileStage;
@@ -850,53 +901,53 @@ function joinRepeatable(compare, a, b) {
 	return compareResult === 0 ? a : compareResult < 0 ? [a, b] : [b, a];
 }
 //#endregion
-//#region src/common/accessor.ts
-let AccessorPrefix = /* @__PURE__ */ function(AccessorPrefix) {
-	AccessorPrefix["BranchScopes"] = "A";
-	AccessorPrefix["ClosureScopes"] = "B";
-	AccessorPrefix["ClosureSignalIndex"] = "C";
-	AccessorPrefix["ConditionalRenderer"] = "D";
-	AccessorPrefix["ControlledHandler"] = "E";
-	AccessorPrefix["ControlledType"] = "F";
-	AccessorPrefix["ControlledValue"] = "G";
-	AccessorPrefix["DynamicHTMLLastChild"] = "H";
-	AccessorPrefix["EventAttributes"] = "I";
-	AccessorPrefix["KeyedScopes"] = "O";
-	AccessorPrefix["Lifecycle"] = "K";
-	AccessorPrefix["Promise"] = "L";
-	AccessorPrefix["TagVariableChange"] = "M";
-	return AccessorPrefix;
-}({});
-let AccessorProp = /* @__PURE__ */ function(AccessorProp) {
-	AccessorProp["Global"] = "$";
-	AccessorProp["Owner"] = "_";
-	AccessorProp["AbortControllers"] = "A";
-	AccessorProp["AbortScopes"] = "B";
-	AccessorProp["AwaitCounter"] = "O";
-	AccessorProp["BranchAccessor"] = "C";
-	AccessorProp["BranchScopes"] = "D";
-	AccessorProp["CatchContent"] = "E";
-	AccessorProp["ClosestBranch"] = "F";
-	AccessorProp["ClosestBranchId"] = "G";
-	AccessorProp["Gen"] = "H";
-	AccessorProp["DetachedAwait"] = "V";
-	AccessorProp["EndNode"] = "K";
-	AccessorProp["Id"] = "L";
-	AccessorProp["Load"] = "X";
-	AccessorProp["LoopKey"] = "M";
-	AccessorProp["LoopIndex"] = "I";
-	AccessorProp["ParentBranch"] = "N";
-	AccessorProp["PendingEffects"] = "J";
-	AccessorProp["PendingRenders"] = "W";
-	AccessorProp["PendingScopes"] = "Y";
-	AccessorProp["PlaceholderBranch"] = "P";
-	AccessorProp["PlaceholderContent"] = "Q";
-	AccessorProp["Renderer"] = "R";
-	AccessorProp["StartNode"] = "S";
-	AccessorProp["TagVariable"] = "T";
-	AccessorProp["TagVariableChange"] = "U";
-	return AccessorProp;
-}({});
+//#region src/common/constants/accessor-prefix.ts
+var accessor_prefix_exports = /* @__PURE__ */ __exportAll({
+	BranchScopes: () => "A",
+	ClosureScopes: () => "B",
+	ClosureSignalIndex: () => "C",
+	ConditionalRenderer: () => "D",
+	ControlledHandler: () => "E",
+	ControlledType: () => "F",
+	ControlledValue: () => "G",
+	DynamicHTMLLastChild: () => "H",
+	EventAttributes: () => "I",
+	KeyedScopes: () => "O",
+	Lifecycle: () => "K",
+	Promise: () => "L",
+	TagVariableChange: () => "M"
+});
+//#endregion
+//#region src/common/constants/accessor-prop.ts
+var accessor_prop_exports = /* @__PURE__ */ __exportAll({
+	AbortControllers: () => "A",
+	AbortScopes: () => "B",
+	AwaitCounter: () => "O",
+	BranchAccessor: () => "C",
+	BranchScopes: () => "D",
+	CatchContent: () => "E",
+	ClosestBranch: () => "F",
+	ClosestBranchId: () => "G",
+	DetachedAwait: () => "V",
+	EndNode: () => "K",
+	Gen: () => "H",
+	Global: () => "$",
+	Id: () => "L",
+	Load: () => "X",
+	LoopIndex: () => "I",
+	LoopKey: () => "M",
+	Owner: () => "_",
+	ParentBranch: () => "N",
+	PendingEffects: () => "J",
+	PendingRenders: () => "W",
+	PendingScopes: () => "Y",
+	PlaceholderBranch: () => "P",
+	PlaceholderContent: () => "Q",
+	Renderer: () => "R",
+	StartNode: () => "S",
+	TagVariable: () => "T",
+	TagVariableChange: () => "U"
+});
 //#endregion
 //#region src/translator/util/marko-config.ts
 function isOutputHTML() {
@@ -919,10 +970,10 @@ function getReadyId(file = (0, _marko_compiler_babel_utils.getFile)()) {
 //#endregion
 //#region src/translator/util/get-accessor-char.ts
 function getAccessorPrefix() {
-	return isOptimize() ? AccessorPrefix : AccessorPrefix$1;
+	return isOptimize() ? accessor_prefix_exports : accessor_prefix_debug_exports;
 }
 function getAccessorProp() {
-	return isOptimize() ? AccessorProp : AccessorProp$1;
+	return isOptimize() ? accessor_prop_exports : accessor_prop_debug_exports;
 }
 //#endregion
 //#region src/translator/util/serialize-reasons.ts
@@ -1804,7 +1855,7 @@ function _script(scopeId, registryId) {
 }
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
-	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { ["#ClosestBranchId"]: branchId });
+	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId$1]: branchId });
 }
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
@@ -1934,7 +1985,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 				if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) if (isEventHandler(name)) {
 					if (!events) {
 						events = {};
-						writeScope(scopeId, { ["EventAttributes:" + nodeAccessor]: events });
+						writeScope(scopeId, { [EventAttributes$1 + nodeAccessor]: events });
 					}
 					events[getEventHandlerName(name)] = value;
 				} else result += nonVoidAttr(name, value);
@@ -1945,12 +1996,12 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
 	writeScope(scopeId, serializeType ? {
-		["ControlledType:" + nodeAccessor]: type,
-		["ControlledValue:" + nodeAccessor]: value,
-		["ControlledHandler:" + nodeAccessor]: valueChange
+		[ControlledType$1 + nodeAccessor]: type,
+		[ControlledValue$1 + nodeAccessor]: value,
+		[ControlledHandler$1 + nodeAccessor]: valueChange
 	} : {
-		["ControlledValue:" + nodeAccessor]: value,
-		["ControlledHandler:" + nodeAccessor]: valueChange
+		[ControlledValue$1 + nodeAccessor]: value,
+		[ControlledHandler$1 + nodeAccessor]: valueChange
 	});
 }
 function stringAttr(name, value) {
@@ -2021,7 +2072,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			const childScope = getScopeById(branchId);
 			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
 			if (needsScript) {
-				writeScope(branchId, { ["#Renderer"]: renderer });
+				writeScope(branchId, { [Renderer$1]: renderer });
 				_script(branchId, "d");
 			}
 			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
@@ -2046,7 +2097,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
 	}
 	if (rendered) {
-		if (shouldResume) writeScope(scopeId, { ["ConditionalRenderer:" + accessor]: renderer?.["id"] || renderer });
+		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: renderer?.["id"] || renderer });
 	} else _scope_id();
 	return result;
 };
@@ -2906,6 +2957,7 @@ function getSignal(section, referencedBindings, name) {
 			renderReferencedBindings: void 0,
 			effect: [],
 			effectReferencedBindings: void 0,
+			hasHTMLEffect: false,
 			build: void 0,
 			export: !!exportName,
 			hasSideEffect: !!(referencedBindings && (Array.isArray(referencedBindings) || referencedBindings.type === 0 || referencedBindings.type === 1 || referencedBindings.section !== section || referencedBindings.closureSections || referencedBindings.hoists)),
@@ -2967,7 +3019,7 @@ function initValue(binding, isLet = false) {
 	return signal;
 }
 function signalHasStatements(signal) {
-	if (signal.extraArgs || signal.forcePersist || 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.hasHTMLEffect || 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;
@@ -3241,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);
 		}
@@ -3250,12 +3309,17 @@ 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) {
-	addStatement("effect", section, referencedBindings, void 0, false);
+	const signal = getSignal(section, referencedBindings);
+	signal.hasHTMLEffect = signal.hasSideEffect = true;
 }
 function writeHTMLResumeStatements(path) {
 	const section = getSectionForBody(path);
@@ -3287,7 +3351,7 @@ function writeHTMLResumeStatements(path) {
 			}
 		}
 	});
-	for (let i = allSignals.length; i--;) if (allSignals[i].effect.length) {
+	for (let i = allSignals.length; i--;) if (allSignals[i].hasHTMLEffect) {
 		const signalRefs = allSignals[i].referencedBindings;
 		body.push(_marko_compiler.types.expressionStatement(callRuntime("_script", scopeIdIdentifier, _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signalRefs)))));
 	}
@@ -3497,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({
@@ -3505,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);
 	}
 }
@@ -3702,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
@@ -5625,6 +5708,7 @@ function buildUndefined() {
 //#endregion
 //#region src/translator/visitors/program/index.ts
 let scopeIdentifier;
+let localsIdentifier;
 var program_default = {
 	migrate: {
 		enter(program) {
@@ -5667,6 +5751,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;
@@ -5861,7 +5946,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")))));
 	}
@@ -6552,6 +6639,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)}`);
@@ -7176,6 +7274,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) {
@@ -7250,6 +7351,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);
@@ -9834,6 +9940,10 @@ function getFileNameWithLoc(fileName, { node: { loc } }) {
 	return fileName;
 }
 //#endregion
+//#region src/translator/interop/constants/feature-type.ts
+const Class = "class";
+const Tags = "tags";
+//#endregion
 //#region src/translator/interop/feature-detection.ts
 function isTagsAPI(file = (0, _marko_compiler_babel_utils.getFile)()) {
 	const program = file.path;
@@ -9843,11 +9953,11 @@ function isTagsAPI(file = (0, _marko_compiler_babel_utils.getFile)()) {
 		const lookup = (0, _marko_compiler_babel_utils.getTaglibLookup)(file);
 		const tagsDir = getTagsDir(file.opts.filename);
 		const state = {};
-		if (tagsDir && !lookup.manualTagsDirs?.has(tagsDir)) addFeature(state, "tags", "Template file within a tags directory", program);
+		if (tagsDir && !lookup.manualTagsDirs?.has(tagsDir)) addFeature(state, Tags, "Template file within a tags directory", program);
 		scanBody(state, program.get("body"));
 		featureType = file.metadata.marko.api = programExtra.featureType = state.feature?.type || (lookup.exclusiveTagDiscoveryDirs === "tags" ? "tags" : "class");
 	}
-	return featureType === "tags";
+	return featureType === Tags;
 }
 function getTagsDir(filename) {
 	const pathSeparator = /\/|\\/.exec(filename)?.[0];
@@ -9874,23 +9984,23 @@ function scanBody(state, body) {
 			scanTag(state, child);
 			break;
 		case "MarkoComment":
-			if (/^\s*use tags\s*$/.test(child.node.value)) addFeature(state, "tags", "<!-- use tags -->", child);
-			else if (/^\s*use class\s*$/.test(child.node.value)) addFeature(state, "class", "<!-- use class -->", child);
+			if (/^\s*use tags\s*$/.test(child.node.value)) addFeature(state, Tags, "<!-- use tags -->", child);
+			else if (/^\s*use class\s*$/.test(child.node.value)) addFeature(state, Class, "<!-- use class -->", child);
 			break;
 		case "MarkoScriptlet":
-			if (!child.node.static) addFeature(state, "class", "Scriptlet", child);
+			if (!child.node.static) addFeature(state, Class, "Scriptlet", child);
 			break;
 		case "MarkoClass":
-			addFeature(state, "class", "Class block", child.get("body"));
+			addFeature(state, Class, "Class block", child.get("body"));
 			break;
 	}
 }
 function scanTag(state, tag) {
-	if (tag.node.var) addFeature(state, "tags", "Tag variable", tag.get("var"));
+	if (tag.node.var) addFeature(state, Tags, "Tag variable", tag.get("var"));
 	const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);
 	if (tagDef) {
 		if (tagDef.name === "style") {
-			if (/^style(?:(?:\.[^.\s\\/:*?"<>|({]+)+)?\s*\{/.test(tag.node.rawValue || "")) addFeature(state, "class", `style block`, tag.get("name"));
+			if (/^style(?:(?:\.[^.\s\\/:*?"<>|({]+)+)?\s*\{/.test(tag.node.rawValue || "")) addFeature(state, Class, `style block`, tag.get("name"));
 		} else if (tagDef.taglibId === runtime_info_default.taglibId) {
 			const feature = getFeatureTypeFromCoreTagName(tagDef.name);
 			if (feature) addFeature(state, feature, `<${tagDef.name}> tag`, tag.get("name"));
@@ -9899,10 +10009,10 @@ function scanTag(state, tag) {
 	if (!tagDef?.parseOptions?.rawOpenTag) {
 		for (const attr of tag.get("attributes")) if (attr.isMarkoAttribute()) {
 			if (attr.node.arguments?.length) {
-				addFeature(state, "class", "Attribute arguments", attr.get("arguments")[0]);
+				addFeature(state, Class, "Attribute arguments", attr.get("arguments")[0]);
 				break;
 			} else if (attr.node.bound) {
-				addFeature(state, "tags", "Bound attribute", attr);
+				addFeature(state, Tags, "Bound attribute", attr);
 				break;
 			}
 		}
@@ -9919,7 +10029,7 @@ function getFeatureTypeFromCoreTagName(tagName) {
 		case "init-components":
 		case "macro":
 		case "module-code":
-		case "while": return "class";
+		case "while": return Class;
 		case "const":
 		case "debug":
 		case "define":
@@ -9929,7 +10039,7 @@ function getFeatureTypeFromCoreTagName(tagName) {
 		case "log":
 		case "return":
 		case "show":
-		case "try": return "tags";
+		case "try": return Tags;
 		default: return;
 	}
 }
@@ -10115,6 +10225,7 @@ function getVisitorExit(visit) {
 }
 //#endregion
 //#region src/translator/index.ts
+const version = package_json.default.version;
 const cheatsheet = "../../cheatsheet.md";
 const visitors = extractVisitors({
 	Program: program_default,
@@ -10151,9 +10262,4 @@ exports.tagDiscoveryDirs = tagDiscoveryDirs;
 exports.taglibs = taglibs;
 exports.transform = transform;
 exports.translate = translate;
-Object.defineProperty(exports, "version", {
-	enumerable: true,
-	get: function() {
-		return package_json.version;
-	}
-});
+exports.version = version;

package/dist/translator/interop/constants/feature-type.d.ts

@@ -0,0 +1,5 @@
+export declare const Class = "class";
+export declare const Tags = "tags";
+type Self = typeof import("./feature-type");
+export type Value = Self[keyof Self];
+export {};