marko 6.1.17 → 6.1.18

package/dist/debug/dom.js

@@ -1900,6 +1900,9 @@ const compat = {
 	getStartNode(branch) {
 		return branch["#StartNode"];
 	},
+	getEndNode(branch) {
+		return branch["#EndNode"];
+	},
 	setScopeNodes(branch, startNode, endNode) {
 		branch["#StartNode"] = startNode;
 		branch["#EndNode"] = endNode;

package/dist/debug/dom.mjs

@@ -1898,6 +1898,9 @@ const compat = {
 	getStartNode(branch) {
 		return branch["#StartNode"];
 	},
+	getEndNode(branch) {
+		return branch["#EndNode"];
+	},
 	setScopeNodes(branch, startNode, endNode) {
 		branch["#StartNode"] = startNode;
 		branch["#EndNode"] = endNode;

package/dist/dom/compat.d.ts

@@ -10,6 +10,7 @@ export declare const compat: {
     setRendererId(renderer: any, id: unknown): void;
     isRenderer(renderer: any): any;
     getStartNode(branch: any): any;
+    getEndNode(branch: any): any;
     setScopeNodes(branch: any, startNode: Node, endNode: Node): void;
     runComponentEffects(this: any): void;
     runComponentDestroy(this: any): void;

package/dist/dom.js

@@ -74,6 +74,9 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	getStartNode(branch) {
 		return branch.S;
 	},
+	getEndNode(branch) {
+		return branch.K;
+	},
 	setScopeNodes(branch, startNode, endNode) {
 		branch.S = startNode, branch.K = endNode;
 	},

package/dist/dom.mjs

@@ -74,6 +74,9 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	getStartNode(branch) {
 		return branch.S;
 	},
+	getEndNode(branch) {
+		return branch.K;
+	},
 	setScopeNodes(branch, startNode, endNode) {
 		branch.S = startNode, branch.K = endNode;
 	},

package/dist/translator/index.js

@@ -1348,7 +1348,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;
@@ -8770,12 +8769,27 @@ 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 classHydration = (classTagTemplate ? (0, _marko_compiler_babel_utils.loadFileForTag)(tag) : void 0)?.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 = classHydration === "descendant" && !tagsSerializeReason;
+					if (isOutputHTML() ? serializeReason || preserveBoundary : 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 +8807,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 +8840,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,15 @@ 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;
+    }
+}
 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.18",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",