marko 6.3.15 → 6.3.17

package/dist/translator/index.js

@@ -127,6 +127,7 @@ let AccessorProp$1 = /* @__PURE__ */ function(AccessorProp) {
 	AccessorProp["Id"] = "#Id";
 	AccessorProp["Load"] = "#Load";
 	AccessorProp["LoopKey"] = "#LoopKey";
+	AccessorProp["LoopIndex"] = "#LoopIndex";
 	AccessorProp["ParentBranch"] = "#ParentBranch";
 	AccessorProp["PendingEffects"] = "#PendingEffects";
 	AccessorProp["PendingRenders"] = "#PendingRenders";
@@ -878,6 +879,7 @@ let AccessorProp = /* @__PURE__ */ function(AccessorProp) {
 	AccessorProp["Id"] = "L";
 	AccessorProp["Load"] = "X";
 	AccessorProp["LoopKey"] = "M";
+	AccessorProp["LoopIndex"] = "I";
 	AccessorProp["ParentBranch"] = "N";
 	AccessorProp["PendingEffects"] = "J";
 	AccessorProp["PendingRenders"] = "W";
@@ -1146,62 +1148,67 @@ function analyzeTagNameType(tag, allowDynamic) {
 }
 function analyzeExpressionTagName(name, extra) {
 	const pending = [name];
+	const seen = /* @__PURE__ */ new Set();
 	let path;
 	let type;
 	let nullable = false;
 	let tagNameImported;
 	let tagNameLoad;
-	while ((path = pending.pop()) && type !== 2) if (path.isConditionalExpression()) {
-		pending.push(path.get("consequent"));
-		if (path.node.alternate) pending.push(path.get("alternate"));
-	} else if (path.isLogicalExpression()) {
-		if (path.node.operator === "&&") nullable = true;
-		else pending.push(path.get("left"));
-		pending.push(path.get("right"));
-	} else if (path.isAssignmentExpression()) pending.push(path.get("right"));
-	else if (path.isBinaryExpression()) type = path.node.operator !== "+" || type === void 0 || type === 0 ? 0 : 2;
-	else if (path.isStringLiteral() || path.isTemplateLiteral()) type = type === void 0 || type === 0 ? 0 : 2;
-	else if (path.isNullLiteral()) nullable = true;
-	else if (path.isIdentifier()) {
-		if (path.node.name === "undefined") {
-			nullable = true;
-			continue;
-		}
-		const binding = path.scope.getBinding(path.node.name);
-		if (!binding) {
-			type = 2;
-			continue;
-		}
-		if (binding.kind === "module") {
-			const decl = binding.path.parent;
-			if (MARKO_FILE_REG.test(decl.source.value) && decl.specifiers.some((it) => _marko_compiler.types.isImportDefaultSpecifier(it))) {
-				const resolvedImport = decl.extra?.tagImport || decl.source.value;
-				if (type === void 0) {
-					type = 1;
-					tagNameImported = resolvedImport;
-					tagNameLoad = decl.extra?.loadImport;
-				} else if (type === 0) {
-					type = 2;
-					tagNameImported = void 0;
-				} else if (tagNameImported !== resolvedImport) tagNameImported = void 0;
-			} else type = 2;
-			continue;
-		}
-		const bindingTag = binding.path;
-		if (bindingTag.isMarkoTag() && binding.kind === "local") {
-			const bindingTagName = bindingTag.get("name").node.value;
-			if (bindingTagName === "const") {
-				pending.push(bindingTag.get("attributes")[0].get("value"));
+	while ((path = pending.pop()) && type !== 2) {
+		if (seen.has(path.node)) continue;
+		seen.add(path.node);
+		if (path.isConditionalExpression()) {
+			pending.push(path.get("consequent"));
+			if (path.node.alternate) pending.push(path.get("alternate"));
+		} else if (path.isLogicalExpression()) {
+			if (path.node.operator === "&&") nullable = true;
+			else pending.push(path.get("left"));
+			pending.push(path.get("right"));
+		} else if (path.isAssignmentExpression()) pending.push(path.get("right"));
+		else if (path.isBinaryExpression()) type = path.node.operator !== "+" || type === void 0 || type === 0 ? 0 : 2;
+		else if (path.isStringLiteral() || path.isTemplateLiteral()) type = type === void 0 || type === 0 ? 0 : 2;
+		else if (path.isNullLiteral()) nullable = true;
+		else if (path.isIdentifier()) {
+			if (path.node.name === "undefined") {
+				nullable = true;
 				continue;
 			}
-			if (bindingTagName === "let") {
+			const binding = path.scope.getBinding(path.node.name);
+			if (!binding) {
 				type = 2;
 				continue;
 			}
-			continue;
-		}
-		type = 2;
-	} else type = 2;
+			if (binding.kind === "module") {
+				const decl = binding.path.parent;
+				if (MARKO_FILE_REG.test(decl.source.value) && decl.specifiers.some((it) => _marko_compiler.types.isImportDefaultSpecifier(it))) {
+					const resolvedImport = decl.extra?.tagImport || decl.source.value;
+					if (type === void 0) {
+						type = 1;
+						tagNameImported = resolvedImport;
+						tagNameLoad = decl.extra?.loadImport;
+					} else if (type === 0) {
+						type = 2;
+						tagNameImported = void 0;
+					} else if (tagNameImported !== resolvedImport) tagNameImported = void 0;
+				} else type = 2;
+				continue;
+			}
+			const bindingTag = binding.path;
+			if (bindingTag.isMarkoTag() && binding.kind === "local") {
+				const bindingTagName = bindingTag.get("name").node.value;
+				if (bindingTagName === "const") {
+					pending.push(bindingTag.get("attributes")[0].get("value"));
+					continue;
+				}
+				if (bindingTagName === "let") {
+					type = 2;
+					continue;
+				}
+				continue;
+			}
+			type = 2;
+		} else type = 2;
+	}
 	extra.tagNameType = type ?? 2;
 	extra.tagNameNullable = nullable;
 	if (type === 1 && tagNameImported) {
@@ -1475,9 +1482,10 @@ function finalizeFunctionRegistry() {
 function canIgnoreRegister(markoRoot, exprRoot) {
 	return markoRoot.isMarkoPlaceholder() || markoRoot.isMarkoScriptlet() && (!markoRoot.node.static || markoRoot.node.target === "server") || markoRoot.isMarkoTag() && markoRoot.node.name == exprRoot.node || isMarkoAttribute(markoRoot) && (analyzeTagNameType(markoRoot.parentPath) === 0 && /^on[A-Z-]/.test(markoRoot.node.name) && !hasSpreadAttributeAfter(markoRoot) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"));
 }
-function getStaticDeclRefs(fnExtra, path, refs = /* @__PURE__ */ new Set()) {
+function getStaticDeclRefs(fnExtra, path, refs = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set()) {
 	const decl = getDeclarationRoot(path);
-	if (decl) {
+	if (decl && !seen.has(decl.node)) {
+		seen.add(decl.node);
 		const ids = decl.getOuterBindingIdentifiers();
 		if (ids) for (const name in ids) {
 			const binding = decl.scope.getBinding(name);
@@ -1488,7 +1496,7 @@ function getStaticDeclRefs(fnExtra, path, refs = /* @__PURE__ */ new Set()) {
 				const markoRoot = getMarkoRoot(exprRoot);
 				if (!markoRoot || canIgnoreRegister(markoRoot, exprRoot)) continue;
 				if (isStaticRoot(markoRoot)) {
-					if (getStaticDeclRefs(fnExtra, ref, refs) === true) return true;
+					if (getStaticDeclRefs(fnExtra, ref, refs, seen) === true) return true;
 				} else if (shouldAlwaysRegister(markoRoot)) return true;
 				else refs.add(exprRoot.node.extra ??= {});
 			}
@@ -1735,8 +1743,8 @@ const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeS
 function _escape_script(val) {
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
@@ -1832,11 +1840,14 @@ function _attr_option_value(value) {
 const kSelectedValue = Symbol("selectedValue");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
 	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	if (content) withContext(kSelectedValue, value, content);
+	if (content) withContext(kSelectedValue, value ?? "", content);
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -1974,7 +1985,7 @@ function normalizedValueMatches(a, b) {
 	return false;
 }
 function normalizeStrAttrValue(value) {
-	return value && value !== true || value === 0 ? value + "" : "";
+	return isNotVoid(value) && value !== true ? value + "" : "";
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
@@ -2119,16 +2130,8 @@ function getCompatRuntimeFile() {
 //#endregion
 //#region src/translator/util/setup-statements.ts
 /**
-* Tracks, during analyze, whether translate will add statements to a
-* section's setup signal (the signal keyed by no referenced bindings).
-* Sites that key statements by an expression's resolved references register
-* the expression with `addSetupExpr`; sites that always target the setup
-* signal call `addSetupStatement`. Expressions that resolve references
-* through `mergeReferences` are covered centrally by `finalizeReferences`.
-*
-* This lets a template's analyze phase prove its setup export is a noop so
-* parent templates can skip importing and calling it. The proof is checked
-* when the template itself is translated (see `visitors/program/dom.ts`).
+* Tracks during analyze whether translate will add setup-signal statements, so a
+* template can prove its setup export is a noop and parents can skip calling it.
 */
 const [getSetupInfo] = createSectionState("setupStatements", () => ({
 	forced: false,
@@ -2387,7 +2390,6 @@ const [getSteps] = createSectionState("steps", (section) => {
 });
 const walkCodeToName = {
 	[32]: "get",
-	[36]: "inside",
 	[37]: "replace",
 	[38]: "endChild",
 	[47]: "beginChild",
@@ -2565,12 +2567,12 @@ function getSectionMetaIdentifiers(section) {
 	}
 	return meta;
 }
-function markNode(path, nodeBinding, reason) {
+function markNode(path, nodeBinding, reason, deferred) {
 	if (nodeBinding.type !== 0) throw path.buildCodeFrameError("POTENTIAL MARKO BUG: Tried to mark a node that was not determined to need a mark during analyze.");
 	if (isOutputHTML()) {
 		if (reason) {
 			const section = getSection(path);
-			writeTo(path)`${callRuntime("_el_resume", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), getSerializeGuard(section, reason, true))}`;
+			writeTo(path, deferred)`${callRuntime("_el_resume", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), getSerializeGuard(section, reason, true))}`;
 		}
 	}
 }
@@ -2812,16 +2814,9 @@ function simplifyFunction(fn) {
 //#endregion
 //#region src/translator/util/to-first-expression-or-block.ts
 function toFirstExpressionOrBlock(stmts) {
-	if (stmts.length === 1 && _marko_compiler.types.isExpressionStatement(stmts[0])) return toParenthesizedExpressionIfNeeded(stmts[0].expression);
+	if (stmts.length === 1 && _marko_compiler.types.isExpressionStatement(stmts[0])) return stmts[0].expression;
 	return _marko_compiler.types.blockStatement(stmts);
 }
-function toParenthesizedExpressionIfNeeded(expr) {
-	switch (expr.type) {
-		case "ObjectExpression":
-		case "AssignmentExpression": return _marko_compiler.types.parenthesizedExpression(expr);
-		default: return expr;
-	}
-}
 //#endregion
 //#region src/translator/util/signals.ts
 const [getSignals] = createSectionState("signals", () => /* @__PURE__ */ new Map());
@@ -2898,7 +2893,6 @@ function getSignal(section, referencedBindings, name) {
 			build: void 0,
 			export: !!exportName,
 			hasSideEffect: !!(referencedBindings && (Array.isArray(referencedBindings) || referencedBindings.type === 0 || referencedBindings.type === 1 || referencedBindings.section !== section || referencedBindings.closureSections || referencedBindings.hoists)),
-			hasDynamicSubscribers: false,
 			forcePersist: false,
 			inline: void 0,
 			extraArgs: void 0,
@@ -2928,7 +2922,7 @@ function getSignal(section, referencedBindings, name) {
 			const render = getSignalFn(signal);
 			const closureSignalBuilder = getClosureSignalBuilder(section);
 			if (closureSignalBuilder && !isDynamicClosure(section, closure)) return closureSignalBuilder(closure, render);
-			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)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : 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)), underTryPlaceholder(section) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
 		};
 	}
 	return signal;
@@ -3126,7 +3120,7 @@ function replaceNullishAndEmptyFunctionsWith0(args) {
 				args[i] = _marko_compiler.types.numericLiteral(0);
 				continue;
 			}
-			if (body.length === 1 && _marko_compiler.types.isExpressionStatement(body[0])) arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
+			if (body.length === 1 && _marko_compiler.types.isExpressionStatement(body[0])) arg.body = body[0].expression;
 		}
 		if (finalLen === void 0) finalLen = i + 1;
 	}
@@ -3698,7 +3692,7 @@ function getRegisteredFnExpression(node) {
 //#region src/translator/util/body-to-text-literal.ts
 const kRawText = Symbol("raw text placeholder");
 function bodyToTextLiteral(body) {
-	return buildTextLiteral(body, toText, false);
+	return buildTextLiteral(body, toText, true);
 }
 function bodyToRawTextLiteral(body) {
 	return buildTextLiteral(body, (value) => value, true);
@@ -3722,15 +3716,17 @@ function buildTextLiteral(body, coerce, bareSingle) {
 	const templateExpressions = [];
 	let currentQuasi = "";
 	let placeholderExtra;
+	let singleValue;
 	for (const child of body.body) if (_marko_compiler.types.isMarkoText(child)) currentQuasi += child.value;
 	else if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 		placeholderExtra ||= child.value.extra;
 		templateQuasis.push(templateElement(currentQuasi, false));
 		templateExpressions.push(coerce(child.value));
+		singleValue = child.value;
 		currentQuasi = "";
 	}
 	if (templateExpressions.length) {
-		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked) return templateExpressions[0];
+		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked && !_marko_compiler.types.isStringLiteral(singleValue)) return singleValue;
 		templateQuasis.push(templateElement(currentQuasi, true));
 		const literal = _marko_compiler.types.templateLiteral(templateQuasis, templateExpressions);
 		literal.extra = placeholderExtra;
@@ -3803,7 +3799,7 @@ var for_default = {
 					"step"
 				];
 				break;
-			default: throw tag.buildCodeFrameError("The [`<for>` tag](https://markojs.com/docs/reference/core-tag#for) requires an `of=`, `in=`, or `to=` attribute.");
+			default: throw tag.buildCodeFrameError("The [`<for>` tag](https://markojs.com/docs/reference/core-tag#for) requires an `of=`, `in=`, `to=`, or `until=` attribute.");
 		}
 		if (!isAttrTag) allowAttrs.push("by");
 		const keyAttr = tag.node.attributes.find((attr) => attr.type === "MarkoAttribute" && attr.name === "key");
@@ -4353,9 +4349,17 @@ var native_tag_default = {
 		let exprExtras;
 		for (let i = attributes.length; i--;) {
 			const attr = attributes[i];
+			if (_marko_compiler.types.isMarkoAttribute(attr) && attr.name === "content" && tag.node.body.body.length) {
+				dropNodes(attr.value);
+				continue;
+			}
 			const valueExtra = attr.value.extra ??= {};
 			if (_marko_compiler.types.isMarkoAttribute(attr)) {
 				if (seen[attr.name]) {
+					(0, _marko_compiler_babel_utils.diagnosticWarn)(tag, {
+						label: `The \`${attr.name}\` attribute is set more than once on \`<${tagName}>\`; only the last value is used.`,
+						loc: attr.loc ?? void 0
+					});
 					dropNodes(attr.value);
 					continue;
 				}
@@ -4397,7 +4401,7 @@ var native_tag_default = {
 		if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || isDynamicControllable(relatedControllable)) {
 			const tagExtra = node.extra ??= {};
 			const tagSection = getOrCreateSection(tag);
-			const nodeBinding = tagExtra[kNativeTagBinding] = createBinding("#" + tagName, 0, tagSection, void 0, void 0, void 0, void 0, !!node.var);
+			const nodeBinding = tagExtra[kNativeTagBinding] = createBinding("#" + tagName.toLowerCase(), 0, tagSection, void 0, void 0, void 0, void 0, !!node.var);
 			if (hasEventHandlers) (0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
 			if (spreadReferenceNodes) {
 				const isMergedSpread = !!relatedControllable;
@@ -4488,7 +4492,7 @@ var native_tag_default = {
 						spreadExpression = spreadIdentifier;
 					}
 					if (valueChange) writeAtStartOfBody = callRuntime("_attr_textarea_value", getScopeIdIdentifier(tagSection), visitAccessor, value, valueChange, staticControllable ? void 0 : _marko_compiler.types.numericLiteral(1));
-					else if (value) writeAtStartOfBody = callRuntime("_escape", value);
+					else if (value) writeAtStartOfBody = callRuntime("_textarea_value", value);
 				}
 				for (const attr of staticAttrs) {
 					const { name, value } = attr;
@@ -4548,7 +4552,7 @@ var native_tag_default = {
 				const tagName = getCanonicalTagName(tag);
 				const tagSection = getSection(tag);
 				const markerSerializeReason = !tagExtra[kSkipEndTag] && nodeBinding && getSerializeReason(tagSection, nodeBinding);
-				const write = writeTo(tag, !markerSerializeReason && (tagName === "html" || tagName === "body"));
+				const write = writeTo(tag, tagName === "html" || !markerSerializeReason && tagName === "body");
 				if (tagExtra[kTagContentAttr]) flushBefore(tag);
 				if (selectArgs) {
 					if (!tagExtra[kSkipEndTag]) write`</${tagName}>`;
@@ -4562,7 +4566,7 @@ var native_tag_default = {
 					if (tagName === "head" && getMarkoOpts().linkAssets) write`${callRuntime("_flush_head")}`;
 					write`</${tagName}>`;
 				}
-				if (markerSerializeReason) markNode(tag, nodeBinding, markerSerializeReason);
+				if (markerSerializeReason) markNode(tag, nodeBinding, markerSerializeReason, tagName === "html");
 				tag.remove();
 			}
 		},
@@ -5067,7 +5071,7 @@ function getOptimizedOnlyChildNodeBinding(tag, section, branchSize = 1) {
 	if (getOnlyChildParentTagName(tag, branchSize)) {
 		const parentTag = getParentTag(tag).node;
 		const parentTagName = parentTag.name?.value;
-		return (parentTag.extra ??= {})[kNativeTagBinding] ??= createBinding("#" + parentTagName, 0, section);
+		return (parentTag.extra ??= {})[kNativeTagBinding] ??= createBinding("#" + parentTagName.toLowerCase(), 0, section);
 	} else return (tag.node.extra ??= {})[kNodeRef] ??= createBinding("#text", 0, section);
 }
 //#endregion
@@ -5256,7 +5260,7 @@ function flattenTextOnlyConditional(rootTag) {
 		if (node.body.attributeTags || !body.length) return;
 		const [attr] = node.attributes;
 		if (isCoreTagName(tag, "else")) {
-			if (node.attributes.length) return;
+			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;
 		for (const child of body) if (_marko_compiler.types.isMarkoText(child)) {
 			if (_escape(child.value) !== child.value) return;
@@ -5273,7 +5277,8 @@ function flattenTextOnlyConditional(rootTag) {
 		const branchTag = branches[i];
 		const text = bodyToRawTextLiteral(branchTag.node.body);
 		rawText ||= _marko_compiler.types.isTemplateLiteral(text);
-		expr = isCoreTagName(branchTag, "else") ? text : _marko_compiler.types.conditionalExpression(branchTag.node.attributes[0].value, text, expr);
+		const [conditionAttr] = branchTag.node.attributes;
+		expr = conditionAttr ? _marko_compiler.types.conditionalExpression(conditionAttr.value, text, expr) : text;
 	}
 	for (let i = branches.length; i-- > 1;) branches[i].remove();
 	const placeholder = _marko_compiler.types.markoPlaceholder(expr, true);
@@ -5362,6 +5367,8 @@ function isRoot(tag) {
 //#region src/translator/core/textarea.ts
 function preAnalyze$1(tag) {
 	if (tag.node.body.body.length) {
+		const [firstChild] = tag.node.body.body;
+		if (firstChild.type === "MarkoText") firstChild.value = firstChild.value.replace(/^\r?\n/, "");
 		const parts = [];
 		for (const child of tag.node.body.body) if (child.type === "MarkoText" || child.type === "MarkoPlaceholder" && child.escape) parts.push(child.value);
 		else throw tag.hub.file.hub.buildError(child, "Unexpected content in textarea, only text and placeholders are supported.", SyntaxError);
@@ -5496,7 +5503,7 @@ function getChangeHandler(tag, attr) {
 		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, "Unable to bind to value.");
+			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);
@@ -5602,9 +5609,6 @@ function buildUndefined() {
 //#endregion
 //#region src/translator/visitors/program/index.ts
 let scopeIdentifier;
-function isScopeIdentifier(node) {
-	return node === scopeIdentifier;
-}
 var program_default = {
 	migrate: {
 		enter(program) {
@@ -5922,7 +5926,7 @@ function analyzeParams(rootTagExtra, section, tag, propTree, rootAttrExprs) {
 		dropNodes(getAllTagReferenceNodes(tag.node));
 		return inputExpr;
 	}
-	if (!propTree.props || tag.node.arguments?.some((node) => _marko_compiler.types.isSpreadElement(node))) {
+	if (!propTree.props || propTree.rest || tag.node.arguments?.some((node) => _marko_compiler.types.isSpreadElement(node))) {
 		const extra = inputExpr.value = mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
 		setBindingDownstream(propTree.binding, extra);
 		return inputExpr;
@@ -5930,14 +5934,13 @@ function analyzeParams(rootTagExtra, section, tag, propTree, rootAttrExprs) {
 	const known = inputExpr.known = {};
 	let i = 0;
 	if (tag.node.arguments) for (const arg of tag.node.arguments) {
-		if (!propTree.props[i]) {
-			dropNodes(arg);
-			continue;
-		}
-		const argValueExtra = arg.extra ??= {};
-		known[i++] = { value: argValueExtra };
-		rootAttrExprs.add(argValueExtra);
-		addSetupExpr(section, arg);
+		if (propTree.props[i]) {
+			const argValueExtra = arg.extra ??= {};
+			known[i] = { value: argValueExtra };
+			rootAttrExprs.add(argValueExtra);
+			addSetupExpr(section, arg);
+		} else dropNodes(arg);
+		i++;
 	}
 	const attrPropsTree = propTree.props[i];
 	if (attrPropsTree) known[i] = analyzeAttrs(rootTagExtra, section, tag, attrPropsTree, rootAttrExprs);
@@ -6112,7 +6115,7 @@ function getSingleKnownSpread(attributes) {
 	};
 }
 function writeParamsToSignals(tag, propTree, importAlias, info) {
-	if (!propTree.props || tag.node.arguments?.some((node) => _marko_compiler.types.isSpreadElement(node))) {
+	if (!propTree.props || propTree.rest || tag.node.arguments?.some((node) => _marko_compiler.types.isSpreadElement(node))) {
 		const referencedBindings = tag.node.extra?.referencedBindings;
 		const tagInputIdentifier = info.getBindingIdentifier(propTree.binding, `${importAlias}_params`);
 		const translatedAttrs = translateAttrs(tag);
@@ -7210,8 +7213,7 @@ function getSectionInstancesAccessor(section) {
 	return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
 function getSectionInstancesAccessorLiteral(section) {
-	const accessor = getSectionInstancesAccessor(section);
-	return accessor ? typeof accessor === "number" ? _marko_compiler.types.numericLiteral(accessor) : _marko_compiler.types.stringLiteral(accessor) : void 0;
+	return _marko_compiler.types.stringLiteral(getSectionInstancesAccessor(section));
 }
 function getReadReplacement(node, signal) {
 	const { extra } = node;
@@ -7655,6 +7657,17 @@ var await_default = {
 	types: runtime_info_default.name + "/tags/await.d.marko"
 };
 //#endregion
+//#region src/translator/core/class.ts
+var class_default = {
+	parse(tag) {
+		throw tag.hub.buildError(tag.node.name, "class {} component blocks are no longer supported. Use <let> and <const> tags for state.");
+	},
+	parseOptions: {
+		statement: true,
+		rawOpenTag: true
+	}
+};
+//#endregion
 //#region src/translator/core/client.ts
 var client_default = {
 	parse(tag) {
@@ -8246,9 +8259,7 @@ var script_default = {
 		if (isOutputDOM()) {
 			const isFunction = _marko_compiler.types.isFunctionExpression(value) || _marko_compiler.types.isArrowFunctionExpression(value);
 			let inlineBody = null;
-			let referencesScope = false;
-			if (isFunction) if (value.async || value.generator) referencesScope = traverseContains(value, isScopeIdentifier);
-			else if (_marko_compiler.types.isBlockStatement(value.body)) {
+			if (isFunction) if (value.async || value.generator) {} else if (_marko_compiler.types.isBlockStatement(value.body)) {
 				if (!traverseContains(value.body, isReturnStatement)) {
 					let hasDeclaration = false;
 					for (const child of value.body.body) if (_marko_compiler.types.isDeclaration(child)) {
@@ -8258,7 +8269,7 @@ var script_default = {
 					inlineBody = hasDeclaration ? value.body : value.body.body;
 				}
 			} else inlineBody = _marko_compiler.types.expressionStatement(value.body);
-			addStatement("effect", section, referencedBindings, inlineBody || _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value, referencesScope ? [scopeIdentifier] : [])));
+			addStatement("effect", section, referencedBindings, inlineBody || _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value, [])));
 		} else addHTMLEffectCall(section, referencedBindings);
 		tag.remove();
 	} },
@@ -8570,6 +8581,7 @@ const cssGluedBefore = /[\w%]$/;
 //#region src/translator/core/style.ts
 const STYLE_EXT_REG = /^style((?:\.[a-zA-Z0-9$_-]+)+)?/;
 const programStyleCounts = /* @__PURE__ */ new WeakMap();
+const programDynamicStyleNameCounts = /* @__PURE__ */ new WeakMap();
 var style_default = {
 	analyze(tag) {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
@@ -8616,25 +8628,14 @@ function analyzeDynamicStyle(tag, names) {
 }
 function collectDynamicStyleNames(tag) {
 	let names;
-	let index = 0;
 	for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoPlaceholder(child)) {
-		if (!names) {
-			names = [];
-			index = dynamicStyleNameOffset(tag);
-		}
-		names.push(dynamicStyleName(tag, index++));
+		const program = (0, _marko_compiler_babel_utils.getProgram)().node;
+		const index = programDynamicStyleNameCounts.get(program) ?? 0;
+		programDynamicStyleNameCounts.set(program, index + 1);
+		(names ??= []).push(dynamicStyleName(tag, index));
 	} else if (!_marko_compiler.types.isMarkoText(child)) throw tag.hub.buildError(child, "The [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) only supports text and `${...}` interpolations. For a native html [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) use the `html-style` core tag instead.");
 	return names;
 }
-function dynamicStyleNameOffset(tag) {
-	const { start } = tag.node;
-	let offset = 0;
-	if (start != null) _marko_compiler.types.traverseFast((0, _marko_compiler_babel_utils.getProgram)().node, (node) => {
-		const dynamicStyle = node.extra?.dynamicStyle;
-		if (dynamicStyle && node.start != null && node.start < start) offset += dynamicStyle.names.length;
-	});
-	return offset;
-}
 const styleNameUnsafeReg = /[^a-zA-Z0-9_]/g;
 const encodeStyleNameChar = (c) => "-" + c.charCodeAt(0).toString(36);
 function dynamicStyleName(tag, index) {
@@ -8718,9 +8719,8 @@ function buildStyleDecls(node) {
 	return normalizeStringExpression(parts);
 }
 /**
-* Resolves a `<style>` block's text content to its client side import path
-* (eg `./template.marko.css`) by handing the css off to the configured
-* `resolveVirtualDependency` hook.
+* Resolves a `<style>` block's text to its client-side import path by handing
+* the css to the configured `resolveVirtualDependency` hook.
 */
 function getStyleImportPath(file, node, names) {
 	const { resolveVirtualDependency, sourceMaps } = file.markoOpts;
@@ -8861,6 +8861,7 @@ var core_default = {
 	taglibId: runtime_info_default.taglibId,
 	"<attrs>": attrs_default,
 	"<await>": await_default,
+	"<class>": class_default,
 	"<client>": client_default,
 	"<const>": const_default,
 	"<debug>": debug_default,
@@ -9495,6 +9496,14 @@ function optionalValueToNode(value) {
 const kDOMBinding = Symbol("dynamic tag dom binding");
 const kChildOffsetScopeBinding = Symbol("custom tag scope offset");
 const importedDynamicTagResume = /* @__PURE__ */ new WeakSet();
+const [getCompatRegistrations] = createProgramState(() => /* @__PURE__ */ new Set());
+function pushCompatRegistration(key, statement) {
+	const keys = getCompatRegistrations();
+	if (!keys.has(key)) {
+		keys.add(key);
+		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(statement);
+	}
+}
 var dynamic_tag_default = {
 	analyze: { enter(tag) {
 		(0, _marko_compiler_babel_utils.assertAttributesOrArgs)(tag);
@@ -9575,32 +9584,33 @@ var dynamic_tag_default = {
 				if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
 				if (classTagTemplate) {
 					const preserveBoundary = !tagsSerializeReason && (classHydration === "descendant" || classHydration === "self" && !!classFile?.metadata.marko.hasComponentBrowser);
-					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(isOutputHTML() ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
+					if (isOutputHTML() ? serializeReason || classHydration : serializeReason) pushCompatRegistration(classFile.metadata.marko.id, isOutputHTML() ? _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression((0, _marko_compiler_babel_utils.importNamed)(tag.hub.file, getCompatRuntimeFile(), "s"), [
 						_marko_compiler.types.stringLiteral(classFile.metadata.marko.id),
 						_marko_compiler.types.identifier(tagExpression.name),
 						...preserveBoundary ? [_marko_compiler.types.stringLiteral("preserve")] : []
 					]))], true) : _marko_compiler.types.expressionStatement(callRuntime("_resume", _marko_compiler.types.stringLiteral(classFile.metadata.marko.id), _marko_compiler.types.identifier(tagExpression.name))));
-				} else (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("??=", _marko_compiler.types.memberExpression(_marko_compiler.types.identifier(tagExpression.name), _marko_compiler.types.identifier("_")), _marko_compiler.types.identifier(tagExpression.name)))], true));
+				} else {
+					const rendererName = tagExpression.name;
+					pushCompatRegistration(rendererName, _marko_compiler.types.markoScriptlet([_marko_compiler.types.expressionStatement(_marko_compiler.types.assignmentExpression("??=", _marko_compiler.types.memberExpression(_marko_compiler.types.identifier(rendererName), _marko_compiler.types.identifier("_")), _marko_compiler.types.identifier(rendererName)))], true));
+				}
 			} else if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
 			const { properties, statements } = translateAttrs(tag, void 0, void 0, void 0, isClassAPI ? "renderBody" : "content");
 			const args = [];
+			const contentProp = getTranslatedBodyContentProperty(properties);
 			let hasTagArgs = false;
 			if (node.arguments) {
 				hasTagArgs = true;
 				args.push(...node.arguments);
 				if (properties.length) args.push(propsToExpression(properties));
-			} else {
-				const contentProp = getTranslatedBodyContentProperty(properties);
-				if (contentProp) {
-					properties.splice(properties.indexOf(contentProp), 1);
-					args.push(propsToExpression(properties), contentProp.value);
-				} else args.push(propsToExpression(properties));
-			}
+			} else if (contentProp) {
+				properties.splice(properties.indexOf(contentProp), 1);
+				args.push(propsToExpression(properties), contentProp.value);
+			} else args.push(propsToExpression(properties));
 			if (isOutputHTML()) {
 				flushInto(tag);
 				writeHTMLResumeStatements(tag.get("body"));
 				const serializeArg = getSerializeGuard(tagSection, serializeReason, true);
-				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), serializeArg) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0), serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0, serializeArg);
+				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), contentProp ? contentProp.value : _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), serializeArg) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0), serializeArg ? _marko_compiler.types.numericLiteral(0) : void 0, serializeArg);
 				if (node.var) {
 					const dynamicScopeIdentifier = generateUidIdentifier(tag.get("name").toString() + "_scope");
 					const mutatesTagVar = !!(tag.node.var.type === "Identifier" && tag.scope.getBinding(tag.node.var.name)?.constantViolations.length);

package/dist/translator/util/body-to-text-literal.d.ts

@@ -5,6 +5,6 @@ declare module "@marko/compiler/dist/types" {
         [kRawText]?: true;
     }
 }
-export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.Expression;
-export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.ArrayExpression | t.ArrowFunctionExpression | t.AssignmentExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.ObjectExpression | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
+export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.ArrayExpression | t.ArrowFunctionExpression | t.AssignmentExpression | t.AwaitExpression | t.BigIntLiteral | t.BinaryExpression | t.BindExpression | t.BooleanLiteral | t.CallExpression | t.ClassExpression | t.ConditionalExpression | t.DecimalLiteral | t.DoExpression | t.FunctionExpression | t.Identifier | t.Import | t.ImportExpression | t.JSXElement | t.JSXFragment | t.LogicalExpression | t.MemberExpression | t.MetaProperty | t.ModuleExpression | t.NewExpression | t.NullLiteral | t.NumericLiteral | t.ObjectExpression | t.OptionalCallExpression | t.OptionalMemberExpression | t.ParenthesizedExpression | t.PipelineBareFunction | t.PipelinePrimaryTopicReference | t.PipelineTopicExpression | t.RecordExpression | t.RegExpLiteral | t.SequenceExpression | t.StringLiteral | t.Super | t.TSAsExpression | t.TSInstantiationExpression | t.TSNonNullExpression | t.TSSatisfiesExpression | t.TSTypeAssertion | t.TaggedTemplateExpression | t.TemplateLiteral | t.ThisExpression | t.TopicReference | t.TupleExpression | t.TypeCastExpression | t.UnaryExpression | t.UpdateExpression | t.YieldExpression | t.MarkoParseError;
 export declare function injectTextCoercion(expr: t.Expression): void;

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

@@ -154,7 +154,7 @@ export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getDebugNamesAsIdentifier(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
-export declare function getSectionInstancesAccessorLiteral(section: Section): t.NumericLiteral | t.StringLiteral | undefined;
+export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral;
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression, signal?: Signal): t.Expression | undefined;
 export declare function isInvokeOnlyBinding(binding: Binding): boolean;
 export declare function hasNonConstantPropertyAlias(ref: Binding): boolean;

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

@@ -18,7 +18,6 @@ export interface Signal {
     renderReferencedBindings: ReferencedBindings;
     effect: t.Statement[];
     effectReferencedBindings: ReferencedBindings;
-    hasDynamicSubscribers: boolean;
     hasSideEffect: boolean;
     forcePersist: boolean;
     inline: {