marko 6.3.14 → 6.3.16

package/dist/translator/index.js

@@ -1146,62 +1146,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 +1480,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 +1494,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 ??= {});
 			}
@@ -1754,13 +1760,14 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
-function _html(html) {
-	$chunk.writeHTML(html);
+function getScopeById(scopeId) {
+	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
 }
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
-	$chunk.boundary.state.needsMainRuntime = true;
-	$chunk.writeEffect(scopeId, registryId);
+function _scope_id() {
+	return $chunk.boundary.state.scopeId++;
+}
+function _peek_scope_id() {
+	return $chunk.boundary.state.scopeId;
 }
 const kPendingContexts = Symbol("Pending Contexts");
 function withContext(key, value, cb, cbValue) {
@@ -1775,27 +1782,23 @@ function withContext(key, value, cb, cbValue) {
 		ctx[key] = prev;
 	}
 }
-function _scope_id() {
-	return $chunk.boundary.state.scopeId++;
-}
-function _peek_scope_id() {
-	return $chunk.boundary.state.scopeId;
+const kBranchId = Symbol("Branch Id");
+const kIsAsync = Symbol("Is Async");
+function withBranchId(branchId, cb) {
+	return withContext(kBranchId, branchId, cb);
 }
-function getScopeById(scopeId) {
-	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
+function _html(html) {
+	$chunk.writeHTML(html);
 }
-function _set_serialize_reason(reason) {
-	$chunk.boundary.state.serializeReason = reason;
+function _script(scopeId, registryId) {
+	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
+	$chunk.boundary.state.needsMainRuntime = true;
+	$chunk.writeEffect(scopeId, registryId);
 }
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { ["#ClosestBranchId"]: branchId });
 }
-const kBranchId = Symbol("Branch Id");
-const kIsAsync = Symbol("Is Async");
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
-}
 let writeScope = (scopeId, partialScope) => {
 	const { state } = $chunk.boundary;
 	const target = $chunk.serializeState;
@@ -1814,6 +1817,9 @@ function scopeWithId(state, scopeId) {
 	if (!scope) scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId });
 	return scope;
 }
+function _set_serialize_reason(reason) {
+	$chunk.boundary.state.serializeReason = reason;
+}
 globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask;
 //#endregion
 //#region src/html/attrs.ts
@@ -1974,7 +1980,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
@@ -1989,25 +1995,28 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 	if (typeof renderer === "string") {
 		const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
 		rendered = true;
-		_scope_id();
-		_html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`);
-		if (!voidElementsReg.test(renderer)) {
-			const renderContent = content || normalizeDynamicRenderer(input.content);
-			if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-			else if (renderContent) {
-				if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-				if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1);
-				else _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
-			}
-			_html(`</${renderer}>`);
-		}
-		const childScope = getScopeById(branchId);
-		const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
-		if (needsScript) {
-			writeScope(branchId, { ["#Renderer"]: renderer });
-			_script(branchId, "d");
-		}
-		if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+		const renderNative = () => {
+			_scope_id();
+			_html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`);
+			if (!voidElementsReg.test(renderer)) {
+				const renderContent = content || normalizeDynamicRenderer(input.content);
+				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
+				else if (renderContent) {
+					if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1);
+					else _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+				}
+				_html(`</${renderer}>`);
+			}
+			const childScope = getScopeById(branchId);
+			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
+			if (needsScript) {
+				writeScope(branchId, { ["#Renderer"]: renderer });
+				_script(branchId, "d");
+			}
+			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
+		};
+		renderNative();
 	} else {
 		if (shouldResume) _html(state.mark("[", ""));
 		const render = () => {
@@ -2116,16 +2125,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,
@@ -2298,7 +2299,10 @@ function getScopeReasonDeclaration(section) {
 	return _marko_compiler.types.variableDeclaration("const", getSectionReasonState(section).declarators);
 }
 function getSerializeGuard(section, reason, optional) {
-	if (!isReasonDynamic(reason) || isCrossSection(section, reason)) return reason ? optional ? void 0 : withLeadingComment(_marko_compiler.types.numericLiteral(1), getDebugNames(reason === true ? void 0 : reason.state)) : _marko_compiler.types.numericLiteral(0);
+	if (!isReasonDynamic(reason) || isCrossSection(section, reason)) {
+		if (!reason) return _marko_compiler.types.numericLiteral(0);
+		return optional ? void 0 : withLeadingComment(_marko_compiler.types.numericLiteral(1), getDebugNames(reason === true ? void 0 : reason.state));
+	}
 	return getOrHoist(reason, true);
 }
 function getSerializeGuardForAny(section, reasons, optional) {
@@ -2892,7 +2896,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,
@@ -3013,12 +3016,14 @@ function getSignalFn(signal) {
 	}
 	for (const value of signal.values) {
 		if (value.signal.inline) continue;
-		if (signalHasStatements(value.signal)) signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
-			scopeIdentifier,
-			value.value,
-			...getTranslatedExtraArgs(value.signal)
-		])));
-		else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
+		if (signalHasStatements(value.signal)) {
+			const invocation = _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value.signal.identifier, [
+				scopeIdentifier,
+				value.value,
+				...getTranslatedExtraArgs(value.signal)
+			]));
+			signal.render.push(invocation);
+		} else signal.render.push(_marko_compiler.types.expressionStatement(withLeadingComment(value.value, getDebugNames(value.signal.referencedBindings))));
 	}
 	forEach(signal.intersection, (intersection) => {
 		signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(intersection.identifier, [scopeIdentifier])));
@@ -3150,13 +3155,16 @@ function addValue(targetSection, referencedBindings, signal, value) {
 	});
 	if (value.extra?.referencedBindingsInFunction) parentSignal.hasSideEffect = true;
 }
-function getResumeRegisterId(section, referencedBindings, type) {
-	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
+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}`;
-	return (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${section.id}${name}${type ? "/" + type : ""}`);
+	return `${section.id}${name}${type ? "/" + type : ""}`;
+}
+function getResumeRegisterId(section, referencedBindings, type) {
+	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
+	return (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, buildResumeRegisterKey(section, referencedBindings, type));
 }
 function writeSignals(section) {
 	const seen = /* @__PURE__ */ new Set();
@@ -3175,7 +3183,8 @@ function writeSignals(section) {
 		if (signal.effect.length) {
 			traverseReplace(signal, "effect", replaceEffectNode);
 			const effectIdentifier = _marko_compiler.types.identifier(`${signal.identifier.name}__script`);
-			effectDeclarator = _marko_compiler.types.variableDeclarator(effectIdentifier, callRuntime("_script", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings)), _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], toFirstExpressionOrBlock(signal.effect))));
+			const effectFn = _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], toFirstExpressionOrBlock(signal.effect));
+			effectDeclarator = _marko_compiler.types.variableDeclarator(effectIdentifier, callRuntime("_script", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings)), effectFn));
 		}
 		let signalDeclaration;
 		if (signal.build) {
@@ -3791,7 +3800,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");
@@ -4344,6 +4353,10 @@ var native_tag_default = {
 			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;
 				}
@@ -4385,7 +4398,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;
@@ -5055,7 +5068,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
@@ -5350,6 +5363,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);
@@ -5590,9 +5605,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) {
@@ -5910,7 +5922,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;
@@ -5918,14 +5930,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);
@@ -6100,7 +6111,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);
@@ -7198,8 +7209,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;
@@ -7643,6 +7653,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) {
@@ -8234,9 +8255,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)) {
@@ -8246,7 +8265,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();
 	} },
@@ -8558,6 +8577,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);
@@ -8604,25 +8624,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) {
@@ -8706,9 +8715,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;
@@ -8849,6 +8857,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,

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: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.14",
+  "version": "6.3.16",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",