marko 6.4.4 → 6.4.5

package/dist/debug/html.js

@@ -700,19 +700,18 @@ function writeScopesRoot(state, flushes) {
 		const ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId);
 		const openIndex = buf.push("") - 1;
 		if (writeObjectProps(state, flush[2], ref)) {
-			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
+			buf[openIndex] = nextSlotId === -1 ? scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
 			if (fillIndex === -1) fillIndex = openIndex;
 			nextSlotId = scopeId + 1;
 			buf.push("}");
 		} else buf.pop();
 	}
-	if (nextSlotId !== -1) buf.push("]");
 	let extras = "";
 	if (state.pendingAssignments.size || hasChannelMutations(state)) {
 		extras = ",0)";
 		if (fillIndex !== -1) {
-			buf[fillIndex] = "_(" + buf[fillIndex];
-			buf.push(")");
+			buf[fillIndex] = "_([" + buf[fillIndex];
+			buf.push("])");
 		}
 		writeAssigned(state);
 	}
@@ -720,10 +719,9 @@ function writeScopesRoot(state, flushes) {
 	for (const chunk of buf) result += chunk;
 	result += extras;
 	if (!result) return "";
-	if (state.wroteUndefined) {
-		state.wroteUndefined = false;
-		return "(_,$)=>" + result;
-	} else return "_=>" + result;
+	const arrow = state.wroteUndefined ? "(_,$)=>" : "_=>";
+	state.wroteUndefined = false;
+	return extras ? arrow + result : arrow + "[" + result + "]";
 }
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";

package/dist/debug/html.mjs

@@ -698,19 +698,18 @@ function writeScopesRoot(state, flushes) {
 		const ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId);
 		const openIndex = buf.push("") - 1;
 		if (writeObjectProps(state, flush[2], ref)) {
-			buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
+			buf[openIndex] = nextSlotId === -1 ? scopeId + ",{" : (scopeId !== nextSlotId ? "," + (scopeId - nextSlotId) : "") + ",{";
 			if (fillIndex === -1) fillIndex = openIndex;
 			nextSlotId = scopeId + 1;
 			buf.push("}");
 		} else buf.pop();
 	}
-	if (nextSlotId !== -1) buf.push("]");
 	let extras = "";
 	if (state.pendingAssignments.size || hasChannelMutations(state)) {
 		extras = ",0)";
 		if (fillIndex !== -1) {
-			buf[fillIndex] = "_(" + buf[fillIndex];
-			buf.push(")");
+			buf[fillIndex] = "_([" + buf[fillIndex];
+			buf.push("])");
 		}
 		writeAssigned(state);
 	}
@@ -718,10 +717,9 @@ function writeScopesRoot(state, flushes) {
 	for (const chunk of buf) result += chunk;
 	result += extras;
 	if (!result) return "";
-	if (state.wroteUndefined) {
-		state.wroteUndefined = false;
-		return "(_,$)=>" + result;
-	} else return "_=>" + result;
+	const arrow = state.wroteUndefined ? "(_,$)=>" : "_=>";
+	state.wroteUndefined = false;
+	return extras ? arrow + result : arrow + "[" + result + "]";
 }
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";

package/dist/html.js

@@ -615,14 +615,15 @@ function writeScopesRoot(state, flushes) {
 	let { buf } = state, nextSlotId = -1, fillIndex = -1;
 	for (let flush of flushes) {
 		let scopeId = flush[0], scope = flush[1], ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId), openIndex = buf.push("") - 1;
-		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
+		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
 	}
-	nextSlotId !== -1 && buf.push("]");
 	let extras = "";
-	(state.pendingAssignments.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_(" + buf[fillIndex], buf.push(")")), writeAssigned(state));
+	(state.pendingAssignments.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_([" + buf[fillIndex], buf.push("])")), writeAssigned(state));
 	let result = extras && "(";
 	for (let chunk of buf) result += chunk;
-	return result += extras, result ? state.wroteUndefined ? (state.wroteUndefined = !1, "(_,$)=>" + result) : "_=>" + result : "";
+	if (result += extras, !result) return "";
+	let arrow = state.wroteUndefined ? "(_,$)=>" : "_=>";
+	return state.wroteUndefined = !1, extras ? arrow + result : arrow + "[" + result + "]";
 }
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";

package/dist/html.mjs

@@ -613,14 +613,15 @@ function writeScopesRoot(state, flushes) {
 	let { buf } = state, nextSlotId = -1, fillIndex = -1;
 	for (let flush of flushes) {
 		let scopeId = flush[0], scope = flush[1], ref = state.refs.get(scope) || newScopeReference(state, scope, scopeId), openIndex = buf.push("") - 1;
-		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? "[" + scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
+		writeObjectProps(state, flush[2], ref) ? (buf[openIndex] = nextSlotId === -1 ? scopeId + ",{" : (scopeId === nextSlotId ? "" : "," + (scopeId - nextSlotId)) + ",{", fillIndex === -1 && (fillIndex = openIndex), nextSlotId = scopeId + 1, buf.push("}")) : buf.pop();
 	}
-	nextSlotId !== -1 && buf.push("]");
 	let extras = "";
-	(state.pendingAssignments.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_(" + buf[fillIndex], buf.push(")")), writeAssigned(state));
+	(state.pendingAssignments.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_([" + buf[fillIndex], buf.push("])")), writeAssigned(state));
 	let result = extras && "(";
 	for (let chunk of buf) result += chunk;
-	return result += extras, result ? state.wroteUndefined ? (state.wroteUndefined = !1, "(_,$)=>" + result) : "_=>" + result : "";
+	if (result += extras, !result) return "";
+	let arrow = state.wroteUndefined ? "(_,$)=>" : "_=>";
+	return state.wroteUndefined = !1, extras ? arrow + result : arrow + "[" + result + "]";
 }
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";

package/dist/translator/index.js

@@ -1834,12 +1834,12 @@ const builder = {
 		}
 		return body;
 	},
-	visit(file, entryFile, visitChild = (id, bundled = false) => {
+	visit(file, entryFile, visitChild = (id, reach = 0) => {
 		const state = entryFile[kState];
 		const resolved = resolveRelativeToEntry(entryFile, file, id);
-		const seenBundled = state.visited.get(resolved);
-		if (seenBundled === false || seenBundled && bundled) return;
-		state.visited.set(resolved, bundled);
+		const seen = state.visited.get(resolved);
+		if (seen !== void 0 && seen <= reach) return;
+		state.visited.set(resolved, reach);
 		const childFile = (0, _marko_compiler_babel_utils.loadFileForImport)(entryFile, resolved);
 		if (childFile) builder.visit(childFile, entryFile);
 	}) {
@@ -1848,10 +1848,11 @@ const builder = {
 			load: false,
 			lazy: false,
 			bundled: 0,
+			lazyDepth: 0,
 			roots: [],
 			assets: /* @__PURE__ */ new Set(),
 			bundledAssets: /* @__PURE__ */ new Set(),
-			visited: /* @__PURE__ */ new Map([[(0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, entryFile.opts.filename), false]])
+			visited: /* @__PURE__ */ new Map([[(0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, entryFile.opts.filename), 0]])
 		};
 		const programExtra = file.path.node.extra;
 		const { analyzedTags, assetImports } = file.metadata.marko;
@@ -1863,16 +1864,22 @@ const builder = {
 		if (load) state.load = true;
 		if (loadImports) state.lazy = true;
 		if (isRoot) state.roots.push((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, file.opts.filename));
-		if (assetImports) {
+		if (assetImports && !state.lazyDepth) {
 			const assets = isRoot || state.bundled ? state.bundledAssets : state.assets;
 			for (const request of assetImports) assets.add(resolveRelativeToEntry(entryFile, file, request));
 		}
 		if (isRoot) state.bundled++;
 		for (const tag of analyzedTags ? [...analyzedTags] : []) {
 			const lazy = loadImports?.has(tag);
-			if (lazy) state.bundled++;
-			visitChild(tag, !!state.bundled);
-			if (lazy) state.bundled--;
+			if (lazy) {
+				state.bundled++;
+				state.lazyDepth++;
+			}
+			visitChild(tag, state.lazyDepth ? 2 : state.bundled ? 1 : 0);
+			if (lazy) {
+				state.bundled--;
+				state.lazyDepth--;
+			}
 		}
 		if (isRoot) state.bundled--;
 	}
@@ -2758,6 +2765,12 @@ function buildGroupMask(groups) {
 function getScopeReasonStatement(section) {
 	return hasConditionalReason(section) ? _marko_compiler.types.variableDeclaration("const", getSectionGuards(section).declarators) : _marko_compiler.types.expressionStatement(callRuntime("_scope_reason"));
 }
+function getWriteReason(binding) {
+	return findSlot(binding)?.reason;
+}
+function getBranchWriteReason(section) {
+	return findSectionSlot(section, 9)?.reason;
+}
 function getWriteGuard(section, reason, optional) {
 	if (!isDynamicWriteGuard(section, reason)) {
 		if (!reason) return _marko_compiler.types.numericLiteral(0);
@@ -3242,8 +3255,12 @@ function getDestructurePattern(id) {
 //#region src/translator/util/signals.ts
 const [getSignals] = createSectionState("signals", () => /* @__PURE__ */ new Map());
 const [getClosureSignalBuilder, _setClosureSignalBuilder] = createSectionState("queue");
-function setClosureSignalBuilder(tag, builder) {
-	_setClosureSignalBuilder(getSectionForBody(tag.get("body")), builder);
+function setClosureSignalBuilder(tag, hop, build = (_closure, render) => buildClosureHop(hop, render)) {
+	_setClosureSignalBuilder(getSectionForBody(tag.get("body")), build);
+}
+function buildClosureHop(hop, render) {
+	const accessor = getScopeAccessorLiteral(hop.ref, true);
+	return hop.kind === "if" ? callRuntime("_if_closure", accessor, _marko_compiler.types.numericLiteral(hop.index), render) : callRuntime("_for_closure", accessor, render);
 }
 const [getOwnerResumedByMarker, setOwnerResumedByMarker] = createSectionState("ownerResumedByMarker");
 function setSectionOwnerResumedByMarker(section) {
@@ -3704,7 +3721,10 @@ function writeHTMLResumeStatements(path) {
 				const closureScopesReason = findSlot(closure, 2)?.reason;
 				const subscribeArg = isConditionalReason(closureScopesReason) && !isSameReason(closureScopesReason, sectionReason) ? getExprIfWritten(closure.section, closureScopesReason, identifier) : identifier;
 				const changeable = isChangeableDynamicClosure(section, closure);
-				addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", subscribeArg, expr, changeable ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "subscribe")) : void 0, changeable ? markerGuard : void 0));
+				addWriteScopeBuilder(section, (expr) => {
+					const resumeId = changeable && _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "subscribe"));
+					return callRuntime("_subscribe", subscribeArg, expr, resumeId, resumeId && markerGuard);
+				});
 			}
 		}
 	});
@@ -3722,7 +3742,7 @@ function writeHTMLResumeStatements(path) {
 	};
 	let debugVars;
 	const writeBinding = (binding) => {
-		const reason = findSlot(binding)?.reason;
+		const reason = getWriteReason(binding);
 		if (!reason) return;
 		const accessor = getScopeAccessor(binding);
 		pendingProperties.delete(accessor);
@@ -3753,7 +3773,8 @@ function writeHTMLResumeStatements(path) {
 			for (const [accessor, varLoc] of getSectionDebugVars(section)) (debugVars ||= []).push(toObjectProperty(accessor, _marko_compiler.types.valueToNode(varLoc)));
 			if (debugVars) writeScopeArgs.push(_marko_compiler.types.objectExpression(debugVars));
 		}
-		body.push(_marko_compiler.types.expressionStatement(getExprIfWritten(section, sectionReason, writeScopeBuilder ? writeScopeBuilder(callRuntime("_scope", ...writeScopeArgs)) : callRuntime("_scope", ...writeScopeArgs))));
+		const writeCall = writeScopeBuilder ? writeScopeBuilder(callRuntime("_scope", ...writeScopeArgs)) : callRuntime("_scope", ...writeScopeArgs);
+		body.push(_marko_compiler.types.expressionStatement(getExprIfWritten(section, sectionReason, writeCall)));
 	}
 	if (!isResumedBranch(section) && (section.hasAbortSignal || !!section.referencedClosures || sectionReason && some(section.bindings, isLetBinding)) && markerGuard) {
 		const call = callRuntime("_resume_branch", scopeIdIdentifier);
@@ -4540,7 +4561,7 @@ function initBranchSection(bodySection, branchExpr, branch) {
 }
 function resumeOwnerByMarkerWhenStatic(bodySection, nodeBinding) {
 	const branchExprReason = findSlot(nodeBinding, 4)?.reason;
-	if (isStateReason(branchExprReason) && some(branchExprReason.state, hasResumableWriter) && isUnconditionalReason(findSectionSlot(bodySection, 9)?.reason) && isUnconditionalReason(findSlot(nodeBinding)?.reason)) setSectionOwnerResumedByMarker(bodySection);
+	if (isStateReason(branchExprReason) && some(branchExprReason.state, hasResumableWriter) && isUnconditionalReason(getBranchWriteReason(bodySection)) && isUnconditionalReason(getWriteReason(nodeBinding))) setSectionOwnerResumedByMarker(bodySection);
 }
 function getBranchResumeArgs(tagSection, nodeBinding, branchReasons, onlyChildParentTagName, singleNode) {
 	const endArgs = getBranchEndArgs(tagSection, nodeBinding, onlyChildParentTagName, singleNode);
@@ -4548,7 +4569,7 @@ function getBranchResumeArgs(tagSection, nodeBinding, branchReasons, onlyChildPa
 	return [getWriteGuardForAny(tagSection, branchReasons, !markerGuard), ...endArgs];
 }
 function getBranchEndArgs(tagSection, nodeBinding, onlyChildParentTagName, singleNode) {
-	const markerReason = findSlot(nodeBinding)?.reason;
+	const markerReason = getWriteReason(nodeBinding);
 	const skipParentEnd = !!onlyChildParentTagName && !!markerReason;
 	if (skipParentEnd) getBranchEndTags().add(nodeBinding);
 	const branchExprGuard = skipParentEnd ? getWriteGuard(tagSection, findSlot(nodeBinding, 4)?.reason, false) : singleNode ? _marko_compiler.types.numericLiteral(0) : void 0;
@@ -4631,7 +4652,7 @@ const IfTag = {
 						const [branchTag, branchBodySection] = branches[i];
 						const bodyStatements = branchTag.node.body.body;
 						if (branchBodySection) {
-							const branchReason = findSectionSlot(branchBodySection, 9)?.reason;
+							const branchReason = getBranchWriteReason(branchBodySection);
 							if (branchReason) {
 								branchReasons = sourcesUtil.add(branchReasons, branchReason);
 								bodyStatements.push(_marko_compiler.types.returnStatement(_marko_compiler.types.numericLiteral(i)));
@@ -4664,8 +4685,10 @@ const IfTag = {
 					const [branchTag, branchBodySection] = branches[i];
 					const [testAttr] = branchTag.node.attributes;
 					const consequent = _marko_compiler.types.numericLiteral(branchBodySection ? i : -1);
-					if (branchBodySection) setClosureSignalBuilder(branchTag, (_closure, render) => {
-						return callRuntime("_if_closure", getScopeAccessorLiteral(nodeBinding, true), _marko_compiler.types.numericLiteral(i), render);
+					if (branchBodySection) setClosureSignalBuilder(branchTag, {
+						kind: "if",
+						ref: nodeBinding,
+						index: i
 					});
 					branchTag.remove();
 					expr = testAttr ? _marko_compiler.types.conditionalExpression(testAttr.value, consequent, expr) : consequent;
@@ -5518,7 +5541,7 @@ var for_default = {
 				const params = node.body.params;
 				const statements = [];
 				const bodyStatements = node.body.body;
-				const branchReason = findSectionSlot(bodySection, 9)?.reason;
+				const branchReason = getBranchWriteReason(bodySection);
 				resumeOwnerByMarkerWhenStatic(bodySection, nodeBinding);
 				flushInto(tag);
 				writeHTMLResumeStatements(tagBody);
@@ -5544,10 +5567,14 @@ var for_default = {
 				const tagExtra = node.extra;
 				const referencedBindings = getReferencedBindings(tagExtra);
 				const nodeBinding = tagExtra.nodeBinding;
-				setClosureSignalBuilder(tag, (closure, render) => {
+				const hop = {
+					kind: "for",
+					ref: nodeBinding
+				};
+				setClosureSignalBuilder(tag, hop, (closure, render) => {
 					const selectorKeyBinding = getForSelectorKey(bodySection, closure);
-					if (selectorKeyBinding) return callRuntime("_for_selector", getScopeAccessorLiteral(nodeBinding, true), getScopeAccessorLiteral(closure, true), getScopeAccessorLiteral(selectorKeyBinding, true), render);
-					return callRuntime("_for_closure", getScopeAccessorLiteral(nodeBinding, true), render);
+					if (!selectorKeyBinding) return buildClosureHop(hop, render);
+					return callRuntime("_for_selector", getScopeAccessorLiteral(nodeBinding, true), getScopeAccessorLiteral(closure, true), getScopeAccessorLiteral(selectorKeyBinding, true), render);
 				});
 				const forType = getForType(node);
 				const forAttrs = getKnownAttrValues(node);
@@ -6592,7 +6619,7 @@ function resolveReads(intersectionsBySection) {
 			}
 			forEach(exprBindings.lazyBindings, addAlwaysRead);
 		} else forEach(reads, (read) => {
-			if (!read.inFunction && read.extra.exprRoot?.retained) addReasonExprs(getSlot(read.binding), expr);
+			if (!read.fnRoot && read.extra.exprRoot?.retained) addReasonExprs(getSlot(read.binding), expr);
 		});
 		if (exprBindings.allBindings) {
 			const exprFnReads = fnReadsByExpression.get(expr);
@@ -7961,7 +7988,7 @@ function addRead(exprExtra, extra, binding, section, getter) {
 		ownVar: false,
 		comparedTo: void 0,
 		deferred: false,
-		inFunction: false
+		fnRoot: void 0
 	};
 	if (section.pruned) return read;
 	binding.reads.set(exprExtra, push(binding.reads.get(exprExtra), read));
@@ -8036,7 +8063,6 @@ function addReadToExpression(root, binding, getter) {
 	}
 	if (!getter && root.parent.type === "MarkoSpreadAttribute") extra.spreadFrom = binding;
 	if (fnRoot) {
-		read.inFunction = true;
 		read.deferred = fnRoot.node.type !== "ObjectMethod" || fnRoot.node.kind === "method";
 		const fnReadsByExpr = getFunctionReadsByExpression();
 		let exprFnReads = fnReadsByExpr.get(exprExtra);
@@ -8044,6 +8070,7 @@ function addReadToExpression(root, binding, getter) {
 		const fnExtra = fnRoot.node.extra ??= {};
 		fnExtra.section = section;
 		fnExtra.exprRoot = rootExtra;
+		read.fnRoot = fnExtra;
 		exprFnReads.set(fnExtra, push(exprFnReads.get(fnExtra), read));
 	}
 }
@@ -8844,7 +8871,7 @@ var html_comment_default = {
 			const textLiteral = bodyToTextLiteral(tag.node.body);
 			if (!_marko_compiler.types.isStringLiteral(textLiteral)) addStatement("render", tagSection, getReferencedBindings(tagExtra), _marko_compiler.types.expressionStatement(callRuntime("_text", createScopeReadExpression(nodeBinding), textLiteral)));
 		}
-		if (nodeBinding) markNode(tag, nodeBinding, findSlot(nodeBinding)?.reason);
+		if (nodeBinding) markNode(tag, nodeBinding, getWriteReason(nodeBinding));
 		tag.remove();
 	} },
 	parseOptions: { text: true },
@@ -9335,11 +9362,12 @@ var show_default = {
 				const singleNode = tagExtra[kSingleNodeBody];
 				const endArgs = getBranchEndArgs(tagSection, nodeBinding, onlyChildParentTagName, singleNode);
 				const showStart = singleNode ? callRuntime("_show_start", _marko_compiler.types.cloneNode(display, true), _marko_compiler.types.numericLiteral(0)) : callRuntime("_show_start", _marko_compiler.types.cloneNode(display, true), ...getBranchEndArgs(tagSection, nodeBinding, onlyChildParentTagName, singleNode));
-				for (const replacement of tag.replaceWithMultiple([
+				const statements = [
 					_marko_compiler.types.expressionStatement(showStart),
 					...bodyStatements,
 					_marko_compiler.types.expressionStatement(callRuntime("_show_end", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), display, ...endArgs))
-				])) replacement.skip();
+				];
+				for (const replacement of tag.replaceWithMultiple(statements)) replacement.skip();
 			}
 		},
 		dom: { exit(tag) {
@@ -9588,7 +9616,7 @@ function translateHTML(tag) {
 	const binding = node.extra?.nodeBinding;
 	if (binding) {
 		writeTo$1(tag)`${callRuntime("_style_html", buildStyleDecls(node))}`;
-		markNode(tag, binding, findSlot(binding)?.reason);
+		markNode(tag, binding, getWriteReason(binding));
 	}
 	emitStyleImport(tag);
 	tag.remove();
@@ -9734,7 +9762,16 @@ var try_default = {
 				const placeholderSection = placeholderTag && getSectionForBody(placeholderTag.get("body"));
 				flushInto(tag);
 				writeHTMLResumeStatements(tagBody);
-				tag.replaceWith(_marko_compiler.types.expressionStatement(callRuntime("_try", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), buildContent(tagBody), placeholderSection && buildContent(placeholderTag.get("body")), catchTag && (catchSection ? buildContent(catchTag.get("body")) : _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([]))), placeholderSection && _marko_compiler.types.stringLiteral(getResumeRegisterId(placeholderSection, "content")), catchTag && _marko_compiler.types.stringLiteral(catchSection ? getResumeRegisterId(catchSection, "content") : getEmptyCatchId(section, nodeBinding)))))[0].skip();
+				const tryArgs = [
+					getScopeIdIdentifier(section),
+					getScopeAccessorLiteral(nodeBinding),
+					buildContent(tagBody),
+					placeholderSection && buildContent(placeholderTag.get("body")),
+					catchTag && (catchSection ? buildContent(catchTag.get("body")) : _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([]))),
+					placeholderSection && _marko_compiler.types.stringLiteral(getResumeRegisterId(placeholderSection, "content")),
+					catchTag && _marko_compiler.types.stringLiteral(catchSection ? getResumeRegisterId(catchSection, "content") : getEmptyCatchId(section, nodeBinding))
+				];
+				tag.replaceWith(_marko_compiler.types.expressionStatement(callRuntime("_try", ...tryArgs)))[0].skip();
 			}
 		},
 		dom: { exit(tag) {
@@ -9961,7 +9998,7 @@ function translateExit(placeholder) {
 	} else {
 		const section = getSection(placeholder);
 		const siblingText = extra[kSiblingText];
-		const markerReason = nodeBinding && findSlot(nodeBinding)?.reason;
+		const markerReason = nodeBinding && getWriteReason(nodeBinding);
 		if (isHTML) {
 			if (markerReason) {
 				const guard = getWriteGuard(section, markerReason, true);
@@ -10242,7 +10279,7 @@ var native_tag_default = {
 					} else {
 						assertValidNativeEventHandlerAttr(tag, attr);
 						if (isChangeHandlerAttr) valueExtra.retained = true;
-						if (!isStaticDelimitedAttr(tag, attr) && !evaluate(attr.value).confident) {
+						if (isDynamicAttr(tag, attr)) {
 							hasDynamicAttributes = true;
 							addSetupExpr(tagSection, attr.value);
 						} else if (attr.name === "content" && tagName !== "meta") addSetupExpr(tagSection, attr.value);
@@ -10449,9 +10486,9 @@ var native_tag_default = {
 				else if (contentAttr) {
 					write`>`;
 					htmlContentAttrTags.add(tag.node);
-					tag.node.body.body = [_marko_compiler.types.expressionStatement(callRuntime("_attr_content", visitAccessor, getScopeIdIdentifier(tagSection), contentAttr.value, getWriteGuard(tagSection, nodeBinding && findSlot(nodeBinding)?.reason, true)))];
+					tag.node.body.body = [_marko_compiler.types.expressionStatement(callRuntime("_attr_content", visitAccessor, getScopeIdIdentifier(tagSection), contentAttr.value, getWriteGuard(tagSection, nodeBinding && getWriteReason(nodeBinding), true)))];
 				} else if (spreadContent) {
-					const markerGuard = getWriteGuard(tagSection, nodeBinding && findSlot(nodeBinding)?.reason, true);
+					const markerGuard = getWriteGuard(tagSection, nodeBinding && getWriteReason(nodeBinding), true);
 					htmlContentAttrTags.add(tag.node);
 					tag.node.body.body = [skipExpression ? _marko_compiler.types.expressionStatement(callRuntime("_attrs_partial_content", spreadExpression, skipExpression, visitAccessor, getScopeIdIdentifier(tagSection), _marko_compiler.types.stringLiteral(tagName), markerGuard)) : _marko_compiler.types.expressionStatement(callRuntime("_attrs_content", spreadExpression, visitAccessor, getScopeIdIdentifier(tagSection), _marko_compiler.types.stringLiteral(tagName), markerGuard))];
 				} else write`>`;
@@ -10465,7 +10502,7 @@ var native_tag_default = {
 				const tagName = getCanonicalTagName(tag);
 				const tagSection = getSection(tag);
 				const skipEndTag = isEndTagWrittenByBranch(nodeBinding);
-				const markerReason = !skipEndTag && nodeBinding && findSlot(nodeBinding)?.reason;
+				const markerReason = !skipEndTag && nodeBinding && getWriteReason(nodeBinding);
 				const write = writeTo$1(tag, tagName === "html" || !markerReason && tagName === "body");
 				if (htmlContentAttrTags.has(tag.node)) flushBefore(tag);
 				if (selectArgs) {
@@ -10947,6 +10984,9 @@ function assertUniqueClassToggles(tag, attr, { staticParts, dynamicValues = [] }
 function getClassNames(part) {
 	return part === void 0 ? [] : isLiteralPart(part) ? part.split(/\s+/).filter(Boolean) : [part.join(".")];
 }
+function isDynamicAttr(tag, attr) {
+	return !isStaticDelimitedAttr(tag, attr) && !evaluate(attr.value).confident;
+}
 function isStaticDelimitedAttr(tag, attr) {
 	const { name, value } = attr;
 	if (name !== "class" && name !== "style") return false;
@@ -11168,7 +11208,7 @@ var dynamic_tag_default = {
 			const tagExtra = node.extra;
 			const nodeBinding = tagExtra.nodeBinding;
 			const isClassAPI = tagExtra.featureType === "class";
-			const markerReason = findSlot(nodeBinding)?.reason;
+			const markerReason = getWriteReason(nodeBinding);
 			let tagExpression = node.name;
 			if (isClassAPI) {
 				const classTagTemplate = (0, _marko_compiler_babel_utils.getTagTemplate)(tag);
@@ -11619,13 +11659,13 @@ function createInteropTranslator(translate5) {
 					const entryFile = (0, _marko_compiler_babel_utils.getFile)();
 					const { output, entry } = entryFile.markoOpts;
 					if (!(output === "dom" && entry === "page" || output === "hydrate")) return enterProgram?.call(this, program, state);
-					const visitedFiles = /* @__PURE__ */ new Map([[(0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, entryFile.opts.filename), false]]);
-					entryBuilder.visit(entryFile, entryFile, function visitChild(resolved, bundled = false) {
-						const seenBundled = visitedFiles.get(resolved);
-						if (seenBundled === false || seenBundled && bundled) return;
-						visitedFiles.set(resolved, bundled);
+					const visitedFiles = /* @__PURE__ */ new Map([[(0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, entryFile.opts.filename), 0]]);
+					entryBuilder.visit(entryFile, entryFile, function visitChild(resolved, reach = 0) {
+						const seen = visitedFiles.get(resolved);
+						if (seen !== void 0 && seen <= reach) return;
+						visitedFiles.set(resolved, reach);
 						const file = (0, _marko_compiler_babel_utils.loadFileForImport)(entryFile, resolved);
-						if (file) entryBuilder.visit(file, entryFile, (id, childBundled = false) => visitChild(resolveRelativeToEntry(entryFile, file, id), childBundled || bundled));
+						if (file) entryBuilder.visit(file, entryFile, (id, childReach = 0) => visitChild(resolveRelativeToEntry(entryFile, file, id), childReach > reach ? childReach : reach));
 					});
 					program.node.body = entryBuilder.build(entryFile);
 					program.skip();

package/dist/translator/util/entry-builder.d.ts

@@ -16,19 +16,26 @@ interface EntryState {
      * below a root everything arrives through its imports, and a lazy subtree
      * is loaded by its own load entry. */
     bundled: number;
+    /** Depth of enclosing lazy imports, whose load entries bring their assets. */
+    lazyDepth: number;
     roots: string[];
     /** Assets of templates the bundle never loads; the entry imports them. */
     assets: Set<string>;
     /** Assets that arrive through a bundled template's imports; the entry
      * imports them itself only when it links nothing (a server only page). */
     bundledAssets: Set<string>;
-    /** Whether each reached file was only ever seen below a bundled template. */
-    visited: Map<string, boolean>;
+    /** The most eager way each file has been reached. */
+    visited: Map<string, Reach>;
 }
+/** How a file was reached: 0 eagerly, 1 below a bundled template, 2 only
+ * within a lazy subtree. Lower is more eager, so `seen <= reach` means it was
+ * already visited at least as eagerly and is skipped; a file reached more
+ * eagerly than before is re-visited, since it may then own assets or a root. */
+export type Reach = 0 | 1 | 2;
 type EntryFile = t.BabelFile & {
     [kState]?: EntryState;
 };
-type VisitChild = (id: string, bundled?: boolean) => void;
+type VisitChild = (id: string, reach?: Reach) => void;
 declare const kState: unique symbol;
 declare const builder: {
     build(entryFile: EntryFile, exportInit?: boolean): t.Statement[];

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

@@ -12,7 +12,8 @@ export interface Read {
     getter: Getter | undefined;
     comparedTo: t.Node | undefined;
     deferred: boolean;
-    inFunction: boolean;
+    /** The outermost function holding it; none when that escapes into a call. */
+    fnRoot: ReferencedFunctionExtra | undefined;
 }
 export interface ExtraRead {
     binding: Binding;

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

@@ -33,8 +33,17 @@ export interface Signal {
     buildAssignment: ((valueSection: Section, value: t.Expression) => t.Expression | undefined) | undefined;
 }
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
+export type ClosureHop = {
+    kind: "if";
+    ref: Binding;
+    index: number;
+} | {
+    kind: "for";
+    ref: Binding;
+};
 export declare const getSignals: (section: Section) => Map<unknown, Signal>;
-export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
+export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, hop: ClosureHop, build?: closureSignalBuilder): void;
+export declare function buildClosureHop(hop: ClosureHop, render: t.Expression): t.CallExpression;
 export declare function setSectionOwnerResumedByMarker(section: Section): void;
 export declare function getContentClosureValues(bodySection: Section): {
     scope: t.Identifier;

package/dist/translator/util/write-guard.d.ts

@@ -1,12 +1,16 @@
 import { types as t } from "@marko/compiler";
+import { type Binding } from "./bindings";
 import { type Reason, type Reasons } from "./reasons";
 import { type Section } from "./sections";
+import { type Sources } from "./sources";
 export declare function isSameReason(a: Reason | undefined, b: Reason | undefined): boolean;
 export declare function buildGroupMask(groups: {
     value: number | t.Expression | undefined;
     names: string;
 }[]): t.Expression | undefined;
 export declare function getScopeReasonStatement(section: Section): t.Statement;
+export declare function getWriteReason(binding: Binding): Sources | undefined;
+export declare function getBranchWriteReason(section: Section): Sources | undefined;
 export declare function getWriteGuard(section: Section, reason: undefined | Reason, optional: boolean): t.Expression | undefined;
 export declare function getWriteGuardForAny(section: Section, reasons: undefined | Reasons, optional: boolean): t.Expression | undefined;
 export declare function getExprIfWritten<T extends undefined | Reason, R extends (T extends {} ? t.Expression : undefined)>(section: Section, reason: T, expr: t.Expression): R;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.4.4",
+  "version": "6.4.5",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -57,8 +57,8 @@
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.4.4",
-    "marko": "5.39.45"
+    "@marko/runtime-tags": "npm:marko@6.4.5",
+    "marko": "5.39.46"
   },
   "engines": {
     "node": ">=22"