@marko/runtime-tags 6.3.3 → 6.3.5

package/dist/common/accessor.d.ts

@@ -8,7 +8,6 @@ export declare enum AccessorPrefix {
     ControlledValue = "G",
     DynamicHTMLLastChild = "H",
     EventAttributes = "I",
-    Getter = "J",
     KeyedScopes = "O",
     Lifecycle = "K",
     Promise = "L",

package/dist/common/accessor.debug.d.ts

@@ -8,7 +8,6 @@ export declare enum AccessorPrefix {
     ControlledValue = "ControlledValue:",
     DynamicHTMLLastChild = "DynamicHTMLLastChild:",
     EventAttributes = "EventAttributes:",
-    Getter = "Getter:",
     KeyedScopes = "KeyedScopes:",
     Lifecycle = "Lifecycle:",
     Promise = "Promise:",

package/dist/debug/dom.js

@@ -1974,6 +1974,7 @@ const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/dom/compat.ts
 const classIdToBranch = /* @__PURE__ */ new Map();
+let classEventResolver;
 const scopesByRender = /* @__PURE__ */ new WeakMap();
 const getRenderScopes = ($global) => {
 	const render = self[$global.runtimeId]?.[$global.renderId];
@@ -1988,9 +1989,16 @@ const compat = {
 		_resume(SET_SCOPE_REGISTER_ID, (scope) => {
 			getRenderScopes(scope["$global"])[scope["#Id"]] = scope;
 			if (scope.m5c) classIdToBranch.set(scope.m5c, scope);
+			if (classEventResolver) for (const key in scope) {
+				const resolved = classEventResolver(scope[key], scope);
+				if (resolved !== scope[key]) scope[key] = resolved;
+			}
 		});
 		_resume(RENDER_BODY_ID, warp10Noop);
 	},
+	setClassEventResolver(fn) {
+		classEventResolver = fn;
+	},
 	getScope($global, scopeId) {
 		return getRenderScopes($global)?.[scopeId];
 	},

package/dist/debug/dom.mjs

@@ -1972,6 +1972,7 @@ const RENDER_BODY_ID = "$compat_renderBody";
 //#endregion
 //#region src/dom/compat.ts
 const classIdToBranch = /* @__PURE__ */ new Map();
+let classEventResolver;
 const scopesByRender = /* @__PURE__ */ new WeakMap();
 const getRenderScopes = ($global) => {
 	const render = self[$global.runtimeId]?.[$global.renderId];
@@ -1986,9 +1987,16 @@ const compat = {
 		_resume(SET_SCOPE_REGISTER_ID, (scope) => {
 			getRenderScopes(scope["$global"])[scope["#Id"]] = scope;
 			if (scope.m5c) classIdToBranch.set(scope.m5c, scope);
+			if (classEventResolver) for (const key in scope) {
+				const resolved = classEventResolver(scope[key], scope);
+				if (resolved !== scope[key]) scope[key] = resolved;
+			}
 		});
 		_resume(RENDER_BODY_ID, warp10Noop);
 	},
+	setClassEventResolver(fn) {
+		classEventResolver = fn;
+	},
 	getScope($global, scopeId) {
 		return getRenderScopes($global)?.[scopeId];
 	},

package/dist/debug/html.js

@@ -247,6 +247,8 @@ function _escape_comment(val) {
 const K_SCOPE_ID = Symbol("Scope ID");
 const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty: hasOwnProperty$1 } = {};
+const objectProto = Object.prototype;
+const arrayProto = Array.prototype;
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
 patchIteratorNext(Generator.prototype);
@@ -685,12 +687,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	const scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) {
-		trackScope(state, val, scopeId);
-		state.buf.push("_(" + scopeId + ")");
-		return true;
-	}
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) {
@@ -811,6 +807,12 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	const scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) {
+		trackScope(state, val, scopeId);
+		state.buf.push("_(" + scopeId + ")");
+		return true;
+	}
 	const wellKnownObject = KNOWN_OBJECTS.get(val);
 	if (wellKnownObject) {
 		state.buf.push(wellKnownObject);
@@ -819,7 +821,10 @@ function writeObject(state, val, parent, accessor) {
 	return writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	const proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -863,7 +868,7 @@ function writeUnknownObject(state, val, ref) {
 }
 function writePlainObject(state, val, ref) {
 	state.buf.push("{");
-	writeObjectProps(state, val, ref);
+	writeMaybeIterableProps(state, val, ref);
 	state.buf.push("}");
 	return true;
 }
@@ -1212,7 +1217,7 @@ function writeAsyncGenerator(state, iter, ref) {
 }
 function writeNullObject(state, val, ref) {
 	state.buf.push("{");
-	state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}");
+	state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}");
 	return true;
 }
 function writeObjectProps(state, val, ref) {
@@ -1223,6 +1228,10 @@ function writeObjectProps(state, val, ref) {
 		if (writeProp(state, val[key], ref, escapedKey)) sep = ",";
 		else state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "";
 		const iterArr = [];
@@ -1309,14 +1318,19 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	const startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	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);
+	}
+	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) {
@@ -1459,15 +1473,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return false;
 	return true;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
@@ -2900,6 +2905,7 @@ var ServerRendered = class {
 	pipe(stream) {
 		this.#read((html) => {
 			stream.write(html);
+			stream.flush?.();
 		}, (err) => {
 			const socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon === "function") socket.destroySoon();
@@ -2910,10 +2916,13 @@ var ServerRendered = class {
 	}
 	toReadable() {
 		let cancelled = false;
+		let started = false;
 		let boundary;
 		const encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
+			pull: (ctrl) => {
+				if (started) return;
+				started = true;
 				boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
@@ -2928,7 +2937,7 @@ var ServerRendered = class {
 				cancelled = true;
 				boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);
@@ -3153,7 +3162,7 @@ const compat = {
 		if (boundary.flush() === 1) throw new Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		const state = this.ensureState(classAPIOut.global);
 		const boundary = new Boundary(state);
 		let head = new Chunk(boundary, null, null, state);
@@ -3163,7 +3172,7 @@ const compat = {
 			for (const key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				const scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id });
 				_script(scopeId, SET_SCOPE_REGISTER_ID);

package/dist/debug/html.mjs

@@ -245,6 +245,8 @@ function _escape_comment(val) {
 const K_SCOPE_ID = Symbol("Scope ID");
 const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty: hasOwnProperty$1 } = {};
+const objectProto = Object.prototype;
+const arrayProto = Array.prototype;
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
 patchIteratorNext(Generator.prototype);
@@ -683,12 +685,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	const scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) {
-		trackScope(state, val, scopeId);
-		state.buf.push("_(" + scopeId + ")");
-		return true;
-	}
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) {
@@ -809,6 +805,12 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	const scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) {
+		trackScope(state, val, scopeId);
+		state.buf.push("_(" + scopeId + ")");
+		return true;
+	}
 	const wellKnownObject = KNOWN_OBJECTS.get(val);
 	if (wellKnownObject) {
 		state.buf.push(wellKnownObject);
@@ -817,7 +819,10 @@ function writeObject(state, val, parent, accessor) {
 	return writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	const proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -861,7 +866,7 @@ function writeUnknownObject(state, val, ref) {
 }
 function writePlainObject(state, val, ref) {
 	state.buf.push("{");
-	writeObjectProps(state, val, ref);
+	writeMaybeIterableProps(state, val, ref);
 	state.buf.push("}");
 	return true;
 }
@@ -1210,7 +1215,7 @@ function writeAsyncGenerator(state, iter, ref) {
 }
 function writeNullObject(state, val, ref) {
 	state.buf.push("{");
-	state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}");
+	state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}");
 	return true;
 }
 function writeObjectProps(state, val, ref) {
@@ -1221,6 +1226,10 @@ function writeObjectProps(state, val, ref) {
 		if (writeProp(state, val[key], ref, escapedKey)) sep = ",";
 		else state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "";
 		const iterArr = [];
@@ -1307,14 +1316,19 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	const startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	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);
+	}
+	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) {
@@ -1457,15 +1471,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return false;
 	return true;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
@@ -2898,6 +2903,7 @@ var ServerRendered = class {
 	pipe(stream) {
 		this.#read((html) => {
 			stream.write(html);
+			stream.flush?.();
 		}, (err) => {
 			const socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon === "function") socket.destroySoon();
@@ -2908,10 +2914,13 @@ var ServerRendered = class {
 	}
 	toReadable() {
 		let cancelled = false;
+		let started = false;
 		let boundary;
 		const encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
+			pull: (ctrl) => {
+				if (started) return;
+				started = true;
 				boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
@@ -2926,7 +2935,7 @@ var ServerRendered = class {
 				cancelled = true;
 				boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);
@@ -3151,7 +3160,7 @@ const compat = {
 		if (boundary.flush() === 1) throw new Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		const state = this.ensureState(classAPIOut.global);
 		const boundary = new Boundary(state);
 		let head = new Chunk(boundary, null, null, state);
@@ -3161,7 +3170,7 @@ const compat = {
 			for (const key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				const scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id });
 				_script(scopeId, SET_SCOPE_REGISTER_ID);

package/dist/dom/compat.d.ts

@@ -6,6 +6,7 @@ export declare const compat: {
     patchDynamicTag: typeof patchDynamicTag;
     queueEffect: typeof queueEffect;
     init(warp10Noop: any): void;
+    setClassEventResolver(fn: (value: unknown, scope: Scope) => unknown): void;
     getScope($global: Record<string, unknown>, scopeId: unknown): Scope | undefined;
     setRendererId(renderer: any, id: unknown): void;
     isRenderer(renderer: any): any;

package/dist/dom.js

@@ -51,7 +51,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	typeof by == "string" ? forOf(all, (item, i) => cb(item[by], [item, i])) : forOf(all, (item, i) => cb(by(item, i), [item, i]));
 }), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], runEffects = ((effects) => {
 	for (let i = 0; i < effects.length;) effects[i++](effects[i++]);
-}), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
+}), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
 	return render && !scopes && scopesByRender.set(render, scopes = {}), scopes;
 }, compat = {
@@ -59,9 +59,15 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	queueEffect,
 	init(warp10Noop) {
 		_resume("$C_s", (scope) => {
-			getRenderScopes(scope.$)[scope.L] = scope, scope.m5c && classIdToBranch.set(scope.m5c, scope);
+			if (getRenderScopes(scope.$)[scope.L] = scope, scope.m5c && classIdToBranch.set(scope.m5c, scope), classEventResolver) for (let key in scope) {
+				let resolved = classEventResolver(scope[key], scope);
+				resolved !== scope[key] && (scope[key] = resolved);
+			}
 		}), _resume("$C_b", warp10Noop);
 	},
+	setClassEventResolver(fn) {
+		classEventResolver = fn;
+	},
 	getScope($global, scopeId) {
 		return getRenderScopes($global)?.[scopeId];
 	},

package/dist/dom.mjs

@@ -51,7 +51,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	typeof by == "string" ? forOf(all, (item, i) => cb(item[by], [item, i])) : forOf(all, (item, i) => cb(by(item, i), [item, i]));
 }), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], runEffects = ((effects) => {
 	for (let i = 0; i < effects.length;) effects[i++](effects[i++]);
-}), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
+}), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), classEventResolver, scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
 	return render && !scopes && scopesByRender.set(render, scopes = {}), scopes;
 }, compat = {
@@ -59,9 +59,15 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	queueEffect,
 	init(warp10Noop) {
 		_resume("$C_s", (scope) => {
-			getRenderScopes(scope.$)[scope.L] = scope, scope.m5c && classIdToBranch.set(scope.m5c, scope);
+			if (getRenderScopes(scope.$)[scope.L] = scope, scope.m5c && classIdToBranch.set(scope.m5c, scope), classEventResolver) for (let key in scope) {
+				let resolved = classEventResolver(scope[key], scope);
+				resolved !== scope[key] && (scope[key] = resolved);
+			}
 		}), _resume("$C_b", warp10Noop);
 	},
+	setClassEventResolver(fn) {
+		classEventResolver = fn;
+	},
 	getScope($global, scopeId) {
 		return getRenderScopes($global)?.[scopeId];
 	},

package/dist/html/compat.d.ts

@@ -16,7 +16,7 @@ export declare const compat: {
     writeSetScopeForComponent(branchId: number, m5c: string, m5i: unknown): void;
     toJSON(): (this: WeakKey) => [registryId: string, scopeId: unknown] | undefined;
     flushScript($global: any): string;
-    render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any, completeChunks: Chunk[]): void;
+    render(renderer: ServerRenderer, willRerender: boolean, classAPIOut: any, component: any, input: any, completeChunks: Chunk[], registerChildScope?: boolean): void;
     register: typeof register;
     registerRenderBody(fn: any): void;
 };

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -323,14 +323,14 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		if (boundary.flush() === 1) throw Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), head = new Chunk(boundary, null, null, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
@@ -565,8 +565,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	let scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) return !1;
@@ -639,11 +637,16 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	let scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let wellKnownObject = KNOWN_OBJECTS.get(val);
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	let proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -685,7 +688,7 @@ function writeUnknownObject(state, val, ref) {
 	return !1;
 }
 function writePlainObject(state, val, ref) {
-	return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
+	return state.buf.push("{"), writeMaybeIterableProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
 	let sep = "[";
@@ -843,7 +846,7 @@ function writeAsyncGenerator(state, iter, ref) {
 	return state.buf.push("(async function*(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()])){for(i of a)v=await i,i!=l&&(yield v);return v})(" + iterId + "={})"), iter.next().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeNullObject(state, val, ref) {
-	return state.buf.push("{"), state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}"), !0;
+	return state.buf.push("{"), state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}"), !0;
 }
 function writeObjectProps(state, val, ref) {
 	let sep = "";
@@ -851,6 +854,10 @@ function writeObjectProps(state, val, ref) {
 		let escapedKey = toObjectKey(key);
 		state.buf.push(sep + escapedKey + ":"), writeProp(state, val[key], ref, escapedKey) ? sep = "," : state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "", iterArr = [];
 		for (let item of val) item === val && !(yieldSelf || iterArr.length) ? yieldSelf = "yield this;" : iterArr.push(item);
@@ -892,14 +899,18 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	let startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	let len = name.length, 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++) {
+		let c = name.charCodeAt(i);
+		if (c < 48 || c > 57) return quote(name, i);
+	}
+	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+		let 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) {
@@ -1009,15 +1020,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return !1;
 	return !0;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
@@ -1885,7 +1887,7 @@ var ServerRendered = class {
 	}
 	pipe(stream) {
 		this.#read((html) => {
-			stream.write(html);
+			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
@@ -1894,21 +1896,21 @@ var ServerRendered = class {
 		});
 	}
 	toReadable() {
-		let cancelled = !1, boundary, encoder = new TextEncoder();
+		let cancelled = !1, started = !1, boundary, encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
-				boundary = this.#read((html) => {
+			pull: (ctrl) => {
+				started || (started = !0, boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
 					boundary = void 0, cancelled || ctrl.error(err);
 				}, () => {
 					boundary = void 0, ctrl.close();
-				});
+				}));
 			},
 			cancel: (reason) => {
 				cancelled = !0, boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<(\/?script|!--)/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C$1") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty: hasOwnProperty$1 } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -323,14 +323,14 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 		if (boundary.flush() === 1) throw Error("Cannot serialize promise across tags/class compat layer.");
 		return new Chunk(boundary, null, null, state).flushScript().scripts;
 	},
-	render(renderer, willRerender, classAPIOut, component, input, completeChunks) {
+	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), head = new Chunk(boundary, null, null, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
 		}
 		head.render(() => {
-			if (willRerender) {
+			if (willRerender || registerChildScope) {
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
@@ -564,8 +564,6 @@ function writeProp(state, val, parent, accessor) {
 	}
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
-	let scopeId = val[K_SCOPE_ID];
-	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let ref = state.refs.get(val);
 	if (ref) {
 		if (!trackChannel(state, ref)) return !1;
@@ -638,11 +636,16 @@ function writeNull(state) {
 }
 function writeObject(state, val, parent, accessor) {
 	if (val === null) return writeNull(state);
+	let scopeId = val[K_SCOPE_ID];
+	if (scopeId !== void 0) return trackScope(state, val, scopeId), state.buf.push("_(" + scopeId + ")"), !0;
 	let wellKnownObject = KNOWN_OBJECTS.get(val);
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (Object.getPrototypeOf(val)?.constructor) {
+	let proto = Object.getPrototypeOf(val);
+	if (proto === objectProto) return writePlainObject(state, val, ref);
+	if (proto === arrayProto) return writeArray(state, val, ref);
+	switch (proto?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -684,7 +687,7 @@ function writeUnknownObject(state, val, ref) {
 	return !1;
 }
 function writePlainObject(state, val, ref) {
-	return state.buf.push("{"), writeObjectProps(state, val, ref), state.buf.push("}"), !0;
+	return state.buf.push("{"), writeMaybeIterableProps(state, val, ref), state.buf.push("}"), !0;
 }
 function writeArray(state, val, ref) {
 	let sep = "[";
@@ -842,7 +845,7 @@ function writeAsyncGenerator(state, iter, ref) {
 	return state.buf.push("(async function*(_,f,v,l,i,p=a=>l=new Promise((r,j)=>{f=_.r=r;_.j=j}),a=((_.f=v=>{f(v);a.push(p())}),[p()])){for(i of a)v=await i,i!=l&&(yield v);return v})(" + iterId + "={})"), iter.next().then(onFulfilled, onRejected), boundary.startAsync(), !0;
 }
 function writeNullObject(state, val, ref) {
-	return state.buf.push("{"), state.buf.push(writeObjectProps(state, val, ref) + "__proto__:null}"), !0;
+	return state.buf.push("{"), state.buf.push(writeMaybeIterableProps(state, val, ref) + "__proto__:null}"), !0;
 }
 function writeObjectProps(state, val, ref) {
 	let sep = "";
@@ -850,6 +853,10 @@ function writeObjectProps(state, val, ref) {
 		let escapedKey = toObjectKey(key);
 		state.buf.push(sep + escapedKey + ":"), writeProp(state, val[key], ref, escapedKey) ? sep = "," : state.buf.pop();
 	}
+	return sep;
+}
+function writeMaybeIterableProps(state, val, ref) {
+	let sep = writeObjectProps(state, val, ref);
 	if (hasSymbolIterator(val)) {
 		let yieldSelf = "", iterArr = [];
 		for (let item of val) item === val && !(yieldSelf || iterArr.length) ? yieldSelf = "yield this;" : iterArr.push(item);
@@ -891,14 +898,18 @@ function isCircular(parent, ref) {
 function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
-	let startChar = name[0];
-	if (isDigit(startChar)) {
-		if (startChar === "0") {
-			if (name !== "0") return quote(name, 1);
-		} else for (let i = 1; i < name.length; i++) if (!isDigit(name[i])) return quote(name, i);
-	} else if (isWord(startChar)) {
-		for (let i = 1; i < name.length; i++) if (!isWordOrDigit(name[i])) return quote(name, i);
-	} else return quote(name, 0);
+	let len = name.length, 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++) {
+		let c = name.charCodeAt(i);
+		if (c < 48 || c > 57) return quote(name, i);
+	}
+	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+		let 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) {
@@ -1008,15 +1019,6 @@ function hasOnlyZeros(typedArray) {
 	for (let i = 0; i < typedArray.length; i++) if (typedArray[i] !== 0) return !1;
 	return !0;
 }
-function isWordOrDigit(char) {
-	return isWord(char) || isDigit(char);
-}
-function isDigit(char) {
-	return char >= "0" && char <= "9";
-}
-function isWord(char) {
-	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
-}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
@@ -1884,7 +1886,7 @@ var ServerRendered = class {
 	}
 	pipe(stream) {
 		this.#read((html) => {
-			stream.write(html);
+			stream.write(html), stream.flush?.();
 		}, (err) => {
 			let socket = "socket" in stream && stream.socket;
 			if (socket && typeof socket.destroySoon == "function" && socket.destroySoon(), !stream.emit?.("error", err)) throw err;
@@ -1893,21 +1895,21 @@ var ServerRendered = class {
 		});
 	}
 	toReadable() {
-		let cancelled = !1, boundary, encoder = new TextEncoder();
+		let cancelled = !1, started = !1, boundary, encoder = new TextEncoder();
 		return new ReadableStream({
-			start: (ctrl) => {
-				boundary = this.#read((html) => {
+			pull: (ctrl) => {
+				started || (started = !0, boundary = this.#read((html) => {
 					ctrl.enqueue(encoder.encode(html));
 				}, (err) => {
 					boundary = void 0, cancelled || ctrl.error(err);
 				}, () => {
 					boundary = void 0, ctrl.close();
-				});
+				}));
 			},
 			cancel: (reason) => {
 				cancelled = !0, boundary?.abort(reason);
 			}
-		});
+		}, { highWaterMark: 0 });
 	}
 	then(onfulfilled, onrejected) {
 		return this.#promise().then(onfulfilled, onrejected);

package/dist/translator/index.js

@@ -104,7 +104,6 @@ let AccessorPrefix$1 = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["ControlledValue"] = "ControlledValue:";
 	AccessorPrefix["DynamicHTMLLastChild"] = "DynamicHTMLLastChild:";
 	AccessorPrefix["EventAttributes"] = "EventAttributes:";
-	AccessorPrefix["Getter"] = "Getter:";
 	AccessorPrefix["KeyedScopes"] = "KeyedScopes:";
 	AccessorPrefix["Lifecycle"] = "Lifecycle:";
 	AccessorPrefix["Promise"] = "Promise:";
@@ -302,6 +301,7 @@ const decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)
 const K_SCOPE_ID = Symbol("Scope ID");
 const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty: hasOwnProperty$1 } = {};
+Array.prototype;
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
 patchIteratorNext(Generator.prototype);
@@ -856,7 +856,6 @@ let AccessorPrefix = /* @__PURE__ */ function(AccessorPrefix) {
 	AccessorPrefix["ControlledValue"] = "G";
 	AccessorPrefix["DynamicHTMLLastChild"] = "H";
 	AccessorPrefix["EventAttributes"] = "I";
-	AccessorPrefix["Getter"] = "J";
 	AccessorPrefix["KeyedScopes"] = "O";
 	AccessorPrefix["Lifecycle"] = "K";
 	AccessorPrefix["Promise"] = "L";
@@ -2078,6 +2077,7 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_load_race_trigger"
 ]);
 function importRuntime(name) {
+	if (!isTranslate()) throw new Error(`\`importRuntime(${JSON.stringify(name)})\` may only be called during the translate stage.`);
 	const { output } = getMarkoOpts();
 	return (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name);
 }
@@ -3692,7 +3692,28 @@ function getRegisteredFnExpression(node) {
 }
 //#endregion
 //#region src/translator/util/body-to-text-literal.ts
+const kRawText = Symbol("raw text placeholder");
 function bodyToTextLiteral(body) {
+	return buildTextLiteral(body, toText, false);
+}
+function bodyToRawTextLiteral(body) {
+	return buildTextLiteral(body, (value) => value, true);
+}
+function injectTextCoercion(expr) {
+	switch (expr.type) {
+		case "ConditionalExpression":
+			injectTextCoercion(expr.consequent);
+			injectTextCoercion(expr.alternate);
+			break;
+		case "TemplateLiteral":
+			expr.expressions = expr.expressions.map((child) => toText(child));
+			break;
+	}
+}
+function toText(value) {
+	return callRuntime("_to_text", value);
+}
+function buildTextLiteral(body, coerce, bareSingle) {
 	const templateQuasis = [];
 	const templateExpressions = [];
 	let currentQuasi = "";
@@ -3701,10 +3722,11 @@ function bodyToTextLiteral(body) {
 	else if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 		placeholderExtra ||= child.value.extra;
 		templateQuasis.push(templateElement(currentQuasi, false));
-		templateExpressions.push(callRuntime("_to_text", child.value));
+		templateExpressions.push(coerce(child.value));
 		currentQuasi = "";
 	}
 	if (templateExpressions.length) {
+		if (bareSingle && templateExpressions.length === 1 && !currentQuasi && !templateQuasis[0].value.cooked) return templateExpressions[0];
 		templateQuasis.push(templateElement(currentQuasi, true));
 		const literal = _marko_compiler.types.templateLiteral(templateQuasis, templateExpressions);
 		literal.extra = placeholderExtra;
@@ -5205,13 +5227,17 @@ function flattenTextOnlyConditional(rootTag) {
 	} while (cur.node && (isCoreTagName(cur, "else-if") || isCoreTagName(cur, "else")));
 	for (const branchTag of branches) assertValidCondition(branchTag);
 	let expr = _marko_compiler.types.stringLiteral("");
+	let rawText = false;
 	for (let i = branches.length; i--;) {
 		const branchTag = branches[i];
-		const text = bodyToTextLiteral(branchTag.node.body);
+		const text = bodyToRawTextLiteral(branchTag.node.body);
+		rawText ||= _marko_compiler.types.isTemplateLiteral(text);
 		expr = isCoreTagName(branchTag, "else") ? text : _marko_compiler.types.conditionalExpression(branchTag.node.attributes[0].value, text, expr);
 	}
 	for (let i = branches.length; i-- > 1;) branches[i].remove();
-	rootTag.replaceWith(_marko_compiler.types.markoPlaceholder(expr, true));
+	const placeholder = _marko_compiler.types.markoPlaceholder(expr, true);
+	if (rawText) (placeholder.extra ??= {})[kRawText] = true;
+	rootTag.replaceWith(placeholder);
 }
 function assertValidCondition(tag) {
 	const conditionTagName = getTagName(tag);
@@ -5825,7 +5851,7 @@ function knownTagTranslateDOM(tag, propTree, getBindingIdentifier, callSetup) {
 	if (node.var) {
 		const varBinding = node.var.extra.binding;
 		const source = initValue(varBinding);
-		source.register = true;
+		source.register = !!getSerializeReason(tagSection, childScopeBinding) || !signalHasStatements(source);
 		source.buildAssignment = (valueSection, value) => {
 			const changeArgs = [createScopeReadExpression(childScopeBinding, valueSection), value];
 			if (!isOptimize()) changeArgs.push(_marko_compiler.types.stringLiteral(varBinding.name));
@@ -8991,6 +9017,7 @@ var placeholder_default = {
 		if (isNonHTMLText(placeholder)) return;
 		const { node } = placeholder;
 		const { value } = node;
+		if (node.extra?.[kRawText]) injectTextCoercion(value);
 		const valueExtra = evaluate(value);
 		const { confident, computed } = valueExtra;
 		if (confident && isVoid(computed)) {
@@ -9312,8 +9339,9 @@ function getTagRelativePath(tag) {
 	const { node, hub: { file } } = tag;
 	let relativePath;
 	if (_marko_compiler.types.isStringLiteral(node.name)) {
-		const template = node.extra?.featureType === "class" && (0, _marko_compiler_babel_utils.getTagDef)(tag)?.renderer || (0, _marko_compiler_babel_utils.getTagTemplate)(tag);
-		relativePath = template && (0, _marko_compiler_babel_utils.resolveRelativePath)(file, template);
+		const tagDef = (0, _marko_compiler_babel_utils.getTagDef)(tag);
+		const template = node.extra?.featureType === "class" && tagDef?.renderer || (0, _marko_compiler_babel_utils.getTagTemplate)(tag);
+		relativePath = template && (0, _marko_compiler_babel_utils.resolveRelativePath)(file, template, tagDef);
 	} else if (node.extra?.tagNameImported) relativePath = node.extra.tagNameImported;
 	if (!relativePath) throw tagNotFoundError(tag);
 	return relativePath;

package/dist/translator/util/body-to-text-literal.d.ts

@@ -1,2 +1,10 @@
 import { types as t } from "@marko/compiler";
-export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.StringLiteral | t.TemplateLiteral;
+export declare const kRawText: unique symbol;
+declare module "@marko/compiler/dist/types" {
+    interface MarkoPlaceholderExtra {
+        [kRawText]?: true;
+    }
+}
+export declare function bodyToTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function bodyToRawTextLiteral(body: t.MarkoTagBody): t.Expression;
+export declare function injectTextCoercion(expr: t.Expression): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -51,7 +51,7 @@
     "build": "node -r ~ts ./scripts/bundle.mts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.40.2",
+    "@marko/compiler": "^5.41.0",
     "csstype": "^3.2.3",
     "fastest-levenshtein": "^1.0.16",
     "magic-string": "^0.30.21"