marko 6.3.32 → 6.3.34

package/dist/translator/index.js

@@ -52,10 +52,21 @@ var runtime_info_default = {
 };
 //#endregion
 //#region src/translator/util/assert.ts
+const docsAnchors = {
+	if: "if--else",
+	"else-if": "if--else",
+	else: "if--else",
+	effect: "",
+	attrs: ""
+};
+function coreTagDocsURL(tagName) {
+	const anchor = docsAnchors[tagName] ?? tagName;
+	return `https://markojs.com/docs/reference/core-tag${anchor && "#" + anchor}`;
+}
 function assertNoSpreadAttrs(tag) {
 	for (const attr of tag.get("attributes")) if (attr.isMarkoSpreadAttribute()) {
 		const tagName = tag.get("name").node.value;
-		throw attr.buildCodeFrameError(`The [\`<${tagName}>\`](https://markojs.com/docs/reference/core-tag#${tagName}) tag does not support \`...spread\` attributes.`);
+		throw attr.buildCodeFrameError(`The [\`<${tagName}>\`](${coreTagDocsURL(tagName)}) tag does not support \`...spread\` attributes.`);
 	}
 }
 function assertNoTagVarMutation(tag) {
@@ -71,7 +82,7 @@ function assertNoBodyContent(tag) {
 	if (tag.node.body.body.length) {
 		const tagName = tag.get("name");
 		const tagNameLiteral = tagName.node.value;
-		throw tagName.buildCodeFrameError(`The [\`<${tagNameLiteral}>\`](https://markojs.com/docs/reference/core-tag#${tagNameLiteral}) tag does not support body content.`);
+		throw tagName.buildCodeFrameError(`The [\`<${tagNameLiteral}>\`](${coreTagDocsURL(tagNameLiteral)}) tag does not support body content.`);
 	}
 }
 //#endregion
@@ -601,7 +612,7 @@ function getTagName(tag) {
 	switch (tag.node.name.type) {
 		case "StringLiteral": return tag.node.name.value;
 		case "TemplateLiteral":
-			if (tag.node.name.quasis.length === 1) return tag.node.name.quasis[0].value.raw;
+			if (tag.node.name.quasis.length === 1) return tag.node.name.quasis[0].value.cooked;
 			break;
 	}
 }
@@ -728,12 +739,8 @@ var Sorted = class {
 		if (!Array.isArray(subset)) return this.findIndex(superset, subset) !== -1;
 		if (!Array.isArray(superset)) return false;
 		const subLen = subset.length;
-		const supLen = superset.length;
-		if (subLen > supLen) return false;
-		for (let i = subLen; i--;) {
-			const found = findIndexSorted(this.compare, superset, subset[i]);
-			if (found === -1 || supLen - found <= i) return false;
-		}
+		if (subLen > superset.length) return false;
+		for (let i = subLen; i--;) if (findIndexSorted(this.compare, superset, subset[i]) < i) return false;
 		return true;
 	}
 };
@@ -983,7 +990,7 @@ function getReadyId(file = (0, _marko_compiler_babel_utils.getFile)()) {
 	return (markoOpts.optimize ? "_" : "ready:") + (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, file.opts.filename);
 }
 //#endregion
-//#region src/translator/util/get-accessor-char.ts
+//#region src/translator/util/get-accessor-enums.ts
 function getAccessorPrefix() {
 	return isOptimize() ? accessor_prefix_exports : accessor_prefix_debug_exports;
 }
@@ -994,6 +1001,8 @@ function getAccessorProp() {
 //#region src/translator/util/serialize-reasons.ts
 const scopeExprsBySection = /* @__PURE__ */ new WeakMap();
 const propExprsBySection = /* @__PURE__ */ new WeakMap();
+const scopeProvenanceBySection = /* @__PURE__ */ new WeakMap();
+const propProvenanceBySection = /* @__PURE__ */ new WeakMap();
 const serializePropsByBinding = /* @__PURE__ */ new WeakMap();
 const serializePropByModifier = {};
 function isSameReason(a, b) {
@@ -1003,43 +1012,46 @@ function isForceSerialized(section, prop, prefix) {
 	return true === (prop ? section.serializeReasons.get(getPropKey(section, prop, prefix)) : section.serializeReason);
 }
 function addSerializeReason(section, reason, prop, prefix) {
-	if (reason) if (prop) {
-		const key = getPropKey(section, prop, prefix);
-		const curReason = section.serializeReasons.get(key);
-		if (curReason !== true) if (reason === true) forcePropSerialize(section, key);
-		else {
-			const newReason = mergeSerializeReasons(curReason, reason);
-			if (curReason !== newReason) setPropSerializeReason(section, key, newReason);
-		}
-	} else {
-		const curReason = section.serializeReason;
-		if (curReason !== true) if (reason === true) forceSerialize(section);
-		else {
-			const newReason = mergeSerializeReasons(curReason, reason);
-			if (curReason !== newReason) setSerializeReason(section, newReason);
+	if (reason) {
+		if (reason !== true) addProvenance(section, reason, prop && getPropKey(section, prop, prefix));
+		if (prop) {
+			const key = getPropKey(section, prop, prefix);
+			const curReason = section.serializeReasons.get(key);
+			if (curReason !== true) if (reason === true) forcePropSerialize(section, key);
+			else {
+				const newReason = mergeSerializeReasons(curReason, reason);
+				if (curReason !== newReason) setPropSerializeReason(section, key, newReason);
+			}
+		} else {
+			const curReason = section.serializeReason;
+			if (curReason !== true) if (reason === true) forceSerialize(section);
+			else {
+				const newReason = mergeSerializeReasons(curReason, reason);
+				if (curReason !== newReason) setSerializeReason(section, newReason);
+			}
 		}
 	}
 }
 function addSerializeExpr(section, expr, prop, prefix) {
-	if (expr) {
-		if (prop) {
-			const key = getPropKey(section, prop, prefix);
-			if (section.serializeReasons.get(key) !== true) if (expr === true) forcePropSerialize(section, key);
+	if (expr) if (prop) {
+		const key = getPropKey(section, prop, prefix);
+		if (expr === true) {
+			if (section.serializeReasons.get(key) !== true) forcePropSerialize(section, key);
+		} else {
+			let curExpr;
+			let curExprs = propExprsBySection.get(section);
+			if (curExprs) curExpr = curExprs.get(key);
 			else {
-				let curExpr;
-				let curExprs = propExprsBySection.get(section);
-				if (curExprs) curExpr = curExprs.get(key);
-				else {
-					curExprs = /* @__PURE__ */ new Map();
-					propExprsBySection.set(section, curExprs);
-				}
-				curExprs.set(key, curExpr ? concat(curExpr, expr) : expr);
+				curExprs = /* @__PURE__ */ new Map();
+				propExprsBySection.set(section, curExprs);
 			}
-		} else if (section.serializeReason !== true) if (expr === true) forceSerialize(section);
-		else {
-			const curExpr = scopeExprsBySection.get(section);
-			scopeExprsBySection.set(section, curExpr ? concat(curExpr, expr) : expr);
+			curExprs.set(key, curExpr ? concat(curExpr, expr) : expr);
 		}
+	} else if (expr === true) {
+		if (section.serializeReason !== true) forceSerialize(section);
+	} else {
+		const curExpr = scopeExprsBySection.get(section);
+		scopeExprsBySection.set(section, curExpr ? concat(curExpr, expr) : expr);
 	}
 }
 function addOwnerSerializeReason(from, to, reason) {
@@ -1093,6 +1105,7 @@ function applySerializeExprs(section) {
 	if (propExprs) {
 		propExprsBySection.delete(section);
 		for (const [key, exprs] of propExprs) {
+			addProvenance(section, getProvenanceForExprs(exprs), key);
 			const exprReason = getSerializeSourcesForExprs(exprs);
 			if (exprReason) {
 				const curReason = section.serializeReasons.get(key);
@@ -1103,8 +1116,9 @@ function applySerializeExprs(section) {
 	}
 	const scopeExprs = scopeExprsBySection.get(section);
 	if (scopeExprs) {
-		const exprReason = getSerializeSourcesForExprs(scopeExprs);
 		scopeExprsBySection.delete(section);
+		addProvenance(section, getProvenanceForExprs(scopeExprs));
+		const exprReason = getSerializeSourcesForExprs(scopeExprs);
 		if (exprReason) {
 			const curReason = section.serializeReason;
 			const newReason = mergeSerializeReasons(curReason, exprReason);
@@ -1125,6 +1139,26 @@ function finalizeSerializeReason(section) {
 		}
 		if (newReason && curReason !== newReason) setSerializeReason(section, newReason);
 	}
+	const propProvenance = propProvenanceBySection.get(section);
+	if (propProvenance) for (const provenance of propProvenance.values()) addProvenance(section, provenance);
+}
+function addProvenance(section, sources, key) {
+	if (!sources) return;
+	if (key) {
+		let provenance = propProvenanceBySection.get(section);
+		if (!provenance) propProvenanceBySection.set(section, provenance = /* @__PURE__ */ new Map());
+		provenance.set(key, mergeSources(provenance.get(key), sources));
+	} else scopeProvenanceBySection.set(section, mergeSources(scopeProvenanceBySection.get(section), sources));
+}
+function getProvenanceForExprs(exprs) {
+	let sources;
+	forEach(exprs, (expr) => {
+		sources = mergeSources(sources, getSerializeSourcesForExpr(expr));
+		forEach(expr.referencedBindingsInFunction, (binding) => {
+			sources = mergeSources(sources, getSerializeSourcesForRef(binding));
+		});
+	});
+	return sources;
 }
 function getPropKey(section, prop, prefix) {
 	if (isStrOrSym(prop)) {
@@ -1142,12 +1176,10 @@ function getPropKey(section, prop, prefix) {
 	}
 }
 function forceSerialize(section) {
-	scopeExprsBySection.delete(section);
 	setSerializeReason(section, true);
 }
 function forcePropSerialize(section, key) {
 	setPropSerializeReason(section, key, true);
-	propExprsBySection.get(section)?.delete(key);
 }
 function isStrOrSym(v) {
 	switch (typeof v) {
@@ -1544,8 +1576,23 @@ var function_default = { analyze(fn) {
 		if (refs === true) registerFunction(fnExtra, true);
 		else if (refs.size) getReferencesByFn().set(fnExtra, refs);
 	} else if (shouldAlwaysRegister(markoRoot)) registerFunction(fnExtra, true);
-	else getReferencesByFn().set(fnExtra, /* @__PURE__ */ new Set([exprRoot.node.extra ??= {}]));
+	else {
+		const refs = /* @__PURE__ */ new Set([exprRoot.node.extra ??= {}]);
+		if (getConstTagVarRefs(markoRoot, refs) === true) registerFunction(fnExtra, true);
+		else getReferencesByFn().set(fnExtra, refs);
+	}
 } };
+function getConstTagVarRefs(markoRoot, refs, seen = /* @__PURE__ */ new Set()) {
+	const tag = getTagFromMarkoRoot(markoRoot);
+	if (!tag?.node.var || !isCoreTagName(tag, "const") || seen.has(tag.node)) return refs;
+	seen.add(tag.node);
+	const ids = tag.get("var").getOuterBindingIdentifiers();
+	for (const name in ids) {
+		const binding = tag.scope.getBinding(name);
+		if (binding && addBindingRefs(binding, refs, seen) === true) return true;
+	}
+	return refs;
+}
 function finalizeFunctionRegistry() {
 	for (const [fnExtra, exprExtras] of getReferencesByFn()) {
 		const reason = resolveSerializeReason(exprExtras);
@@ -1676,7 +1723,10 @@ function addBindingRefs(binding, refs, seen) {
 		if (isStaticRoot(markoRoot)) {
 			if (getStaticDeclRefs(ref, refs, seen) === true) return true;
 		} else if (shouldAlwaysRegister(markoRoot)) return true;
-		else refs.add(exprRoot.node.extra ??= {});
+		else {
+			refs.add(exprRoot.node.extra ??= {});
+			if (getConstTagVarRefs(markoRoot, refs, seen) === true) return true;
+		}
 	}
 }
 function shouldAlwaysRegister(markoRoot) {
@@ -1976,6 +2026,14 @@ function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId$1]: branchId });
 }
+function deferBranchStart(chunk) {
+	const beforeBranch = chunk.html;
+	chunk.html = "";
+	return beforeBranch;
+}
+function applyBranchStart(chunk, beforeBranch, rendered) {
+	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
+}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
 	const target = $chunk.serializeState;
@@ -2135,8 +2193,8 @@ function nonVoidAttr(name, value) {
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
-const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g;
 const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
@@ -2145,13 +2203,13 @@ function escapeSingleQuotedAttrValue(value) {
 	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
 }
 function replaceUnsafeSingleQuoteAttrChar(match) {
-	return match === "'" ? "&#39;" : "&amp;";
+	return match === "'" ? "&#39;" : match === "\r" ? "&#13;" : "&amp;";
 }
 function escapeDoubleQuotedAttrValue(value) {
 	return doubleQuoteAttrReplacements.test(value) ? value.replace(doubleQuoteAttrReplacements, replaceUnsafeDoubleQuoteAttrChar) : value;
 }
 function replaceUnsafeDoubleQuoteAttrChar(match) {
-	return match === "\"" ? "&#34;" : "&amp;";
+	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
 }
 function normalizedValueMatches(a, b) {
 	const value = normalizeStrAttrValue(b);
@@ -2196,7 +2254,8 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		renderNative();
 	} else {
-		if (shouldResume) _html(state.mark("[", ""));
+		const chunk = void 0;
+		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
 		const render = () => {
 			if (renderer) try {
 				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
@@ -2211,7 +2270,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render();
 		rendered = _peek_scope_id() !== branchId;
-		if (shouldResume) _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		if (beforeBranch !== void 0) {
+			applyBranchStart(chunk, beforeBranch, rendered);
+			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
+		}
 	}
 	if (rendered) {
 		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: renderer?.["id"] || renderer });
@@ -2678,6 +2740,17 @@ var return_default = {
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		assertNoBodyContent(tag);
 		(0, _marko_compiler_babel_utils.assertAllowedAttributes)(tag, ["value", "valueChange"]);
+		let valueAttr;
+		let valueChangeAttr;
+		for (const attr of tag.node.attributes) if (_marko_compiler.types.isMarkoAttribute(attr)) {
+			if (attr.name === "value") {
+				if (valueAttr) throw tag.hub.buildError(attr, "Invalid duplicate value attribute.");
+				valueAttr = attr;
+			} else if (attr.name === "valueChange") {
+				if (valueChangeAttr) throw tag.hub.buildError(attr, "Invalid duplicate valueChange attribute.");
+				valueChangeAttr = attr;
+			}
+		}
 		const parentTag = getParentTag(tag);
 		if (parentTag) {
 			if ((0, _marko_compiler_babel_utils.isNativeTag)(parentTag)) throw tag.get("name").buildCodeFrameError("The [`<return>` tag](https://markojs.com/docs/reference/core-tag#return) can not be used in a [native tag](https://markojs.com/docs/reference/native-tag).");
@@ -2986,10 +3059,9 @@ function getSignal(section, referencedBindings, name) {
 			section,
 			values: [],
 			intersection: void 0,
+			forwards: void 0,
 			render: [],
-			renderReferencedBindings: void 0,
 			effect: [],
-			effectReferencedBindings: void 0,
 			hasHTMLEffect: false,
 			build: void 0,
 			export: !!exportName,
@@ -3064,12 +3136,13 @@ function isPureMemberForwarder(binding) {
 	for (const alias of binding.propertyAliases.values()) if (alias.type !== 6) return true;
 	return false;
 }
-function pushMemberForwards(renderStatements, value, alias) {
+function pushMemberForwards(signal, value, alias) {
 	if (isPureMemberForwarder(alias)) {
-		for (const [key, child] of alias.propertyAliases) if (child.type !== 6) pushMemberForwards(renderStatements, toMemberExpression(_marko_compiler.types.cloneNode(value, true), key, alias.nullable), child);
+		for (const [key, child] of alias.propertyAliases) if (child.type !== 6) pushMemberForwards(signal, toMemberExpression(_marko_compiler.types.cloneNode(value, true), key, alias.nullable), child);
 	} else {
 		const aliasSignal = getSignal(alias.section, alias);
-		renderStatements.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(aliasSignal.identifier, [
+		signal.forwards = push(signal.forwards, aliasSignal);
+		signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(aliasSignal.identifier, [
 			scopeIdentifier,
 			value,
 			...getTranslatedExtraArgs(aliasSignal)
@@ -3084,32 +3157,35 @@ function getSignalFn(signal) {
 	if (isValue) {
 		for (const alias of binding.aliases) {
 			const aliasSignal = getSignal(alias.section, alias);
-			if (signalHasStatements(aliasSignal)) if (alias.excludeProperties !== void 0) {
-				const aliasId = _marko_compiler.types.identifier(alias.name);
-				let pattern;
-				if (alias.restOffset) pattern = _marko_compiler.types.arrayPattern(new Array(alias.restOffset).fill(null).concat(_marko_compiler.types.restElement(aliasId)));
-				else {
-					const props = [];
-					forEach(alias.excludeProperties, (name) => {
-						const propId = toPropertyName(name);
-						const shorthand = propId.type === "Identifier" && _marko_compiler.types.isValidIdentifier(name);
-						props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
-					});
-					props.push(_marko_compiler.types.restElement(aliasId));
-					pattern = _marko_compiler.types.objectPattern(props);
-				}
-				signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([pattern], _marko_compiler.types.callExpression(aliasSignal.identifier, [
+			if (signalHasStatements(aliasSignal)) {
+				signal.forwards = push(signal.forwards, aliasSignal);
+				if (alias.excludeProperties !== void 0) {
+					const aliasId = _marko_compiler.types.identifier(alias.name);
+					let pattern;
+					if (alias.restOffset) pattern = _marko_compiler.types.arrayPattern(new Array(alias.restOffset).fill(null).concat(_marko_compiler.types.restElement(aliasId)));
+					else {
+						const props = [];
+						forEach(alias.excludeProperties, (name) => {
+							const propId = toPropertyName(name);
+							const shorthand = propId.type === "Identifier" && _marko_compiler.types.isValidIdentifier(name);
+							props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
+						});
+						props.push(_marko_compiler.types.restElement(aliasId));
+						pattern = _marko_compiler.types.objectPattern(props);
+					}
+					signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([pattern], _marko_compiler.types.callExpression(aliasSignal.identifier, [
+						scopeIdentifier,
+						aliasId,
+						...getTranslatedExtraArgs(aliasSignal)
+					])), [binding.nullable ? _marko_compiler.types.logicalExpression("||", createScopeReadExpression(binding), alias.restOffset ? _marko_compiler.types.arrayExpression([]) : _marko_compiler.types.objectExpression([])) : createScopeReadExpression(binding)])));
+				} else signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(aliasSignal.identifier, [
 					scopeIdentifier,
-					aliasId,
+					createScopeReadExpression(binding),
 					...getTranslatedExtraArgs(aliasSignal)
-				])), [binding.nullable ? _marko_compiler.types.logicalExpression("||", createScopeReadExpression(binding), alias.restOffset ? _marko_compiler.types.arrayExpression([]) : _marko_compiler.types.objectExpression([])) : createScopeReadExpression(binding)])));
-			} else signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(aliasSignal.identifier, [
-				scopeIdentifier,
-				createScopeReadExpression(binding),
-				...getTranslatedExtraArgs(aliasSignal)
-			])));
+				])));
+			}
 		}
-		for (const [key, alias] of binding.propertyAliases) if (alias.type !== 6) pushMemberForwards(signal.render, toMemberExpression(createScopeReadExpression(binding), key, binding.nullable), alias);
+		for (const [key, alias] of binding.propertyAliases) if (alias.type !== 6) pushMemberForwards(signal, 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) {
@@ -3228,25 +3304,15 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
 	args.length = finalLen || 0;
 	return args;
 }
-function addStatement(type, targetSection, referencedBindings, statement, usedReferences, isPure) {
+function addStatement(type, targetSection, referencedBindings, statement, isPure) {
 	const signal = getSignal(targetSection, referencedBindings);
 	const statements = signal[type] ??= [];
-	const add = type === "effect" ? addEffectReferences : addRenderReferences;
 	if (Array.isArray(statement)) statements.push(...statement);
 	else statements.push(statement);
-	if (usedReferences !== false) if (usedReferences) for (const ref of usedReferences) add(signal, ref);
-	else add(signal, referencedBindings);
 	if (!isPure || type === "effect") signal.hasSideEffect = true;
 }
-function addEffectReferences(signal, referencedBindings) {
-	signal.effectReferencedBindings = bindingUtil.union(signal.effectReferencedBindings, referencedBindings);
-}
-function addRenderReferences(signal, referencedBindings) {
-	signal.renderReferencedBindings = bindingUtil.union(signal.renderReferencedBindings, referencedBindings);
-}
 function addValue(targetSection, referencedBindings, signal, value) {
 	const parentSignal = getSignal(targetSection, referencedBindings);
-	addRenderReferences(parentSignal, referencedBindings);
 	parentSignal.values.push({
 		signal,
 		value
@@ -3255,9 +3321,9 @@ function addValue(targetSection, referencedBindings, signal, value) {
 }
 function buildResumeRegisterKey(section, referencedBindings, type) {
 	let name = "";
-	if (referencedBindings) if (typeof referencedBindings === "string") name += `_${referencedBindings}`;
-	else if (Array.isArray(referencedBindings)) for (const ref of referencedBindings) name += `_${ref.name}`;
-	else name += `_${referencedBindings.name}`;
+	if (referencedBindings) if (typeof referencedBindings === "string") name += `*${referencedBindings}`;
+	else if (Array.isArray(referencedBindings)) for (const ref of referencedBindings) name += `_${ref.name}#${ref.id}`;
+	else name += `_${referencedBindings.name}#${referencedBindings.id}`;
 	return `${section.id}${name}${type ? "/" + type : ""}`;
 }
 function getResumeRegisterId(section, referencedBindings, type) {
@@ -3287,9 +3353,11 @@ function writeSignals(section) {
 		let signalDeclaration;
 		if (signal.build) {
 			let value = signal.build();
+			const buildsEagerForward = _marko_compiler.types.isIdentifier(value);
 			if (!value || !signal.register && _marko_compiler.types.isFunction(value) && _marko_compiler.types.isBlockStatement(value.body) && !value.body.body.length) return;
 			if (_marko_compiler.types.isCallExpression(value)) replaceNullishAndEmptyFunctionsWith0(value.arguments);
 			if (signal.register) value = callRuntime("_var_resume", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings, "var")), value);
+			if (buildsEagerForward) forEach(signal.forwards, writeSignal);
 			const signalDeclarator = _marko_compiler.types.variableDeclarator(signal.identifier, value);
 			signalDeclaration = !section.parent && !signal.referencedBindings && (_marko_compiler.types.isFunctionExpression(value) || _marko_compiler.types.isArrowFunctionExpression(value)) ? _marko_compiler.types.functionDeclaration(signal.identifier, value.params, _marko_compiler.types.isExpression(value.body) ? _marko_compiler.types.blockStatement([_marko_compiler.types.expressionStatement(value.body)]) : value.body) : _marko_compiler.types.variableDeclaration("const", [signalDeclarator]);
 			if (signal.export) signalDeclaration = _marko_compiler.types.exportNamedDeclaration(signalDeclaration);
@@ -3576,15 +3644,15 @@ function replaceRegisteredFunctionNode$1(node) {
 	switch (node.type) {
 		case "ClassMethod": {
 			const replacement = getRegisteredFnExpression$1(node);
-			return replacement && _marko_compiler.types.classProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.classProperty(node.key, replacement, void 0, void 0, node.computed, node.static);
 		}
 		case "ClassPrivateMethod": {
 			const replacement = getRegisteredFnExpression$1(node);
-			return replacement && _marko_compiler.types.classPrivateProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.classPrivateProperty(node.key, replacement, void 0, node.static);
 		}
 		case "ObjectMethod": {
 			const replacement = getRegisteredFnExpression$1(node);
-			return replacement && _marko_compiler.types.objectProperty(node.key, replacement);
+			return replacement && _marko_compiler.types.objectProperty(node.key, replacement, node.computed);
 		}
 		case "ArrowFunctionExpression":
 		case "FunctionExpression": return getRegisteredFnExpression$1(node);
@@ -4093,9 +4161,25 @@ function templateElement(value, tail) {
 	}, tail);
 }
 //#endregion
+//#region src/translator/util/branch-tag.ts
+function getBranchSectionAccessor(nodeBinding) {
+	return {
+		binding: nodeBinding,
+		prefix: getAccessorPrefix().BranchScopes
+	};
+}
+function initBranchSection(bodySection, upstreamExpression, sectionAccessor) {
+	bodySection.isBranch = true;
+	bodySection.upstreamExpression = upstreamExpression;
+	bodySection.sectionAccessor = sectionAccessor;
+}
+function resumeOwnerByMarkerWhenStatic(tagSection, bodySection, nodeBinding, statefulReasonKey) {
+	if (isStateSerializeReason(getSerializeReason(tagSection, statefulReasonKey)) && isStaticSerializeReason(getSerializeReason(bodySection, kBranchSerializeReason)) && isStaticSerializeReason(getSerializeReason(tagSection, nodeBinding))) setSectionOwnerResumedByMarker(bodySection);
+}
+//#endregion
 //#region src/translator/util/is-event-or-change-handler.ts
 function isEventOrChangeHandler(prop) {
-	return /^on[-A-Z][a-zA-Z0-9_$]|[a-zA-Z_$][a-zA-Z0-9_$]*Change$/.test(prop);
+	return /^on[-A-Z]|[a-zA-Z_$][a-zA-Z0-9_$]*Change$/.test(prop);
 }
 //#endregion
 //#region src/translator/util/is-non-html-text.ts
@@ -4160,7 +4244,12 @@ var for_default = {
 		if (isAttrTag) return;
 		const byAttr = getKnownAttrValues(tag.node).by;
 		if (forType !== "of" && byAttr?.type === "StringLiteral") throw tag.hub.buildError(byAttr, `The [\`<for>\` tag](https://markojs.com/docs/reference/core-tag#for) only supports a string \`by\` key with \`of\`; use a \`by=(${forType === "in" ? "key, value" : "index"}) => ...\` function for \`<for ${forType}>\`.`);
-		if (byAttr?.type === "Identifier" && !tag.scope.getBinding(byAttr.name) && tag.node.body.params.some((param) => Object.hasOwn(_marko_compiler.types.getBindingIdentifiers(param), byAttr.name))) throw tag.hub.buildError(byAttr, `The \`by=\` attribute is evaluated before the loop runs, so \`${byAttr.name}\` is not in scope. Key with a property name string (\`by="id"\`) or a function (\`by=(${byAttr.name}) => key\`).`);
+		if (byAttr) {
+			const paramNames = /* @__PURE__ */ new Set();
+			for (const param of tag.node.body.params) for (const name in _marko_compiler.types.getBindingIdentifiers(param)) paramNames.add(name);
+			const paramRead = paramNames.size ? findLoopParamRead(byAttr, paramNames) : void 0;
+			if (paramRead) throw tag.hub.buildError(paramRead, `The \`by=\` attribute is evaluated before the loop runs, so \`${paramRead.name}\` is not in scope. Key with a property name string (\`by="id"\`) or a function (\`by=(${paramRead.name}) => key\`).`);
+		}
 		const bodySection = startSection(tagBody);
 		if (!bodySection) {
 			dropNodes(getAllTagReferenceNodes(tag.node));
@@ -4180,12 +4269,7 @@ var for_default = {
 				onFinalizeReferences(() => detectForSelector(bodySection, keyBinding));
 			}
 		}
-		bodySection.sectionAccessor = {
-			binding: nodeBinding,
-			prefix: getAccessorPrefix().BranchScopes
-		};
-		bodySection.upstreamExpression = tagExtra;
-		bodySection.isBranch = true;
+		initBranchSection(bodySection, tagExtra, getBranchSectionAccessor(nodeBinding));
 		if (!isAttrTag && !getOnlyChildParentTagName(tag)) {
 			visit(tag, 37);
 			enterShallow(tag);
@@ -4219,11 +4303,11 @@ var for_default = {
 				const singleChild = bodySection.content?.singleChild && bodySection.content.startType !== 4;
 				const branchSerializeReason = getSerializeReason(bodySection, kBranchSerializeReason);
 				const markerSerializeReason = getSerializeReason(tagSection, nodeBinding);
-				if (isStateSerializeReason(getSerializeReason(tagSection, kStatefulReason$2)) && isStaticSerializeReason(branchSerializeReason) && isStaticSerializeReason(markerSerializeReason)) setSectionOwnerResumedByMarker(bodySection);
+				resumeOwnerByMarkerWhenStatic(tagSection, bodySection, nodeBinding, kStatefulReason$2);
 				flushInto(tag);
 				writeHTMLResumeStatements(tagBody);
 				const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
-				const forTagHTMLRuntime = branchSerializeReason ? forTypeToHTMLResumeRuntime(forType) : forTypeToRuntime(forType);
+				const forTagHTMLRuntime = branchSerializeReason ? forTypeToBranchRuntime(forType) : forTypeToRuntime(forType);
 				forTagArgs.push(_marko_compiler.types.arrowFunctionExpression(params, _marko_compiler.types.blockStatement(bodyStatements)));
 				if (branchSerializeReason) {
 					const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
@@ -4269,7 +4353,7 @@ var for_default = {
 				const forType = getForType(node);
 				const signal = getSignal(tagSection, nodeRef, "for");
 				signal.build = () => {
-					return callRuntime(forTypeToDOMRuntime(forType), getScopeAccessorLiteral(nodeRef, true), ...replaceNullishAndEmptyFunctionsWith0(getBranchRendererArgs(bodySection)));
+					return callRuntime(forTypeToBranchRuntime(forType), getScopeAccessorLiteral(nodeRef, true), ...replaceNullishAndEmptyFunctionsWith0(getBranchRendererArgs(bodySection)));
 				};
 				const forAttrs = getKnownAttrValues(node);
 				const loopArgs = getBaseArgsInForTag(forType, forAttrs);
@@ -4337,6 +4421,27 @@ function getForType(tag) {
 		case "until": return attr.name;
 	}
 }
+function findLoopParamRead(node, names) {
+	switch (node.type) {
+		case "Identifier": return names.has(node.name) ? node : void 0;
+		case "MemberExpression":
+		case "OptionalMemberExpression": return findLoopParamRead(node.object, names) || (node.computed ? findLoopParamRead(node.property, names) : void 0);
+	}
+	if (_marko_compiler.types.isFunction(node) || _marko_compiler.types.isClass(node)) return;
+	for (const key of _marko_compiler.types.VISITOR_KEYS[node.type] || []) {
+		if (key === "typeAnnotation" || key === "typeParameters") continue;
+		if (key === "key" && !node.computed) continue;
+		const value = node[key];
+		if (Array.isArray(value)) for (const child of value) {
+			const found = child?.type && findLoopParamRead(child, names);
+			if (found) return found;
+		}
+		else if (value?.type) {
+			const found = findLoopParamRead(value, names);
+			if (found) return found;
+		}
+	}
+}
 function getLoopKeyBinding(byAttr, paramsBinding, forType) {
 	if (!paramsBinding) return;
 	if (byAttr) {
@@ -4379,15 +4484,7 @@ function forTypeToRuntime(type) {
 		case "until": return "forUntil";
 	}
 }
-function forTypeToHTMLResumeRuntime(type) {
-	switch (type) {
-		case "of": return "_for_of";
-		case "in": return "_for_in";
-		case "to": return "_for_to";
-		case "until": return "_for_until";
-	}
-}
-function forTypeToDOMRuntime(type) {
+function forTypeToBranchRuntime(type) {
 	switch (type) {
 		case "of": return "_for_of";
 		case "in": return "_for_in";
@@ -4753,7 +4850,7 @@ var native_tag_default = {
 			}
 			relatedControllable ||= getRelatedControllable(tagName, seen);
 			if (relatedControllable && relatedControllable.attrs[1]) hasEventHandlers = true;
-			if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || isDynamicControllable(relatedControllable)) {
+			if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || seen.content && tagName !== "meta" && !node.body.body.length || isDynamicControllable(relatedControllable)) {
 				const tagExtra = node.extra ??= {};
 				const tagSection = getOrCreateSection(tag);
 				const nodeBinding = tagExtra[kNativeTagBinding] = createBinding("#" + tagName.toLowerCase(), 0, tagSection, void 0, void 0, void 0, void 0, !!node.var);
@@ -4864,6 +4961,7 @@ var native_tag_default = {
 					if (hasChangeHandler) addHTMLEffectCall(tagSection, void 0);
 				}
 				let writeAtStartOfBody;
+				if (tagName === "html" && getMarkoOpts().linkAssets && !tag.node.body.body.some((child) => child.type === "MarkoTag" && child.name.type === "StringLiteral" && child.name.value === "head")) writeAtStartOfBody = callRuntime("_flush_head");
 				if (tagName === "select") {
 					if (staticControllable) htmlSelectArgs.set(tag.node, {
 						value: staticControllable.attrs[0]?.value || buildUndefined$1(),
@@ -4987,7 +5085,7 @@ var native_tag_default = {
 				const isOpenOnly = !!(tagDef && tagDef.parseOptions?.openTagOnly);
 				const isTextOnly = isTextOnlyNativeTag(tag);
 				const hasChildren = !!tag.node.body.body.length;
-				if (injectNonce) addStatement("render", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_attr_nonce", scopeIdentifier, getScopeAccessorLiteral(nodeBinding))), void 0, true);
+				if (injectNonce) addStatement("render", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_attr_nonce", scopeIdentifier, getScopeAccessorLiteral(nodeBinding))), true);
 				if (staticControllable) {
 					const hasChangeHandler = !!staticControllable.attrs[1];
 					const defaultHelper = getDOMControllableDefaultHelper(staticControllable);
@@ -5030,14 +5128,14 @@ var native_tag_default = {
 										stmt = _marko_compiler.types.expressionStatement(callRuntime(`_attr_${name}_items`, nodeExpr, _marko_compiler.types.objectExpression(props)));
 									}
 								}
-								if (stmt) addStatement("render", tagSection, valueReferences, stmt, void 0, !!meta.dynamicItems);
+								if (stmt) addStatement("render", tagSection, valueReferences, stmt, !!meta.dynamicItems);
 							}
 							break;
 						}
 						default:
 							if (confident) break;
 							else if (isEventHandler(name)) addStatement("effect", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_on", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(getEventHandlerName(name)), value)));
-							else addStatement("render", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_attr", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(name), value)), void 0, true);
+							else addStatement("render", tagSection, valueReferences, _marko_compiler.types.expressionStatement(callRuntime("_attr", createScopeReadExpression(nodeBinding), _marko_compiler.types.stringLiteral(name), value)), true);
 							break;
 					}
 				}
@@ -5049,9 +5147,9 @@ var native_tag_default = {
 					if (skipExpression) addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_partial_content" : "_attrs_partial", scopeIdentifier, visitAccessor, spreadExpression, skipExpression, controllable && importRuntime(controllable))));
 					else addStatement("render", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime(canHaveAttrContent ? "_attrs_content" : "_attrs", scopeIdentifier, visitAccessor, spreadExpression, controllable && importRuntime(controllable))));
 					enableControllable(controllableFeatureFor(staticName));
-					addStatement("effect", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attrs_script", scopeIdentifier, visitAccessor)), false);
+					addStatement("effect", tagSection, tagExtra.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attrs_script", scopeIdentifier, visitAccessor)));
 				}
-				if (staticContentAttr) addStatement("render", tagSection, staticContentAttr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attr_content", scopeIdentifier, visitAccessor, staticContentAttr.value)), void 0, true);
+				if (staticContentAttr) addStatement("render", tagSection, staticContentAttr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_attr_content", scopeIdentifier, visitAccessor, staticContentAttr.value)), true);
 			},
 			exit(tag) {
 				const nodeBinding = tag.node.extra[kNativeTagBinding];
@@ -5059,7 +5157,7 @@ var native_tag_default = {
 				const tagName = getCanonicalTagName(tag);
 				if (!openTagOnly) if (tagName !== "textarea" && isTextOnlyNativeTag(tag)) {
 					const textLiteral = bodyToTextLiteral(tag.node.body);
-					if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", getSection(tag), textLiteral.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text_content", createScopeReadExpression(nodeBinding), textLiteral)), void 0, true);
+					if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", getSection(tag), textLiteral.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text_content", createScopeReadExpression(nodeBinding), textLiteral)), true);
 				} else tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
 				tag.remove();
 			}
@@ -5437,7 +5535,7 @@ function trackDelimitedAttrObjectProperties(obj, meta) {
 		if (prop.key.type === "Identifier") key = prop.key.name;
 		else {
 			const keyEval = evaluate(prop.key);
-			if (keyEval.confident && typeof keyEval.computed === "string" && !/\s/.test(keyEval.computed)) key = keyEval.computed + "";
+			if (keyEval.confident && typeof keyEval.computed === "string" && !/^$|\s/.test(keyEval.computed)) key = keyEval.computed + "";
 			else {
 				(dynamicProps ||= []).push(prop);
 				continue;
@@ -5529,16 +5627,9 @@ const IfTag = {
 				visit(ifTag, 37);
 				enterShallow(ifTag);
 			}
-			const sectionAccessor = {
-				binding: getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length),
-				prefix: getAccessorPrefix().BranchScopes
-			};
+			const sectionAccessor = getBranchSectionAccessor(getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length));
 			for (const [branchTag, branchBodySection] of branches) {
-				if (branchBodySection) {
-					branchBodySection.isBranch = true;
-					branchBodySection.upstreamExpression = ifTagExtra;
-					branchBodySection.sectionAccessor = sectionAccessor;
-				}
+				if (branchBodySection) initBranchSection(branchBodySection, ifTagExtra, sectionAccessor);
 				if (branchTag.node.attributes.length) mergeReferenceNodes.push(branchTag.node.attributes[0].value);
 			}
 			mergeReferences(ifTagSection, ifTag.node, mergeReferenceNodes);
@@ -5558,9 +5649,10 @@ const IfTag = {
 				const tagBody = tag.get("body");
 				const bodySection = getSectionForBody(tagBody);
 				if (bodySection) {
-					const [[ifTag]] = getBranches(tag);
+					const branches = getBranches(tag);
+					const [ifTag] = branches[0];
 					const ifTagSection = getSection(ifTag);
-					if (isStateSerializeReason(getSerializeReason(ifTagSection, kStatefulReason$1)) && isStaticSerializeReason(getSerializeReason(bodySection, kBranchSerializeReason)) && isStaticSerializeReason(getSerializeReason(ifTagSection, getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection)))) setSectionOwnerResumedByMarker(bodySection);
+					resumeOwnerByMarkerWhenStatic(ifTagSection, bodySection, getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length), kStatefulReason$1);
 					flushInto(tag);
 					writeHTMLResumeStatements(tagBody);
 				}
@@ -5568,22 +5660,22 @@ const IfTag = {
 					const branches = getBranches(tag);
 					const [ifTag] = branches[0];
 					const ifTagSection = getSection(ifTag);
-					const nodeBinding = getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection);
-					const onlyChildParentTagName = getOnlyChildParentTagName(ifTag);
+					const nodeBinding = getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length);
+					const onlyChildParentTagName = getOnlyChildParentTagName(ifTag, branches.length);
 					const markerSerializeReason = getSerializeReason(ifTagSection, nodeBinding);
 					const nextTag = tag.getNextSibling();
 					let branchSerializeReasons;
 					let statement;
 					let singleChild = true;
-					for (const [, branchBody] of branches) if (!(branchBody?.content?.singleChild && branchBody.content.startType !== 4)) {
+					for (const [, branchBodySection] of branches) if (!(branchBodySection?.content?.singleChild && branchBodySection.content.startType !== 4)) {
 						singleChild = false;
 						break;
 					}
 					for (let i = branches.length; i--;) {
-						const [branchTag, branchBody] = branches[i];
+						const [branchTag, branchBodySection] = branches[i];
 						const bodyStatements = branchTag.node.body.body;
-						if (branchBody) {
-							const branchSerializeReason = getSerializeReason(branchBody, kBranchSerializeReason);
+						if (branchBodySection) {
+							const branchSerializeReason = getSerializeReason(branchBodySection, kBranchSerializeReason);
 							if (branchSerializeReason) {
 								if (branchSerializeReasons !== true) if (branchSerializeReason === true || branchSerializeReason.state) branchSerializeReasons = true;
 								else if (branchSerializeReasons) branchSerializeReasons = addSorted(compareSources, branchSerializeReasons, branchSerializeReason);
@@ -5622,7 +5714,7 @@ const IfTag = {
 					const [ifTag] = branches[0];
 					const ifTagSection = getSection(ifTag);
 					const ifTagExtra = branches[0][0].node.extra;
-					const nodeRef = getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection);
+					const nodeRef = getOptimizedOnlyChildNodeBinding(ifTag, ifTagSection, branches.length);
 					let expr = _marko_compiler.types.numericLiteral(branches.length);
 					for (let i = branches.length; i--;) {
 						const [branchTag, branchBodySection] = branches[i];
@@ -5685,7 +5777,7 @@ function flattenTextOnlyConditional(rootTag) {
 		const [attr] = node.attributes;
 		if (isCoreTagName(tag, "else")) {
 			if (node.attributes.length > 1 || attr && (!_marko_compiler.types.isMarkoAttribute(attr) || attr.name !== "if")) return;
-		} else if (node.attributes.length !== 1 || !_marko_compiler.types.isMarkoAttribute(attr) || !attr.default) return;
+		} else if (node.attributes.length !== 1 || !_marko_compiler.types.isMarkoAttribute(attr) || !(attr.default || attr.name === "value")) return;
 		for (const child of body) if (_marko_compiler.types.isMarkoText(child)) {
 			if (_escape(child.value) !== child.value) return;
 		} else if (!_marko_compiler.types.isMarkoPlaceholder(child) || !child.escape) return;
@@ -5741,7 +5833,7 @@ function assertHasBody$1(tag) {
 function assertHasValueAttribute$1(tag) {
 	const { node } = tag;
 	const [valueAttr] = node.attributes;
-	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !valueAttr.default) throw tag.get("name").buildCodeFrameError(`The [\`${getTagName(tag)}\` tag](https://markojs.com/docs/reference/core-tag#if--else) requires a [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
+	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !(valueAttr.default || valueAttr.name === "value")) throw tag.get("name").buildCodeFrameError(`The [\`${getTagName(tag)}\` tag](https://markojs.com/docs/reference/core-tag#if--else) requires a [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
 	if (node.attributes.length > 1) {
 		const start = node.attributes[1].loc?.start;
 		const end = node.attributes[node.attributes.length - 1].loc?.end;
@@ -5920,14 +6012,17 @@ function getChangeHandler(tag, attr) {
 	if (_marko_compiler.types.isIdentifier(attr.value)) {
 		const binding = tag.scope.getBinding(attr.value.name);
 		if (!binding) return _marko_compiler.types.markoAttribute(changeAttrName, buildChangeHandlerFunction(attr.value, modifier));
-		const existingChangedAttr = BINDING_CHANGE_HANDLER.get(binding.identifier);
+		const modifierKey = modifier?.name ?? "";
+		let handlerByModifier = BINDING_CHANGE_HANDLER.get(binding.identifier);
+		if (!handlerByModifier) BINDING_CHANGE_HANDLER.set(binding.identifier, handlerByModifier = /* @__PURE__ */ new Map());
+		const existingChangedAttr = handlerByModifier.get(modifierKey);
 		if (!existingChangedAttr) {
 			const bindingIdentifierPath = binding.path.getOuterBindingIdentifierPaths()[binding.identifier.name];
 			let changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value, modifier) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(bindingIdentifierPath.parentPath) : void 0 : void 0;
 			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, bindingIdentifierPath?.parentPath?.isArrayPattern() ? `Cannot two-way bind to \`${attr.value.name}\` because it comes from array destructuring, which has no change handler. Use object destructuring or pass an explicit \`${changeAttrName}\` attribute.` : "Unable to bind to value.");
 			if (modifier && _marko_compiler.types.isIdentifier(changeAttrExpr)) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildModifierForwarder(_marko_compiler.types.cloneNode(changeAttrExpr), modifier));
 			const changeHandlerAttr = _marko_compiler.types.markoAttribute(changeAttrName, changeAttrExpr);
-			BINDING_CHANGE_HANDLER.set(binding.identifier, changeHandlerAttr);
+			handlerByModifier.set(modifierKey, changeHandlerAttr);
 			return changeHandlerAttr;
 		}
 		if (existingChangedAttr.type === "Identifier") return _marko_compiler.types.markoAttribute(changeAttrName, withPreviousLocation(_marko_compiler.types.identifier(existingChangedAttr.name), attr.value));
@@ -5935,7 +6030,7 @@ function getChangeHandler(tag, attr) {
 		if (!(markoRoot?.isMarkoTag() || markoRoot?.isMarkoTagBody())) throw tag.hub.buildError(attr.value, "Unable to bind to value.");
 		const changeHandlerId = generateUid(changeAttrName);
 		const changeHandlerConst = _marko_compiler.types.markoTag(_marko_compiler.types.stringLiteral("const"), [_marko_compiler.types.markoAttribute("value", existingChangedAttr.value, null, null, true)], _marko_compiler.types.markoTagBody([]), null, _marko_compiler.types.identifier(changeHandlerId));
-		BINDING_CHANGE_HANDLER.set(binding.identifier, existingChangedAttr.value = _marko_compiler.types.identifier(changeHandlerId));
+		handlerByModifier.set(modifierKey, existingChangedAttr.value = _marko_compiler.types.identifier(changeHandlerId));
 		if (markoRoot.isMarkoTag()) markoRoot.insertAfter(changeHandlerConst);
 		else markoRoot.unshiftContainer("body", changeHandlerConst);
 		return _marko_compiler.types.markoAttribute(changeAttrName, withPreviousLocation(_marko_compiler.types.identifier(changeHandlerId), attr.value));
@@ -6248,7 +6343,8 @@ function knownTagAnalyze(tag, contentSection, propTree) {
 		const varExpr = tagExtra.defineBodySection ? contentSection.returnValueExpr : mapParamReasonToExpr(exprs, contentSection.returnSerializeReason && (contentSection.returnSerializeReason === true || !!contentSection.returnSerializeReason.state || contentSection.returnSerializeReason.param));
 		varBinding.scopeOffset = tagExtra[kChildOffsetScopeBinding$1] = createBinding("#scopeOffset", 0, section);
 		setBindingDownstream(varBinding, varExpr);
-		addSerializeExpr(section, mutatesTagVar || varExpr, childScopeBinding);
+		if (mutatesTagVar) addSerializeExpr(section, true, childScopeBinding);
+		addSerializeExpr(section, varExpr, childScopeBinding);
 	}
 	addSerializeExpr(section, fromIter(attrExprs), childScopeBinding);
 }
@@ -6555,7 +6651,7 @@ function writeParamsToSignals(tag, propTree, importAlias, info) {
 		const argExport = propTree.props[i];
 		if (argExport) {
 			const argExportIdentifier = info.getBindingIdentifier(argExport.binding, `${importAlias}_param_${i}`);
-			addStatement("render", info.tagSection, arg.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(argExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), arg])), void 0, true);
+			addStatement("render", info.tagSection, arg.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(argExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), arg])), true);
 		}
 		i++;
 	}
@@ -6568,36 +6664,31 @@ function applyAttrObject(tag, propTree, tagInputIdentifier, info) {
 	let translatedProps = propsToExpression(translatedAttrs.properties);
 	if (translatedAttrs.statements.length) addStatement("render", info.tagSection, referencedBindings, translatedAttrs.statements);
 	if ((0, _marko_compiler_babel_utils.isAttributeTag)(tag)) {
-		translatedProps = _marko_compiler.types.objectExpression(translatedAttrs.properties);
-		const attrTagName = getTagName(tag);
-		const parentTag = tag.parentPath;
-		if (analyzeAttributeTags(parentTag)?.[attrTagName]?.repeated) {
-			let attrTagCallsForTag = (info.attrTagCallsByTag ||= /* @__PURE__ */ new Map()).get(parentTag);
-			if (!attrTagCallsForTag) info.attrTagCallsByTag.set(parentTag, attrTagCallsForTag = /* @__PURE__ */ new Map());
-			const attrTagCall = attrTagCallsForTag.get(attrTagName);
-			if (attrTagCall) {
-				attrTagCall.expression = callRuntime("attrTags", attrTagCall.expression, translatedProps);
-				return;
-			} else attrTagCallsForTag.set(attrTagName, translatedProps = _marko_compiler.types.parenthesizedExpression(callRuntime("attrTag", translatedProps)));
-		} else translatedProps = callRuntime("attrTag", translatedProps);
+		const repeated = analyzeAttributeTags(tag.parentPath)?.[getTagName(tag)]?.repeated;
+		const mergedProps = getAttrTagProps(tag, repeated, _marko_compiler.types.objectExpression(translatedAttrs.properties), info);
+		if (!mergedProps) return;
+		translatedProps = mergedProps;
 	}
-	addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), translatedProps])), void 0, true);
+	addStatement("render", info.tagSection, referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(tagInputIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), translatedProps])), true);
 }
 function translateAttrTag(tag, attrTagMeta, info, statements) {
 	const translatedAttrs = translateAttrs(tag, true, void 0, statements);
-	let translatedProps = _marko_compiler.types.objectExpression(translatedAttrs.properties);
+	return getAttrTagProps(tag, attrTagMeta.repeated, _marko_compiler.types.objectExpression(translatedAttrs.properties), info);
+}
+function getAttrTagProps(tag, repeated, translatedProps, info) {
+	if (!repeated) return callRuntime("attrTag", translatedProps);
 	const attrTagName = getTagName(tag);
 	const parentTag = tag.parentPath;
-	if (attrTagMeta.repeated) {
-		let attrTagCallsForTag = (info.attrTagCallsByTag ||= /* @__PURE__ */ new Map()).get(parentTag);
-		if (!attrTagCallsForTag) info.attrTagCallsByTag.set(parentTag, attrTagCallsForTag = /* @__PURE__ */ new Map());
-		const attrTagCall = attrTagCallsForTag.get(attrTagName);
-		if (attrTagCall) {
-			attrTagCall.expression = callRuntime("attrTags", attrTagCall.expression, translatedProps);
-			return;
-		} else attrTagCallsForTag.set(attrTagName, translatedProps = _marko_compiler.types.parenthesizedExpression(callRuntime("attrTag", translatedProps)));
-	} else translatedProps = callRuntime("attrTag", translatedProps);
-	return translatedProps;
+	let attrTagCallsForTag = (info.attrTagCallsByTag ||= /* @__PURE__ */ new Map()).get(parentTag);
+	if (!attrTagCallsForTag) info.attrTagCallsByTag.set(parentTag, attrTagCallsForTag = /* @__PURE__ */ new Map());
+	const attrTagCall = attrTagCallsForTag.get(attrTagName);
+	if (attrTagCall) {
+		attrTagCall.expression = callRuntime("attrTags", attrTagCall.expression, translatedProps);
+		return;
+	}
+	const wrappedProps = _marko_compiler.types.parenthesizedExpression(callRuntime("attrTag", translatedProps));
+	attrTagCallsForTag.set(attrTagName, wrappedProps);
+	return wrappedProps;
 }
 function writeAttrsToSignals(tag, propTree, importAlias, info) {
 	if (!propTree.props) {
@@ -6691,7 +6782,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 			else {
 				remaining.delete("content");
 				const directContent = !bodySection.params;
-				addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(contentExport.binding, `${importAlias}_content`, directContent), [createScopeReadExpression(info.childScopeBinding, info.tagSection), bodyValue])), void 0, true);
+				addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(contentExport.binding, `${importAlias}_content`, directContent), [createScopeReadExpression(info.childScopeBinding, info.tagSection), bodyValue])), true);
 			}
 		}
 	}
@@ -6719,13 +6810,13 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 		const childAttrExports = getKnownFromPropTree(propTree, attr.name);
 		const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${attr.name}`);
 		remaining.delete(attr.name);
-		addStatement("render", info.tagSection, attr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), attr.value])), void 0, true);
+		addStatement("render", info.tagSection, attr.value.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), attr.value])), true);
 	}
 	if (knownSpread) for (const prop of remaining) {
 		const childAttrExports = getKnownFromPropTree(propTree, prop);
 		const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${prop}`);
 		const propBinding = knownSpread.binding.propertyAliases.get(prop);
-		addStatement("render", info.tagSection, propBinding, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), createScopeReadExpression(propBinding, info.tagSection)])), void 0, true);
+		addStatement("render", info.tagSection, propBinding, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection), createScopeReadExpression(propBinding, info.tagSection)])), true);
 	}
 	else if (spreadProps && (remaining.size || propTree.rest && !propTree.rest.props)) {
 		const spreadExpr = propsToExpression(spreadProps.reverse());
@@ -6748,7 +6839,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 				props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
 			});
 			props.push(_marko_compiler.types.restElement(restId));
-			addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.objectPattern(props)], restId), [spreadId])])), void 0, true);
+			addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.objectPattern(props)], restId), [spreadId])])), true);
 		}
 	} else {
 		for (const name of remaining) {
@@ -6756,7 +6847,7 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
 			const attrExportIdentifier = info.getBindingIdentifier(childAttrExports.binding, `${importAlias}_${name}`);
 			addStatement("render", info.tagSection, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(attrExportIdentifier, [createScopeReadExpression(info.childScopeBinding, info.tagSection)])));
 		}
-		if (propTree.rest && !propTree.rest.props) addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.objectExpression(restProps || [])])), void 0, true);
+		if (propTree.rest && !propTree.rest.props) addStatement("render", info.tagSection, tagReferencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(info.getBindingIdentifier(propTree.rest.binding, importAlias + "_$rest"), [createScopeReadExpression(info.childScopeBinding, info.tagSection), _marko_compiler.types.objectExpression(restProps || [])])), true);
 	}
 }
 function mapParamReasonToExpr(exprs, reason) {
@@ -6772,11 +6863,11 @@ function mapParamReasonToExpr(exprs, reason) {
 	}
 }
 function mapParamBindingToExpr(exprs, binding) {
-	const isRest = binding.property === void 0 && binding.excludeProperties !== void 0;
+	const isWholeAlias = binding.property === void 0 && binding.upstreamAlias !== void 0;
 	const props = [];
-	let curBinding = isRest ? binding.upstreamAlias : binding;
-	while (curBinding && curBinding.property !== void 0) {
-		props.push(curBinding.property);
+	let curBinding = isWholeAlias ? binding.upstreamAlias : binding;
+	while (curBinding && (curBinding.property !== void 0 || curBinding.upstreamAlias)) {
+		if (curBinding.property !== void 0) props.push(curBinding.property);
 		curBinding = curBinding.upstreamAlias;
 	}
 	let curExpr = exprs;
@@ -6785,7 +6876,7 @@ function mapParamBindingToExpr(exprs, binding) {
 		if (!nestedExpr) return curExpr.value;
 		curExpr = nestedExpr;
 	}
-	if (isRest) {
+	if (isWholeAlias) {
 		let result = curExpr.value;
 		if (curExpr.known) {
 			for (const key in curExpr.known) if (!includes(binding.excludeProperties, key)) result = concat(result, curExpr.known[key].value);
@@ -6814,6 +6905,11 @@ function getRootSection(section) {
 //#endregion
 //#region src/translator/util/references.ts
 const kBranchSerializeReason = Symbol("branch serialize reason");
+const globalSources = {
+	state: void 0,
+	param: void 0,
+	global: true
+};
 const [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 const [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
 function createBinding(name, type, refSection, upstreamAlias, property, excludeProperties, loc = null, refDeclared = false) {
@@ -6872,11 +6968,10 @@ function getOrCreatePropertyAlias(binding, property) {
 function trackDomVarReferences(tag, binding) {
 	const tagVar = tag.node.var;
 	if (!tagVar) return;
-	if (!_marko_compiler.types.isIdentifier(tagVar)) throw tag.get("var").buildCodeFrameError("Tag variables on native elements cannot be destructured.");
 	const babelBinding = tag.scope.getBinding(tagVar.name);
 	const section = getOrCreateSection(tag);
 	binding.originalName = tagVar.name;
-	if (babelBinding.constantViolations.length) for (const ref of babelBinding.constantViolations) throw ref.type === "MarkoTag" ? ref.get("var").buildCodeFrameError(`Duplicate declaration ${JSON.stringify(binding.originalName)}`) : ref.buildCodeFrameError("Tag variables on native elements cannot be assigned to.");
+	if (babelBinding.constantViolations.length) for (const ref of babelBinding.constantViolations) throw ref.type === "MarkoTag" ? ref.get("var").buildCodeFrameError(`Duplicate declaration of \`${binding.originalName}\`.`) : ref.buildCodeFrameError(`\`${binding.originalName}\` is a [tag variable](https://markojs.com/docs/reference/language#tag-variables) on a native element (an element reference) and cannot be assigned to.`);
 	for (const ref of babelBinding.referencePaths) {
 		const refSection = getOrCreateSection(ref);
 		const invoked = isInvokedFunction(ref);
@@ -6954,7 +7049,7 @@ function trackReferencesForBinding(babelBinding, binding) {
 	for (const ref of referencePaths) {
 		const refSection = getOrCreateSection(ref);
 		const markoRoot = getMarkoRoot(ref);
-		if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path) throw ref.buildCodeFrameError(`Tag variable circular references are not supported.`);
+		if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path) throw ref.buildCodeFrameError(`\`${ref.node.name}\` is the [tag variable](https://markojs.com/docs/reference/language#tag-variables) this tag declares, so its own attributes cannot read it.`);
 		else if (isReferenceHoisted(babelBinding.path, ref)) {
 			const invoked = isInvokedFunction(ref);
 			if (invoked) setReferencesScope(ref);
@@ -6976,8 +7071,8 @@ function trackReferencesForBinding(babelBinding, binding) {
 		}
 	}
 	for (const ref of constantViolations) {
-		if (ref.type === "MarkoTag") throw ref.get("var").buildCodeFrameError(`Duplicate declaration ${JSON.stringify(binding.name)}`);
-		if (isReferenceHoisted(babelBinding.path, ref)) throw ref.buildCodeFrameError("Cannot assign to hoisted tag variable.");
+		if (ref.type === "MarkoTag") throw ref.get("var").buildCodeFrameError(`Duplicate declaration of \`${binding.name}\`.`);
+		if (isReferenceHoisted(babelBinding.path, ref)) throw ref.buildCodeFrameError(`\`${binding.name}\` is declared by a tag below this assignment; a [tag variable](https://markojs.com/docs/reference/language#tag-variables) can only be assigned below its declaration. Move the declaring tag above this code.`);
 		if (ref.isUpdateExpression()) trackAssignment(ref.get("argument"), binding);
 		else if (ref.isAssignmentExpression()) {
 			trackAssignment(ref.get("left"), binding);
@@ -6990,7 +7085,7 @@ function trackReferencesForBinding(babelBinding, binding) {
 }
 function trackAssignment(assignment, binding) {
 	const fnParent = getFnParent(assignment);
-	if (!fnParent) throw assignment.buildCodeFrameError(`Assignments to a tag ${binding.type === 3 ? "parameter" : "variable"} must be within a script or function.`);
+	if (!fnParent) throw assignment.buildCodeFrameError(`\`${binding.name}\` is a tag ${binding.type === 3 ? "parameter" : "variable"} and can only be assigned within a script or function.`);
 	const fnRoot = getFnRoot(fnParent);
 	const fnExtra = fnRoot && (fnRoot.node.extra ??= {});
 	const section = getOrCreateSection(assignment);
@@ -7019,6 +7114,10 @@ function setReferencesScope(path) {
 	const fnRoot = getFnRoot(path);
 	if (fnRoot) (fnRoot.node.extra ??= {}).referencesScope = true;
 }
+const [getGlobalBinding] = createProgramState(() => createBinding("$global", 7, getOrCreateSection((0, _marko_compiler_babel_utils.getProgram)())));
+function trackGlobalReference(path) {
+	trackReference(path, getGlobalBinding());
+}
 function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, property, excludeProperties, restOffset) {
 	switch (lVal.type) {
 		case "Identifier": {
@@ -7141,6 +7240,7 @@ function finalizeReferences() {
 		const exprBindings = resolveReferencedBindings(expr, reads, intersectionsBySection);
 		expr.referencedBindings = exprBindings.referencedBindings;
 		expr.lazyBindings = exprBindings.lazyBindings;
+		expr.globalBindings = exprBindings.globalBindings;
 		if (!exprBindings.referencedBindings) addSetupStatement(expr.section);
 		forEach(exprBindings.lazyBindings, (binding) => {
 			binding.forcePersist = true;
@@ -7156,7 +7256,9 @@ function finalizeReferences() {
 			forEach(exprBindings.lazyBindings, (binding) => {
 				addSerializeReason(binding.section, true, binding);
 			});
-		}
+		} else forEach(reads, (read) => {
+			if (read.serializedValue) addSerializeExpr(read.binding.section, expr, read.binding);
+		});
 		if (exprBindings.allBindings) {
 			const exprFnReads = fnReadsByExpression.get(expr);
 			if (exprFnReads) for (const [fn, fnReads] of exprFnReads) {
@@ -7186,6 +7288,10 @@ function finalizeReferences() {
 	forEachSection(finalizeTagDownstreams);
 	for (const binding of bindings) {
 		const { name, section } = binding;
+		if (binding.type === 7) {
+			resolveBindingSources(binding);
+			continue;
+		}
 		if (binding.type !== 0) {
 			resolveBindingSources(binding);
 			forEach(binding.assignmentSections, (assignedSection) => {
@@ -7220,7 +7326,8 @@ function finalizeReferences() {
 						section.referencedClosures = bindingUtil.add(section.referencedClosures, canonicalUpstreamAlias);
 					}
 					setReadsOwner(section, canonicalUpstreamAlias.section);
-					addOwnerSerializeReason(section, canonicalUpstreamAlias.section, !!isEffect || canonicalUpstreamAlias.sources);
+					if (isEffect) addOwnerSerializeReason(section, canonicalUpstreamAlias.section, true);
+					addOwnerSerializeReason(section, canonicalUpstreamAlias.section, canonicalUpstreamAlias.sources);
 				}
 			}
 		}
@@ -7232,7 +7339,8 @@ function finalizeReferences() {
 			addOwnerSerializeReason(section, hoistedBinding.section, true);
 		});
 		if (section.parent && section.isBranch && section.sectionAccessor && section.upstreamExpression) {
-			addSerializeReason(section, !!(section.isHoistThrough || section.hoisted) || getSerializeSourcesForRef(getDirectClosures(section)), kBranchSerializeReason);
+			if (section.isHoistThrough || section.hoisted) addSerializeReason(section, true, kBranchSerializeReason);
+			addSerializeReason(section, getSerializeSourcesForRef(getDirectClosures(section)), kBranchSerializeReason);
 			addSerializeExpr(section, section.upstreamExpression, kBranchSerializeReason);
 			addSerializeExpr(section.parent, section.upstreamExpression, section.sectionAccessor.binding);
 		}
@@ -7263,16 +7371,16 @@ function finalizeReferences() {
 		forEach(section.referencedClosures, (closure) => {
 			const sourceSection = closure.section;
 			let currentSection = section;
-			let branchesReason;
+			let branchesForced = false;
+			let branchesSources;
 			while (currentSection !== sourceSection) {
 				const upstreamReason = currentSection.downstreamBinding ? getSectionRegisterReasons(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
-				if (upstreamReason === true) {
-					branchesReason = true;
-					break;
-				}
-				branchesReason = mergeSerializeReasons(branchesReason, upstreamReason);
+				if (upstreamReason === true) branchesForced = true;
+				else if (upstreamReason) branchesSources = mergeSources(branchesSources, upstreamReason);
 				currentSection = currentSection.parent;
 			}
+			const branchesReason = branchesForced || branchesSources;
+			if (branchesForced) addSerializeReason(sourceSection, branchesSources, closure);
 			addSerializeReason(sourceSection, branchesReason, closure);
 			addSerializeReason(sourceSection, getSerializeReason(sourceSection, closure));
 			if (isDynamicClosure(section, closure)) {
@@ -7423,6 +7531,9 @@ function resolveBindingSources(binding) {
 		case 3:
 			binding.sources = createSources(void 0, getCanonicalBinding(binding));
 			return;
+		case 7:
+			binding.sources = globalSources;
+			return;
 	}
 	const aliasRoot = getAliasRoot(binding);
 	if (aliasRoot) {
@@ -7459,15 +7570,17 @@ function resolveDerivedSources(binding) {
 		});
 	}
 }
-function createSources(state, param) {
-	if (!(state || param)) throw new Error("Cannot create a serialize reason that does not reference state or a param.");
+function createSources(state, param, global) {
+	if (!(state || param || global)) throw new Error("Cannot create a serialize reason that does not reference state, a param, or $global.");
 	return {
 		state,
-		param
+		param,
+		global
 	};
 }
 function compareSources(a, b) {
 	let delta;
+	if (a.global !== b.global) return a.global ? 1 : -1;
 	if (a.param) {
 		if (!b.param) return 1;
 		if (delta = compareReferences(a.param, b.param)) return delta;
@@ -7481,8 +7594,8 @@ function compareSources(a, b) {
 function mergeSources(a, b) {
 	if (!a) return b;
 	if (!b) return a;
-	if (a.state === b.state && a.param === b.param) return a;
-	return createSources(bindingUtil.union(a.state, b.state), unionParamSources(a.param, b.param));
+	if (a.state === b.state && a.param === b.param && a.global === b.global) return a;
+	return createSources(bindingUtil.union(a.state, b.state), unionParamSources(a.param, b.param), a.global || b.global);
 }
 function unionParamSources(a, b) {
 	const merged = bindingUtil.union(a, b);
@@ -7542,6 +7655,14 @@ function dropExtra(exprExtra) {
 		});
 	}
 }
+function isSerializedChangeHandlerRead(exprRoot) {
+	const markoRoot = getMarkoRoot(exprRoot);
+	if (!markoRoot?.isMarkoAttribute()) return false;
+	const attr = markoRoot.node;
+	if (!isEventOrChangeHandler(attr.name) || isEventHandler(attr.name) || _marko_compiler.types.isFunction(attr.value)) return false;
+	const tag = markoRoot.parentPath;
+	return tag.isMarkoTag() && (tag.node.name.type !== "StringLiteral" || (0, _marko_compiler_babel_utils.isNativeTag)(tag));
+}
 function addReadToExpression(root, binding, getter) {
 	const { node } = root;
 	const fnRoot = getFnRoot(root);
@@ -7549,6 +7670,7 @@ function addReadToExpression(root, binding, getter) {
 	const section = getOrCreateSection(exprRoot);
 	const exprExtra = getCanonicalExtra(exprRoot.node.extra ??= { section });
 	const read = addRead(exprExtra, node.extra ??= {}, binding, section, getter);
+	if (!fnRoot && isSerializedChangeHandlerRead(exprRoot)) read.serializedValue = true;
 	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) {
@@ -7755,13 +7877,13 @@ function resolveReferencedBindingsInFunction(refs, reads) {
 		const { getter, binding } = read;
 		if (getter) {} else if (binding.type === 6) {
 			if (bindingUtil.find(refs, binding)) constantBindings = bindingUtil.add(constantBindings, binding);
-		} else if (binding.type !== 0) referencedBindings = bindingUtil.add(referencedBindings, findClosestReference(read.binding, refs));
+		} else if (binding.type !== 0 && binding.type !== 7) referencedBindings = bindingUtil.add(referencedBindings, findClosestReference(read.binding, refs));
 	}
 	else {
 		const { getter, binding } = reads;
 		if (getter) {} else if (binding.type === 6) {
 			if (bindingUtil.find(refs, binding)) constantBindings = binding;
-		} else if (binding.type !== 0) referencedBindings = findClosestReference(binding, refs);
+		} else if (binding.type !== 0 && binding.type !== 7) referencedBindings = findClosestReference(binding, refs);
 	}
 	return {
 		referencedBindings,
@@ -7820,6 +7942,7 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 	let hoistedBindings;
 	let allBindings;
 	let lazyBindings;
+	let globalBindings;
 	if (Array.isArray(reads)) {
 		const rootBindings = getRootBindings(reads);
 		for (const read of reads) {
@@ -7838,11 +7961,12 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 				if (isChangeHandlerRead) {
 					const upstreamRoot = binding.upstreamAlias && findClosestReference(binding.upstreamAlias, rootBindings);
 					if (upstreamRoot) binding = upstreamRoot;
-				} else {
+				} else if (binding.type !== 7) {
 					extra.section = expr.section;
 					({binding} = extra.read ??= resolveExpressionReference(rootBindings, binding));
 				}
-				if (isLazyRead(expr, read, binding, isChangeHandlerRead)) lazyBindings = bindingUtil.add(lazyBindings, binding);
+				if (binding.type === 7) globalBindings = bindingUtil.add(globalBindings, binding);
+				else if (isLazyRead(expr, read, binding, isChangeHandlerRead)) lazyBindings = bindingUtil.add(lazyBindings, binding);
 				else if (binding.type === 6) constantBindings = bindingUtil.add(constantBindings, binding);
 				else if (binding.type !== 0) referencedBindings = bindingUtil.add(referencedBindings, binding);
 			}
@@ -7857,7 +7981,8 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 				binding.hoists = sectionUtil.add(binding.hoists, getter.hoisted);
 				hoistedBindings = bindingUtil.add(hoistedBindings, binding);
 			}
-		} else {
+		} else if (binding.type === 7) globalBindings = binding;
+		else {
 			extra.read = createRead(binding, void 0, ownVar);
 			if (isLazyRead(expr, reads, binding, extra.assignmentTo === binding)) lazyBindings = binding;
 			else if (binding.type === 6) constantBindings = binding;
@@ -7889,7 +8014,8 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 		constantBindings,
 		hoistedBindings,
 		allBindings,
-		lazyBindings
+		lazyBindings,
+		globalBindings
 	};
 }
 function resolveExpressionReference(rootBindings, readBinding) {
@@ -8129,27 +8255,34 @@ var class_default = {
 	}
 };
 //#endregion
+//#region src/translator/util/statement-tag.ts
+function createStatementTag(keyword) {
+	const target = keyword === "static" ? void 0 : keyword;
+	const keywordReg = new RegExp(`^${keyword}\\s*`);
+	return {
+		parse(tag) {
+			const { node, hub: { file } } = tag;
+			const rawValue = node.rawValue;
+			const code = rawValue.replace(keywordReg, "");
+			const start = node.start + (rawValue.length - code.length);
+			let body = (0, _marko_compiler_babel_utils.parseStatements)(file, code, start, start + code.length);
+			if (body.length === 1 && _marko_compiler.types.isBlockStatement(body[0])) body = body[0].body;
+			tag.replaceWith(_marko_compiler.types.markoScriptlet(body, true, target));
+		},
+		parseOptions: {
+			statement: true,
+			rawOpenTag: true
+		},
+		autocomplete: [{
+			displayText: `${keyword} <statement>`,
+			description: `A JavaScript statement which is only evaluated once your template is loaded${target ? ` on the ${target}` : ""}.`,
+			descriptionMoreURL: `https://markojs.com/docs/reference/language#${keyword === "static" ? "static" : "server-and-client"}`
+		}]
+	};
+}
+//#endregion
 //#region src/translator/core/client.ts
-var client_default = {
-	parse(tag) {
-		const { node, hub: { file } } = tag;
-		const rawValue = node.rawValue;
-		const code = rawValue.replace(/^client\s*/, "");
-		const start = node.start + (rawValue.length - code.length);
-		let body = (0, _marko_compiler_babel_utils.parseStatements)(file, code, start, start + code.length);
-		if (body.length === 1 && _marko_compiler.types.isBlockStatement(body[0])) body = body[0].body;
-		tag.replaceWith(_marko_compiler.types.markoScriptlet(body, true, "client"));
-	},
-	parseOptions: {
-		statement: true,
-		rawOpenTag: true
-	},
-	autocomplete: [{
-		displayText: "client <statement>",
-		description: "A JavaScript statement which is only evaluated once your template is loaded on the client.",
-		descriptionMoreURL: "https://markojs.com/docs/syntax/#client-javascript"
-	}]
-};
+var client_default = createStatementTag("client");
 //#endregion
 //#region src/translator/core/const.ts
 var const_default = {
@@ -8396,7 +8529,8 @@ var html_comment_default = {
 			const tagExtra = mergeReferences(tagSection, tag.node, referenceNodes);
 			nodeBinding = tagExtra[kNodeBinding$1] = createBinding("#comment", 0, tagSection, void 0, void 0, void 0, void 0, !!tagVar);
 			trackDomVarReferences(tag, nodeBinding);
-			addSerializeExpr(tagSection, !!tagVar || tagExtra, nodeBinding);
+			if (tagVar) addSerializeExpr(tagSection, true, nodeBinding);
+			addSerializeExpr(tagSection, tagExtra, nodeBinding);
 		}
 		const write = writeTo(tag);
 		if (nodeBinding) visit(tag, 32);
@@ -8529,7 +8663,7 @@ var import_default = {
 	parse(tag) {
 		const { node } = tag;
 		const statements = (0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end);
-		if (statements.length > 1) throw tag.hub.buildError(statements[1], "The [`<import>` tag](https://markojs.com/docs/syntax/#importing-external-files) takes a single import statement.");
+		if (statements.length > 1) throw tag.hub.buildError(statements[1], "The [`<import>` tag](https://markojs.com/docs/reference/language#import) takes a single import statement.");
 		tag.replaceWith(statements[0]);
 	},
 	parseOptions: {
@@ -8540,7 +8674,7 @@ var import_default = {
 		displayText: "import <scope> from \"<path>\"",
 		description: "Use to import external modules, follows the same syntax as JavaScript imports.",
 		snippet: "import ${2} from \"${1:path}\"",
-		descriptionMoreURL: "https://markojs.com/docs/syntax/#importing-external-files"
+		descriptionMoreURL: "https://markojs.com/docs/reference/language#import"
 	}]
 };
 //#endregion
@@ -8732,6 +8866,7 @@ var script_default = {
 		const section = getSection(tag);
 		const { value } = valueAttr;
 		const referencedBindings = value.extra?.referencedBindings;
+		if ((_marko_compiler.types.isFunctionExpression(value) || _marko_compiler.types.isArrowFunctionExpression(value)) && _marko_compiler.types.isBlockStatement(value.body) && traverseContains(value.body, isReturnedFunction)) (0, _marko_compiler_babel_utils.diagnosticWarn)(tag, { label: "The value returned from a [`<script>`](https://markojs.com/docs/reference/core-tag#script) body is discarded, so this cleanup function will never run. Register it with [`$signal.onabort`](https://markojs.com/docs/reference/language#signal) or use [`<lifecycle onDestroy>`](https://markojs.com/docs/reference/core-tag#lifecycle) instead." });
 		if (isOutputDOM()) {
 			const isFunction = _marko_compiler.types.isFunctionExpression(value) || _marko_compiler.types.isArrowFunctionExpression(value);
 			let inlineBody = null;
@@ -8772,6 +8907,18 @@ function isAwaitExpression(node) {
 		default: return false;
 	}
 }
+function isReturnedFunction(node) {
+	switch (node.type) {
+		case "FunctionDeclaration":
+		case "FunctionExpression":
+		case "ArrowFunctionExpression":
+		case "ClassMethod":
+		case "ObjectMethod":
+		case "ClassPrivateMethod": return skip;
+		case "ReturnStatement": return _marko_compiler.types.isFunctionExpression(node.argument) || _marko_compiler.types.isArrowFunctionExpression(node.argument);
+		default: return false;
+	}
+}
 function isReturnStatement(node) {
 	switch (node.type) {
 		case "FunctionDeclaration":
@@ -8786,26 +8933,7 @@ function isReturnStatement(node) {
 }
 //#endregion
 //#region src/translator/core/server.ts
-var server_default = {
-	parse(tag) {
-		const { node, hub: { file } } = tag;
-		const rawValue = node.rawValue;
-		const code = rawValue.replace(/^server\s*/, "");
-		const start = node.start + (rawValue.length - code.length);
-		let body = (0, _marko_compiler_babel_utils.parseStatements)(file, code, start, start + code.length);
-		if (body.length === 1 && _marko_compiler.types.isBlockStatement(body[0])) body = body[0].body;
-		tag.replaceWith(_marko_compiler.types.markoScriptlet(body, true, "server"));
-	},
-	parseOptions: {
-		statement: true,
-		rawOpenTag: true
-	},
-	autocomplete: [{
-		displayText: "server <statement>",
-		description: "A JavaScript statement which is only evaluated once your template is loaded on the server.",
-		descriptionMoreURL: "https://markojs.com/docs/syntax/#server-javascript"
-	}]
-};
+var server_default = createStatementTag("server");
 //#endregion
 //#region src/translator/util/insertion-context.ts
 const discardsUnknownChildren = /* @__PURE__ */ new Set([
@@ -8944,7 +9072,8 @@ var show_default = {
 		snippet: "show=${1:condition}",
 		description: "Use to render content that is always mounted but only displayed when the condition is met.",
 		descriptionMoreURL: "https://markojs.com/docs/reference/core-tag#show"
-	}]
+	}],
+	types: runtime_info_default.name + "/tags/show.d.marko"
 };
 function isSingleNodeBody(tag) {
 	let elements = 0;
@@ -8974,31 +9103,12 @@ function assertHasBody(tag) {
 function assertHasValueAttribute(tag) {
 	const { node } = tag;
 	const [valueAttr] = node.attributes;
-	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !valueAttr.default) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) requires a [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
+	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !(valueAttr.default || valueAttr.name === "value")) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) requires a [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
 	if (node.attributes.length > 1) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) only supports the [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
 }
 //#endregion
 //#region src/translator/core/static.ts
-var static_default = {
-	parse(tag) {
-		const { node, hub: { file } } = tag;
-		const rawValue = node.rawValue;
-		const code = rawValue.replace(/^static\s*/, "");
-		const start = node.start + (rawValue.length - code.length);
-		let body = (0, _marko_compiler_babel_utils.parseStatements)(file, code, start, start + code.length);
-		if (body.length === 1 && _marko_compiler.types.isBlockStatement(body[0])) body = body[0].body;
-		tag.replaceWith(_marko_compiler.types.markoScriptlet(body, true));
-	},
-	parseOptions: {
-		statement: true,
-		rawOpenTag: true
-	},
-	autocomplete: [{
-		displayText: "static <statement>",
-		description: "A JavaScript statement which is only evaluated once your template is loaded.",
-		descriptionMoreURL: "https://markojs.com/docs/syntax/#static-javascript"
-	}]
-};
+var static_default = createStatementTag("static");
 function checkStyleInterpolations(tag) {
 	const { body } = tag.node.body;
 	let stringQuote = "";
@@ -9148,7 +9258,7 @@ function checkDynamicStylePlacement(tag) {
 	for (const sibling of tag.getAllPrevSiblings()) {
 		if (isCoreTagName(sibling, "style")) continue;
 		if (sibling.isMarkoText() ? /\S/.test(sibling.node.value) : getNodeContentType(sibling, "startType") !== null) {
-			(0, _marko_compiler_babel_utils.diagnosticWarn)(tag, { label: "The `${...}` values of a [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) only apply to elements rendered after it, so the content before this tag will not receive them. Move the `<style>` tag above the content it styles." });
+			(0, _marko_compiler_babel_utils.diagnosticWarn)(tag, { label: "The `${...}` values of a [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) only apply to the subsequent siblings of the `<style>` tag and their descendants, so the content before this tag will not receive them. Move the `<style>` tag above the content it styles." });
 			return;
 		}
 	}
@@ -9180,10 +9290,10 @@ function translateDOM$1(tag) {
 		const { names, binding } = dynamic;
 		const section = getSection(tag);
 		const readEl = () => createScopeReadExpression(binding);
-		addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(callRuntime("_style_shell", scopeIdentifier, getScopeAccessorLiteral(binding))), void 0, true);
+		addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(callRuntime("_style_shell", scopeIdentifier, getScopeAccessorLiteral(binding))), true);
 		dynamicStyleValues(node).forEach((value, i) => {
 			const valueRef = value.extra?.referencedBindings;
-			addStatement("render", section, valueRef, _marko_compiler.types.expressionStatement(callRuntime("_style_rule_item", readEl(), _marko_compiler.types.stringLiteral(names[i]), value)), void 0, !valueRef);
+			addStatement("render", section, valueRef, _marko_compiler.types.expressionStatement(callRuntime("_style_rule_item", readEl(), _marko_compiler.types.stringLiteral(names[i]), value)), !valueRef);
 		});
 	}
 	emitStyleImport(tag);
@@ -9276,7 +9386,13 @@ var try_default = {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		(0, _marko_compiler_babel_utils.assertNoAttributes)(tag);
-		analyzeAttributeTags(tag);
+		const attrTags = analyzeAttributeTags(tag);
+		if (attrTags) {
+			for (const name in attrTags) if (name !== "@placeholder" && name !== "@catch") {
+				const suggestion = name[1] === "p" ? "`<@placeholder>`" : "`<@catch>`";
+				throw tag.buildCodeFrameError(`The [\`<try>\` tag](https://markojs.com/docs/reference/core-tag#try) only supports the \`<@placeholder>\` and \`<@catch>\` attribute tags, but received \`<${name}>\`. Did you mean ${suggestion}?`);
+			}
+		}
 		const section = getOrCreateSection(tag);
 		const tagExtra = mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
 		tagExtra[kDOMBinding$1] = createBinding("#text", 0, section);
@@ -9400,9 +9516,23 @@ var declaration_default = { translate: { enter(decl) {
 //#endregion
 //#region src/translator/visitors/document-type.ts
 var document_type_default = { translate: { exit(documentType) {
-	if (isOutputHTML()) writeTo$1(documentType)`<!${documentType.node.value}>`;
+	if (isOutputHTML()) {
+		writeTo$1(documentType)`<!${documentType.node.value}>`;
+		if (getMarkoOpts().linkAssets && !isBeforeHtmlOrHead(documentType)) writeTo$1(documentType)`${callRuntime("_flush_head")}`;
+	}
 	documentType.remove();
 } } };
+function isBeforeHtmlOrHead(documentType) {
+	let next = documentType.getNextSibling();
+	while (next.node) {
+		if (next.isMarkoTag()) {
+			const { name } = next.node;
+			return name.type === "StringLiteral" && (name.value === "html" || name.value === "head");
+		}
+		next = next.getNextSibling();
+	}
+	return false;
+}
 //#endregion
 //#region src/translator/visitors/import-declaration.ts
 const triggerRegExp = /\s*([\w-]+)\s*([^?|]+?)?\s*(?:\?([^|]*?))?\s*(?:\||$)/g;
@@ -9422,16 +9552,17 @@ var import_declaration_default = {
 		}
 		const loadAttrPath = node.attributes?.length ? importDecl.get("attributes").find((p) => (p.node.key.type === "Identifier" ? p.node.key.name : p.node.key.value) === "load") : void 0;
 		if (loadAttrPath) {
+			const loadImport = getLoadImportConfig(loadAttrPath.get("value"));
+			if ((node.importKind || "value") !== "value") throw importDecl.buildCodeFrameError("Invalid load import.");
+			for (const specifier of importDecl.get("specifiers")) if (!_marko_compiler.types.isImportDefaultSpecifier(specifier.node)) throw specifier.buildCodeFrameError("Invalid load import, only a default specifier is allowed.");
+			if (!node.specifiers.some(_marko_compiler.types.isImportDefaultSpecifier)) throw importDecl.buildCodeFrameError("Invalid load import, a default specifier is required.");
 			if (!getMarkoOpts().linkAssets) {
 				loadAttrPath.remove();
 				return;
 			}
-			(node.extra ??= {}).loadImport = getLoadImportConfig(loadAttrPath.get("value"));
+			(node.extra ??= {}).loadImport = loadImport;
 			const { file } = importDecl.hub;
 			if (!(tagImport && (0, _marko_compiler_babel_utils.loadFileForImport)(file, value))) throw importDecl.buildCodeFrameError("Unable to resolve marko file for load import.");
-			if ((node.importKind || "value") !== "value") throw importDecl.buildCodeFrameError("Invalid load import.");
-			for (const specifier of importDecl.get("specifiers")) if (!_marko_compiler.types.isImportDefaultSpecifier(specifier.node)) throw specifier.buildCodeFrameError("Invalid load import, only a default specifier is allowed.");
-			if (!node.specifiers.some(_marko_compiler.types.isImportDefaultSpecifier)) throw importDecl.buildCodeFrameError("Invalid load import, a default specifier is required.");
 		}
 	},
 	translate: { exit(importDecl) {
@@ -9449,6 +9580,7 @@ var import_declaration_default = {
 					const wrappedName = getOrCreateHtmlLoadWrapped(getReadyId(loadFile), _marko_compiler.types.identifier(local.name), loadFile.opts.filename, loadImport.render ? void 0 : loadImport.triggers);
 					for (const ref of binding.referencePaths) ref.replaceWith(_marko_compiler.types.identifier(wrappedName));
 					node.source.value = tagImport;
+					node.attributes = void 0;
 					return;
 				} else if (binding.referencePaths.every((ref) => _marko_compiler.types.isMarkoTag(ref.parent) && ref.parent.extra?.tagNameLoad)) importDecl.remove();
 				else {
@@ -9554,7 +9686,7 @@ function isStaticText(node) {
 		case "MarkoPlaceholder":
 			if (node.escape) {
 				const { confident, computed } = evaluate(node.value);
-				return confident && isNotVoid(computed);
+				return confident && getHTMLRuntime()._escape(computed) !== "";
 			}
 			return false;
 	}
@@ -9566,7 +9698,7 @@ function getPrevStaticSibling(path) {
 }
 function isEmptyPlaceholder(placeholder) {
 	const { confident, computed } = evaluate(placeholder.value);
-	return confident && isVoid(computed);
+	return confident && getHTMLRuntime()[placeholder.escape ? "_escape" : "_unescaped"](computed) === "";
 }
 //#endregion
 //#region src/translator/visitors/placeholder.ts
@@ -9579,7 +9711,7 @@ var placeholder_default = {
 			const { node } = placeholder;
 			const valueExtra = evaluate(node.value);
 			const { confident, computed } = valueExtra;
-			if (confident && isVoid(computed)) return;
+			if (confident && getHTMLRuntime()[node.escape ? "_escape" : "_unescaped"](computed) === "") return;
 			if (!isStaticText(node)) {
 				const section = getOrCreateSection(placeholder);
 				const nodeBinding = (node.extra ??= {})[kNodeBinding] = createBinding("#text", 0, section);
@@ -9592,9 +9724,10 @@ var placeholder_default = {
 			if (isNonHTMLText(placeholder)) return;
 			const { node } = placeholder;
 			const { confident, computed } = evaluate(node.value);
-			if (confident && isVoid(computed)) return;
+			const staticText = confident ? getHTMLRuntime()[node.escape ? "_escape" : "_unescaped"](computed) : void 0;
+			if (staticText === "") return;
 			const extra = node.extra || {};
-			if (confident && node.escape) writeTo(placeholder)`${getHTMLRuntime()._escape(computed)}`;
+			if (confident && node.escape) writeTo(placeholder)`${staticText}`;
 			else {
 				const siblingText = extra[kSiblingText];
 				if (siblingText === 1 || siblingText === 2) visit(placeholder, 37);
@@ -9617,7 +9750,7 @@ function translateExit(placeholder) {
 	if (node.extra?.[kRawText]) injectTextCoercion(value);
 	const valueExtra = evaluate(value);
 	const { confident, computed } = valueExtra;
-	if (confident && isVoid(computed)) {
+	if (confident && getHTMLRuntime()[node.escape ? "_escape" : "_unescaped"](computed) === "") {
 		placeholder.remove();
 		return;
 	}
@@ -9640,7 +9773,7 @@ function translateExit(placeholder) {
 		if (isHTML) {
 			write`${method === "_escape" ? buildEscapedTextExpression(value) : callRuntime(method, value)}`;
 			if (nodeBinding) markNode(placeholder, nodeBinding, markerSerializeReason);
-		} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), void 0, true);
+		} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), true);
 	}
 	placeholder.remove();
 }
@@ -9735,8 +9868,10 @@ var referenced_identifier_default = {
 	analyze(identifier) {
 		const { name } = identifier.node;
 		if (identifier.scope.hasBinding(name)) return;
-		if (name === "$global") setReferencesScope(identifier);
-		else if (name === "$signal") {
+		if (name === "$global") {
+			setReferencesScope(identifier);
+			trackGlobalReference(identifier);
+		} else if (name === "$signal") {
 			const section = getOrCreateSection(identifier);
 			section.hasAbortSignal = true;
 			setReferencesScope(identifier);
@@ -9761,7 +9896,7 @@ var referenced_identifier_default = {
 				const resetEmitted = getAbortResetEmitted(section);
 				if (!resetEmitted.has(exprRoot)) {
 					resetEmitted.add(exprRoot);
-					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])), false);
+					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])));
 				}
 				identifier.replaceWith(_marko_compiler.types.callExpression(importRuntime("$signal"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)]));
 			}
@@ -10050,7 +10185,8 @@ var dynamic_tag_default = {
 		}
 		const bodySection = startSection(tagBody);
 		trackParamsReferences(tagBody, 3);
-		addSerializeExpr(tagSection, hasVar || tagExtra, nodeBinding);
+		if (hasVar) addSerializeExpr(tagSection, true, nodeBinding);
+		addSerializeExpr(tagSection, tagExtra, nodeBinding);
 		if (!hasVar && !node.arguments && !node.attributes.length && !node.body.body.length) tagExtra[kDirectContent] = true;
 		if (tagExtra.featureType !== "class" || (0, _marko_compiler_babel_utils.getTagTemplate)(tag)) {
 			visit(tag, hasVar ? 49 : 37);