marko 6.3.27 → 6.3.29

package/dist/debug/dom.js

@@ -1694,7 +1694,7 @@ function _if(nodeAccessor, ...branchesArgs) {
 		if (newBranch !== (scope[branchAccessor] ?? (scope["BranchScopes:" + nodeAccessor] && 0))) setConditionalRenderer(scope, nodeAccessor, branches[scope[branchAccessor] = newBranch], createAndSetupBranch);
 	};
 }
-function _show(nodeAccessor, startNodeAccessor) {
+function _show(nodeAccessor, startNodeAccessor, endNodeAccessor) {
 	const rangeAccessor = BranchScopes$1 + nodeAccessor;
 	enableBranches();
 	return (scope, display) => {
@@ -1705,7 +1705,7 @@ function _show(nodeAccessor, startNodeAccessor) {
 		if (!range) {
 			range = scope[rangeAccessor] = {};
 			range[StartNode] = onlyChild ? parentNode.firstChild : scope[startNodeAccessor];
-			range[EndNode] = onlyChild ? parentNode.lastChild : referenceNode.previousSibling;
+			range[EndNode] = onlyChild ? parentNode.lastChild : endNodeAccessor === void 0 ? referenceNode.previousSibling : scope[endNodeAccessor];
 		}
 		let startNode = range[StartNode];
 		if (range["#Id"] && startNode === range["#EndNode"] && startNode.tagName === "T") {
@@ -1716,10 +1716,16 @@ function _show(nodeAccessor, startNodeAccessor) {
 			range[EndNode] = wrapper.lastChild;
 			wrapper.replaceWith(...wrapper.childNodes);
 		}
-		const inDom = startNode.parentNode === parentNode;
+		const inDom = onlyChild ? !!parentNode.firstChild : startNode.parentNode === parentNode;
 		if (display) {
 			if (!inDom) insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode);
-		} else if (inDom) tempDetachBranch(range);
+		} else if (inDom) {
+			if (onlyChild) {
+				range[StartNode] = parentNode.firstChild;
+				range[EndNode] = parentNode.lastChild;
+			}
+			tempDetachBranch(range);
+		}
 	};
 }
 function patchDynamicTag(fn) {

package/dist/debug/dom.mjs

@@ -1692,7 +1692,7 @@ function _if(nodeAccessor, ...branchesArgs) {
 		if (newBranch !== (scope[branchAccessor] ?? (scope["BranchScopes:" + nodeAccessor] && 0))) setConditionalRenderer(scope, nodeAccessor, branches[scope[branchAccessor] = newBranch], createAndSetupBranch);
 	};
 }
-function _show(nodeAccessor, startNodeAccessor) {
+function _show(nodeAccessor, startNodeAccessor, endNodeAccessor) {
 	const rangeAccessor = BranchScopes$1 + nodeAccessor;
 	enableBranches();
 	return (scope, display) => {
@@ -1703,7 +1703,7 @@ function _show(nodeAccessor, startNodeAccessor) {
 		if (!range) {
 			range = scope[rangeAccessor] = {};
 			range[StartNode] = onlyChild ? parentNode.firstChild : scope[startNodeAccessor];
-			range[EndNode] = onlyChild ? parentNode.lastChild : referenceNode.previousSibling;
+			range[EndNode] = onlyChild ? parentNode.lastChild : endNodeAccessor === void 0 ? referenceNode.previousSibling : scope[endNodeAccessor];
 		}
 		let startNode = range[StartNode];
 		if (range["#Id"] && startNode === range["#EndNode"] && startNode.tagName === "T") {
@@ -1714,10 +1714,16 @@ function _show(nodeAccessor, startNodeAccessor) {
 			range[EndNode] = wrapper.lastChild;
 			wrapper.replaceWith(...wrapper.childNodes);
 		}
-		const inDom = startNode.parentNode === parentNode;
+		const inDom = onlyChild ? !!parentNode.firstChild : startNode.parentNode === parentNode;
 		if (display) {
 			if (!inDom) insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode);
-		} else if (inDom) tempDetachBranch(range);
+		} else if (inDom) {
+			if (onlyChild) {
+				range[StartNode] = parentNode.firstChild;
+				range[EndNode] = parentNode.lastChild;
+			}
+			tempDetachBranch(range);
+		}
 	};
 }
 function patchDynamicTag(fn) {

package/dist/dom/control-flow.d.ts

@@ -10,7 +10,7 @@ export declare function _try(nodeAccessor: EncodedAccessor, template?: string |
 }) => void;
 export declare function renderCatch(scope: Scope, error: unknown): void;
 export declare function _if(nodeAccessor: EncodedAccessor, ...branchesArgs: (string | SetupFn | 0)[]): (scope: Scope, newBranch: number) => void;
-export declare function _show(nodeAccessor: EncodedAccessor, startNodeAccessor?: EncodedAccessor): (scope: Scope, display: unknown) => void;
+export declare function _show(nodeAccessor: EncodedAccessor, startNodeAccessor?: EncodedAccessor, endNodeAccessor?: EncodedAccessor): (scope: Scope, display: unknown) => void;
 export declare function patchDynamicTag(fn: <T extends typeof _dynamic_tag>(cond: T) => T): void;
 export declare let _dynamic_tag: (nodeAccessor: EncodedAccessor, getContent?: ((scope: Scope) => Renderer) | 0, getTagVar?: (() => Signal<unknown>) | 0, inputIsArgs?: 1) => Signal<Renderer | string | undefined>;
 export declare function _dynamic_tag_content(nodeAccessor: EncodedAccessor): Signal<Renderer | undefined>;

package/dist/dom.js

@@ -1054,19 +1054,19 @@ function _if(nodeAccessor, ...branchesArgs) {
 		newBranch !== (scope[branchAccessor] ?? (scope["A" + nodeAccessor] && 0)) && setConditionalRenderer(scope, nodeAccessor, branches[scope[branchAccessor] = newBranch], createAndSetupBranch);
 	};
 }
-function _show(nodeAccessor, startNodeAccessor) {
-	nodeAccessor = decodeAccessor(nodeAccessor), startNodeAccessor !== void 0 && (startNodeAccessor = decodeAccessor(startNodeAccessor));
+function _show(nodeAccessor, startNodeAccessor, endNodeAccessor) {
+	nodeAccessor = decodeAccessor(nodeAccessor), startNodeAccessor !== void 0 && (startNodeAccessor = decodeAccessor(startNodeAccessor)), endNodeAccessor !== void 0 && (endNodeAccessor = decodeAccessor(endNodeAccessor));
 	let rangeAccessor = "A" + nodeAccessor;
 	return enableBranches(), (scope, display) => {
 		let referenceNode = scope[nodeAccessor], onlyChild = referenceNode.nodeType === 1, parentNode = onlyChild ? referenceNode : referenceNode.parentNode, range = scope[rangeAccessor];
-		range || (range = scope[rangeAccessor] = {}, range.S = onlyChild ? parentNode.firstChild : scope[startNodeAccessor], range.K = onlyChild ? parentNode.lastChild : referenceNode.previousSibling);
+		range || (range = scope[rangeAccessor] = {}, range.S = onlyChild ? parentNode.firstChild : scope[startNodeAccessor], range.K = onlyChild ? parentNode.lastChild : endNodeAccessor === void 0 ? referenceNode.previousSibling : scope[endNodeAccessor]);
 		let startNode = range.S;
 		if (range.L && startNode === range.K && startNode.tagName === "T") {
 			let wrapper = startNode;
 			wrapper.firstChild || wrapper.appendChild(new Text()), range = scope[rangeAccessor] = {}, range.S = startNode = wrapper.firstChild, range.K = wrapper.lastChild, wrapper.replaceWith(...wrapper.childNodes);
 		}
-		let inDom = startNode.parentNode === parentNode;
-		display ? inDom || insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode) : inDom && tempDetachBranch(range);
+		let inDom = onlyChild ? !!parentNode.firstChild : startNode.parentNode === parentNode;
+		display ? inDom || insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode) : inDom && (onlyChild && (range.S = parentNode.firstChild, range.K = parentNode.lastChild), tempDetachBranch(range));
 	};
 }
 function patchDynamicTag(fn) {

package/dist/dom.mjs

@@ -1053,19 +1053,19 @@ function _if(nodeAccessor, ...branchesArgs) {
 		newBranch !== (scope[branchAccessor] ?? (scope["A" + nodeAccessor] && 0)) && setConditionalRenderer(scope, nodeAccessor, branches[scope[branchAccessor] = newBranch], createAndSetupBranch);
 	};
 }
-function _show(nodeAccessor, startNodeAccessor) {
-	nodeAccessor = decodeAccessor(nodeAccessor), startNodeAccessor !== void 0 && (startNodeAccessor = decodeAccessor(startNodeAccessor));
+function _show(nodeAccessor, startNodeAccessor, endNodeAccessor) {
+	nodeAccessor = decodeAccessor(nodeAccessor), startNodeAccessor !== void 0 && (startNodeAccessor = decodeAccessor(startNodeAccessor)), endNodeAccessor !== void 0 && (endNodeAccessor = decodeAccessor(endNodeAccessor));
 	let rangeAccessor = "A" + nodeAccessor;
 	return enableBranches(), (scope, display) => {
 		let referenceNode = scope[nodeAccessor], onlyChild = referenceNode.nodeType === 1, parentNode = onlyChild ? referenceNode : referenceNode.parentNode, range = scope[rangeAccessor];
-		range || (range = scope[rangeAccessor] = {}, range.S = onlyChild ? parentNode.firstChild : scope[startNodeAccessor], range.K = onlyChild ? parentNode.lastChild : referenceNode.previousSibling);
+		range || (range = scope[rangeAccessor] = {}, range.S = onlyChild ? parentNode.firstChild : scope[startNodeAccessor], range.K = onlyChild ? parentNode.lastChild : endNodeAccessor === void 0 ? referenceNode.previousSibling : scope[endNodeAccessor]);
 		let startNode = range.S;
 		if (range.L && startNode === range.K && startNode.tagName === "T") {
 			let wrapper = startNode;
 			wrapper.firstChild || wrapper.appendChild(new Text()), range = scope[rangeAccessor] = {}, range.S = startNode = wrapper.firstChild, range.K = wrapper.lastChild, wrapper.replaceWith(...wrapper.childNodes);
 		}
-		let inDom = startNode.parentNode === parentNode;
-		display ? inDom || insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode) : inDom && tempDetachBranch(range);
+		let inDom = onlyChild ? !!parentNode.firstChild : startNode.parentNode === parentNode;
+		display ? inDom || insertBranchBefore(range, parentNode, onlyChild ? null : referenceNode) : inDom && (onlyChild && (range.S = parentNode.firstChild, range.K = parentNode.lastChild), tempDetachBranch(range));
 	};
 }
 function patchDynamicTag(fn) {

package/dist/translator/core/show.d.ts

@@ -2,12 +2,14 @@ import { types as t } from "@marko/compiler";
 import { type Tag } from "@marko/compiler/babel-utils";
 import { type Binding } from "../util/references";
 declare const kStartBinding: unique symbol;
+declare const kEndBinding: unique symbol;
 declare const kStaticDisplay: unique symbol;
 declare const kSingleNodeBody: unique symbol;
 declare const kDisplayRef: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         [kStartBinding]?: Binding;
+        [kEndBinding]?: Binding;
         [kStaticDisplay]?: boolean;
         [kSingleNodeBody]?: boolean;
         [kDisplayRef]?: t.Expression;

package/dist/translator/index.js

@@ -1514,6 +1514,7 @@ function isNativeNode(tag) {
 //#endregion
 //#region src/translator/visitors/function.ts
 const [getReferencesByFn] = createProgramState(() => /* @__PURE__ */ new Map());
+const [getReferencesByImportedFn] = createProgramState(() => /* @__PURE__ */ new Map());
 var function_default = { analyze(fn) {
 	if (fn !== getFnRoot(fn)) return;
 	const exprRoot = getExprRoot(fn);
@@ -1524,8 +1525,9 @@ var function_default = { analyze(fn) {
 	const fnExtra = node.extra ??= {};
 	fnExtra.section = section;
 	fnExtra.name = node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? _marko_compiler.types.toIdentifier((markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")).toString()) : markoRoot.node.name : _marko_compiler.types.isVariableDeclarator(fn.parent) && _marko_compiler.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : _marko_compiler.types.isObjectMethod(node) && _marko_compiler.types.isIdentifier(node.key) ? node.key.name : "anonymous");
+	reserveExportRegisterId(fnExtra, fn, markoRoot);
 	if (isStaticRoot(markoRoot)) {
-		const refs = getStaticDeclRefs(fnExtra, fn);
+		const refs = getStaticDeclRefs(fn);
 		if (refs === true) registerFunction(fnExtra, true);
 		else if (refs.size) getReferencesByFn().set(fnExtra, refs);
 	} else if (shouldAlwaysRegister(markoRoot)) registerFunction(fnExtra, true);
@@ -1533,15 +1535,113 @@ var function_default = { analyze(fn) {
 } };
 function finalizeFunctionRegistry() {
 	for (const [fnExtra, exprExtras] of getReferencesByFn()) {
-		let reason;
-		for (const exprExtra of exprExtras) reason = mergeSerializeReasons(reason, getAllSerializeReasonsForExtra(getCanonicalExtra(exprExtra)));
+		const reason = resolveSerializeReason(exprExtras);
 		if (reason) registerFunction(fnExtra, reason);
 	}
+	for (const [importedFn, exprExtras] of getReferencesByImportedFn()) if (resolveSerializeReason(exprExtras)) registerImportedFn(importedFn);
+}
+/**
+* Tracks a function imported from another template that reserved a register id.
+* The importing template registers it (under the reserved id) when its own
+* references reach something serialized.
+*/
+function trackImportedFn(importDecl, local, resolved) {
+	const binding = importDecl.scope.getBinding(local);
+	if (!binding) return;
+	const importedFn = {
+		...resolved,
+		node: importDecl.node,
+		local
+	};
+	const refs = /* @__PURE__ */ new Set();
+	if (addBindingRefs(binding, refs, /* @__PURE__ */ new Set()) === true) registerImportedFn(importedFn);
+	else if (refs.size) getReferencesByImportedFn().set(importedFn, refs);
+}
+/**
+* Finds the id reserved for an export, following `export ... from` hops. Each
+* template only records the exports it declares, so this resolves on demand:
+* a template in an import cycle is read while it is still analyzing, and would
+* 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}`;
+	if (seen.has(key)) return;
+	seen.add(key);
+	const reserved = file.ast.program.extra?.registeredExports?.get(exportName);
+	if (reserved) return {
+		...reserved,
+		filename
+	};
+	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);
+		if (!sourceFile) continue;
+		if (child.type === "ExportAllDeclaration") {
+			const resolved = resolveRegisteredExport(sourceFile, exportName, seen);
+			if (resolved) return resolved;
+			continue;
+		}
+		for (const specifier of child.specifiers) {
+			if (specifier.type !== "ExportSpecifier" || (specifier.exportKind || "value") !== "value" || getExportedName(specifier) !== exportName) continue;
+			const resolved = resolveRegisteredExport(sourceFile, specifier.local.name, seen);
+			if (resolved) return resolved;
+		}
+	}
+}
+function resolveSerializeReason(exprExtras) {
+	let reason;
+	for (const exprExtra of exprExtras) reason = mergeSerializeReasons(reason, getAllSerializeReasonsForExtra(getCanonicalExtra(exprExtra)));
+	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 reserveExportRegisterId(fnExtra, fn, markoRoot) {
+	if (!isStaticRoot(markoRoot)) return;
+	const exportNames = getExportNames(fn, markoRoot);
+	const exportName = exportNames?.find((name) => _marko_compiler.types.isValidIdentifier(name));
+	if (!exportName) return;
+	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}`);
+	fnExtra.exportRegisterId = registerId;
+	programExtra.registeredExports ??= /* @__PURE__ */ new Map();
+	for (const name of exportNames) programExtra.registeredExports.set(name, {
+		registerId,
+		exportName
+	});
+}
+function getExportNames(fn, markoRoot) {
+	const localName = getExportableName(fn);
+	if (localName === void 0) return;
+	const exportNames = markoRoot.isExportNamedDeclaration() && !markoRoot.node.source ? [localName] : [];
+	const binding = fn.scope.getBinding(localName);
+	if (binding) for (const ref of binding.referencePaths) {
+		const specifier = ref.parent;
+		if (specifier?.type === "ExportSpecifier" && (specifier.exportKind || "value") === "value" && !ref.parentPath.parent.source) {
+			const exportName = getExportedName(specifier);
+			if (exportName !== "default") exportNames.push(exportName);
+		}
+	}
+	return exportNames.length ? exportNames : void 0;
+}
+function getExportableName(fn) {
+	const { node, parent } = fn;
+	if (node.type === "FunctionDeclaration") return node.id?.name;
+	if (_marko_compiler.types.isVariableDeclarator(parent) && parent.init === node && _marko_compiler.types.isIdentifier(parent.id) && _marko_compiler.types.isVariableDeclaration(fn.parentPath.parent, { kind: "const" })) return parent.id.name;
+}
+function getExportedName(specifier) {
+	const { exported } = specifier;
+	return exported.type === "Identifier" ? exported.name : exported.value;
 }
 function canIgnoreRegister(markoRoot, exprRoot) {
 	return markoRoot.isMarkoPlaceholder() || markoRoot.isMarkoScriptlet() && (!markoRoot.node.static || markoRoot.node.target === "server") || markoRoot.isMarkoTag() && markoRoot.node.name == exprRoot.node || isMarkoAttribute(markoRoot) && (analyzeTagNameType(markoRoot.parentPath) === 0 && /^on[A-Z-]/.test(markoRoot.node.name) && !hasSpreadAttributeAfter(markoRoot) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"));
 }
-function getStaticDeclRefs(fnExtra, path, refs = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set()) {
+function getStaticDeclRefs(path, refs = /* @__PURE__ */ new Set(), seen = /* @__PURE__ */ new Set()) {
 	const decl = getDeclarationRoot(path);
 	if (decl && !seen.has(decl.node)) {
 		seen.add(decl.node);
@@ -1549,20 +1649,23 @@ function getStaticDeclRefs(fnExtra, path, refs = /* @__PURE__ */ new Set(), seen
 		if (ids) for (const name in ids) {
 			const binding = decl.scope.getBinding(name);
 			if (!binding) continue;
-			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 (isStaticRoot(markoRoot)) {
-					if (getStaticDeclRefs(fnExtra, ref, refs, seen) === true) return true;
-				} else if (shouldAlwaysRegister(markoRoot)) return true;
-				else refs.add(exprRoot.node.extra ??= {});
-			}
+			if (addBindingRefs(binding, refs, seen) === true) return true;
 		}
 	}
 	return refs;
 }
+function addBindingRefs(binding, refs, seen) {
+	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 (isStaticRoot(markoRoot)) {
+			if (getStaticDeclRefs(ref, refs, seen) === true) return true;
+		} else if (shouldAlwaysRegister(markoRoot)) return true;
+		else refs.add(exprRoot.node.extra ??= {});
+	}
+}
 function shouldAlwaysRegister(markoRoot) {
 	const tag = getTagFromMarkoRoot(markoRoot);
 	if (!tag) return false;
@@ -1594,7 +1697,7 @@ function registerFunction(fnExtra, reason) {
 	program.node.extra.isInteractive = true;
 	fnExtra.registerReason = reason;
 	fnExtra.name = generateUid(fnExtra.name);
-	fnExtra.registerId = (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${fnExtra.section.id}/${fnExtra.name.slice(1)}`);
+	fnExtra.registerId = fnExtra.exportRegisterId ?? (0, _marko_compiler_babel_utils.getTemplateId)(markoOpts, filename, `${fnExtra.section.id}/${fnExtra.name.slice(1)}`);
 }
 function isMarkoAttribute(path) {
 	return path ? path.isMarkoAttribute() : false;
@@ -2231,6 +2334,61 @@ function bindingHasProperty(binding, properties) {
 	return false;
 }
 //#endregion
+//#region src/translator/util/module-registrations.ts
+/**
+* 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.
+*/
+function writeModuleRegistrations(program) {
+	const { file } = program.hub;
+	const statements = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const child of program.node.body) {
+		const registeredImportedFns = 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));
+		}
+		else if (child.type === "ExportNamedDeclaration") addExportRegistrations(child, seen, statements);
+	}
+	program.node.body.push(...statements);
+}
+function addExportRegistrations(node, seen, statements) {
+	const { declaration } = node;
+	if (!declaration) return;
+	const add = (local, registerId) => {
+		if (seen.has(registerId)) return;
+		seen.add(registerId);
+		statements.push(buildRegistration(local, registerId));
+	};
+	if (declaration.type === "FunctionDeclaration") {
+		if (isRegisteredFnExtra(declaration.extra)) add(declaration.id.name, declaration.extra.registerId);
+		return;
+	}
+	if (isOutputHTML() || declaration.type !== "VariableDeclaration") return;
+	for (const declarator of declaration.declarations) {
+		const extra = declarator.init?.extra;
+		if (isRegisteredFnExtra(extra) && _marko_compiler.types.isIdentifier(declarator.id)) add(declarator.id.name, extra.registerId);
+	}
+}
+function buildRegistration(local, registerId) {
+	return _marko_compiler.types.expressionStatement(isOutputHTML() ? callRuntime("_resume", _marko_compiler.types.identifier(local), _marko_compiler.types.stringLiteral(registerId)) : callRuntime("_resume", _marko_compiler.types.stringLiteral(registerId), _marko_compiler.types.identifier(local)));
+}
+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 { _resume } from "${getRuntimePath("dom")}";\n_resume(${JSON.stringify(registerId)}, ${exportName});\n`
+	});
+}
+function relativePath(from, to) {
+	const relative = path.default.relative(path.default.dirname(from), to).split(path.default.sep).join("/");
+	return relative.startsWith(".") ? relative : `./${relative}`;
+}
+//#endregion
 //#region src/translator/util/get-known-attr-values.ts
 function getKnownAttrValues(tag) {
 	const attrs = {};
@@ -3677,6 +3835,7 @@ var dom_default = { translate: {
 		if (!setup) program.node.body.unshift(_marko_compiler.types.exportNamedDeclaration(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(setupIdentifier, _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement([])))])));
 		program.node.body.unshift(_marko_compiler.types.exportNamedDeclaration(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(templateIdentifier, writes || _marko_compiler.types.stringLiteral(""))])), _marko_compiler.types.exportNamedDeclaration(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(walksIdentifier, walks || _marko_compiler.types.stringLiteral(""))])));
 		if (extraDecls) program.node.body.unshift(_marko_compiler.types.variableDeclaration("const", extraDecls));
+		writeModuleRegistrations(program);
 		program.node.body.push(_marko_compiler.types.exportDefaultDeclaration(callRuntime("_template", _marko_compiler.types.stringLiteral(program.hub.file.metadata.marko.id), templateIdentifier, walksIdentifier, setupIdentifier, programInputSignal?.identifier)));
 	}
 } };
@@ -3737,6 +3896,7 @@ var html_default = { translate: {
 			child.remove();
 		} else if (child.isMarkoScriptlet()) if (child.node.target && child.node.target !== "server") child.remove();
 		else child.replaceWithMultiple(child.node.body);
+		writeModuleRegistrations(program);
 		const contentId = usedSharedUid("content") && getTemplateContentName();
 		const contentFn = _marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.identifier("input")], _marko_compiler.types.blockStatement(renderContent));
 		const exportDefault = _marko_compiler.types.exportDefaultDeclaration(callRuntime("_template", _marko_compiler.types.stringLiteral(program.hub.file.metadata.marko.id), contentId ? _marko_compiler.types.identifier(contentId) : contentFn, program.node.extra.page || !getMarkoOpts().linkAssets ? _marko_compiler.types.numericLiteral(1) : void 0));
@@ -4510,7 +4670,8 @@ var native_tag_default = {
 			throw tag.get("name").buildCodeFrameError(msg);
 		});
 		if (seen.content) {
-			if ((0, _marko_compiler_babel_utils.getTagDef)(tag)?.parseOptions?.openTagOnly) throw tag.hub.buildError(seen.content, `The \`<${tagName}>\` tag cannot have content, so it does not support the \`content\` attribute.`);
+			const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);
+			if (tagDef?.parseOptions?.openTagOnly && !tagDef.attributes?.content) throw tag.hub.buildError(seen.content, `The \`<${tagName}>\` tag cannot have content, so it does not support the \`content\` attribute.`);
 			if (isTextOnly) throw tag.hub.buildError(seen.content, `The \`<${tagName}>\` tag takes its content from its body as text, so it does not support the \`content\` attribute.`);
 		}
 		let textPlaceholders;
@@ -8095,6 +8256,8 @@ var export_default = {
 		const { node } = tag;
 		const statements = (0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, node.rawValue, node.start, node.end);
 		if (statements.length > 1) throw tag.hub.buildError(statements[1], "The `<export>` tag takes a single export statement.");
+		const defaultExport = getDefaultExport(statements[0]);
+		if (defaultExport) throw tag.hub.buildError(defaultExport, "A template is already its own default export. Use a named export instead.");
 		tag.replaceWith(statements[0]);
 	},
 	parseOptions: {
@@ -8103,6 +8266,14 @@ var export_default = {
 	},
 	autocomplete: [{ displayText: "export <value>" }]
 };
+function getDefaultExport(statement) {
+	if (statement.type === "ExportDefaultDeclaration") return statement;
+	if (statement.type !== "ExportNamedDeclaration") return;
+	for (const specifier of statement.specifiers) {
+		const { exported } = specifier;
+		if (exported && (exported.type === "Identifier" ? exported.name : exported.value) === "default") return specifier;
+	}
+}
 //#endregion
 //#region src/translator/core/html-comment.ts
 const kNodeBinding$1 = Symbol("comment tag binding");
@@ -8539,9 +8710,25 @@ var server_default = {
 	}]
 };
 //#endregion
+//#region src/translator/util/insertion-context.ts
+const discardsUnknownChildren = /* @__PURE__ */ new Set([
+	"table",
+	"thead",
+	"tbody",
+	"tfoot",
+	"tr",
+	"colgroup",
+	"select",
+	"optgroup"
+]);
+function discardsWrapperChildren(tagName) {
+	return discardsUnknownChildren.has(tagName);
+}
+//#endregion
 //#region src/translator/core/show.ts
 const kStatefulReason = Symbol("<show> stateful reason");
 const kStartBinding = Symbol("<show> range start binding");
+const kEndBinding = Symbol("<show> range end binding");
 const kStaticDisplay = Symbol("<show> static display");
 const kSingleNodeBody = Symbol("<show> single node body");
 const kDisplayRef = Symbol("<show> hoisted display reference");
@@ -8555,6 +8742,7 @@ var show_default = {
 			tagExtra[kSingleNodeBody] = isSingleNodeBody(tag);
 			if (displayEval.confident) tagExtra[kStaticDisplay] = !!displayEval.computed;
 			if (tagExtra[kStaticDisplay] === true) return;
+			assertLegalHiddenContext(tag);
 			const tagSection = getOrCreateSection(tag);
 			if (getOnlyChildParentTagName(tag)) getOptimizedOnlyChildNodeBinding(tag, tagSection);
 			else tagExtra[kStartBinding] = createBinding("#text", 0, tagSection);
@@ -8567,6 +8755,7 @@ var show_default = {
 			const tagExtra = tag.node.extra;
 			if (tagExtra[kStaticDisplay] === true) return;
 			const tagSection = getSection(tag);
+			if (tagExtra[kStartBinding] && !tagExtra[kSingleNodeBody]) tagExtra[kEndBinding] = createBinding("#text", 0, tagSection);
 			const nodeBinding = getOptimizedOnlyChildNodeBinding(tag, tagSection);
 			if (tagExtra[kStaticDisplay] === void 0) addSerializeExpr(tagSection, tagExtra, nodeBinding);
 		}
@@ -8636,16 +8825,21 @@ var show_default = {
 					return;
 				}
 				const tagSection = getSection(tag);
+				const endBinding = tagExtra[kEndBinding];
 				const nodeBinding = getOptimizedOnlyChildNodeBinding(tag, tagSection);
 				const startBinding = tagExtra[kStartBinding];
 				const display = tagExtra[kStaticDisplay] === false ? _marko_compiler.types.booleanLiteral(false) : tag.node.attributes[0].value;
+				if (endBinding) {
+					visit(tag, 37);
+					enterShallow(tag);
+				}
 				if (startBinding) {
 					visit(tag, 37);
 					enterShallow(tag);
 				}
 				const signal = getSignal(tagSection, nodeBinding, "show");
 				signal.build = () => {
-					return callRuntime("_show", getScopeAccessorLiteral(nodeBinding, true), startBinding ? getScopeAccessorLiteral(startBinding, true) : void 0);
+					return callRuntime("_show", getScopeAccessorLiteral(nodeBinding, true), startBinding ? getScopeAccessorLiteral(startBinding, true) : void 0, endBinding ? getScopeAccessorLiteral(endBinding, true) : void 0);
 				};
 				addValue(tagSection, tagExtra.referencedBindings, signal, display);
 				tag.remove();
@@ -8676,6 +8870,10 @@ function assertValidShow(tag) {
 	assertHasBody(tag);
 	assertHasValueAttribute(tag);
 }
+function assertLegalHiddenContext(tag) {
+	const parentName = getParentTag(tag)?.node.name;
+	if (_marko_compiler.types.isStringLiteral(parentName) && discardsWrapperChildren(parentName.value)) throw tag.get("name").buildCodeFrameError(`A [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) cannot be a direct child of \`<${parentName.value}>\`: hidden content is wrapped in an element that \`<${parentName.value}>\` discards, which would render the content instead of hiding it. Move the \`<${getTagName(tag)}>\` inside the row or option, or use [\`<if>\`](https://markojs.com/docs/reference/core-tag#if).`);
+}
 function assertHasBody(tag) {
 	if (!tag.node.body.body.length) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) requires [body content](https://markojs.com/docs/reference/language#tag-content).`);
 	if (tag.node.body.attributeTags) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) does not support [attribute tags](https://markojs.com/docs/reference/language#attribute-tags).`);
@@ -9132,6 +9330,7 @@ var import_declaration_default = {
 			(node.extra ??= {}).tagImport = tagImport;
 			const tags = importDecl.hub.file.metadata.marko.tags;
 			if (!tags.includes(tagImport)) tags.push(tagImport);
+			trackImportedRegisteredFns(importDecl);
 		}
 		const loadAttrPath = node.attributes?.length ? importDecl.get("attributes").find((p) => (p.node.key.type === "Identifier" ? p.node.key.name : p.node.key.value) === "load") : void 0;
 		if (loadAttrPath) {
@@ -9187,6 +9386,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, _marko_compiler.types.stringLiteral(readyId), triggers ? _marko_compiler.types.valueToNode(triggers) : void 0))])], true));
 	return wrappedName;
 }
+function trackImportedRegisteredFns(importDecl) {
+	const { node } = importDecl;
+	const childFile = (0, _marko_compiler_babel_utils.loadFileForImport)(importDecl.hub.file, 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);
+	}
+}
 function getLoadImportConfig(attrValue) {
 	const raw = attrValue.node.value;
 	if (raw === "render") return { render: true };
@@ -10005,7 +10217,7 @@ var text_default = {
 function buildAggregateError(file, rootMsg, ...paths) {
 	const err = /* @__PURE__ */ new SyntaxError();
 	const fileName = path.default.relative(_marko_compiler_modules.cwd, file.opts.filename);
-	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$12]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$12)}:\x1b[0m\n${getFrame(file, path$12)}`).join("\n\n")}`;
+	const finalMsg = `${rootMsg}:\n\n${paths.map(([msg, path$13]) => `\x1b[90m${msg} at ${getFileNameWithLoc(fileName, path$13)}:\x1b[0m\n${getFrame(file, path$13)}`).join("\n\n")}`;
 	if (!("MARKO_DEBUG" in process.env)) err.stack = finalMsg;
 	Object.defineProperty(err, "message", {
 		get() {
@@ -10235,13 +10447,13 @@ function mergeVisitors(visitor5, visitor6) {
 function mergeVisit(visit5, visit6) {
 	const enter5 = getVisitorEnter(visit5);
 	const enter6 = getVisitorEnter(visit6);
-	const enter = (enter5 || enter6) && function enter(path$8, state) {
-		return (isTagsAPI() ? enter6 : enter5)?.call(this, path$8, state);
+	const enter = (enter5 || enter6) && function enter(path$9, state) {
+		return (isTagsAPI() ? enter6 : enter5)?.call(this, path$9, state);
 	};
 	const exit5 = getVisitorExit(visit5);
 	const exit6 = getVisitorExit(visit6);
-	const exit = (exit5 || exit6) && function exit(path$9, state) {
-		return (isTagsAPI() ? exit6 : exit5)?.call(this, path$9, state);
+	const exit = (exit5 || exit6) && function exit(path$10, state) {
+		return (isTagsAPI() ? exit6 : exit5)?.call(this, path$10, state);
 	};
 	return exit ? enter ? {
 		enter,
@@ -10324,17 +10536,17 @@ function sequenceVisit(first, second) {
 	if (!first || !second) return first || second;
 	const enterFirst = getVisitorEnter(first);
 	const enterSecond = getVisitorEnter(second);
-	const enter = (enterFirst || enterSecond) && function enter(path$10, state) {
-		const { node } = path$10;
-		enterFirst?.call(this, path$10, state);
-		if (path$10.node === node) enterSecond?.call(this, path$10, state);
+	const enter = (enterFirst || enterSecond) && function enter(path$11, state) {
+		const { node } = path$11;
+		enterFirst?.call(this, path$11, state);
+		if (path$11.node === node) enterSecond?.call(this, path$11, state);
 	};
 	const exitFirst = getVisitorExit(first);
 	const exitSecond = getVisitorExit(second);
-	const exit = (exitFirst || exitSecond) && function exit(path$11, state) {
-		const { node } = path$11;
-		exitFirst?.call(this, path$11, state);
-		if (path$11.node === node) exitSecond?.call(this, path$11, state);
+	const exit = (exitFirst || exitSecond) && function exit(path$12, state) {
+		const { node } = path$12;
+		exitFirst?.call(this, path$12, state);
+		if (path$12.node === node) exitSecond?.call(this, path$12, state);
 	};
 	return exit ? enter ? {
 		enter,

package/dist/translator/util/insertion-context.d.ts

@@ -0,0 +1 @@
+export declare function discardsWrapperChildren(tagName: string): boolean;

package/dist/translator/util/module-registrations.d.ts

@@ -0,0 +1,7 @@
+import { types as t } from "@marko/compiler";
+/**
+ * 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.
+ */
+export declare function writeModuleRegistrations(program: t.NodePath<t.Program>): void;

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

@@ -103,6 +103,7 @@ declare module "@marko/compiler/dist/types" {
         name?: string;
         registerId?: string;
         registerReason?: SerializeReason;
+        exportRegisterId?: string;
     }
     interface ArrowFunctionExpressionExtra extends FunctionExtra {
     }

package/dist/translator/visitors/function.d.ts

@@ -1,6 +1,33 @@
 import { types as t } from "@marko/compiler";
+declare module "@marko/compiler/dist/types" {
+    interface ProgramExtra {
+        registeredExports?: Map<string, ReservedExport>;
+    }
+}
+/** The canonical name a reserved register id is exported under, and its id. */
+export interface ReservedExport {
+    registerId: string;
+    exportName: string;
+}
+/** A reserved export, plus the template that declares it. */
+export interface ResolvedExport extends ReservedExport {
+    filename: string;
+}
 declare const _default: {
     analyze(this: unknown, fn: t.NodePath<t.Function>): void;
 };
 export default _default;
 export declare function finalizeFunctionRegistry(): void;
+/**
+ * Tracks a function imported from another template that reserved a register id.
+ * The importing template registers it (under the reserved id) when its own
+ * references reach something serialized.
+ */
+export declare function trackImportedFn(importDecl: t.NodePath<t.ImportDeclaration>, local: string, resolved: ResolvedExport): void;
+/**
+ * Finds the id reserved for an export, following `export ... from` hops. Each
+ * template only records the exports it declares, so this resolves on demand:
+ * a template in an import cycle is read while it is still analyzing, and would
+ * hand out an incomplete map if the ids were pushed ahead of time.
+ */
+export declare function resolveRegisteredExport(file: t.BabelFile, exportName: string, seen?: Set<string>): ResolvedExport | undefined;

package/dist/translator/visitors/import-declaration.d.ts

@@ -1,9 +1,13 @@
 import { types as t } from "@marko/compiler";
 import type { LoadTrigger } from "../../html/assets";
+import { type ResolvedExport } from "./function";
 declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         tagImport?: string;
         loadImport?: LoadImportConfig;
+        registeredImportedFns?: (ResolvedExport & {
+            local: string;
+        })[];
     }
 }
 export type LoadImportConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.27",
+  "version": "6.3.29",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,13 +48,13 @@
     }
   },
   "dependencies": {
-    "@marko/compiler": "^5.41.11",
+    "@marko/compiler": "^5.41.12",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.27",
+    "@marko/runtime-tags": "npm:marko@6.3.29",
     "marko": "5.39.30"
   },
   "engines": {