marko 6.4.3 → 6.4.5

package/dist/translator/index.js

@@ -955,7 +955,7 @@ function createSectionState(key, init) {
 //#region src/translator/visitors/function.ts
 const kRegisteredExports = Symbol("registered exports");
 const [getReferencesByFn] = createProgramState(() => /* @__PURE__ */ new Map());
-const [getReferencesByImportedFn] = createProgramState(() => /* @__PURE__ */ new Map());
+const [getReferencesByImport] = createProgramState(() => /* @__PURE__ */ new Map());
 var function_default = { analyze(fn) {
 	const awaitNode = isMarkoAttribute(fn.parentPath) && _marko_compiler.types.isFunctionExpression(fn.node) && !fn.node.async && traverseFindAwait(fn.node.body);
 	if (awaitNode) {
@@ -989,24 +989,45 @@ function resolveFunctionReason() {
 }
 function finalizeFunctionRegistry() {
 	for (const fnExtra of getReferencesByFn().keys()) if (fnExtra.reason) registerFunction(fnExtra);
-	for (const [importedFn, exprExtras] of getReferencesByImportedFn()) if (resolveReason(exprExtras)) registerImportedFn(importedFn);
+	for (const [{ node, local, registered, fnRoots }, exprExtras] of getReferencesByImport()) {
+		const reason = fnRoots ? resolveTemplateReason(exprExtras) : resolveReason(exprExtras);
+		if (reason) {
+			if (!fnRoots || !isTemplateShipped(fnRoots, exprExtras)) {
+				const extra = node.extra ??= {};
+				extra.registeredImports ??= /* @__PURE__ */ new Map();
+				extra.registeredImports.set(local, registered);
+			}
+			markRegistrationInteractive(reason);
+		}
+	}
+}
+/**
+* Tracks a template imported as a default export. The server writes a template
+* only as a binding's value, so the importing template registers it when one may.
+*/
+function trackImportedTemplate(importDecl, local, templateFile) {
+	trackImport(importDecl, local, {
+		registerId: templateFile.metadata.marko.id,
+		exportName: "default",
+		filename: templateFile.opts.filename
+	}, /* @__PURE__ */ new Set());
 }
 /**
-* Tracks a function imported from another template that reserved a register id.
-* The importing template registers it (under the reserved id) when client
+* Tracks an export imported from another template that registers under an id,
+* if it does. The importing template registers it (under that id) when client
 * code reads its own references.
 */
-function trackImportedFn(importDecl, local, resolved) {
-	const binding = importDecl.scope.getBinding(local);
+function trackImport(importDecl, local, registered, fnRoots) {
+	const binding = registered && importDecl.scope.getBinding(local);
 	if (!binding) return;
-	const importedFn = {
-		...resolved,
-		node: importDecl.node,
-		local
-	};
 	const refs = /* @__PURE__ */ new Set();
-	addBindingRefs(binding, refs, /* @__PURE__ */ new Set());
-	if (refs.size) getReferencesByImportedFn().set(importedFn, refs);
+	addBindingRefs(binding, refs, /* @__PURE__ */ new Set(), fnRoots);
+	if (refs.size) getReferencesByImport().set({
+		node: importDecl.node,
+		local,
+		registered,
+		fnRoots
+	}, refs);
 }
 /**
 * Finds the id reserved for an export, following `export ... from` hops. Each
@@ -1015,15 +1036,11 @@ function trackImportedFn(importDecl, local, resolved) {
 * hand out an incomplete map if the ids were pushed ahead of time.
 */
 function resolveRegisteredExport(file, exportName, seen = /* @__PURE__ */ new Set()) {
-	const filename = file.opts.filename;
-	const key = `${filename}\0${exportName}`;
+	const key = `${file.opts.filename}\0${exportName}`;
 	if (seen.has(key)) return;
 	seen.add(key);
-	const reserved = file.ast.program.extra?.[kRegisteredExports]?.get(exportName);
-	if (reserved) return {
-		...reserved,
-		filename
-	};
+	const registered = file.ast.program.extra?.[kRegisteredExports]?.get(exportName);
+	if (registered) return registered;
 	for (const child of file.ast.program.body) {
 		if (child.type !== "ExportNamedDeclaration" && child.type !== "ExportAllDeclaration" || !child.source || (child.exportKind || "value") !== "value") continue;
 		const sourceFile = (0, _marko_compiler_babel_utils.loadFileForImport)(file, child.source.value);
@@ -1048,11 +1065,21 @@ function resolveReason(exprExtras) {
 	}
 	return reason;
 }
-function registerImportedFn({ node, ...importedFn }) {
-	const extra = node.extra ??= {};
-	extra.registeredImportedFns ??= [];
-	extra.registeredImportedFns.push(importedFn);
-	(0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive = true;
+function resolveTemplateReason(exprExtras) {
+	let reason;
+	for (const exprExtra of exprExtras) {
+		const extra = getCanonicalExtra(exprExtra);
+		if (!extra.isEffect) reason = mergeReasons(reason, getReasonForExpr(extra));
+	}
+	return reason;
+}
+function isTemplateShipped(fnRoots, exprExtras) {
+	for (const fnRoot of fnRoots) if (isRegisteredFnExtra(fnRoot)) return true;
+	for (const exprExtra of exprExtras) if (getCanonicalExtra(exprExtra).isEffect) return true;
+	return false;
+}
+function markRegistrationInteractive(reason) {
+	(0, _marko_compiler_babel_utils.getProgram)().node.extra.isInteractive ||= isUnconditionalReason(reason);
 }
 function reserveExportRegisterId(fnExtra, fn, markoRoot) {
 	if (!isStatic(markoRoot)) return;
@@ -1062,12 +1089,14 @@ function reserveExportRegisterId(fnExtra, fn, markoRoot) {
 	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
 	const programExtra = (0, _marko_compiler_babel_utils.getProgram)().node.extra;
 	const registerId = (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${fnExtra.section.id}/export/${exportName}`);
+	const registered = {
+		registerId,
+		exportName,
+		filename
+	};
 	fnExtra.exportRegisterId = registerId;
 	programExtra[kRegisteredExports] ??= /* @__PURE__ */ new Map();
-	for (const name of exportNames) programExtra[kRegisteredExports].set(name, {
-		registerId,
-		exportName
-	});
+	for (const name of exportNames) programExtra[kRegisteredExports].set(name, registered);
 }
 function getExportNames(fn, markoRoot) {
 	const localName = getExportableName(fn);
@@ -1095,31 +1124,35 @@ function getExportedName(specifier) {
 function canIgnoreRegister(markoRoot, exprRoot) {
 	return markoRoot.isMarkoPlaceholder() || markoRoot.isMarkoScriptlet() && (!markoRoot.node.static || markoRoot.node.target === "server") || markoRoot.isMarkoTag() && markoRoot.node.name == exprRoot.node;
 }
-function getStaticDeclRefs(path, refs = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set()) {
+function getStaticDeclRefs(path, refs = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set(), fnRoots) {
 	const decl = getDeclarationRoot(path);
 	if (decl && !seen.has(decl.node)) {
 		seen.add(decl.node);
 		const ids = decl.getOuterBindingIdentifiers();
 		if (ids) for (const name in ids) {
 			const binding = decl.scope.getBinding(name);
-			if (binding) addBindingRefs(binding, refs, seen);
+			if (binding) addBindingRefs(binding, refs, seen, fnRoots);
 		}
 	}
 	return refs;
 }
-function addBindingRefs(binding, refs, seen) {
+function addBindingRefs(binding, refs, seen, fnRoots) {
 	for (const ref of binding.referencePaths) {
 		if (isInvokedFunction(ref) || ref.parentPath.type === "Program") continue;
 		const exprRoot = getExprRoot(ref);
 		const markoRoot = getMarkoRoot(exprRoot);
 		if (!markoRoot || canIgnoreRegister(markoRoot, exprRoot)) continue;
-		if (isStatic(markoRoot)) getStaticDeclRefs(ref, refs, seen);
+		if (fnRoots) {
+			const fnRoot = getFnRoot(ref);
+			if (fnRoot) fnRoots.add(fnRoot.node.extra ??= {});
+		}
+		if (isStatic(markoRoot)) getStaticDeclRefs(ref, refs, seen, fnRoots);
 		else refs.add(exprRoot.node.extra ??= {});
 	}
 }
 function registerFunction(fnExtra) {
-	const { markoOpts, path: program, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
-	program.node.extra.isInteractive = true;
+	const { markoOpts, opts: { filename } } = (0, _marko_compiler_babel_utils.getFile)();
+	markRegistrationInteractive(fnExtra.reason);
 	fnExtra.name = generateUid(fnExtra.name);
 	fnExtra.registerId = fnExtra.exportRegisterId ?? (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${fnExtra.section.id}/${fnExtra.name.slice(1)}`);
 }
@@ -1593,7 +1626,7 @@ function _escape(val) {
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
 const unsafeScriptReg = /<(\/?script|!--)/gi;
-const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str;
+const escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\u003C$1") : str;
 function _escape_script(val) {
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
@@ -1662,6 +1695,7 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_dynamic_tag_content",
 	"_content_closures",
 	"_template",
+	"_return_setup",
 	"_closure",
 	"_closure_get",
 	"_or",
@@ -1680,7 +1714,6 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_const",
 	"_load_signal",
 	"_load_setup",
-	"_load_setup_var",
 	"_load_template",
 	"_load_visible_trigger",
 	"_load_event_trigger",
@@ -1801,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);
 	}) {
@@ -1815,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;
@@ -1830,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--;
 	}
@@ -1890,19 +1930,20 @@ function escapeRegExp(str) {
 /**
 * Writes the registrations for module scoped functions: the ones this template
 * exports and registers itself, and the ones it imports from a template that
-* reserved a register id without registering it.
+* reserved a register id without registering it; and for templates it imports.
 */
 function writeModuleRegistrations(program) {
 	const file = (0, _marko_compiler_babel_utils.getFile)();
 	const statements = [];
 	const seen = /* @__PURE__ */ new Set();
 	for (const child of program.node.body) {
-		const registeredImportedFns = _marko_compiler.types.isImportDeclaration(child) && child.extra?.registeredImportedFns;
-		if (registeredImportedFns) for (const importedFn of registeredImportedFns) {
-			if (seen.has(importedFn.registerId)) continue;
-			seen.add(importedFn.registerId);
-			if (isOutputHTML()) statements.push(buildRegistration(importedFn.local, importedFn.registerId));
-			else (0, _marko_compiler_babel_utils.importDefault)(file, resolveRegisterModule(file, importedFn));
+		const registeredImports = _marko_compiler.types.isImportDeclaration(child) && child.extra?.registeredImports;
+		if (registeredImports) for (const [local, registered] of registeredImports) {
+			if (seen.has(registered.registerId)) continue;
+			seen.add(registered.registerId);
+			if (isOutputHTML()) {
+				if (registered.exportName !== "default") statements.push(buildRegistration(local, registered.registerId));
+			} else (0, _marko_compiler_babel_utils.importDefault)(file, resolveRegisterModule(file, registered));
 		}
 		else if (child.type === "ExportNamedDeclaration") addExportRegistrations(child, seen, statements);
 	}
@@ -1933,7 +1974,7 @@ function resolveRegisterModule(file, { filename, exportName, registerId }) {
 	const importer = file.opts.filename;
 	return getMarkoOpts().resolveVirtualDependency(importer, {
 		virtualPath: `${relativePath(importer, filename)}.register-${exportName}.js`,
-		code: `import { ${exportName} } from "./${path.default.basename(filename)}";\nimport { _resumed } from "${getRuntimePath("dom")}";\n_resumed${isValidPropertyIdentifier(registerId) ? `.${registerId}` : `[${JSON.stringify(registerId)}]`} = ${exportName};\n`
+		code: `import { ${exportName} as value } from "./${path.default.basename(filename)}";\nimport { _resumed } from "${getRuntimePath("dom")}";\n_resumed${isValidPropertyIdentifier(registerId) ? `.${registerId}` : `[${JSON.stringify(registerId)}]`} = value;\n`
 	});
 }
 function relativePath(from, to) {
@@ -2157,7 +2198,7 @@ var import_declaration_default = {
 		if (tagImport) {
 			const tags = (0, _marko_compiler_babel_utils.getFile)().metadata.marko.tags;
 			if (!tags.includes(tagImport)) tags.push(tagImport);
-			trackImportedRegisteredFns(importDecl);
+			trackRegisteredImports(importDecl);
 		}
 		const loadAttrPath = getLoadAttr(importDecl);
 		if (loadAttrPath) {
@@ -2198,7 +2239,9 @@ var import_declaration_default = {
 				} else if (binding.referencePaths.every((ref) => _marko_compiler.types.isMarkoTag(ref.parent) && ref.parent.extra?.tagNameLoad)) importDecl.remove();
 				else {
 					importRuntimeFeature("catch");
-					importDecl.replaceWith(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(local, callRuntime("_load_template", _marko_compiler.types.stringLiteral(loadFile.metadata.marko.id), _marko_compiler.types.arrowFunctionExpression([], dynamicImport((0, _marko_compiler_babel_utils.resolveRelativePath)(file, loadFile.opts.filename), _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier("mod")], toMemberExpression(_marko_compiler.types.identifier("mod"), "default"))))))]));
+					const load = _marko_compiler.types.arrowFunctionExpression([], dynamicImport((0, _marko_compiler_babel_utils.resolveRelativePath)(file, loadFile.opts.filename), _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier("mod")], toMemberExpression(_marko_compiler.types.identifier("mod"), "default"))));
+					const args = [_marko_compiler.types.stringLiteral(loadFile.metadata.marko.id), load];
+					importDecl.replaceWith(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(local, extra.registeredImports?.has(local.name) ? _marko_compiler.types.callExpression(importRuntime("_load_template"), args) : callRuntime("_load_template", ...args))]));
 				}
 				return;
 			}
@@ -2230,17 +2273,19 @@ function getOrCreateHtmlLoadWrapped(readyId, originalIdentifier, filename, trigg
 	(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.markoScriptlet([_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(wrappedName), callRuntime("withLoadAssets", originalIdentifier, (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), markoOpts.linkAssets.runtime, "flush"), _marko_compiler.types.stringLiteral(readyId), triggers ? _marko_compiler.types.valueToNode(triggers) : void 0))])], true));
 	return wrappedName;
 }
-function trackImportedRegisteredFns(importDecl) {
+function trackRegisteredImports(importDecl) {
 	const { node } = importDecl;
 	const childFile = (0, _marko_compiler_babel_utils.loadFileForImport)((0, _marko_compiler_babel_utils.getFile)(), node.source.value);
 	if (!childFile) return;
 	for (const specifier of importDecl.get("specifiers")) {
-		if (!specifier.isImportSpecifier()) continue;
-		const { imported } = specifier.node;
-		const importedName = imported.type === "Identifier" ? imported.name : imported.value;
-		if (importedName === "default") continue;
-		const resolved = resolveRegisteredExport(childFile, importedName);
-		if (resolved) trackImportedFn(importDecl, specifier.node.local.name, resolved);
+		let importedName = "default";
+		if (specifier.isImportSpecifier()) {
+			const { imported } = specifier.node;
+			importedName = imported.type === "Identifier" ? imported.name : imported.value;
+		} else if (!specifier.isImportDefaultSpecifier()) continue;
+		const local = specifier.node.local.name;
+		if (importedName === "default") trackImportedTemplate(importDecl, local, childFile);
+		else trackImport(importDecl, local, resolveRegisteredExport(childFile, importedName));
 	}
 }
 function getLoadAttr(importDecl) {
@@ -2720,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);
@@ -3204,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) {
@@ -3666,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);
+				});
 			}
 		}
 	});
@@ -3684,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);
@@ -3715,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);
@@ -4299,8 +4358,7 @@ var dom_default = { translate: {
 						let renderer = callRuntime("_content", _marko_compiler.types.stringLiteral(registerId), ...replaceNullishAndEmptyFunctionsWith0([
 							writes,
 							walks,
-							setupIdentifier,
-							tagParamsIdentifier,
+							...markReturn(childSection, setupIdentifier, tagParamsIdentifier),
 							childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
 						]));
 						if (!registerReason || registerWrapper) renderer = _marko_compiler.types.addComment(renderer, "leading", "@__PURE__");
@@ -4323,8 +4381,7 @@ var dom_default = { translate: {
 		program.node.body.push(_marko_compiler.types.exportDefaultDeclaration(callRuntime("_template", _marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.getFile)().metadata.marko.id), ...replaceNullishAndEmptyFunctionsWith0([
 			templateIdentifier,
 			walksIdentifier,
-			section.hasSetupWork ? setupIdentifier : void 0,
-			programInputSignal?.identifier
+			...markReturn(section, section.hasSetupWork ? setupIdentifier : void 0, programInputSignal?.identifier)
 		]))));
 	}
 } };
@@ -4332,6 +4389,9 @@ function assertSetupWorkFound(program, section, written) {
 	const setup = getSetup(section);
 	if (!section.hasSetupWork && setup && written.has(setup)) throw program.buildCodeFrameError("Marko internal error: analysis found no setup work for a section whose translation produced setup statements. Please open an issue with a reproduction.");
 }
+function markReturn(section, setup, params) {
+	return section.returnValueExpr && !isOptimize() ? setup ? [callRuntime("_return_setup", setup), params] : [setup, callRuntime("_return_setup", params)] : [setup, params];
+}
 //#endregion
 //#region src/translator/visitors/program/html.ts
 function getTemplateContentName() {
@@ -4339,11 +4399,11 @@ function getTemplateContentName() {
 }
 var html_default = { translate: {
 	enter() {
+		const sectionDynamicSubscribers = /* @__PURE__ */ new Set();
 		forEachSection((section) => {
 			forEach(section.bindings, (binding) => {
 				for (const [hoistSection, hasReference] of binding.getters) if (hasReference) getHTMLSectionStatements(hoistSection || section).push(_marko_compiler.types.variableDeclaration("const", [hoistSection ? _marko_compiler.types.variableDeclarator(getBindingGetterIdentifier(binding, hoistSection), callRuntime("_hoist", getScopeIdIdentifier(hoistSection), _marko_compiler.types.stringLiteral(getResumeRegisterId(hoistSection, binding, "hoist")))) : _marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(binding.originalName), callRuntime("_el", getScopeIdIdentifier(section), _marko_compiler.types.stringLiteral(getResumeRegisterId(section, binding))))]));
 			});
-			const sectionDynamicSubscribers = /* @__PURE__ */ new Set();
 			forEach(section.hoisted, (binding) => {
 				let highestHoistSection;
 				forEach(binding.hoists, (hoistSection) => {
@@ -4501,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);
@@ -4509,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;
@@ -4592,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)));
@@ -4625,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;
@@ -4819,7 +4881,10 @@ var custom_tag_default = {
 		const childSection = childExtra.section;
 		if (childSection === programSection && getOrCreateSection(tag) === programSection) throw tag.get("name").buildCodeFrameError(`A template that renders itself outside a branch never terminates. Render \`<${getStaticTagName(tag.node)}>\` inside a branch that eventually stops, such as \`<if>\`.`);
 		if (childExtra.page) programExtra.page ??= true;
-		if (tagExtra.tagNameLoad) tagExtra[kLoadTagBinding] = createBinding("#text", 0, getOrCreateSection(tag));
+		if (tagExtra.tagNameLoad) {
+			if (tag.node.var) throw tag.get("var").buildCodeFrameError(`The \`${getStaticTagName(tag.node)}\` tag is lazily loaded, so it does not support a [tag variable](https://markojs.com/docs/reference/language#tag-variables). Remove the variable, or import the tag without \`load\`.`);
+			tagExtra[kLoadTagBinding] = createBinding("#text", 0, getOrCreateSection(tag));
+		}
 		knownTagAnalyze(tag, childSection, childExtra.paramsTree);
 		const tagName = getStaticTagName(tag.node);
 		if (tagExtra.tagNameLoad) {
@@ -4866,7 +4931,6 @@ function translateDOM$1(tag) {
 	const isLoad = !!loadConfig;
 	const tagName = getStaticTagName(node);
 	if (isLoad) {
-		if (node.var) importRuntimeFeature("dynamic-tag-var");
 		const childFileName = childFile.opts.filename;
 		const { triggers, signals, setups } = getLoadIdentifiers();
 		let triggerIdent = triggers.get(loadConfig);
@@ -4889,14 +4953,14 @@ function translateDOM$1(tag) {
 			}
 			return signalIdent;
 		}, (section, childBinding) => {
-			const setupKey = `${triggerIdent ? triggerIdent.name : ""}\0${childFileName}${node.var ? "\0var" : ""}`;
+			const setupKey = `${triggerIdent ? triggerIdent.name : ""}\0${childFileName}`;
 			let setupIdent = setups.get(setupKey);
 			if (!setupIdent) {
 				setupIdent = generateUidIdentifier(`load_${tagName}_setup`);
 				setups.set(setupKey, setupIdent);
 				const setupLoadExpr = _marko_compiler.types.arrowFunctionExpression([], dynamicImport(buildLoadSetupVirtualModule(file, childFileName, childExports)));
 				importRuntimeFeature("catch");
-				(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(setupIdent, callRuntime(node.var ? "_load_setup_var" : "_load_setup", triggerIdent ? _marko_compiler.types.addComment(_marko_compiler.types.callExpression(triggerIdent, [setupLoadExpr]), "leading", "@__PURE__") : setupLoadExpr))]));
+				(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(setupIdent, callRuntime("_load_setup", triggerIdent ? _marko_compiler.types.addComment(_marko_compiler.types.callExpression(triggerIdent, [setupLoadExpr]), "leading", "@__PURE__") : setupLoadExpr))]));
 			}
 			addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(setupIdent, [
 				scopeIdentifier,
@@ -5477,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);
@@ -5503,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);
@@ -5870,6 +5938,7 @@ function knownTagAnalyze(tag, contentSection, childParamsTree) {
 		else exprs = analyzeKnownTagParams(tag, getParamsTree(contentSection));
 	} else exprs = analyzeKnownTagParams(tag, childParamsTree);
 	if (varBinding) {
+		if (!recursive) assertReturns(tag, contentSection);
 		addSetupExpr(section);
 		const mutatesTagVar = !!(tag.node.var.type === "Identifier" && tag.scope.getBinding(tag.node.var.name)?.constantViolations.length);
 		const varExpr = recursive || (tagExtra.defineBodySection ? contentSection.returnValueExpr : mapParamReasonToExpr(exprs, getReturnParams(contentSection)));
@@ -5882,7 +5951,11 @@ function knownTagAnalyze(tag, contentSection, childParamsTree) {
 	}
 }
 function analyzeRecursiveTags() {
-	for (const tag of getRecursiveTags()) analyzeKnownTagParams(tag, getParamsTree(tag.node.extra[kContentSection]));
+	for (const tag of getRecursiveTags()) {
+		const contentSection = tag.node.extra[kContentSection];
+		if (tag.node.var) assertReturns(tag, contentSection);
+		analyzeKnownTagParams(tag, getParamsTree(contentSection));
+	}
 }
 function getParamsTree(contentSection) {
 	return contentSection.params && getBindingPropTree(contentSection.params, true);
@@ -5897,9 +5970,12 @@ function analyzeKnownTagParams(tag, propTree) {
 	return exprs;
 }
 function getReturnParams(section) {
-	const sources = section.returnValueExpr && getSourcesForExpr(section.returnValueExpr);
+	const sources = getSourcesForExpr(section.returnValueExpr);
 	return sources && (sources.always || !!sources.state || sources.param);
 }
+function assertReturns(tag, contentSection) {
+	if (!contentSection.returnValueExpr) throw tag.get("var").buildCodeFrameError(`The \`${getStaticTagName(tag.node)}\` tag does not [\`<return>\`](https://markojs.com/docs/reference/core-tag#return) a value, so it does not support a [tag variable](https://markojs.com/docs/reference/language#tag-variables). Remove the variable, or add a \`<return>\` to the tag.`);
+}
 function isChildScopeResumed(tagExtra) {
 	return !!findSlot(tagExtra.nodeBinding)?.reason;
 }
@@ -6543,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);
@@ -7062,6 +7138,9 @@ function getValueReason(extra) {
 	}
 	return reason;
 }
+function getReasonForExpr(extra) {
+	return readersOfExtra(extra).reason;
+}
 function readersOfExtra(extra) {
 	if (extra.isEffect) return ALWAYS_READ;
 	const readers = extraReaders(extra);
@@ -7909,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));
@@ -7984,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);
@@ -7992,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));
 	}
 }
@@ -8792,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 },
@@ -9283,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) {
@@ -9536,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();
@@ -9682,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) {
@@ -9909,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);
@@ -10190,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);
@@ -10397,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`>`;
@@ -10413,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) {
@@ -10895,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;
@@ -11116,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);
@@ -11164,7 +11256,8 @@ var dynamic_tag_default = {
 				flushInto(tag);
 				writeHTMLResumeStatements(tag.get("body"));
 				const markerGuard = getWriteGuard(tagSection, markerReason, true);
-				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), contentProp ? contentProp.value : _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), markerGuard) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (markerGuard ? _marko_compiler.types.numericLiteral(0) : void 0), markerGuard ? _marko_compiler.types.numericLiteral(0) : void 0, markerGuard);
+				const debugTagVar = !isOptimize() && node.var && _marko_compiler.types.numericLiteral(1);
+				const dynamicTagExpr = hasTagArgs ? callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, _marko_compiler.types.arrayExpression(args), contentProp ? contentProp.value : _marko_compiler.types.numericLiteral(0), _marko_compiler.types.numericLiteral(1), markerGuard, debugTagVar) : callRuntime("_dynamic_tag", getScopeIdIdentifier(tagSection), getScopeAccessorLiteral(nodeBinding), tagExpression, args[0], args[1] || (markerGuard ? _marko_compiler.types.numericLiteral(0) : void 0), markerGuard ? _marko_compiler.types.numericLiteral(0) : void 0, markerGuard, debugTagVar);
 				if (node.var && isTagVarResumed(tag)) {
 					const dynamicScopeIdentifier = generateUidIdentifier(tag.get("name").toString() + "_scope");
 					const mutatesTagVar = isTagVarAssigned(tag);
@@ -11566,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();