marko 6.3.54 → 6.3.56

package/dist/translator/index.js

@@ -86,7 +86,7 @@ function assertNoBodyContent(tag) {
 //#endregion
 //#region src/translator/core/attrs.ts
 var attrs_default = {
-	migrate: [(tag) => {
+	migrate: (tag) => {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		(0, _marko_compiler_babel_utils.assertNoAttributes)(tag);
@@ -103,7 +103,7 @@ var attrs_default = {
 				} else tag.remove();
 			}
 		});
-	}],
+	},
 	attributes: {},
 	autocomplete: [{
 		displayText: "attrs/{ ... }",
@@ -861,13 +861,6 @@ function fromIter(data) {
 	else one = item;
 	return many || one;
 }
-function* toIter(data) {
-	if (data !== void 0) if (Array.isArray(data)) yield* data;
-	else yield data;
-}
-function includes(data, item) {
-	return data !== void 0 ? Array.isArray(data) ? data.includes(item) : data === item : false;
-}
 function find(data, cb) {
 	if (data !== void 0) {
 		if (Array.isArray(data)) return data.find(cb);
@@ -886,6 +879,9 @@ function reduce(data, cb, initial) {
 function toArray(data, cb) {
 	return data !== void 0 ? Array.isArray(data) ? data.map(cb) : [cb(data, 0)] : [];
 }
+function toSet(data) {
+	return data !== void 0 ? Array.isArray(data) ? new Set(data) : (/* @__PURE__ */ new Set()).add(data) : /* @__PURE__ */ new Set();
+}
 function mapToString(data, sep, cb) {
 	if (data !== void 0) {
 		if (Array.isArray(data)) {
@@ -981,9 +977,6 @@ function joinRepeatable(compare, a, b) {
 	const compareResult = compare(a, b);
 	return compareResult === 0 ? a : compareResult < 0 ? [a, b] : [b, a];
 }
-function addUnique(data, item) {
-	return includes(data, item) ? data : push(data, item);
-}
 function at(data, index) {
 	return Array.isArray(data) ? data[index] : index ? void 0 : data;
 }
@@ -1194,6 +1187,14 @@ function mergeRemappedSources(reason, params, mapped) {
 function mergeSerializeReasons(a, b) {
 	return mergeSources(a, b);
 }
+function isOwnResumeReason(reason) {
+	return !!reason && !!(reason.state || reason.forced);
+}
+function hasOwnResumeReason(section) {
+	if (isOwnResumeReason(section.serializeReason)) return true;
+	for (const reason of section.serializeReasons.values()) if (isOwnResumeReason(reason)) return true;
+	return false;
+}
 function applySerializeExprs(section) {
 	const propExprs = section.propSerializeExprs;
 	if (propExprs) {
@@ -2731,47 +2732,33 @@ function getExprIfSerialized(section, reason, expr) {
 	return guard ? _marko_compiler.types.logicalExpression("&&", guard, expr) : expr;
 }
 function getOrHoist(reason, isGuard) {
-	const onlySection = getOnlySection(reason.param);
-	if (onlySection) {
-		const state = getSectionReasonState(onlySection);
-		const tracking = isGuard ? state.guard : state.if;
-		const existingFound = sourcesUtil.find(tracking.hoistedReasons, reason);
-		if (existingFound) return _marko_compiler.types.identifier(tracking.names.get(existingFound));
-		const guard = buildGuardExpr(onlySection, reason.param, isGuard);
-		const seenFound = sourcesUtil.find(tracking.seenReasons, reason);
-		if (!seenFound) {
-			const expr = _marko_compiler.types.parenthesizedExpression(guard);
-			tracking.pending.set(reason, expr);
-			tracking.seenReasons = sourcesUtil.add(tracking.seenReasons, reason);
-			return expr;
-		}
-		const name = generateUid(`${isGuard ? "sg" : "si"}__${getDebugNamesAsIdentifier(reason.param)}`);
-		tracking.hoistedReasons = sourcesUtil.add(tracking.hoistedReasons, reason);
-		tracking.names.set(reason, name);
-		state.declarators.push(_marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(name), guard));
-		const pendingParen = tracking.pending.get(seenFound);
-		if (pendingParen) {
-			pendingParen.expression = _marko_compiler.types.identifier(name);
-			tracking.pending.delete(seenFound);
-		}
-		return _marko_compiler.types.parenthesizedExpression(_marko_compiler.types.identifier(name));
-	}
-	let orExpr;
-	for (const [paramsSection, params] of groupParamsBySection(reason.param)) {
-		const expr = buildGuardExpr(paramsSection, params, isGuard);
-		orExpr = orExpr ? _marko_compiler.types.logicalExpression("||", orExpr, expr) : expr;
-	}
-	return orExpr;
-}
-function buildGuardExpr(paramsSection, params, isGuard) {
-	const serializeIdentifier = scopeReasonIdentifier(paramsSection);
-	return paramsSection.paramReasonGroups ? callRuntime(isGuard ? "_serialize_guard" : "_serialize_if", serializeIdentifier, withLeadingComment(_marko_compiler.types.numericLiteral(getParamReasonGroupIndex(paramsSection, params)), getDebugNames(params))) : serializeIdentifier;
-}
-function getOnlySection(params) {
-	if (params === void 0) return void 0;
-	if (!Array.isArray(params)) return params.section;
-	const { section } = params[0];
-	return section === params[params.length - 1].section ? section : void 0;
+	let expr;
+	for (const [section, params] of groupParamsBySection(reason.param)) {
+		const part = getOrHoistSectionGuard(section, params, isGuard);
+		expr = expr ? _marko_compiler.types.logicalExpression("||", expr, part) : part;
+	}
+	return expr;
+}
+function getOrHoistSectionGuard(section, params, isGuard) {
+	if (!section.paramReasonGroups) return scopeReasonIdentifier(section);
+	const state = getSectionReasonState(section);
+	const tracking = isGuard ? state.guard : state.if;
+	const index = getParamReasonGroupIndex(section, params);
+	const name = tracking.names.get(index);
+	if (name) return _marko_compiler.types.identifier(name);
+	const guard = callRuntime(isGuard ? "_serialize_guard" : "_serialize_if", scopeReasonIdentifier(section), withLeadingComment(_marko_compiler.types.numericLiteral(index), getDebugNames(params)));
+	const pending = tracking.pending.get(index);
+	if (!pending) {
+		const expr = _marko_compiler.types.parenthesizedExpression(guard);
+		tracking.pending.set(index, expr);
+		return expr;
+	}
+	const hoisted = generateUid(`${isGuard ? "sg" : "si"}__${getDebugNamesAsIdentifier(params)}`);
+	tracking.names.set(index, hoisted);
+	tracking.pending.delete(index);
+	state.declarators.push(_marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(hoisted), guard));
+	pending.expression = _marko_compiler.types.identifier(hoisted);
+	return _marko_compiler.types.parenthesizedExpression(_marko_compiler.types.identifier(hoisted));
 }
 function isDynamicSerializeGuard(section, reason) {
 	return isReasonDynamic(reason) && !isCrossSection(section, reason);
@@ -2782,9 +2769,7 @@ function isCrossSection(section, reason) {
 function createTypeState() {
 	return {
 		names: /* @__PURE__ */ new Map(),
-		pending: /* @__PURE__ */ new Map(),
-		seenReasons: void 0,
-		hoistedReasons: void 0
+		pending: /* @__PURE__ */ new Map()
 	};
 }
 function hasDynamicSerializeReason(section) {
@@ -3212,8 +3197,7 @@ function getSignal(section, referencedBindings, name) {
 			const render = getSignalFn(signal);
 			const closureSignalBuilder = getClosureSignalBuilder(section);
 			if (closureSignalBuilder && !isDynamicClosure(section, closure)) return closureSignalBuilder(closure, render);
-			const changeable = isChangeableDynamicClosure(section, closure);
-			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), changeable ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "subscribe")) : void 0, changeable && isOptimize() ? getScopeAccessorLiteral(closure, true) : void 0);
+			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), isChangeableDynamicClosure(section, closure) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "subscribe")) : void 0);
 		};
 	}
 	return signal;
@@ -4765,7 +4749,7 @@ const contentProps = /* @__PURE__ */ new WeakSet();
 function translateAttrs(tag, propTree = true, skip, statements = [], contentKey = "content") {
 	const contentProperties = [];
 	const attrTagLookup = tag.node.extra?.attributeTags;
-	const seen = new Set(skip);
+	const seen = toSet(skip);
 	if (attrTagLookup) {
 		for (const name in attrTagLookup) {
 			const attrTagMeta = attrTagLookup[name];
@@ -4782,7 +4766,7 @@ function translateAttrs(tag, propTree = true, skip, statements = [], contentKey
 			const child = attrTags[i];
 			if (child.isMarkoTag()) if ((0, _marko_compiler_babel_utils.isAttributeTag)(child)) {
 				const attrTagMeta = attrTagLookup[getTagName(child)];
-				if (skip?.has(attrTagMeta.name)) continue;
+				if (propsUtil.has(skip, attrTagMeta.name)) continue;
 				if (attrTagMeta.dynamic) i = addDynamicAttrTagStatements(attrTags, i, attrTagLookup, statements, propTree, contentKey);
 				else {
 					const translatedAttrTag = translateAttrs(child, getKnownFromPropTree(propTree, attrTagMeta.name), void 0, statements, contentKey);
@@ -5038,7 +5022,7 @@ var native_tag_default = {
 					const attr = seen[name];
 					if (isEventHandler(name) || name === "content" || !evaluate(attr.value).confident) addSetupExpr(tagSection, attr.value);
 				}
-				if (node.var || hasEventHandlers) addSerializeReason(tagSection, FORCED, nodeBinding);
+				if (hasEventHandlers || isTagVarRead(tag)) addSerializeReason(tagSection, FORCED, nodeBinding);
 				trackDomVarReferences(tag, nodeBinding);
 				addSerializeExpr(tagSection, push(exprExtras, tagExtra), nodeBinding);
 			}
@@ -6126,14 +6110,16 @@ function translateVar(tag, initialValue, kind = "const", statements) {
 			const restPath = id.parentPath;
 			if (restPath.type !== "RestElement") throw restPath.buildCodeFrameError("Invalid compiler state, found a rest binding outside of a rest element.");
 			let curPath = tag.parentPath;
+			let prevPath = tag;
 			while (curPath) {
 				if (curPath.node.extra?.section === binding.section) {
 					const canonicalUpstreamAlias = getCanonicalBinding(binding.upstreamAlias);
 					const props = toArray(binding.excludeProperties, (name) => _marko_compiler.types.objectProperty(toPropertyName(name), generateUidIdentifier(name)));
 					props.push(restPath.node);
-					curPath.insertBefore(_marko_compiler.types.variableDeclaration(kind, [_marko_compiler.types.variableDeclarator(_marko_compiler.types.objectPattern(props), canonicalUpstreamAlias.nullable ? _marko_compiler.types.logicalExpression("||", getDeclaredBindingExpression(canonicalUpstreamAlias), _marko_compiler.types.objectExpression([])) : getDeclaredBindingExpression(canonicalUpstreamAlias))]));
+					(curPath.parentPath ? curPath : prevPath).insertBefore(_marko_compiler.types.variableDeclaration(kind, [_marko_compiler.types.variableDeclarator(_marko_compiler.types.objectPattern(props), canonicalUpstreamAlias.nullable ? _marko_compiler.types.logicalExpression("||", getDeclaredBindingExpression(canonicalUpstreamAlias), _marko_compiler.types.objectExpression([])) : getDeclaredBindingExpression(canonicalUpstreamAlias))]));
 					break;
 				}
+				prevPath = curPath;
 				curPath = curPath.parentPath;
 			}
 			restPath.remove();
@@ -6493,7 +6479,7 @@ function writeParamsToSignals(tag, propTree, importAlias, info) {
 }
 function applyAttrObject(tag, propTree, tagInputIdentifier, info) {
 	const referencedBindings = tag.node.extra?.referencedBindings;
-	const translatedAttrs = translateAttrs(tag, true, propTree.rest && new Set(toIter(propTree.rest.binding.excludeProperties)));
+	const translatedAttrs = translateAttrs(tag, true, propTree.rest?.binding.excludeProperties);
 	let translatedProps = propsToExpression(translatedAttrs.properties);
 	if (translatedAttrs.statements.length) addStatement("render", info.tagSection, referencedBindings, translatedAttrs.statements);
 	if ((0, _marko_compiler_babel_utils.isAttributeTag)(tag)) {
@@ -7196,7 +7182,7 @@ var program_default = {
 			if (paramsBinding && !paramsBinding.pruned) programExtra.domExports.params = getBindingPropTree(paramsBinding);
 			const section = programExtra.section;
 			forEachSection((childSection) => {
-				programExtra.hasResumes ||= !!(childSection.serializeReason || childSection.serializeReasons.size || childSection !== section && !isSectionRendererElided(childSection) && getSectionRegisterReasons(childSection));
+				programExtra.hasResumes ||= !!(hasOwnResumeReason(childSection) || childSection !== section && !isSectionRendererElided(childSection) && getSectionRegisterReasons(childSection));
 			});
 			if (!section.hoistedTo && !sectionHasSetupStatements(section)) programExtra.domExports.setupEmpty = true;
 		}
@@ -7409,6 +7395,10 @@ function getExistingPropertyAlias(binding, property) {
 		binding = binding.upstreamAlias;
 	}
 }
+function isTagVarRead(tag) {
+	const tagVar = tag.node.var;
+	return !!tagVar && !!tag.scope.getBinding(tagVar.name)?.referencePaths.length;
+}
 function trackDomVarReferences(tag, binding) {
 	const tagVar = tag.node.var;
 	if (!tagVar) return;
@@ -8231,6 +8221,7 @@ function addReadToExpression(root, binding, getter) {
 	const section = getOrCreateSection(exprRoot);
 	const rootExtra = exprRoot.node.extra ??= { section };
 	const exprExtra = getCanonicalExtra(rootExtra);
+	if (exprExtra.pruned) return;
 	const extra = node.extra ??= {};
 	extra.exprRoot = rootExtra;
 	const read = addRead(exprExtra, extra, binding, section, getter);
@@ -8690,15 +8681,15 @@ function getAllSerializeReasonsForBinding(binding, properties) {
 function getRegisterReasonForExtra(extra) {
 	if (extra.forceRegister) return FORCED;
 	const { reason, reads } = serializationForExtra(extra);
-	return some(reads, isForceRegisterRead) ? FORCED : reason;
-}
-function isForceRegisterRead(read) {
-	return !!read.forceRegister;
+	if (reads) {
+		for (const read of reads) if (read.forceRegister) return FORCED;
+	}
+	return reason;
 }
 function serializationForExtra(extra) {
 	if (extra.isEffect) return FORCED_SERIALIZATION;
 	const serialization = extraSerialization(extra);
-	const reads = isReferencedExtra(extra) ? addUnique(serialization.reads, extra) : serialization.reads;
+	const reads = isReferencedExtra(extra) ? addSerializationRead(serialization.reads, extra) : serialization.reads;
 	return reads === serialization.reads ? serialization : {
 		reason: serialization.reason,
 		reads
@@ -8766,7 +8757,7 @@ function computeBindingSerialization(binding, properties) {
 			if (!(head === "content" && expr.nativeTagSpread && bindingUtil.has(expr.spreadFrom, binding))) serialization = mergeSerialization(serialization, FORCED_SERIALIZATION);
 			continue;
 		}
-		const reads = addUnique(serialization.reads, expr);
+		const reads = addSerializationRead(serialization.reads, expr);
 		if (reads !== serialization.reads) serialization = {
 			reason: serialization.reason,
 			reads
@@ -8793,10 +8784,7 @@ function mergeSerialization(a, b) {
 	if (a === UNSERIALIZED) return b;
 	if (b === UNSERIALIZED) return a;
 	const reason = mergeSources(a.reason, b.reason);
-	let reads = a.reads;
-	forEach(b.reads, (read) => {
-		reads = addUnique(reads, read);
-	});
+	const reads = unionSerializationReads(a.reads, b.reads);
 	if (reason === a.reason && reads === a.reads) return a;
 	if (reason === b.reason && reads === b.reads) return b;
 	return {
@@ -8804,6 +8792,15 @@ function mergeSerialization(a, b) {
 		reads
 	};
 }
+function addSerializationRead(reads, read) {
+	return reads?.has(read) ? reads : new Set(reads).add(read);
+}
+function unionSerializationReads(a, b) {
+	if (!a || !b || a === b) return a || b;
+	let result;
+	for (const read of b) if (!a.has(read)) (result ??= new Set(a)).add(read);
+	return result || a;
+}
 function addNumericPropertiesUntil(props, len) {
 	let result = props;
 	for (let i = len; i--;) result = propsUtil.add(result, i + "");
@@ -8957,9 +8954,11 @@ function createStatementTag(keyword) {
 			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));
+			let block = (0, _marko_compiler_babel_utils.parseBlock)(file, code, start, start + code.length);
+			if (block.body.length === 1 && _marko_compiler.types.isBlockStatement(block.body[0])) block = block.body[0];
+			const scriptlet = _marko_compiler.types.markoScriptlet(block.body, true, target);
+			scriptlet.innerComments = block.innerComments;
+			tag.replaceWith(scriptlet);
 		},
 		parseOptions: {
 			statement: true,
@@ -9150,7 +9149,7 @@ var define_default = {
 //#endregion
 //#region src/translator/core/effect.ts
 var effect_default = {
-	migrate: [(tag) => {
+	migrate: (tag) => {
 		if (tag.node.body.body.length) throw tag.get("name").buildCodeFrameError("The `<effect>` tag has been replaced by [`<script>`](https://markojs.com/docs/reference/core-tag#script), which runs its body as code. Rename it to `<script>`.");
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
@@ -9164,7 +9163,7 @@ var effect_default = {
 				tag.replaceWith(_marko_compiler.types.markoTag(withPreviousLocation(_marko_compiler.types.stringLiteral("script"), node.name), node.attributes, node.body, node.arguments, node.var, node.attributeTags));
 			}
 		});
-	}],
+	},
 	attributes: {},
 	types: runtime_info_default.name + "/tags/effect.d.marko"
 };
@@ -9219,7 +9218,7 @@ 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);
-			if (tagVar) addSerializeReason(tagSection, FORCED, nodeBinding);
+			if (isTagVarRead(tag)) addSerializeReason(tagSection, FORCED, nodeBinding);
 			addSerializeExpr(tagSection, tagExtra, nodeBinding);
 		}
 		const write = writeTo(tag);
@@ -9535,9 +9534,9 @@ var script_default = {
 			}
 			const start = body[0]?.start;
 			const end = body[body.length - 1]?.end;
-			const bodyStatements = (0, _marko_compiler_babel_utils.parseStatements)((0, _marko_compiler_babel_utils.getFile)(), code, start, end);
-			if (bodyStatements.length) {
-				const valueFn = _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(bodyStatements), !!traverseFindAwait(bodyStatements));
+			const block = (0, _marko_compiler_babel_utils.parseBlock)((0, _marko_compiler_babel_utils.getFile)(), code, start, end);
+			if (block.body.length || block.innerComments) {
+				const valueFn = _marko_compiler.types.arrowFunctionExpression([], block, !!traverseFindAwait(block));
 				node.attributes.push(_marko_compiler.types.markoAttribute("value", valueFn));
 			}
 			node.body.body = [];
@@ -9554,16 +9553,18 @@ var script_default = {
 		for (const attr of node.attributes) if (attr.type === "MarkoAttribute" && attr.name === "value") {
 			if (seenValueAttr) throw tag.hub.buildError(attr, "Invalid duplicate value attribute.");
 			seenValueAttr = true;
-			(attr.value.extra ??= {}).isEffect = true;
-			addSetupExpr(getOrCreateSection(tag), attr.value);
-			(0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
+			if (!isEmptyFunction(attr.value)) {
+				(attr.value.extra ??= {}).isEffect = true;
+				addSetupExpr(getOrCreateSection(tag), attr.value);
+				(0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
+			}
 		} else throw tag.hub.buildError(attr, "The [`<script>` tag](https://markojs.com/docs/reference/core-tag#script) does not support html attributes. For a native html [`<script>` tag](https://markojs.com/docs/reference/core-tag#script) use the `html-script` core tag instead.");
 		if (!seenValueAttr) dropNodes(getAllTagReferenceNodes(node));
 	},
 	translate: { exit(tag) {
 		const { node } = tag;
 		const [valueAttr] = node.attributes;
-		if (!valueAttr) {
+		if (!valueAttr?.value.extra?.isEffect) {
 			tag.remove();
 			return;
 		}
@@ -9598,6 +9599,9 @@ var script_default = {
 	}],
 	types: runtime_info_default.name + "/tags/script.d.marko"
 };
+function isEmptyFunction(node) {
+	return (_marko_compiler.types.isFunctionExpression(node) || _marko_compiler.types.isArrowFunctionExpression(node)) && _marko_compiler.types.isBlockStatement(node.body) && !node.body.body.length;
+}
 function isReturnedFunction(node) {
 	switch (node.type) {
 		case "FunctionDeclaration":
@@ -10454,13 +10458,14 @@ var referenced_identifier_default = {
 				const globalRead = _marko_compiler.types.memberExpression(scopeIdentifier, _marko_compiler.types.identifier(getAccessorProp().Global));
 				const key = !isOptimize() && getSignalGlobalKey(identifier);
 				if (key) identifier.parentPath.replaceWith(callRuntime("_global_read", globalRead, _marko_compiler.types.stringLiteral(key)));
-				else identifier.replaceWith(globalRead);
+				else replaceWithExtra(identifier, globalRead);
 				break;
 			}
-			case "$signal": if (isOutputHTML()) identifier.replaceWith(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([_marko_compiler.types.throwStatement(_marko_compiler.types.newExpression(_marko_compiler.types.identifier("Error"), [_marko_compiler.types.stringLiteral("Cannot use $signal in a server render.")]))])), []));
+			case "$signal": if (isOutputHTML()) replaceWithExtra(identifier, _marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([_marko_compiler.types.throwStatement(_marko_compiler.types.newExpression(_marko_compiler.types.identifier("Error"), [_marko_compiler.types.stringLiteral("Cannot use $signal in a server render.")]))])), []));
 			else {
-				const section = getSection(identifier);
 				const exprRoot = identifier.node.extra.exprRoot;
+				if (getCanonicalExtra(exprRoot).pruned) break;
+				const section = getSection(identifier);
 				const exprId = exprRoot.abortId;
 				const resetEmitted = getAbortResetEmitted(section);
 				if (!resetEmitted.has(exprRoot)) {
@@ -10472,6 +10477,10 @@ var referenced_identifier_default = {
 		}
 	}
 };
+function replaceWithExtra(path, replacement) {
+	replacement.extra = path.node.extra;
+	path.replaceWith(replacement);
+}
 function getSignalGlobalKey(identifier) {
 	const { parent } = identifier;
 	if (!_marko_compiler.types.isMemberExpression(parent) || parent.computed || !_marko_compiler.types.isIdentifier(parent.property) || parent.object !== identifier.node) return;
@@ -10729,7 +10738,7 @@ function enableDynamicTagVar(tag) {
 	importRuntimeFeature("dynamic-tag-var");
 	if (!tag.node.var.extra.binding.pruned) {
 		const accessor = getScopeAccessorLiteral(tag.node.extra.nodeBinding, true);
-		if (addRuntimeOnce(`_resume_dynamic_tag_var ${accessor.value}`)) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.expressionStatement(callRuntime("_resume_dynamic_tag_var", accessor)));
+		if (addRuntimeOnce(`_dynamic_tag_var_resume ${accessor.value}`)) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.expressionStatement(callRuntime("_dynamic_tag_var_resume", accessor)));
 	}
 }
 function enableDynamicTagResume(tag) {
@@ -10883,7 +10892,7 @@ var text_default = {
 function buildAggregateError(file, rootMsg, ...paths) {
 	const err = /* @__PURE__ */ new SyntaxError();
 	const fileName = path.default.relative(_marko_compiler_modules.cwd, file.opts.filename);
-	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$13]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$13)}:\x1b[0m\n${getFrame(file, path$13)}`).join("\n\n")}`;
+	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$11]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$11)}:\x1b[0m\n${getFrame(file, path$11)}`).join("\n\n")}`;
 	if (!("MARKO_DEBUG" in process.env)) err.stack = finalMsg;
 	Object.defineProperty(err, "message", {
 		get() {
@@ -11183,34 +11192,9 @@ function normalizeVisitor(visitor) {
 	return visitor?.default ?? visitor;
 }
 function normalizeVisit(visitor) {
-	if (Array.isArray(visitor)) {
-		let merged;
-		for (const entry of visitor) merged = sequenceVisit(merged, normalizeVisit(entry));
-		return merged;
-	}
+	if (Array.isArray(visitor)) throw new Error("A core tag's hook must be a single visitor for the interop merge, not a list.");
 	return typeof visitor === "function" ? visitor : normalizeVisitor(visitor);
 }
-function sequenceVisit(first, second) {
-	if (!first || !second) return first || second;
-	const enterFirst = getVisitorEnter(first);
-	const enterSecond = getVisitorEnter(second);
-	const enter = (enterFirst || enterSecond) && function enter(path$11, state) {
-		const { node } = path$11;
-		enterFirst?.call(this, path$11, state);
-		if (path$11.node === node) enterSecond?.call(this, path$11, state);
-	};
-	const exitFirst = getVisitorExit(first);
-	const exitSecond = getVisitorExit(second);
-	const exit = (exitFirst || exitSecond) && function exit(path$12, state) {
-		const { node } = path$12;
-		exitFirst?.call(this, path$12, state);
-		if (path$12.node === node) exitSecond?.call(this, path$12, state);
-	};
-	return exit ? enter ? {
-		enter,
-		exit
-	} : { exit } : enter;
-}
 function getVisitorEnter(visit) {
 	return typeof visit === "function" ? visit : visit?.enter;
 }

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

@@ -28,19 +28,17 @@ export declare function size<T>(data: Opt<T>): number;
 export declare function filter<T>(data: Opt<T>, cb: (item: T) => boolean): Opt<T>;
 export declare function forEach<T>(data: Opt<T>, cb: (item: T, index: number) => void): void;
 export declare function fromIter<T>(data: Iterable<T>): T | Many<T> | undefined;
-export declare function toIter<T>(data: Opt<T>): Iterable<T>;
-export declare function includes<T>(data: Opt<T>, item: T): boolean;
 export declare function find<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): Opt<T>;
 export declare function some<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): boolean;
 export declare function every<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): boolean;
 export declare function reduce<T, R>(data: Opt<T>, cb: (acc: R | undefined, item: T, index: number) => R | undefined): R | undefined;
 export declare function reduce<T, R>(data: Opt<T>, cb: (acc: R, item: T, index: number) => R, initial: R): R;
 export declare function toArray<T, R>(data: Opt<T>, cb: (item: T, index: number) => R): R[];
+export declare function toSet<T>(data: Opt<T>): Set<T>;
 export declare function mapToString<T>(data: Opt<T>, sep: string, cb: (item: T, index: number) => string): string;
 export declare function findSorted<T>(compare: Compare<T>, data: T[], item: T): T | undefined;
 export declare function findIndexSorted<T>(compare: Compare<T>, data: T[], item: T): number;
 export declare function addSorted<T, U extends T[]>(compare: Compare<T>, data: U, item: T): U;
-export declare function addUnique<T>(data: Opt<T>, item: T): OneMany<T>;
 export declare function at<T>(data: Opt<T>, index: number): T | undefined;
 export declare function first<T>(data: OneMany<T>): T;
 export declare function rest<T>(data: OneMany<T>): Opt<T>;

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

@@ -36,6 +36,7 @@ export interface Binding {
     sources: undefined | Sources;
     /** The intersection whose work computes it, or the nearest one upstream. Set on alias roots only. */
     upstreamIntersection: Intersection | undefined;
+    /** Complete only once `finalizeReferences` runs at program analyze exit. */
     reads: Set<ReferencedExtra>;
     aliases: Set<Binding>;
     hoists: SortedOpt<Section>;
@@ -64,6 +65,7 @@ export interface Binding {
     localClosures: Map<Section, Binding> | undefined;
     declared: boolean;
     nullable: boolean;
+    /** Settled only once `finalizeReferences` runs at program analyze exit. */
     pruned: boolean | undefined;
     exposed: boolean;
     forcePersist: boolean;
@@ -163,6 +165,7 @@ declare module "@marko/compiler/dist/types" {
 export declare function createBinding(name: string, type: Binding["type"], refSection: Section, upstreamAlias?: Binding["upstreamAlias"], property?: string, excludeProperties?: SortedOpt<string>, loc?: t.SourceLocation | null, refDeclared?: boolean): Binding;
 export declare function getOrCreatePropertyAlias(binding: Binding, property: string): Binding;
 export declare function getPropertyAlias(binding: Binding | undefined, properties: Opt<string>): Binding | undefined;
+export declare function isTagVarRead(tag: t.NodePath<t.MarkoTag>): boolean;
 export declare function trackDomVarReferences(tag: t.NodePath<t.MarkoTag>, binding: Binding): Binding | undefined;
 export declare function trackVarReferences(tag: t.NodePath<t.MarkoTag>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;
 export declare function trackParamsReferences(body: t.NodePath<t.MarkoTagBody | t.Program>, type: BindingType): Binding | undefined;

package/dist/translator/util/serialize-reasons.d.ts

@@ -30,6 +30,8 @@ export declare function mapParamReason(program: Section, reason: Sources, exprs:
 export declare function mergeSerializeReasons(a: SerializeReason, b: undefined | SerializeReason): SerializeReason;
 export declare function mergeSerializeReasons(a: undefined | SerializeReason, b: SerializeReason): SerializeReason;
 export declare function mergeSerializeReasons(a: undefined | SerializeReason, b: undefined | SerializeReason): SerializeReason | undefined;
+export declare function isOwnResumeReason(reason: SerializeReason | undefined): boolean;
+export declare function hasOwnResumeReason(section: Section): boolean;
 export declare function applySerializeExprs(section: Section): void;
 export declare function finalizeSerializeReason(section: Section): void;
 export declare function getSerializeReasonsVersion(): number;

package/dist/translator/util/translate-attrs.d.ts

@@ -1,8 +1,9 @@
 import { types as t } from "@marko/compiler";
 import { type BindingPropTree } from "./binding-prop-tree";
 import { type AttrTagLookup } from "./nested-attribute-tags";
+import { type SortedOpt } from "./optional";
 type ContentKey = "renderBody" | "content";
-export declare function translateAttrs(tag: t.NodePath<t.MarkoTag>, propTree?: BindingPropTree | true, skip?: Set<string>, statements?: t.Statement[], contentKey?: ContentKey): {
+export declare function translateAttrs(tag: t.NodePath<t.MarkoTag>, propTree?: BindingPropTree | true, skip?: SortedOpt<string>, statements?: t.Statement[], contentKey?: ContentKey): {
     properties: (t.ObjectMethod | t.ObjectProperty | t.SpreadElement)[];
     statements: t.Statement[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.54",
+  "version": "6.3.56",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -51,14 +51,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.42.7",
+    "@marko/compiler": "^5.42.9",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.54",
-    "marko": "5.39.43"
+    "@marko/runtime-tags": "npm:marko@6.3.56",
+    "marko": "5.39.44"
   },
   "engines": {
     "node": ">=22"

package/tags-html.d.ts

@@ -1662,7 +1662,8 @@ declare global {
          */
         type?: AttrMissing | "context" | "toolbar";
       }
-      interface Meta extends HTMLAttributes<HTMLMetaElement> {
+      // The one tag whose `content` is its HTML attribute instead of its body.
+      interface Meta extends Omit<HTMLAttributes<HTMLMetaElement>, "content"> {
         /**
          * Specifies the character encoding for the HTML document.
          * @see https://html.spec.whatwg.org/multipage/semantics.html#attr-meta-charset
@@ -4413,7 +4414,7 @@ declare global {
        * @see Marko.Body
        */
       content?:
-        | AttrString
+        | AttrMissing
         | Marko.Body<[], void>
         | Marko.Template<Record<any, never>, void>;
 
@@ -4466,7 +4467,7 @@ declare global {
        * @see Marko.Body
        */
       content?:
-        | AttrString
+        | AttrMissing
         | Marko.Body<[], void>
         | Marko.Template<Record<any, never>, void>;