marko 6.3.45 → 6.3.47

package/dist/translator/index.js

@@ -203,7 +203,6 @@ const StartNode$1 = "#StartNode";
 const Subscriptions$1 = "#Subscriptions";
 const TagVariable$1 = "#TagVariable";
 const TagVariableChange$2 = "#TagVariableChange";
-const Owner$1 = "owner";
 //#endregion
 //#region src/translator/util/evaluate.ts
 function evaluate(value) {
@@ -354,120 +353,20 @@ function getEventHandlerName(name) {
 function isVoid(value) {
 	return value == null || value === false;
 }
-function isNotVoid(value) {
-	return value != null && value !== false;
-}
-function normalizeDynamicRenderer(value) {
-	if (value) {
-		if (typeof value === "string") return value;
-		const normalized = value.content || value.default || value;
-		if ("id" in normalized) return normalized;
-	}
-}
 const decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36);
 //#endregion
 //#region src/html/serializer.ts
-const K_SCOPE_ID = Symbol("Scope ID");
-const kTouchedIterator = Symbol.for("marko.touchedIterator");
+const kTouchedIterator = /* @__PURE__ */ Symbol.for("marko.touchedIterator");
 const { hasOwnProperty } = {};
 Array.prototype;
-const Generator = (function* () {})().constructor;
-const AsyncGenerator = (async function* () {})().constructor;
+const Generator = (/* @__PURE__ */ (function* () {})()).constructor;
+const AsyncGenerator = (/* @__PURE__ */ (async function* () {})()).constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
-const REGISTRY = /* @__PURE__ */ new WeakMap();
-(() => {
-	const KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
-	for (const name of Object.getOwnPropertyNames(Symbol)) {
-		const symbol = Symbol[name];
-		if (typeof symbol === "symbol") KNOWN_SYMBOLS.set(symbol, "Symbol." + name);
-	}
-	return KNOWN_SYMBOLS;
-})();
-Array.from, Array.isArray, Array.of, ArrayBuffer.isView, Atomics.add, Atomics.and, Atomics.compareExchange, Atomics.exchange, Atomics.isLockFree, Atomics.load, Atomics.notify, Atomics.or, Atomics.store, Atomics.sub, Atomics.wait, BigInt.asIntN, BigInt.asUintN, BigInt64Array, BigInt64Array.from, BigInt64Array.of, BigUint64Array, BigUint64Array.from, BigUint64Array.of, console.timeStamp, Date.now, Date.parse, Date.UTC, Float32Array.from, Float32Array.of, Float64Array.from, Float64Array.of, globalThis.atob, globalThis.btoa, globalThis.clearImmediate, globalThis.clearInterval, globalThis.clearTimeout, globalThis.crypto?.getRandomValues, globalThis.crypto?.randomUUID, globalThis.fetch, globalThis.performance?.now, globalThis.queueMicrotask, globalThis.setImmediate, globalThis.setInterval, globalThis.setTimeout, globalThis.structuredClone, globalThis.URL, globalThis.URLSearchParams, globalThis.WritableStream, Int16Array.from, Int16Array.of, Int32Array.from, Int32Array.of, Int8Array.from, Int8Array.of, Intl.Collator, Intl.DateTimeFormat, Intl.DisplayNames, Intl.getCanonicalLocales, Intl.ListFormat, Intl.Locale, Intl.NumberFormat, Intl.PluralRules, Intl.RelativeTimeFormat, Intl.Segmenter, Intl.supportedValuesOf, Map.groupBy, Number.isFinite, Number.isInteger, Number.isNaN, Number.isSafeInteger, Number.parseFloat, Number.parseInt, String.fromCharCode, String.fromCodePoint, String.raw, Symbol.for, Uint16Array.from, Uint16Array.of, Uint32Array.from, Uint32Array.of, Uint8Array.from, Uint8Array.of, Uint8ClampedArray.from, Uint8ClampedArray.of;
-Atomics, globalThis.crypto;
-function register(id, val, scope) {
-	REGISTRY.set(val, {
-		id,
-		scope,
-		access: "_._" + toAccess(toObjectKey(id))
-	});
-	return val;
-}
-function toObjectKey(name) {
-	if (name === "") return "\"\"";
-	if (name === "__proto__") return "[\"__proto__\"]";
-	const len = name.length;
-	const c0 = name.charCodeAt(0);
-	if (c0 >= 48 && c0 <= 57) if (c0 === 48) {
-		if (len !== 1) return quote(name, 1);
-	} else {
-		for (let i = 1; i < len; i++) {
-			const c = name.charCodeAt(i);
-			if (c < 48 || c > 57) return quote(name, i);
-		}
-		if (len > 15 && "" + +name !== name) return quote(name, 0);
-	}
-	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
-		const c = name.charCodeAt(i);
-		if (!(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c >= 48 && c <= 57 || c === 95 || c === 36)) return quote(name, i);
-	}
-	else return quote(name, 0);
-	return name;
-}
 function toAccess(accessor) {
 	const start = accessor[0];
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
-const unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u;
-function quote(str, startPos) {
-	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
-	let result = "";
-	let lastPos = 0;
-	for (let i = startPos; i < str.length; i++) {
-		let replacement;
-		const code = str.charCodeAt(i);
-		switch (code) {
-			case 34:
-				replacement = "\\\"";
-				break;
-			case 92:
-				replacement = "\\\\";
-				break;
-			case 60:
-				replacement = "\\x3C";
-				break;
-			case 10:
-				replacement = "\\n";
-				break;
-			case 13:
-				replacement = "\\r";
-				break;
-			case 8232:
-				replacement = "\\u2028";
-				break;
-			case 8233:
-				replacement = "\\u2029";
-				break;
-			case 0:
-				replacement = "\\x00";
-				break;
-			default:
-				if (code < 55296 || code > 57343) continue;
-				if (code < 56320) {
-					const next = str.charCodeAt(i + 1);
-					if (next >= 56320 && next <= 57343) {
-						i++;
-						continue;
-					}
-				}
-				replacement = "\\u" + code.toString(16);
-		}
-		result += str.slice(lastPos, i) + replacement;
-		lastPos = i + 1;
-	}
-	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
@@ -1710,10 +1609,11 @@ var function_default = { analyze(fn) {
 		throw fn.hub.buildError(highlight, "Attribute methods containing `await` must be `async`. Add `async` before the method name.");
 	}
 	if (fn !== getFnRoot(fn)) return;
+	const { node } = fn;
+	if ((_marko_compiler.types.isObjectMethod(node) || _marko_compiler.types.isClassMethod(node)) && (node.kind === "get" || node.kind === "set")) return;
 	const exprRoot = getExprRoot(fn);
 	const markoRoot = getMarkoRoot(exprRoot);
 	if (!markoRoot || canIgnoreRegister(markoRoot, exprRoot)) return;
-	const { node } = fn;
 	const section = getSection(fn);
 	const fnExtra = node.extra ??= {};
 	fnExtra.section = section;
@@ -2127,6 +2027,8 @@ const regexpCharsReg = /[\\^$.*+?()[\]{}|]/g;
 function escapeRegExp(str) {
 	return str.replace(regexpCharsReg, "\\$&");
 }
+//#endregion
+//#region src/common/errors.ts
 function assertExclusiveAttrs(attrs, onError = throwErr) {
 	if (attrs) {
 		let exclusiveAttrs;
@@ -2182,95 +2084,6 @@ const escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsaf
 function _escape_comment(val) {
 	return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
 }
-//#endregion
-//#region src/html/writer.ts
-let $chunk;
-function getContext(key) {
-	return $chunk.context?.[key];
-}
-function getState() {
-	return $chunk.boundary.state;
-}
-function rendererKey(renderer) {
-	return renderer?.["owner"] === void 0 ? renderer?.["id"] || renderer : renderer["id"] + " " + renderer[Owner$1];
-}
-function getScopeById(scopeId) {
-	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
-}
-function _scope_id() {
-	return $chunk.boundary.state.scopeId++;
-}
-function _peek_scope_id() {
-	return $chunk.boundary.state.scopeId;
-}
-const kPendingContexts = Symbol("Pending Contexts");
-function withContext(key, value, cb, cbValue) {
-	const ctx = $chunk.context ||= { [kPendingContexts]: 0 };
-	const prev = ctx[key];
-	ctx[kPendingContexts]++;
-	ctx[key] = value;
-	try {
-		return cb(cbValue);
-	} finally {
-		ctx[kPendingContexts]--;
-		ctx[key] = prev;
-	}
-}
-const kBranchId = Symbol("Branch Id");
-const kIsAsync = Symbol("Is Async");
-function withBranchId(branchId, cb) {
-	return withContext(kBranchId, branchId, cb);
-}
-function _html(html) {
-	$chunk.writeHTML(html);
-}
-function _script(scopeId, registryId) {
-	if ($chunk.serializeState.readyId || $chunk.context?.[kIsAsync]) _resume_branch(scopeId);
-	$chunk.boundary.state.needsMainRuntime = true;
-	$chunk.writeEffect(scopeId, registryId);
-}
-function _resume(val, id, scopeId) {
-	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
-}
-function _el(scopeId, id) {
-	return _resume(() => void 0, id, scopeId);
-}
-function _resume_branch(scopeId) {
-	const branchId = $chunk.context?.[kBranchId];
-	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId$1]: branchId });
-}
-function deferBranchStart(chunk) {
-	const beforeBranch = chunk.html;
-	chunk.html = "";
-	return beforeBranch;
-}
-function applyBranchStart(chunk, beforeBranch, rendered) {
-	chunk.html = beforeBranch + (rendered ? chunk.boundary.state.mark("[", "") : "") + chunk.html;
-}
-let writeScope = (scopeId, partialScope) => {
-	const { state } = $chunk.boundary;
-	const target = $chunk.serializeState;
-	const scope = scopeWithId(state, scopeId);
-	const pending = target.writeScopes[scopeId];
-	state.needsMainRuntime = true;
-	Object.assign(scope, partialScope);
-	if (pending && pending !== partialScope) Object.assign(pending, partialScope);
-	else target.writeScopes[scopeId] = partialScope;
-	target.flushScopes = true;
-	return scope;
-};
-function _scope_with_id(scopeId) {
-	return scopeWithId($chunk.boundary.state, scopeId);
-}
-function scopeWithId(state, scopeId) {
-	const { scopes } = state;
-	let scope = scopes.get(scopeId);
-	if (!scope) scopes.set(scopeId, scope = { [K_SCOPE_ID]: scopeId });
-	return scope;
-}
-function _set_serialize_reason(reason) {
-	$chunk.boundary.state.serializeReason = reason;
-}
 globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask;
 //#endregion
 //#region src/html/attrs.ts
@@ -2280,124 +2093,9 @@ function _attr_class(value) {
 function _attr_style(value) {
 	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
 }
-function _attr_option_value(value) {
-	const valueAttr = _attr("value", value);
-	const selectedValue = getContext(kSelectedValue);
-	if (selectedValue !== void 0 && normalizedValueMatches(selectedValue, value)) return valueAttr + " selected";
-	return valueAttr;
-}
-const kSelectedValue = Symbol("selectedValue");
-function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
-	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	if (content) withContext(kSelectedValue, value ?? "", content);
-}
-function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _textarea_value(value);
-}
-function _textarea_value(value) {
-	const escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" ? "\n" + escaped : escaped;
-}
-function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _attr("value", value);
-}
-function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
-	if (checkedChange) writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType);
-	return isNotVoid(checked) ? " checked" : "";
-}
-function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
-	const valueAttr = _attr("value", value);
-	if (checkedValueChange) writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType);
-	return normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
-}
-const checkedValuesRefs = /* @__PURE__ */ new WeakMap();
-function getCheckedValueRef(checkedValue) {
-	if (Array.isArray(checkedValue)) {
-		let ref = checkedValuesRefs.get(checkedValue);
-		if (!ref) {
-			ref = [];
-			checkedValuesRefs.set(checkedValue, ref);
-		}
-		return ref;
-	}
-}
-function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
-	const normalizedOpen = isNotVoid(open);
-	if (openChange) writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType);
-	return normalizedOpen ? " open" : "";
-}
 function _attr(name, value) {
 	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
-function _attrs(data, nodeAccessor, scopeId, tagName) {
-	let result = "";
-	let skip = /[\s/>"'=]/;
-	let events;
-	switch (data && tagName) {
-		case "input":
-			if (data.checkedChange) {
-				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
-				skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/;
-			} else if ("checkedValue" in data || data.checkedValueChange) {
-				result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1);
-				skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/;
-			} else if (data.valueChange) {
-				result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1);
-				skip = /^value(?:Change)?$|[\s/>"'=]/;
-			}
-			break;
-		case "select":
-		case "textarea":
-			if ("value" in data || data.valueChange) skip = /^value(?:Change)?$|[\s/>"'=]/;
-			break;
-		case "option":
-			if ("value" in data) {
-				result += _attr_option_value(data.value);
-				skip = /^value$|[\s/>"'=]/;
-			}
-			break;
-		case "details":
-		case "dialog":
-			if (data.openChange) {
-				result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1);
-				skip = /^open(?:Change)?$|[\s/>"'=]/;
-			}
-			break;
-	}
-	for (const name in data) {
-		const value = data[name];
-		switch (name) {
-			case "class":
-				result += _attr_class(value);
-				break;
-			case "style":
-				result += _attr_style(value);
-				break;
-			default:
-				if (name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta")) if (isEventHandler(name)) {
-					if (!events) {
-						events = {};
-						writeScope(scopeId, { [EventAttributes$1 + nodeAccessor]: events });
-					}
-					events[getEventHandlerName(name)] = value;
-				} else result += nonVoidAttr(name, value);
-				break;
-		}
-	}
-	return result;
-}
-function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
-	writeScope(scopeId, serializeType ? {
-		[ControlledType$1 + nodeAccessor]: type,
-		[ControlledValue$1 + nodeAccessor]: value,
-		[ControlledHandler$1 + nodeAccessor]: valueChange
-	} : {
-		[ControlledValue$1 + nodeAccessor]: value,
-		[ControlledHandler$1 + nodeAccessor]: valueChange
-	});
-}
 function stringAttr(name, value) {
 	return value && " " + name + attrAssignment(value);
 }
@@ -2427,83 +2125,6 @@ function escapeDoubleQuotedAttrValue(value) {
 function replaceUnsafeDoubleQuoteAttrChar(match) {
 	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
 }
-function normalizedValueMatches(a, b) {
-	const value = normalizeStrAttrValue(b);
-	if (Array.isArray(a)) {
-		for (const item of a) if (normalizeStrAttrValue(item) === value) return true;
-	} else if (normalizeStrAttrValue(a) === value) return true;
-	return false;
-}
-function normalizeStrAttrValue(value) {
-	return isNotVoid(value) && value !== true ? value + "" : "";
-}
-//#endregion
-//#region src/html/dynamic-tag.ts
-const voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
-	const shouldResume = serializeReason !== 0;
-	const renderer = normalizeDynamicRenderer(tag);
-	const state = getState();
-	const branchId = _peek_scope_id();
-	let rendered;
-	let result;
-	if (typeof renderer === "string") {
-		const input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
-		rendered = true;
-		const renderNative = () => {
-			_scope_id();
-			_html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`);
-			if (!voidElementsReg.test(renderer)) {
-				const renderContent = content || normalizeDynamicRenderer(input.content);
-				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-				else {
-					if (renderContent && typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1);
-					else if (renderContent) _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
-				}
-				_html(`</${renderer}>`);
-			}
-			const childScope = getScopeById(branchId);
-			const needsScript = childScope && (childScope["EventAttributes:a"] || childScope["ControlledHandler:a"]);
-			if (needsScript) _script(branchId, "_d");
-			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
-		};
-		renderNative();
-		result = _el(branchId, "_e");
-	} else {
-		const chunk = void 0;
-		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
-		const render = () => {
-			if (renderer) try {
-				_set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0);
-				return inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
-					...inputOrArgs,
-					content
-				} : inputOrArgs);
-			} finally {
-				_set_serialize_reason(void 0);
-			}
-			else if (content) return content();
-		};
-		result = shouldResume ? withBranchId(branchId, render) : render();
-		rendered = _peek_scope_id() !== branchId;
-		if (beforeBranch !== void 0) {
-			applyBranchStart(chunk, beforeBranch, rendered);
-			_html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : "")));
-		}
-	}
-	if (rendered) {
-		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: rendererKey(renderer) });
-	} else _scope_id();
-	return result;
-};
-((originalDynamicTag) => (patch) => {
-	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
-		const patched = patch(tag, scopeId, accessor);
-		if (patched !== tag) patched["id"] = tag;
-		return originalDynamicTag(scopeId, accessor, patched, input, content, inputIsArgs, resume);
-	};
-})(_dynamic_tag);
 //#endregion
 //#region src/translator/util/runtime.ts
 const pureDOMFunctions = /* @__PURE__ */ new Set([
@@ -3279,6 +2900,7 @@ function getSignal(section, referencedBindings, name) {
 			values: [],
 			intersection: void 0,
 			forwards: void 0,
+			prepare: [],
 			render: [],
 			effect: [],
 			hasHTMLEffect: false,
@@ -3343,7 +2965,7 @@ function initValue(binding, isLet = false) {
 	return signal;
 }
 function signalHasStatements(signal) {
-	if (signal.extraArgs || signal.forcePersist || signal.render.length || signal.effect.length || signal.hasHTMLEffect || signal.values.length || signal.intersection) return true;
+	if (signal.extraArgs || signal.forcePersist || signal.prepare.length || signal.render.length || signal.effect.length || signal.hasHTMLEffect || signal.values.length || signal.intersection) return true;
 	const binding = signal.referencedBindings;
 	if (binding) {
 		if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 || binding.section === signal.section && (binding.hoists || binding.aliases.size || hasNonConstantPropertyAlias(binding)))) return true;
@@ -3441,20 +3063,21 @@ function getSignalFn(signal) {
 		signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(effectIdentifier, [scopeIdentifier])));
 	}
 	if (isValue && getSerializeReason(section, binding)) signal.hasSideEffect = true;
+	const render = signal.prepare.length ? signal.prepare.concat(signal.render) : signal.render;
 	if (!signal.hasSideEffect) {
-		if (isValue && signal.render.length === 1) {
-			const render = signal.render[0];
-			if (render.type === "ExpressionStatement") {
-				const { expression } = render;
+		if (isValue && render.length === 1) {
+			const first = render[0];
+			if (first.type === "ExpressionStatement") {
+				const { expression } = first;
 				if (expression.type === "CallExpression" && expression.callee.type === "Identifier" && expression.arguments.length === 2 && expression.arguments[0] === scopeIdentifier && isOwnValueRead(expression.arguments[1], binding)) return expression.callee;
 			}
 		}
-		return _marko_compiler.types.arrowFunctionExpression(isValue ? [scopeIdentifier, getSignalValueIdentifier(signal)] : [scopeIdentifier], toFirstExpressionOrBlock(signal.render));
+		return _marko_compiler.types.arrowFunctionExpression(isValue ? [scopeIdentifier, getSignalValueIdentifier(signal)] : [scopeIdentifier], toFirstExpressionOrBlock(render));
 	}
-	if (signal.render.length === 1) {
-		const render = signal.render[0];
-		if (render.type === "ExpressionStatement") {
-			const { expression } = render;
+	if (render.length === 1) {
+		const first = render[0];
+		if (first.type === "ExpressionStatement") {
+			const { expression } = first;
 			if (expression.type === "CallExpression") {
 				const args = expression.arguments;
 				if (args.length === 1 && args[0] === scopeIdentifier) {
@@ -3464,7 +3087,7 @@ function getSignalFn(signal) {
 			}
 		}
 	}
-	return _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], _marko_compiler.types.blockStatement(signal.render));
+	return _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], _marko_compiler.types.blockStatement(render));
 }
 const hasTranslatedExtraArgs = /* @__PURE__ */ new WeakSet();
 const emptyExtraArgs = [];
@@ -5864,7 +5487,7 @@ function getOnlyChildParentTagName(tag, branchSize = 1) {
 	const extra = tag.node.extra;
 	if (extra[kOnlyChildInParent] !== void 0) return extra[kOnlyChildInParent];
 	const parentTag = getParentTag(tag);
-	return extra[kOnlyChildInParent] = parentTag && (0, _marko_compiler_babel_utils.getTagDef)(parentTag)?.html && parentTag.node.name.type === "StringLiteral" && tag.parent.body.filter((node) => node.type !== "MarkoComment").length === branchSize ? parentTag.node.name.value : false;
+	return extra[kOnlyChildInParent] = parentTag && analyzeTagNameType(parentTag) === 0 && parentTag.node.name.type === "StringLiteral" && tag.parent.body.filter((node) => node.type !== "MarkoComment").length === branchSize ? parentTag.node.name.value : false;
 }
 function getOptimizedOnlyChildNodeBinding(tag, section, branchSize = 1) {
 	if (getOnlyChildParentTagName(tag, branchSize)) {
@@ -6453,7 +6076,9 @@ var program_default = {
 				if (isLoadEntry) {
 					const entryFile = program.hub.file;
 					const { filename } = entryFile.opts;
-					program.node.body = [_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier("ready"), _marko_compiler.types.identifier("ready"))], _marko_compiler.types.stringLiteral(getRuntimePath("dom"))), _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.memberExpression(_marko_compiler.types.callExpression(_marko_compiler.types.import(), [_marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, filename))]), _marko_compiler.types.identifier("then")), [_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.callExpression(_marko_compiler.types.identifier("ready"), [_marko_compiler.types.stringLiteral(getReadyId(entryFile))]))]))];
+					const readyId = getReadyId(entryFile);
+					const report = !markoOpts.optimize;
+					program.node.body = [_marko_compiler.types.importDeclaration([_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier("ready"), _marko_compiler.types.identifier("ready")), ...report ? [_marko_compiler.types.importSpecifier(_marko_compiler.types.identifier("readyFailed"), _marko_compiler.types.identifier("readyFailed"))] : []], _marko_compiler.types.stringLiteral(getRuntimePath("dom"))), _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.memberExpression(_marko_compiler.types.callExpression(_marko_compiler.types.import(), [_marko_compiler.types.stringLiteral((0, _marko_compiler_babel_utils.resolveRelativePath)(entryFile, filename))]), _marko_compiler.types.identifier("then")), [_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.callExpression(_marko_compiler.types.identifier("ready"), [_marko_compiler.types.stringLiteral(readyId)])), ...report ? [_marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.callExpression(_marko_compiler.types.identifier("readyFailed"), [_marko_compiler.types.stringLiteral(readyId)]))] : []]))];
 					program.skip();
 					return;
 				}
@@ -6697,7 +6322,7 @@ function knownTagTranslateDOM(tag, propTree, getBindingIdentifier, callSetup) {
 			if (!isOptimize()) changeArgs.push(_marko_compiler.types.stringLiteral(varBinding.name));
 			return _marko_compiler.types.callExpression(importRuntime("_var_change"), changeArgs);
 		};
-		addStatement("render", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_var", scopeIdentifier, getScopeAccessorLiteral(childScopeBinding, true), source.identifier)));
+		addStatement("prepare", tagSection, void 0, _marko_compiler.types.expressionStatement(callRuntime("_var", scopeIdentifier, getScopeAccessorLiteral(childScopeBinding, true), source.identifier)));
 	}
 	callSetup?.(tagSection, childScopeBinding);
 	if (propTree) writeParamsToSignals(tag, propTree, getTagName(tag) || "tag", {
@@ -9390,7 +9015,10 @@ function assertHasBody(tag) {
 function assertHasValueAttribute(tag) {
 	const { node } = tag;
 	const [valueAttr] = node.attributes;
-	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !(valueAttr.default || valueAttr.name === "value")) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) requires a [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
+	if (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !(valueAttr.default || valueAttr.name === "value")) {
+		const wrongName = _marko_compiler.types.isMarkoAttribute(valueAttr) && valueAttr.name;
+		throw (wrongName ? tag.get("attributes")[0] : tag.get("name")).buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) requires the [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).${wrongName ? ` Use \`<${getTagName(tag)}=condition>\` instead of \`<${getTagName(tag)} ${wrongName}=condition>\`.` : ""}`);
+	}
 	if (node.attributes.length > 1) throw tag.get("name").buildCodeFrameError(`The [\`<${getTagName(tag)}>\` tag](https://markojs.com/docs/reference/core-tag#show) only supports the [\`value=\` attribute](https://markojs.com/docs/reference/language#shorthand-value).`);
 }
 //#endregion
@@ -10089,14 +9717,11 @@ function translateExit(placeholder) {
 		const section = getSection(placeholder);
 		const siblingText = extra[kSiblingText];
 		const markerSerializeReason = nodeBinding && getSerializeReason(section, nodeBinding);
-		if (isHTML && markerSerializeReason) {
-			if (siblingText === 1) writeSeparator(write, section, markerSerializeReason);
-			else if (siblingText === 3) writeSeparator(write, section, markerSerializeReason);
-		}
-		if (isHTML) {
-			write`${method === "_escape" ? buildEscapedTextExpression(value) : callRuntime(method, value)}`;
-			if (nodeBinding) markNode(placeholder, nodeBinding, markerSerializeReason);
-		} else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), true);
+		if (isHTML) if (markerSerializeReason) {
+			const guard = getSerializeGuard(section, markerSerializeReason, true);
+			write`${callRuntime(node.escape ? "_text_resume" : "_html_resume", getScopeIdIdentifier(section), getScopeAccessorLiteral(nodeBinding), value, siblingText === 1 ? guard ? _marko_compiler.types.binaryExpression("*", guard, _marko_compiler.types.numericLiteral(2)) : _marko_compiler.types.numericLiteral(2) : guard)}`;
+		} else write`${method === "_escape" ? buildEscapedTextExpression(value) : callRuntime(method, value)}`;
+		else addStatement("render", section, valueExtra.referencedBindings, _marko_compiler.types.expressionStatement(method === "_text" ? callRuntime("_text", createScopeReadExpression(nodeBinding), value) : callRuntime("_html", scopeIdentifier, value, getScopeAccessorLiteral(nodeBinding))), true);
 	}
 	placeholder.remove();
 }
@@ -10120,13 +9745,8 @@ function buildEscapedTextExpression(value) {
 		default: return callRuntime("_escape", value);
 	}
 }
-function writeSeparator(write, section, reason) {
-	if (reason === true || reason.state) write`<!>`;
-	else write`${callRuntime("_sep", getSerializeGuard(section, reason, true))}`;
-}
 function analyzeSiblingText(placeholder) {
 	const placeholderExtra = placeholder.node.extra;
-	let hasNodeBefore = false;
 	let prev = placeholder.getPrevSibling();
 	let prevParent = placeholder.parentPath;
 	for (;;) {
@@ -10142,10 +9762,7 @@ function analyzeSiblingText(placeholder) {
 		const contentType = getNodeContentType(prev, "endType");
 		if (contentType === null) prev = prev.getPrevSibling();
 		else if (contentType === 4 || contentType === 1 || contentType === 2) return placeholderExtra[kSiblingText] = 1;
-		else {
-			hasNodeBefore = true;
-			break;
-		}
+		else break;
 	}
 	if (!prev.node && prevParent.isProgram()) return placeholderExtra[kSiblingText] = 1;
 	let next = placeholder.getNextSibling();
@@ -10166,7 +9783,7 @@ function analyzeSiblingText(placeholder) {
 		else break;
 	}
 	if (!next.node && nextParent.isProgram()) return placeholderExtra[kSiblingText] = 2;
-	return placeholderExtra[kSiblingText] = hasNodeBefore ? 3 : 0;
+	return placeholderExtra[kSiblingText] = 0;
 }
 function getInlinedBodyTag(parent) {
 	if (parent.isMarkoTagBody()) {

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

@@ -18,6 +18,9 @@ export interface Signal {
     /** Signals this one forwards into: they must declare first when the
      * forward simplifies to a bare, eagerly evaluated reference. */
     forwards: Opt<Signal>;
+    /** Runs before `render`: registrations (eg `_var`) that an earlier tag's
+     * synchronous `_return` may reach before the registering tag's own setup. */
+    prepare: t.Statement[];
     render: t.Statement[];
     effect: t.Statement[];
     hasHTMLEffect: boolean;
@@ -49,7 +52,7 @@ export declare function signalHasStatements(signal: Signal): boolean;
 export declare function getSignalFn(signal: Signal): t.Expression;
 export declare function getSignalValueIdentifier(signal: Signal): t.Identifier;
 export declare function replaceNullishAndEmptyFunctionsWith0(args: (t.Expression | undefined | false)[]): t.Expression[];
-export declare function addStatement(type: "render" | "effect", targetSection: Section, referencedBindings: ReferencedBindings, statement: t.Statement | t.Statement[], isPure?: boolean): void;
+export declare function addStatement(type: "prepare" | "render" | "effect", targetSection: Section, referencedBindings: ReferencedBindings, statement: t.Statement | t.Statement[], isPure?: boolean): void;
 export declare function addValue(targetSection: Section, referencedBindings: ReferencedBindings, signal: Signal, value: t.Expression): void;
 export declare function getResumeRegisterId(section: Section, referencedBindings: string | ReferencedBindings, type?: string): string;
 export declare function writeSignals(section: Section): Set<Signal>;

package/dist/translator/visitors/constants/sibling-text.d.ts

@@ -1,7 +1,6 @@
 export declare const None = 0;
 export declare const Before = 1;
 export declare const After = 2;
-export declare const NodeBefore = 3;
 type Self = typeof import("./sibling-text");
 export type Value = Self[keyof Self];
 export {};

package/package.json

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