marko 6.1.17 → 6.1.20

package/dist/translator/index.js

@@ -25,7 +25,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let package_json = require("../../package.json");
 let _marko_compiler = require("@marko/compiler");
 let _marko_compiler_babel_utils = require("@marko/compiler/babel-utils");
-let _marko_compiler_config = require("@marko/compiler/config");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let path = require("path");
@@ -1348,7 +1347,6 @@ function analyzeTagNameType(tag, allowDynamic) {
 				extra.tagNameType = 2;
 				extra.tagNameDynamic = true;
 				extra.featureType = "class";
-				((0, _marko_compiler_babel_utils.getProgram)().node.extra ??= {}).needsCompat = true;
 			} else if (!childFile) {
 				extra.tagNameType = 2;
 				extra.tagNameDynamic = true;
@@ -1766,13 +1764,13 @@ function getBindingPropTree(binding) {
 	};
 	if (!binding.reads.size) {
 		if (!binding.aliases.size) {
-			props.props = {};
+			props.props = Object.create(null);
 			for (const [property, alias] of binding.propertyAliases) props.props[property] = getBindingPropTree(alias);
 		} else if (binding.aliases.size === 1) {
 			const [restAlias] = binding.aliases;
 			if (hasSupersetExcludeProperties(binding, restAlias.excludeProperties)) {
 				props.rest = getBindingPropTree(restAlias);
-				props.props = {};
+				props.props = Object.create(null);
 				if (restAlias.type === 2) restAlias.export ??= generateUid(restAlias.name);
 				forEach(restAlias.excludeProperties, (property) => {
 					const propAlias = binding.propertyAliases.get(property);
@@ -2014,29 +2012,30 @@ function _attr_style(value) {
 }
 function _attr_option_value(value) {
 	const valueAttr = _attr("value", value);
-	if (normalizedValueMatches(getContext(kSelectedValue), value)) return valueAttr + " selected";
+	const selectedValue = getContext(kSelectedValue);
+	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) return valueAttr + " selected";
 	return valueAttr;
 }
 const kSelectedValue = Symbol("selectedValue");
-function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content) {
-	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange);
+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);
 }
-function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange);
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
 	return _escape(value);
 }
-function _attr_input_value(scopeId, nodeAccessor, value, valueChange) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange);
+function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
 	return _attr("value", value);
 }
-function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange) {
-	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange);
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
+	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
 	return isNotVoid(checked) ? " checked" : "";
 }
-function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value) {
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
 	const valueAttr = _attr("value", value);
-	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange);
+	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType);
 	return normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
 }
 const checkedValuesRefs = /* @__PURE__ */ new WeakMap();
@@ -2050,9 +2049,9 @@ function getCheckedValueRef(checkedValue) {
 		return ref;
 	}
 }
-function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange) {
+function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
 	const normalizedOpen = isNotVoid(open);
-	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange);
+	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
 	return normalizedOpen ? " open" : "";
 }
 function _attr(name, value) {
@@ -2064,11 +2063,16 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let events;
 	switch (tagName) {
 		case "input":
-			if (data.checkedChange) result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange);
-			else if ("checkedValue" in data || data.checkedValueChange) result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value);
-			else if (data.valueChange) result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange);
-			else break;
-			skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
+			if (data.checkedChange) {
+				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
+				skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/;
+			} else if ("checkedValue" in data || data.checkedValueChange) {
+				result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1);
+				skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
+			} else if (data.valueChange) {
+				result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1);
+				skip = /^value(?:Change)?$|[\s/>"'=]/;
+			} else break;
 			break;
 		case "select":
 		case "textarea":
@@ -2083,7 +2087,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 		case "details":
 		case "dialog":
 			if (data.openChange) {
-				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange);
+				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1);
 				skip = /^open(?:Change)?$|[\s/>"'=]/;
 			}
 			break;
@@ -2110,11 +2114,14 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	}
 	return result;
 }
-function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
-	writeScope(scopeId, {
+function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
+	writeScope(scopeId, serializeType ? {
 		["ControlledType:" + nodeAccessor]: type,
 		["ControlledValue:" + nodeAccessor]: value,
 		["ControlledHandler:" + nodeAccessor]: valueChange
+	} : {
+		["ControlledValue:" + nodeAccessor]: value,
+		["ControlledHandler:" + nodeAccessor]: valueChange
 	});
 }
 function stringAttr(name, value) {
@@ -2176,10 +2183,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		_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));
+			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);
+				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}>`);
@@ -4071,8 +4078,7 @@ function analyzeAttributeTags(tag) {
 			}
 			let attrTagMeta = lookup[name];
 			if (!attrTagMeta) {
-				attrTagMeta = lookup[name] = createAttrTagMeta(name, []);
-				curGroup = attrTagMeta.group;
+				attrTagMeta = lookup[name] = createAttrTagMeta(name, curGroup ||= []);
 				curGroup.push(name);
 			}
 			attrTagMeta.dynamic = true;
@@ -4419,7 +4425,8 @@ var native_tag_default = {
 						tag.insertBefore(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(spreadIdentifier, spreadExpression)]));
 						htmlSelectArgs.set(tag.node, {
 							value: _marko_compiler.types.memberExpression(spreadIdentifier, _marko_compiler.types.identifier("value")),
-							valueChange: _marko_compiler.types.memberExpression(spreadIdentifier, _marko_compiler.types.identifier("valueChange"))
+							valueChange: _marko_compiler.types.memberExpression(spreadIdentifier, _marko_compiler.types.identifier("valueChange")),
+							serializeType: _marko_compiler.types.numericLiteral(1)
 						});
 						spreadExpression = spreadIdentifier;
 					}
@@ -4436,7 +4443,7 @@ var native_tag_default = {
 						valueChange = _marko_compiler.types.memberExpression(spreadIdentifier, _marko_compiler.types.identifier("valueChange"));
 						spreadExpression = spreadIdentifier;
 					}
-					if (valueChange) writeAtStartOfBody = callRuntime("_attr_textarea_value", getScopeIdIdentifier(tagSection), visitAccessor, value, valueChange);
+					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);
 				}
 				for (const attr of staticAttrs) {
@@ -4496,7 +4503,7 @@ var native_tag_default = {
 				if (selectArgs) {
 					if (!tagExtra[kSkipEndTag]) write`</${tagName}>`;
 					flushInto(tag);
-					tag.insertBefore(_marko_compiler.types.expressionStatement(callRuntime("_attr_select_value", getScopeIdIdentifier(tagSection), nodeBinding && getScopeAccessorLiteral(nodeBinding), selectArgs.value, selectArgs.valueChange, _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(tag.node.body.body)))));
+					tag.insertBefore(_marko_compiler.types.expressionStatement(callRuntime("_attr_select_value", getScopeIdIdentifier(tagSection), nodeBinding && getScopeAccessorLiteral(nodeBinding), selectArgs.value, selectArgs.valueChange, _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(tag.node.body.body)), selectArgs.serializeType)));
 				} else if (isTextOnly) {
 					for (const child of tag.node.body.body) if (_marko_compiler.types.isMarkoText(child)) write`${child.value}`;
 					else if (_marko_compiler.types.isMarkoPlaceholder(child)) write`${callRuntime(getTextOnlyEscapeHelper(tagName), child.value)}`;
@@ -6920,7 +6927,7 @@ function getReadReplacement(node, signal) {
 			else if (read.getter?.hoisted) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, read.getter.hoisted), [getScopeExpression(extra.section, read.getter.hoisted)]);
 			else if (readBinding.type === 0) {
 				if (read.getter) replacement = _marko_compiler.types.callExpression(getBindingGetterIdentifier(readBinding, readBinding.section), [getScopeExpression(extra.section, readBinding.section)]);
-			} else if (!_marko_compiler_config.optimize && read.ownVar) replacement = callRuntime("_assert_init", extra.section ? getScopeExpression(extra.section, readBinding.section) : scopeIdentifier, getScopeAccessorLiteral(readBinding));
+			} else if (!isOptimize() && read.ownVar) replacement = callRuntime("_assert_init", extra.section ? getScopeExpression(extra.section, readBinding.section) : scopeIdentifier, getScopeAccessorLiteral(readBinding));
 			else replacement = createScopeReadExpression(readBinding, extra.section);
 			else if (node.type !== "Identifier") replacement = _marko_compiler.types.identifier(readBinding.name);
 			else if (read.getter?.hoisted) replacement = getBindingGetterIdentifier(readBinding, read.getter.hoisted);
@@ -7983,9 +7990,9 @@ var style_default = {
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		(0, _marko_compiler_babel_utils.assertNoAttributeTags)(tag);
 		const { node, hub: { file } } = tag;
-		const ext = STYLE_EXT_REG.exec(node.rawValue || "")?.[1]?.slice(1);
+		const extClass = (STYLE_EXT_REG.exec(node.rawValue || "")?.[1]?.slice(1))?.replace(/\./g, " ");
 		for (const attr of node.attributes) {
-			if (attr.start == null && attr.type === "MarkoAttribute" && attr.name === "class" && attr.value.type === "StringLiteral" && attr.value.value === ext) continue;
+			if (attr.start == null && attr.type === "MarkoAttribute" && attr.name === "class" && attr.value.type === "StringLiteral" && attr.value.value === extClass) continue;
 			throw tag.hub.buildError(attr.value, "The `style` does not support html attributes." + htmlStyleTagAlternateMsg);
 		}
 		for (const child of node.body.body) if (child.type !== "MarkoText") throw tag.hub.buildError(child, "The [`<style>` tag](https://markojs.com/docs/reference/core-tag#style) currently only supports static content." + htmlStyleTagAlternateMsg);
@@ -8482,7 +8489,7 @@ var referenced_identifier_default = {
 					abortIdsByExpression = /* @__PURE__ */ new Map();
 					abortIdsByExpressionForSection.set(section, abortIdsByExpression);
 				}
-				if (!exprId) {
+				if (exprId === void 0) {
 					exprId = abortIdsByExpression.size;
 					abortIdsByExpression.set(exprRoot, exprId);
 					addStatement("render", section, exprRoot.node.extra?.referencedBindings, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(importRuntime("$signalReset"), [scopeIdentifier, _marko_compiler.types.numericLiteral(exprId)])), false);
@@ -8770,12 +8777,28 @@ var dynamic_tag_default = {
 			const tagExtra = node.extra;
 			const nodeBinding = tagExtra[kDOMBinding];
 			const isClassAPI = tagExtra.featureType === "class";
+			const tagsSerializeReason = getSerializeReason(tagSection, nodeBinding);
+			const serializeReason = tagsSerializeReason;
 			let tagExpression = node.name;
-			if (_marko_compiler.types.isStringLiteral(tagExpression)) tagExpression = (0, _marko_compiler_babel_utils.importDefault)(tag.hub.file, getTagRelativePath(tag), tagExpression.value);
-			if (isClassAPI) if ((0, _marko_compiler_babel_utils.getTagTemplate)(tag)) {
-				if (getSerializeReason(tagSection, nodeBinding)) if (isOutputHTML()) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_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((0, _marko_compiler_babel_utils.loadFileForTag)(tag).metadata.marko.id), _marko_compiler.types.identifier(tagExpression.name)]))], true));
-				else (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.expressionStatement(callRuntime("_resume", _marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.loadFileForTag)(tag).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));
+			if (isClassAPI) {
+				const classTagTemplate = (0, _marko_compiler_babel_utils.getTagTemplate)(tag);
+				const classFile = classTagTemplate ? (0, _marko_compiler_babel_utils.loadFileForTag)(tag) : void 0;
+				const classHydration = classFile?.metadata.marko.classHydration;
+				if (!isOutputHTML() && isOptimize() && classTagTemplate && !tagsSerializeReason && !classHydration) {
+					tag.remove();
+					return;
+				}
+				((0, _marko_compiler_babel_utils.getProgram)().node.extra ??= {}).needsCompat = true;
+				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"), [
+						_marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.loadFileForTag)(tag).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((0, _marko_compiler_babel_utils.loadFileForTag)(tag).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 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 = [];
 			let hasTagArgs = false;
@@ -8793,7 +8816,7 @@ var dynamic_tag_default = {
 			if (isOutputHTML()) {
 				flushInto(tag);
 				writeHTMLResumeStatements(tag.get("body"));
-				const serializeArg = getSerializeGuard(tagSection, getSerializeReason(tagSection, nodeBinding), true);
+				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);
 				if (node.var) {
 					const dynamicScopeIdentifier = generateUidIdentifier(tag.get("name").toString() + "_scope");
@@ -8826,7 +8849,7 @@ var dynamic_tag_default = {
 					const argsOrInput = hasTagArgs ? _marko_compiler.types.arrayExpression(args) : args[0];
 					if (!_marko_compiler.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) signal.extraArgs = [_marko_compiler.types.arrowFunctionExpression([], statements.length ? _marko_compiler.types.blockStatement(statements.concat(_marko_compiler.types.returnStatement(argsOrInput))) : argsOrInput)];
 				}
-				enableDynamicTagResume(tag);
+				if (!isClassAPI) enableDynamicTagResume(tag);
 				addValue(section, tagExtra.referencedBindings, signal, tagExpression);
 				tag.remove();
 			}

package/dist/translator/visitors/tag/dynamic-tag.d.ts

@@ -3,6 +3,16 @@ import { type Binding } from "../../util/references";
 import { type Section } from "../../util/sections";
 declare const kDOMBinding: unique symbol;
 declare const kChildOffsetScopeBinding: unique symbol;
+declare enum ClassHydration {
+    Self = "self",
+    Descendant = "descendant"
+}
+declare module "@marko/compiler" {
+    interface MarkoMeta {
+        classHydration?: ClassHydration;
+        hasComponentBrowser?: boolean;
+    }
+}
 declare module "@marko/compiler/dist/types" {
     interface MarkoTagExtra {
         [kDOMBinding]?: Binding;

package/package.json

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