marko 6.3.49 → 6.3.51

package/dist/translator/index.js

@@ -995,12 +995,6 @@ function getAccessorProp() {
 //#endregion
 //#region src/translator/util/serialize-reasons.ts
 const sourcesUtil = new Sorted(compareSources);
-const scopeExprsBySection = /* @__PURE__ */ new WeakMap();
-const propExprsBySection = /* @__PURE__ */ new WeakMap();
-const scopeProvenanceBySection = /* @__PURE__ */ new WeakMap();
-const propProvenanceBySection = /* @__PURE__ */ new WeakMap();
-const serializePropsByBinding = /* @__PURE__ */ new WeakMap();
-const serializePropByModifier = {};
 function isSameReason(a, b) {
 	return a === b || (a && b ? a !== true && b !== true && compareSources(a, b) === 0 : false);
 }
@@ -1034,20 +1028,15 @@ function addSerializeExpr(section, expr, prop, prefix) {
 		if (expr === true) {
 			if (section.serializeReasons.get(key) !== true) forcePropSerialize(section, key);
 		} else {
-			let curExpr;
-			let curExprs = propExprsBySection.get(section);
-			if (curExprs) curExpr = curExprs.get(key);
-			else {
-				curExprs = /* @__PURE__ */ new Map();
-				propExprsBySection.set(section, curExprs);
-			}
+			const curExprs = section.propSerializeExprs ??= /* @__PURE__ */ new Map();
+			const curExpr = curExprs.get(key);
 			curExprs.set(key, curExpr ? concat(curExpr, expr) : expr);
 		}
 	} else if (expr === true) {
 		if (section.serializeReason !== true) forceSerialize(section);
 	} else {
-		const curExpr = scopeExprsBySection.get(section);
-		scopeExprsBySection.set(section, curExpr ? concat(curExpr, expr) : expr);
+		const curExpr = section.serializeExprs;
+		section.serializeExprs = curExpr ? concat(curExpr, expr) : expr;
 	}
 }
 function addOwnerSerializeReason(from, to, reason) {
@@ -1073,7 +1062,7 @@ function getSerializeReason(section, prop, prefix) {
 	else return section.serializeReason;
 }
 function getSerializeSourcesForExpr(expr) {
-	if (isReferencedExtra(expr)) return getSerializeSourcesForRef(expr.referencedBindings);
+	return isReferencedExtra(expr) ? getSerializeSourcesForRef(expr.referencedBindings) : void 0;
 }
 function getSerializeSourcesForExprs(exprs) {
 	if (exprs) if (exprs === true) return exprs;
@@ -1128,9 +1117,9 @@ function mergeSerializeReasons(a, b) {
 	return mergeSources(a, b);
 }
 function applySerializeExprs(section) {
-	const propExprs = propExprsBySection.get(section);
+	const propExprs = section.propSerializeExprs;
 	if (propExprs) {
-		propExprsBySection.delete(section);
+		section.propSerializeExprs = void 0;
 		for (const [key, exprs] of propExprs) {
 			addProvenance(section, getProvenanceForExprs(exprs), key);
 			const exprReason = getSerializeSourcesForExprs(exprs);
@@ -1141,9 +1130,9 @@ function applySerializeExprs(section) {
 			}
 		}
 	}
-	const scopeExprs = scopeExprsBySection.get(section);
+	const scopeExprs = section.serializeExprs;
 	if (scopeExprs) {
-		scopeExprsBySection.delete(section);
+		section.serializeExprs = void 0;
 		addProvenance(section, getProvenanceForExprs(scopeExprs));
 		const exprReason = getSerializeSourcesForExprs(scopeExprs);
 		if (exprReason) {
@@ -1171,16 +1160,15 @@ function finalizeSerializeReason(section) {
 		}
 		if (newReason && curReason !== newReason) setSerializeReason(section, newReason);
 	}
-	const propProvenance = propProvenanceBySection.get(section);
+	const propProvenance = section.propSerializeProvenance;
 	if (propProvenance) for (const provenance of propProvenance.values()) addProvenance(section, provenance);
 }
 function addProvenance(section, sources, key) {
 	if (!sources) return;
 	if (key) {
-		let provenance = propProvenanceBySection.get(section);
-		if (!provenance) propProvenanceBySection.set(section, provenance = /* @__PURE__ */ new Map());
+		const provenance = section.propSerializeProvenance ??= /* @__PURE__ */ new Map();
 		provenance.set(key, mergeSources(provenance.get(key), sources));
-	} else scopeProvenanceBySection.set(section, mergeSources(scopeProvenanceBySection.get(section), sources));
+	} else section.serializeProvenance = mergeSources(section.serializeProvenance, sources);
 }
 function getProvenanceForExprs(exprs) {
 	let sources;
@@ -1194,16 +1182,16 @@ function getProvenanceForExprs(exprs) {
 }
 function getPropKey(section, prop, prefix) {
 	if (isStrOrSym(prop)) {
-		const keys = serializePropByModifier[prop] ||= /* @__PURE__ */ new WeakMap();
-		let key = keys.get(section);
-		if (!key) keys.set(section, key = Symbol(typeof prop === "symbol" ? `Symbol(${prop.description})` : prop));
+		const keys = section.serializePropKeys ??= /* @__PURE__ */ new Map();
+		let key = keys.get(prop);
+		if (!key) keys.set(prop, key = Symbol(typeof prop === "symbol" ? `Symbol(${prop.description})` : prop));
 		if (prefix) throw new Error("Cannot have a scope property reason with a prefix.");
 		return key;
 	} else {
-		const keys = prefix ? serializePropByModifier[prefix] ||= /* @__PURE__ */ new WeakMap() : serializePropsByBinding;
 		const binding = getCanonicalBinding(prop);
-		let key = keys.get(binding);
-		if (!key) keys.set(binding, key = Symbol((prefix ? typeof prefix === "symbol" ? `Symbol(${prefix.description})` : prefix : "") + binding.name));
+		const keys = binding.serializePropKeys ??= /* @__PURE__ */ new Map();
+		let key = keys.get(prefix);
+		if (!key) keys.set(prefix, key = Symbol((prefix ? typeof prefix === "symbol" ? `Symbol(${prefix.description})` : prefix : "") + binding.name));
 		return key;
 	}
 }
@@ -1391,12 +1379,17 @@ function startSection(path) {
 			serializeReason: void 0,
 			serializeReasons: /* @__PURE__ */ new Map(),
 			domSerializeReasons: void 0,
+			serializeExprs: void 0,
+			propSerializeExprs: void 0,
+			serializeProvenance: void 0,
+			propSerializeProvenance: void 0,
+			serializePropKeys: void 0,
 			paramReasonGroups: void 0,
 			returnValueExpr: void 0,
 			returnSerializeReason: void 0,
 			content: getContentInfo(path),
 			upstreamExpression: void 0,
-			downstreamBinding: void 0,
+			downstream: void 0,
 			hasAbortSignal: false,
 			abortSignalExprs: 0,
 			readsOwner: false,
@@ -1505,14 +1498,14 @@ function getNodeContentType(path, extraMember, contentInfo) {
 }
 function getSectionRegisterReasons(section) {
 	if (section.isBranch) return false;
-	const { downstreamBinding } = section;
-	if (downstreamBinding) {
-		let downstreamReasons = getAllSerializeReasonsForBinding(downstreamBinding.binding, downstreamBinding.properties);
-		if (downstreamReasons && downstreamReasons !== true) downstreamReasons = mapCrossProgramReason(section.program, downstreamReasons, downstreamBinding.exprs);
+	const { downstream } = section;
+	if (downstream?.binding) {
+		let downstreamReasons = getAllSerializeReasonsForBinding(downstream.binding, downstream.properties);
+		if (downstreamReasons && downstreamReasons !== true) downstreamReasons = mapCrossProgramReason(section.program, downstreamReasons, downstream.exprs);
 		if (!downstreamReasons) return false;
 		if (isReasonDynamic(downstreamReasons) && !section.serializeReason && !section.serializeReasons.size && !section.parent?.serializeReason && !section.parent?.serializeReasons.size) return false;
 		return downstreamReasons;
-	} else if (downstreamBinding === false) return false;
+	} else if (downstream) return false;
 	return true;
 }
 function isImmediateOwner(section, binding) {
@@ -1834,8 +1827,8 @@ function hasAnalyzeErrors() {
 }
 //#endregion
 //#region src/translator/util/asset-imports.ts
-function addAssetImport(file, request) {
-	(file.metadata.marko.assetImports ??= /* @__PURE__ */ new Set()).add(request);
+function addAssetImport(request) {
+	((0, _marko_compiler_babel_utils.getFile)().metadata.marko.assetImports ??= /* @__PURE__ */ new Set()).add(request);
 }
 function isClientAssetImport(file, request) {
 	const { hydrateIncludeImports } = file.markoOpts;
@@ -1844,7 +1837,7 @@ function isClientAssetImport(file, request) {
 //#endregion
 //#region src/translator/util/binding-has-prop.ts
 function isSectionRendererElided(section) {
-	return !!section.downstreamBinding && !bindingHasProperty(section.downstreamBinding.binding, section.downstreamBinding.properties);
+	return !!section.downstream?.binding && !bindingHasProperty(section.downstream.binding, section.downstream.properties);
 }
 function bindingHasProperty(binding, properties) {
 	if (binding.pruned) return false;
@@ -2248,7 +2241,7 @@ function sectionHasSetupStatements(section) {
 * reserved a register id without registering it.
 */
 function writeModuleRegistrations(program) {
-	const { file } = program.hub;
+	const file = (0, _marko_compiler_babel_utils.getFile)();
 	const statements = [];
 	const seen = /* @__PURE__ */ new Set();
 	for (const child of program.node.body) {
@@ -3290,11 +3283,14 @@ function writeHTMLResumeStatements(path) {
 				}
 				const closureIndex = getDynamicClosureIndex(closure, section);
 				if (closureIndex) setBindingSerializedValue(section, closure, _marko_compiler.types.numericLiteral(closureIndex), getAccessorPrefix().ClosureSignalIndex);
+				const closureScopesReason = getSerializeReason(closure.section, closure, getAccessorPrefix().ClosureScopes);
 				if (underTryPlaceholder(section)) {
 					const reason = getSerializeReason(section);
-					if (reason) getHTMLSectionStatements(section).push(_marko_compiler.types.expressionStatement(getExprIfSerialized(section, reason, callRuntime("_script", getScopeIdIdentifier(section), _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")), markerSerializeArg))));
+					if (reason) {
+						const script = getExprIfSerialized(section, reason, callRuntime("_script", getScopeIdIdentifier(section), _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")), markerSerializeArg));
+						getHTMLSectionStatements(section).push(_marko_compiler.types.expressionStatement(isReasonDynamic(closureScopesReason) && !isSameReason(closureScopesReason, reason) ? getExprIfSerialized(closure.section, closureScopesReason, script) : script));
+					}
 				} else {
-					const closureScopesReason = getSerializeReason(closure.section, closure, getAccessorPrefix().ClosureScopes);
 					const subscribeArg = isReasonDynamic(closureScopesReason) && !isSameReason(closureScopesReason, sectionSerializeReason) ? getExprIfSerialized(closure.section, closureScopesReason, identifier) : identifier;
 					addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", subscribeArg, expr));
 				}
@@ -3998,8 +3994,8 @@ function getRegisteredFnExpression(node) {
 //#endregion
 //#region src/translator/util/body-to-text-literal.ts
 const kRawText = Symbol("raw text placeholder");
-function bodyToTextLiteral(body) {
-	return buildTextLiteral(body, toText, true);
+function bodyToTextLiteral(body, decodeEntities = false) {
+	return buildTextLiteral(body, toText, true, decodeEntities);
 }
 function bodyToRawTextLiteral(body) {
 	return buildTextLiteral(body, (value) => value, true);
@@ -4018,13 +4014,13 @@ function injectTextCoercion(expr) {
 function toText(value) {
 	return callRuntime("_to_text", value);
 }
-function buildTextLiteral(body, coerce, bareSingle) {
+function buildTextLiteral(body, coerce, bareSingle, decodeEntities = false) {
 	const templateQuasis = [];
 	const templateExpressions = [];
 	let currentQuasi = "";
 	let placeholderExtra;
 	let singleValue;
-	for (const child of body.body) if (_marko_compiler.types.isMarkoText(child)) currentQuasi += child.value;
+	for (const child of body.body) if (_marko_compiler.types.isMarkoText(child)) currentQuasi += decodeEntities ? (0, _marko_compiler_babel_utils.decodeHTML)(child.value) : child.value;
 	else if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 		placeholderExtra ||= child.value.extra;
 		templateQuasis.push(templateElement(currentQuasi, false));
@@ -4084,6 +4080,7 @@ function isNonHTMLText(placeholder) {
 	return false;
 }
 function isTextOnlyNativeTag(tag) {
+	if (analyzeTagNameType(tag) !== 0) return false;
 	const def = (0, _marko_compiler_babel_utils.getTagDef)(tag);
 	return !!(def && def.html && (def.name === "title" || def.parseOptions?.text));
 }
@@ -5062,7 +5059,7 @@ var native_tag_default = {
 				const openTagOnly = (0, _marko_compiler_babel_utils.getTagDef)(tag)?.parseOptions?.openTagOnly;
 				const tagName = getCanonicalTagName(tag);
 				if (!openTagOnly) if (tagName !== "textarea" && isTextOnlyNativeTag(tag)) {
-					const textLiteral = bodyToTextLiteral(tag.node.body);
+					const textLiteral = bodyToTextLiteral(tag.node.body, tagName === "title");
 					if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", getSection(tag), textLiteral.extra?.referencedBindings, _marko_compiler.types.expressionStatement(callRuntime("_text_content", createScopeReadExpression(nodeBinding), textLiteral)), true);
 				} else tag.insertBefore(tag.node.body.body).forEach((child) => child.skip());
 				tag.remove();
@@ -5857,6 +5854,10 @@ function normalizeTag(tag) {
 	const { node } = tag;
 	const { name, attributes } = node;
 	let attrNameReg = userAttrNameReg;
+	if (name.type === "StringLiteral") {
+		const tagName = name.value;
+		if (tag.scope.getBinding(tagName) && TAG_NAME_IDENTIFIER_REG.test(tagName)) node.name = withPreviousLocation(_marko_compiler.types.identifier(tagName), name);
+	}
 	normalizeBody(tag.get("body").get("body"));
 	normalizeBody(tag.get("attributeTags"));
 	if (node.var) {
@@ -5868,17 +5869,15 @@ function normalizeTag(tag) {
 		for (const param of node.body.params) insertions = getAssignmentInsertions(param, insertions);
 		if (insertions) node.body.body = [...insertions, ...node.body.body];
 	}
-	if (name.type === "StringLiteral") {
-		const tagName = name.value;
-		if (tag.scope.getBinding(tagName) && TAG_NAME_IDENTIFIER_REG.test(tagName)) node.name = withPreviousLocation(_marko_compiler.types.identifier(tagName), name);
-		else if ((0, _marko_compiler_babel_utils.isNativeTag)(tag)) {
-			attrNameReg = htmlAttrNameReg;
-			switch (tagName) {
-				case "textarea":
-					preAnalyze$1(tag);
-					break;
-			}
+	const nativeTagDef = getStaticNativeTagDef(tag);
+	if (nativeTagDef) {
+		if (!_marko_compiler.types.isStringLiteral(node.name)) {
+			node.name = withPreviousLocation(_marko_compiler.types.stringLiteral(nativeTagDef.name), node.name);
+			node.tagDef = nativeTagDef;
 		}
+		attrNameReg = htmlAttrNameReg;
+		if (nativeTagDef.parseOptions?.openTagOnly && node.body.body.length) throw tag.hub.buildError(node.body.body[0], `The \`<${nativeTagDef.name}>\` tag cannot have content, so it does not support a body.`);
+		if (nativeTagDef.name === "textarea") preAnalyze$1(tag);
 	}
 	for (let i = 0; i < attributes.length; i++) {
 		const attr = attributes[i];
@@ -5898,6 +5897,14 @@ function normalizeTag(tag) {
 		}
 	}
 }
+function getStaticNativeTagDef(tag) {
+	const { name } = tag.node;
+	if (_marko_compiler.types.isStringLiteral(name)) return (0, _marko_compiler_babel_utils.isNativeTag)(tag) ? (0, _marko_compiler_babel_utils.getTagDef)(tag) : void 0;
+	if (_marko_compiler.types.isTemplateLiteral(name) && name.quasis.length === 1) {
+		const tagDef = (0, _marko_compiler_babel_utils.getTagDefForTagName)((0, _marko_compiler_babel_utils.getFile)(), name.quasis[0].value.cooked);
+		if (tagDef?.taglibId === "marko-html" && tagDef.html && !tagDef.template && !tagDef.renderer) return tagDef;
+	}
+}
 function getChangeHandler(tag, attr) {
 	const changeAttrName = attr.name + "Change";
 	let modifier;
@@ -6053,7 +6060,7 @@ var program_default = {
 			const styleFile = getStyleFile((0, _marko_compiler_babel_utils.getFile)());
 			if (styleFile) {
 				programExtra.styleFile = styleFile;
-				addAssetImport((0, _marko_compiler_babel_utils.getFile)(), styleFile);
+				addAssetImport(styleFile);
 			}
 		},
 		exit(program) {
@@ -6147,9 +6154,9 @@ function setTagDownstream(tag, binding, exprs) {
 	});
 }
 function finalizeTagDownstreams(section) {
-	for (const [tag, { binding, exprs }] of getTagDownstreams(section)) crawlSectionsAndSetBinding(tag, binding, exprs);
+	for (const [tag, { binding, exprs }] of getTagDownstreams(section)) crawlSectionsAndSetBinding(tag, tag.node.extra, binding, exprs);
 }
-function crawlSectionsAndSetBinding(tag, binding, exprs, properties, skip) {
+function crawlSectionsAndSetBinding(tag, downstreamTag, binding, exprs, properties, skip) {
 	if (!skip) {
 		const contentSection = getSectionForBody(tag.get("body"));
 		if (contentSection) {
@@ -6157,10 +6164,12 @@ function crawlSectionsAndSetBinding(tag, binding, exprs, properties, skip) {
 			forEach(properties, (property) => {
 				target = target?.propertyAliases.get(property);
 			});
-			contentSection.downstreamBinding = target && (target.noSerialize || includes(target.noSerializeProperties, "content")) ? false : {
-				binding,
-				properties: concat(properties, "content"),
-				exprs
+			const serialized = !(target && (target.noSerialize || includes(target.noSerializeProperties, "content")));
+			contentSection.downstream = {
+				tag: downstreamTag,
+				binding: serialized ? binding : void 0,
+				properties: serialized ? concat(properties, "content") : void 0,
+				exprs: serialized ? exprs : void 0
 			};
 		}
 	}
@@ -6169,8 +6178,8 @@ function crawlSectionsAndSetBinding(tag, binding, exprs, properties, skip) {
 	const attrTags = getAttrTagPaths(tag);
 	for (const child of attrTags) if (child.isMarkoTag()) if ((0, _marko_compiler_babel_utils.isAttributeTag)(child)) {
 		const attrTagMeta = attrTagLookup[getTagName(child)];
-		crawlSectionsAndSetBinding(child, binding, exprs, concat(properties, attrTagMeta.name));
-	} else crawlSectionsAndSetBinding(child, binding, exprs, properties, true);
+		crawlSectionsAndSetBinding(child, downstreamTag, binding, exprs, concat(properties, attrTagMeta.name));
+	} else crawlSectionsAndSetBinding(child, downstreamTag, binding, exprs, properties, true);
 }
 //#endregion
 //#region src/translator/util/translate-var.ts
@@ -6820,6 +6829,7 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 		pruned: void 0,
 		exposed: false,
 		forcePersist: false,
+		serializePropKeys: void 0,
 		reserveSize: 0
 	};
 	if (property) {
@@ -7267,7 +7277,7 @@ function finalizeReferences() {
 			let branchesForced = false;
 			let branchesSources;
 			while (currentSection !== sourceSection) {
-				const upstreamReason = currentSection.downstreamBinding ? getSectionRegisterReasons(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+				const upstreamReason = currentSection.downstream?.binding ? getSectionRegisterReasons(currentSection) || void 0 : !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
 				if (upstreamReason === true) branchesForced = true;
 				else if (upstreamReason) branchesSources = mergeSources(branchesSources, upstreamReason);
 				currentSection = currentSection.parent;
@@ -8210,7 +8220,8 @@ function createStatementTag(keyword) {
 	const keywordReg = new RegExp(`^${keyword}\\s*`);
 	return {
 		parse(tag) {
-			const { node, hub: { file } } = tag;
+			const { node } = tag;
+			const file = (0, _marko_compiler_babel_utils.getFile)();
 			const rawValue = node.rawValue;
 			const code = rawValue.replace(keywordReg, "");
 			const start = node.start + (rawValue.length - code.length);
@@ -9145,16 +9156,16 @@ var style_default = {
 		(0, _marko_compiler_babel_utils.assertNoArgs)(tag);
 		(0, _marko_compiler_babel_utils.assertNoParams)(tag);
 		(0, _marko_compiler_babel_utils.assertNoAttributeTags)(tag);
-		const { node, hub: { file } } = tag;
+		const { node } = tag;
 		assertNoStyleAttributes(tag);
 		const names = collectDynamicStyleNames(tag);
 		if (names) {
 			checkStyleInterpolations(tag);
 			checkDynamicStylePlacement(tag);
 		}
-		const importPath = getStyleImportPath(file, node, names);
+		const importPath = getStyleImportPath((0, _marko_compiler_babel_utils.getFile)(), node, names);
 		(node.extra ??= {}).styleImportPath = importPath;
-		if (importPath) addAssetImport(file, importPath);
+		if (importPath) addAssetImport(importPath);
 		if (names) {
 			analyzeDynamicStyle(tag, names);
 			addSetupStatement(getOrCreateSection(tag));
@@ -9192,14 +9203,14 @@ function collectDynamicStyleNames(tag) {
 		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));
+		(names ??= []).push(dynamicStyleName(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;
 }
 const styleNameUnsafeReg = /[^a-zA-Z0-9_]/g;
 const encodeStyleNameChar = (c) => "-" + c.charCodeAt(0).toString(36);
-function dynamicStyleName(tag, index) {
-	const { file } = tag.hub;
+function dynamicStyleName(index) {
+	const file = (0, _marko_compiler_babel_utils.getFile)();
 	const id = (0, _marko_compiler_babel_utils.getTemplateId)(file.markoOpts, file.opts.filename, index.toString(36));
 	return "--" + ((file.markoOpts.runtimeId || "M_") + id).replace(styleNameUnsafeReg, encodeStyleNameChar);
 }
@@ -9254,13 +9265,13 @@ function dynamicStyleValues(node) {
 	return values;
 }
 function emitStyleImport(tag) {
-	const { node, hub: { file } } = tag;
+	const { node } = tag;
 	const importPath = node.extra?.styleImportPath;
 	if (!importPath) return;
 	if (!node.var) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.importDeclaration([], _marko_compiler.types.stringLiteral(importPath)));
 	else if (_marko_compiler.types.isIdentifier(node.var)) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.importDeclaration([_marko_compiler.types.importNamespaceSpecifier(node.var)], _marko_compiler.types.stringLiteral(importPath)));
 	else {
-		const varDecl = _marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(node.var, (0, _marko_compiler_babel_utils.importStar)(file, importPath, "style"))]);
+		const varDecl = _marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(node.var, (0, _marko_compiler_babel_utils.importStar)((0, _marko_compiler_babel_utils.getFile)(), importPath, "style"))]);
 		(0, _marko_compiler_babel_utils.getProgram)().node.body.push(isOutputDOM() ? varDecl : _marko_compiler.types.markoScriptlet([varDecl], true));
 	}
 }
@@ -9514,7 +9525,7 @@ var import_declaration_default = {
 		const { node } = importDecl;
 		const { source } = node;
 		const { value } = source;
-		if (_marko_compiler.types.isProgram(importDecl.parent) && isClientAssetImport((0, _marko_compiler_babel_utils.getFile)(), value)) addAssetImport((0, _marko_compiler_babel_utils.getFile)(), value);
+		if (_marko_compiler.types.isProgram(importDecl.parent) && isClientAssetImport((0, _marko_compiler_babel_utils.getFile)(), value)) addAssetImport(value);
 		const tagImport = (0, _marko_compiler_babel_utils.resolveTagImport)(importDecl, value);
 		if (tagImport) {
 			(node.extra ??= {}).tagImport = tagImport;
@@ -9533,7 +9544,7 @@ var import_declaration_default = {
 				return;
 			}
 			(node.extra ??= {}).loadImport = loadImport;
-			const { file } = importDecl.hub;
+			const file = (0, _marko_compiler_babel_utils.getFile)();
 			const loadFile = tagImport && (0, _marko_compiler_babel_utils.loadFileForImport)(file, value);
 			if (!loadFile) throw importDecl.buildCodeFrameError("Unable to resolve marko file for load import.");
 			(file.path.node.extra.loadImports ??= /* @__PURE__ */ new Set()).add(loadFile.opts.filename);
@@ -9550,8 +9561,7 @@ var import_declaration_default = {
 				const { local } = node.specifiers.find(_marko_compiler.types.isImportDefaultSpecifier);
 				const binding = importDecl.scope.getBinding(local.name);
 				if (isOutputHTML()) {
-					const { file } = importDecl.hub;
-					const loadFile = (0, _marko_compiler_babel_utils.loadFileForImport)(file, node.source.value);
+					const loadFile = (0, _marko_compiler_babel_utils.loadFileForImport)((0, _marko_compiler_babel_utils.getFile)(), node.source.value);
 					const wrappedName = getOrCreateHtmlLoadWrapped(getReadyId(loadFile), _marko_compiler.types.identifier(local.name), loadFile.opts.filename, loadImport.render ? void 0 : loadImport.triggers);
 					for (const ref of binding.referencePaths) ref.replaceWith(_marko_compiler.types.identifier(wrappedName));
 					node.source.value = tagImport;
@@ -9559,7 +9569,7 @@ var import_declaration_default = {
 					return;
 				} else if (binding.referencePaths.every((ref) => _marko_compiler.types.isMarkoTag(ref.parent) && ref.parent.extra?.tagNameLoad)) importDecl.remove();
 				else {
-					const { file } = importDecl.hub;
+					const file = (0, _marko_compiler_babel_utils.getFile)();
 					const loadFile = (0, _marko_compiler_babel_utils.loadFileForImport)(file, node.source.value);
 					const resolvedPath = (0, _marko_compiler_babel_utils.resolveRelativePath)(file, loadFile.opts.filename);
 					importRuntimeFeature("catch");
@@ -9988,7 +9998,7 @@ function translateHTML(tag) {
 }
 function translateDOM(tag) {
 	const { node } = tag;
-	const { file } = tag.hub;
+	const file = (0, _marko_compiler_babel_utils.getFile)();
 	const relativePath = getTagRelativePath(tag);
 	const programSection = (0, _marko_compiler_babel_utils.getProgram)().node.extra.section;
 	const childFile = (0, _marko_compiler_babel_utils.loadFileForTag)(tag);
@@ -10040,7 +10050,8 @@ function translateDOM(tag) {
 	tag.remove();
 }
 function getTagRelativePath(tag) {
-	const { node, hub: { file } } = tag;
+	const { node } = tag;
+	const file = (0, _marko_compiler_babel_utils.getFile)();
 	let relativePath;
 	if (_marko_compiler.types.isStringLiteral(node.name)) {
 		const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);

package/dist/translator/util/asset-imports.d.ts

@@ -9,5 +9,5 @@ declare module "@marko/compiler" {
         assetImports?: Set<string>;
     }
 }
-export declare function addAssetImport(file: t.BabelFile, request: string): void;
+export declare function addAssetImport(request: string): void;
 export declare function isClientAssetImport(file: t.BabelFile, request: string): boolean;

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.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.MarkoParseError | 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;
+export declare function bodyToTextLiteral(body: t.MarkoTagBody, decodeEntities?: boolean): 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.MarkoParseError | 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;
 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.MarkoParseError | 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;
 export declare function injectTextCoercion(expr: t.Expression): void;

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

@@ -23,6 +23,7 @@ export declare function toIter<T>(data: Opt<T>): Iterable<T>;
 export declare function includes<T>(data: Opt<T>, item: T): boolean;
 export declare function find<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): Opt<T>;
 export declare function some<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): boolean;
+export declare function every<T>(data: Opt<T>, cb: (item: T, index: number) => boolean): boolean;
 export declare function toArray<T, R>(data: Opt<T>, cb: (item: T, index: number) => R): R[];
 export declare function mapToString<T>(data: Opt<T>, sep: string, cb: (item: T, index: number) => string): string;
 export declare function findSorted<T>(compare: Compare<T>, data: T[], item: T): T | undefined;

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

@@ -3,7 +3,7 @@ import type { AccessorPrefix } from "../../common/accessor.debug";
 import * as BindingType from "./constants/binding-type";
 import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
-import { type SerializeReason } from "./serialize-reasons";
+import { type SerializeKey, type SerializeReason } from "./serialize-reasons";
 import { type Signal } from "./signals";
 export declare const kBranchSerializeReason: unique symbol;
 export type Aliases = undefined | Binding | {
@@ -48,6 +48,9 @@ export interface Binding {
     pruned: boolean | undefined;
     exposed: boolean;
     forcePersist: boolean;
+    /** Binding-side counterpart of `Section.serializePropKeys`, keyed by
+     * accessor prefix (`undefined` is the plain binding key). */
+    serializePropKeys: Map<AccessorPrefix | symbol | undefined, SerializeKey> | undefined;
     reserveSize: number;
 }
 export interface InputBinding extends Binding {

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

@@ -4,9 +4,9 @@ import type { WalkCode } from "../../common/types";
 import * as ContentType from "./constants/content-type";
 import type * as Step from "./constants/step";
 import * as StructureKind from "./constants/structure-kind";
-import { type Opt, Sorted } from "./optional";
+import { type OneMany, type Opt, Sorted } from "./optional";
 import { type Binding, type InputBinding, type KnownExprs, type ParamBinding, type ReferencedBindings, type Sources } from "./references";
-import { type SerializeReason, type SerializeReasons } from "./serialize-reasons";
+import { type SerializeKey, type SerializeReason, type SerializeReasons } from "./serialize-reasons";
 export interface ParamSerializeReasonGroup {
     id: symbol;
     reason: NonNullable<Sources["param"]>;
@@ -67,16 +67,29 @@ export interface Section {
     /** Reasons any of the section's dom nodes resumes, as the analyzed reasons
      * (not merged) so each one's guard stays buildable. */
     domSerializeReasons: undefined | SerializeReasons;
+    /** Pending serialize exprs, resolved into the reasons (and provenance)
+     * once references finalize. */
+    serializeExprs: Opt<t.NodeExtra>;
+    propSerializeExprs: Map<SerializeKey, OneMany<t.NodeExtra>> | undefined;
+    /** Whose values feed each serialization decision — survives force-`true`
+     * and counts function-body reads; complete after reference finalize. */
+    serializeProvenance: Sources | undefined;
+    propSerializeProvenance: Map<SerializeKey, Sources> | undefined;
+    /** Interned per-prop reason keys for string/symbol props. */
+    serializePropKeys: Map<string | symbol, SerializeKey> | undefined;
     paramReasonGroups: ParamSerializeReasonGroups | undefined;
     returnValueExpr: t.NodeExtra | undefined;
     returnSerializeReason: SerializeReason | undefined;
     isHoistThrough: true | undefined;
     upstreamExpression: t.NodeExtra | undefined;
-    downstreamBinding: {
-        binding: Binding;
+    /** The content's rendering tag (its extra), and the child binding the
+     * content feeds when the child can serialize it. */
+    downstream: {
+        tag: t.MarkoTagExtra;
+        binding: Binding | undefined;
         properties: Opt<string>;
         exprs: KnownExprs | undefined;
-    } | false | undefined;
+    } | undefined;
     hasAbortSignal: boolean;
     /** Count of distinct `$signal` expression roots; analyze allocates each
      * root's `abortId` from this so translates read, never re-derive. */
@@ -108,6 +121,7 @@ export declare const getScopeIdIdentifier: (section: Section) => t.Identifier;
 export declare const getSectionParentIsOwner: (section: Section) => boolean, setSectionParentIsOwner: (section: Section, value: boolean) => void;
 export declare const getBranchRendererArgs: (section: Section) => [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined], setBranchRendererArgs: (section: Section, value: [template?: t.Expression | undefined, walks?: t.Expression | undefined, setup?: t.Expression | undefined, params?: t.Expression | undefined]) => void;
 export declare function forEachSection(fn: (section: Section) => void): void;
+export declare function getChildSections(section: Section): Section[];
 export declare function forEachSectionReverse(fn: (section: Section) => void): void;
 export declare function getNodeContentType(path: t.NodePath<t.Statement>, extraMember: "startType" | "endType", contentInfo?: Section["content"]): ContentType.Value | null;
 export declare function getSectionRegisterReasons(section: Section): false | SerializeReason;
@@ -119,5 +133,6 @@ export declare function getDirectClosures(section: Section): Opt<Binding>;
 export declare function isSameOrChildSection(section: Section, other: Section): boolean;
 export declare function getCommonSection(section: Section, other: Section): Section;
 export declare function finalizeParamSerializeReasonGroups(section: Section): void;
+export declare function ensureReasonGroups(reason: Section["serializeReason"]): void;
 export declare function getParamReasonGroupIndex(section: Section, reason: ParamSerializeReasonGroup["reason"]): number;
-export declare function groupParamsBySection(params: Sources["param"]): Map<Section, import("./optional").OneMany<InputBinding | ParamBinding>>;
+export declare function groupParamsBySection(params: Sources["param"]): Map<Section, OneMany<InputBinding | ParamBinding>>;

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

@@ -6,6 +6,9 @@ import type { Section } from "./sections";
 export type SerializeReasons = true | OneMany<Sources>;
 export declare const sourcesUtil: Sorted<Sources>;
 export type SerializeReason = true | Sources;
+export type SerializeKey = symbol & {
+    __serialize_key__: 1;
+};
 export declare function isSameReason(a: SerializeReason | undefined, b: SerializeReason | undefined): boolean;
 export declare function isForceSerialized(section: Section, prop?: Binding | AccessorProp | symbol, prefix?: AccessorPrefix | symbol): boolean;
 export declare function addSerializeReason(section: Section, reason: undefined | false | SerializeReason, prop?: Binding | AccessorProp | symbol, prefix?: AccessorPrefix | symbol): void;

package/dist/translator/visitors/program/pre-analyze.d.ts

@@ -1,2 +1,8 @@
 import { types as t } from "@marko/compiler";
+import { type TagDefinition } from "@marko/compiler/babel-utils";
+declare module "@marko/compiler/dist/types" {
+    interface MarkoTag {
+        tagDef?: TagDefinition | null;
+    }
+}
 export declare function preAnalyze(program: t.NodePath<t.Program>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.49",
+  "version": "6.3.51",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -51,14 +51,14 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.42.4",
+    "@marko/compiler": "^5.42.5",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.49",
-    "marko": "5.39.39"
+    "@marko/runtime-tags": "npm:marko@6.3.51",
+    "marko": "5.39.40"
   },
   "engines": {
     "node": ">=22"