marko 6.3.51 → 6.3.53

package/dist/html/template.d.ts

@@ -1,7 +1,9 @@
-import { RendererProp, type Template } from "../common/types";
+import { type RenderedTemplate, RendererProp, type Template, type TemplateInput } from "../common/types";
+import { State } from "./writer";
 export type ServerRenderer = ((...args: unknown[]) => unknown) & {
     [RendererProp.Id]?: string;
     [RendererProp.Owner]?: number;
     [RendererProp.Embed]?: boolean;
 };
 export declare const _template: (templateId: string, renderer: ServerRenderer, page?: 1) => Template;
+export declare function startRender(template: Template & ServerRenderer, input: TemplateInput, StateClass: typeof State): RenderedTemplate;

package/dist/html/writer.d.ts

@@ -67,7 +67,9 @@ export { writeScope as _scope };
 export declare function _existing_scope(scopeId: number): ScopeInternals;
 export declare function _scope_with_id(scopeId: number): ScopeInternals;
 export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals): ScopeInternals;
-export type SerializeReasonValue = undefined | number | Partial<Record<string, 0 | 1>>;
+export type SerializeReasonValue = undefined | number | Partial<Record<string, number>>;
+export declare const CLIENT_ALL = 715827882;
+export declare function maskGroup(mask: SerializeReasonValue, group: number): number;
 export declare function _set_serialize_reason(reason: SerializeReasonValue): void;
 export declare function _scope_reason(): SerializeReasonValue;
 export declare function _serialize_if(condition: SerializeReasonValue, key: number): 1 | undefined;
@@ -114,6 +116,9 @@ export declare class State implements SerializeState {
         renderId: string;
         runtimeId: string;
     });
+    flushChunk(html: string, scripts: string, pending: number): string;
+    walkScript(): string;
+    resumeScript(resumes: string): string;
     get runtimePrefix(): string;
     get commentPrefix(): string;
     reorder(chunk: Chunk): void;

package/dist/html.js

@@ -247,7 +247,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 }, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, countResumeWrite($chunk.boundary), Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+}, CLIENT_ALL = 715827882, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -263,11 +263,11 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
 			needsScript && _script(branchId, "_d"), (shouldResume || needsScript) && _html(state.mark("(", scopeId + " " + accessor + " " + branchId));
-		})(), result = _el(branchId, "_e");
+		})(), result = _el(scopeId, "-" + accessor);
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
-				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
+				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
@@ -357,7 +357,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(+!!willRerender);
+			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {
@@ -496,6 +496,7 @@ var State$1 = class {
 	flushId;
 	pos;
 	id;
+	path = null;
 	constructor(parent, accessor, flushId, pos = null, id = null) {
 		this.parent = parent, this.accessor = accessor, this.flushId = flushId, this.pos = pos, this.id = id;
 	}
@@ -629,7 +630,7 @@ function writeProp(state, val, parent, accessor) {
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
 	let ref = state.refs.get(val);
-	if (ref) return trackChannel(state, ref) ? parent && isCircular(parent, ref) ? (ensureId(state, ref), state.pendingAssignments.add(ref), addAssignment(ref, accessId(state, parent) + toAccess(accessor)), !1) : (state.buf.push(ensureId(state, ref)), !0) : !1;
+	if (ref) return trackChannel(state, ref) ? parent && isCircular(parent, ref) ? (ensureId(state, ref), state.pendingAssignments.add(ref), addAssignment(ref, accessId(state, parent) + toAccess(accessor)), !1) : (writeRef(state, ref), !0) : !1;
 	let registered = REGISTRY.get(val);
 	return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(val, ref = new Reference(parent, accessor, state.flushId, state.buf.length)), ref.channel = state.channel, write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
@@ -655,7 +656,7 @@ function writeString(state, val, parent, accessor) {
 	if (val.length > 12) {
 		let ref = state.strs.get(val);
 		if (ref) {
-			if (trackChannel(state, ref)) return state.buf.push(ensureId(state, ref)), !0;
+			if (trackChannel(state, ref)) return writeRef(state, ref), !0;
 		} else {
 			let ref = new Reference(parent, accessor, state.flushId, state.buf.length);
 			ref.channel = state.channel, state.strs.set(val, ref);
@@ -1134,6 +1135,9 @@ function quote(str, startPos) {
 	}
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
+function writeRef(state, ref) {
+	ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId) ? (ref.path = accessPath(state, ref), ref.pos = state.buf.length, ref.flushId = state.flushId, ref.channel = state.channel, state.buf.push(ref.path)) : state.buf.push(ensureId(state, ref));
+}
 function ensureId(state, ref) {
 	return ref.scopeId === void 0 ? ref.id ? (trackChannel(state, ref), ref.id) : assignId(state, ref) : (trackChannel(state, ref), "_(" + ref.scopeId + ")");
 }
@@ -1143,23 +1147,18 @@ function accessId(state, ref) {
 }
 function assignId(state, ref) {
 	let { pos } = ref;
-	if (ref.id = nextRefAccess(state), pos !== null && ref.flushId === state.flushId) return pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id;
-	ref.channel = state.channel;
+	return ref.id = nextRefAccess(state), pos !== null && ref.flushId === state.flushId ? (pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id) : (ref.channel = state.channel, ref.id + "=" + (ref.path || accessPath(state, ref)));
+}
+function accessPath(state, ref) {
 	let cur = ref, accessPrevValue = "";
 	do {
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		let parent = cur.parent;
-		if (parent.id && (trackChannel(state, parent) || !parent.parent)) {
-			accessPrevValue = parent.id + accessPrevValue;
-			break;
-		}
-		if (parent.flushId === state.flushId || parent.scopeId !== void 0) {
-			accessPrevValue = accessId(state, parent) + accessPrevValue;
-			break;
-		}
+		if (parent.id && (trackChannel(state, parent) || !parent.parent)) return parent.id + accessPrevValue;
+		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
 	} while (cur);
-	return ref.id + "=" + accessPrevValue;
+	return accessPrevValue;
 }
 function assignmentsToString(assignments, value) {
 	return assignments.length > 100 ? "($=>(" + assignments.join("=$,") + "=$))(" + value + ")" : assignments.join("=") + "=" + value;
@@ -1479,6 +1478,9 @@ function _subscribe(subscribers, scope) {
 	}
 	return scope;
 }
+function maskGroup(mask, group) {
+	return mask === 715827882 ? 1 : typeof mask == "number" ? mask >>> 1 + 2 * group & 3 : mask[group] ?? 0;
+}
 function _set_serialize_reason(reason) {
 	$chunk.boundary.state.serializeReason = reason;
 }
@@ -1487,7 +1489,7 @@ function _scope_reason() {
 	return $chunk.boundary.state.serializeReason = void 0, reason;
 }
 function _serialize_if(condition, key) {
-	return condition && (condition === 1 || (typeof condition == "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+	return condition && maskGroup(condition, key) ? 1 : void 0;
 }
 function _serialize_guard(condition, key) {
 	return _serialize_if(condition, key) || 0;
@@ -1606,6 +1608,16 @@ var State = class {
 	constructor($global) {
 		this.$global = $global, $global.cspNonce && (this.nonceAttr = " nonce" + attrAssignment($global.cspNonce));
 	}
+	flushChunk(html, scripts, pending) {
+		let { $global, nonceAttr } = this, { __flush__ } = $global;
+		return scripts && (html += "<script" + nonceAttr + ">" + scripts + "<\/script>"), __flush__ && ($global.__flush__ = void 0, html = __flush__($global, html)), pending ? html : html + this.trailerHTML;
+	}
+	walkScript() {
+		return this.runtimePrefix + ".w()";
+	}
+	resumeScript(resumes) {
+		return this.hasWrittenResume ? this.runtimePrefix + ".r.push(" + resumes + ")" : (this.hasWrittenResume = !0, this.runtimePrefix + ".r=[" + resumes + "]");
+	}
 	get runtimePrefix() {
 		let { $global } = this;
 		return $global.runtimeId + "." + $global.renderId;
@@ -1685,7 +1697,7 @@ var State = class {
 		this.scripts = concatScripts(this.scripts, script);
 	}
 	append(chunk) {
-		this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
+		this.html += chunk.html, this.needsWalk ||= chunk.needsWalk, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
 	}
 	takeDeferredReady() {
 		let { deferredReady } = this;
@@ -1784,13 +1796,13 @@ var State = class {
 			}
 			state.writeReorders = carried;
 		}
-		return flushSerializer(boundary, state), state.resumes ? state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]")) : needsResumeArray && !state.hasWrittenResume && (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
+		return flushSerializer(boundary, state), (state.resumes || needsResumeArray && !state.hasWrittenResume) && (scripts = concatScripts(scripts, state.resumeScript(state.resumes))), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, state.walkScript())), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}
 	flushHTML() {
 		let { boundary } = this, { state } = boundary;
 		this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript();
-		let { scripts } = this, { $global, nonceAttr } = state, { __flush__ } = $global, { html } = this;
-		return this.html = this.scripts = "", scripts && (html += "<script" + nonceAttr + ">" + scripts + "<\/script>"), __flush__ && ($global.__flush__ = void 0, html = __flush__($global, html)), boundary.count || (html += state.trailerHTML), html;
+		let { html, scripts } = this;
+		return this.html = this.scripts = "", state.flushChunk(html, scripts, boundary.count);
 	}
 };
 function flushSerializer(boundary, serializeState) {
@@ -2044,17 +2056,20 @@ function _content_resume(id, fn, scopeId) {
 //#endregion
 //#region src/html/template.ts
 function render(input = {}) {
+	return startRender(this, input, State);
+}
+function startRender(template, input, StateClass) {
 	let { $global } = input;
 	$global ? ({$global, ...input} = input, $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this),
+		renderId: getDefaultRenderId(template),
 		...$global
 	}) : $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this)
+		renderId: getDefaultRenderId(template)
 	};
-	let state = new State($global), head = new Chunk(new Boundary(state, $global.signal), null, null, state);
-	return this.i ? head.render(() => writeWaitReady(this.a, this, input)) : head.render(this, input), new ServerRendered(head);
+	let state = new StateClass($global), head = new Chunk(new Boundary(state, $global.signal), null, null, state);
+	return template.i ? head.render(() => writeWaitReady(template.a, template, input)) : head.render(template, input), new ServerRendered(head);
 }
 function getDefaultRenderId(template) {
 	if (template.i) {

package/dist/html.mjs

@@ -247,7 +247,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 }, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, $chunk, kPendingContexts = Symbol("Pending Contexts"), kBranchId = Symbol("Branch Id"), kIsAsync = Symbol("Is Async"), writeScope = (scopeId, partialScope) => {
 	let { state } = $chunk.boundary, target = $chunk.serializeState, scope = scopeWithId(state, scopeId), pending = target.writeScopes[scopeId];
 	return state.needsMainRuntime = !0, countResumeWrite($chunk.boundary), Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
-}, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
+}, CLIENT_ALL = 715827882, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, kSelectedValue = Symbol("selectedValue"), checkedValuesRefs = /* @__PURE__ */ new WeakMap(), singleQuoteAttrReplacements = /['\r]|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /["\r]|&(?=[#a-zA-Z])/g, needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g, voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/, _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, serializeReason) => {
 	let shouldResume = serializeReason !== 0, renderer = normalizeDynamicRenderer(tag), state = getState(), branchId = _peek_scope_id(), rendered, result;
 	if (typeof renderer == "string") {
 		let input = (inputIsArgs ? inputOrArgs[0] : inputOrArgs) || {};
@@ -263,11 +263,11 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			let childScope = getScopeById(branchId), needsScript = childScope && (childScope.Ia || childScope.Ea);
 			needsScript && _script(branchId, "_d"), (shouldResume || needsScript) && _html(state.mark("(", scopeId + " " + accessor + " " + branchId));
-		})(), result = _el(branchId, "_e");
+		})(), result = _el(scopeId, "-" + accessor);
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
-				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? 1 : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
+				return _set_serialize_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
@@ -357,7 +357,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 				let scopeId = _peek_scope_id();
 				writeScope(scopeId, { m5c: component.id }), _script(scopeId, SET_SCOPE_REGISTER_ID);
 			}
-			_set_serialize_reason(+!!willRerender);
+			_set_serialize_reason(willRerender ? CLIENT_ALL : 0);
 			try {
 				renderer(normalizedInput);
 			} finally {
@@ -495,6 +495,7 @@ var State$1 = class {
 	flushId;
 	pos;
 	id;
+	path = null;
 	constructor(parent, accessor, flushId, pos = null, id = null) {
 		this.parent = parent, this.accessor = accessor, this.flushId = flushId, this.pos = pos, this.id = id;
 	}
@@ -628,7 +629,7 @@ function writeProp(state, val, parent, accessor) {
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
 	let ref = state.refs.get(val);
-	if (ref) return trackChannel(state, ref) ? parent && isCircular(parent, ref) ? (ensureId(state, ref), state.pendingAssignments.add(ref), addAssignment(ref, accessId(state, parent) + toAccess(accessor)), !1) : (state.buf.push(ensureId(state, ref)), !0) : !1;
+	if (ref) return trackChannel(state, ref) ? parent && isCircular(parent, ref) ? (ensureId(state, ref), state.pendingAssignments.add(ref), addAssignment(ref, accessId(state, parent) + toAccess(accessor)), !1) : (writeRef(state, ref), !0) : !1;
 	let registered = REGISTRY.get(val);
 	return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(val, ref = new Reference(parent, accessor, state.flushId, state.buf.length)), ref.channel = state.channel, write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
@@ -654,7 +655,7 @@ function writeString(state, val, parent, accessor) {
 	if (val.length > 12) {
 		let ref = state.strs.get(val);
 		if (ref) {
-			if (trackChannel(state, ref)) return state.buf.push(ensureId(state, ref)), !0;
+			if (trackChannel(state, ref)) return writeRef(state, ref), !0;
 		} else {
 			let ref = new Reference(parent, accessor, state.flushId, state.buf.length);
 			ref.channel = state.channel, state.strs.set(val, ref);
@@ -1133,6 +1134,9 @@ function quote(str, startPos) {
 	}
 	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
 }
+function writeRef(state, ref) {
+	ref.id === null && ref.scopeId === void 0 && ref.path === null && (ref.pos === null || ref.flushId !== state.flushId) ? (ref.path = accessPath(state, ref), ref.pos = state.buf.length, ref.flushId = state.flushId, ref.channel = state.channel, state.buf.push(ref.path)) : state.buf.push(ensureId(state, ref));
+}
 function ensureId(state, ref) {
 	return ref.scopeId === void 0 ? ref.id ? (trackChannel(state, ref), ref.id) : assignId(state, ref) : (trackChannel(state, ref), "_(" + ref.scopeId + ")");
 }
@@ -1142,23 +1146,18 @@ function accessId(state, ref) {
 }
 function assignId(state, ref) {
 	let { pos } = ref;
-	if (ref.id = nextRefAccess(state), pos !== null && ref.flushId === state.flushId) return pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id;
-	ref.channel = state.channel;
+	return ref.id = nextRefAccess(state), pos !== null && ref.flushId === state.flushId ? (pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id) : (ref.channel = state.channel, ref.id + "=" + (ref.path || accessPath(state, ref)));
+}
+function accessPath(state, ref) {
 	let cur = ref, accessPrevValue = "";
 	do {
 		accessPrevValue = toAccess(cur.accessor) + accessPrevValue;
 		let parent = cur.parent;
-		if (parent.id && (trackChannel(state, parent) || !parent.parent)) {
-			accessPrevValue = parent.id + accessPrevValue;
-			break;
-		}
-		if (parent.flushId === state.flushId || parent.scopeId !== void 0) {
-			accessPrevValue = accessId(state, parent) + accessPrevValue;
-			break;
-		}
+		if (parent.id && (trackChannel(state, parent) || !parent.parent)) return parent.id + accessPrevValue;
+		if (parent.flushId === state.flushId || parent.scopeId !== void 0) return accessId(state, parent) + accessPrevValue;
 		cur = parent;
 	} while (cur);
-	return ref.id + "=" + accessPrevValue;
+	return accessPrevValue;
 }
 function assignmentsToString(assignments, value) {
 	return assignments.length > 100 ? "($=>(" + assignments.join("=$,") + "=$))(" + value + ")" : assignments.join("=") + "=" + value;
@@ -1478,6 +1477,9 @@ function _subscribe(subscribers, scope) {
 	}
 	return scope;
 }
+function maskGroup(mask, group) {
+	return mask === 715827882 ? 1 : typeof mask == "number" ? mask >>> 1 + 2 * group & 3 : mask[group] ?? 0;
+}
 function _set_serialize_reason(reason) {
 	$chunk.boundary.state.serializeReason = reason;
 }
@@ -1486,7 +1488,7 @@ function _scope_reason() {
 	return $chunk.boundary.state.serializeReason = void 0, reason;
 }
 function _serialize_if(condition, key) {
-	return condition && (condition === 1 || (typeof condition == "number" ? condition >>> key + 1 & 1 : condition[key])) ? 1 : void 0;
+	return condition && maskGroup(condition, key) ? 1 : void 0;
 }
 function _serialize_guard(condition, key) {
 	return _serialize_if(condition, key) || 0;
@@ -1605,6 +1607,16 @@ var State = class {
 	constructor($global) {
 		this.$global = $global, $global.cspNonce && (this.nonceAttr = " nonce" + attrAssignment($global.cspNonce));
 	}
+	flushChunk(html, scripts, pending) {
+		let { $global, nonceAttr } = this, { __flush__ } = $global;
+		return scripts && (html += "<script" + nonceAttr + ">" + scripts + "<\/script>"), __flush__ && ($global.__flush__ = void 0, html = __flush__($global, html)), pending ? html : html + this.trailerHTML;
+	}
+	walkScript() {
+		return this.runtimePrefix + ".w()";
+	}
+	resumeScript(resumes) {
+		return this.hasWrittenResume ? this.runtimePrefix + ".r.push(" + resumes + ")" : (this.hasWrittenResume = !0, this.runtimePrefix + ".r=[" + resumes + "]");
+	}
 	get runtimePrefix() {
 		let { $global } = this;
 		return $global.runtimeId + "." + $global.renderId;
@@ -1684,7 +1696,7 @@ var State = class {
 		this.scripts = concatScripts(this.scripts, script);
 	}
 	append(chunk) {
-		this.html += chunk.html, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
+		this.html += chunk.html, this.needsWalk ||= chunk.needsWalk, this.effects = concatEffects(this.effects, chunk.effects), this.scripts = concatScripts(this.scripts, chunk.scripts), this.lastEffect = chunk.lastEffect || this.lastEffect, this.deferredReady = concat(this.deferredReady, chunk.takeDeferredReady());
 	}
 	takeDeferredReady() {
 		let { deferredReady } = this;
@@ -1783,13 +1795,13 @@ var State = class {
 			}
 			state.writeReorders = carried;
 		}
-		return flushSerializer(boundary, state), state.resumes ? state.hasWrittenResume ? scripts = concatScripts(scripts, runtimePrefix + ".r.push(" + state.resumes + ")") : (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]")) : needsResumeArray && !state.hasWrittenResume && (state.hasWrittenResume = !0, scripts = concatScripts(scripts, runtimePrefix + ".r=[]")), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, runtimePrefix + ".w()")), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
+		return flushSerializer(boundary, state), (state.resumes || needsResumeArray && !state.hasWrittenResume) && (scripts = concatScripts(scripts, state.resumeScript(state.resumes))), scripts = concatScripts(scripts, reordered), needsWalk && (scripts = concatScripts(scripts, state.walkScript())), this.html = html, this.scripts = scripts, this.async || (this.effects = this.lastEffect = ""), state.resumes = "", this;
 	}
 	flushHTML() {
 		let { boundary } = this, { state } = boundary;
 		this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript();
-		let { scripts } = this, { $global, nonceAttr } = state, { __flush__ } = $global, { html } = this;
-		return this.html = this.scripts = "", scripts && (html += "<script" + nonceAttr + ">" + scripts + "<\/script>"), __flush__ && ($global.__flush__ = void 0, html = __flush__($global, html)), boundary.count || (html += state.trailerHTML), html;
+		let { html, scripts } = this;
+		return this.html = this.scripts = "", state.flushChunk(html, scripts, boundary.count);
 	}
 };
 function flushSerializer(boundary, serializeState) {
@@ -2043,17 +2055,20 @@ function _content_resume(id, fn, scopeId) {
 //#endregion
 //#region src/html/template.ts
 function render(input = {}) {
+	return startRender(this, input, State);
+}
+function startRender(template, input, StateClass) {
 	let { $global } = input;
 	$global ? ({$global, ...input} = input, $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this),
+		renderId: getDefaultRenderId(template),
 		...$global
 	}) : $global = {
 		runtimeId: "M",
-		renderId: getDefaultRenderId(this)
+		renderId: getDefaultRenderId(template)
 	};
-	let state = new State($global), head = new Chunk(new Boundary(state, $global.signal), null, null, state);
-	return this.i ? head.render(() => writeWaitReady(this.a, this, input)) : head.render(this, input), new ServerRendered(head);
+	let state = new StateClass($global), head = new Chunk(new Boundary(state, $global.signal), null, null, state);
+	return template.i ? head.render(() => writeWaitReady(template.a, template, input)) : head.render(template, input), new ServerRendered(head);
 }
 function getDefaultRenderId(template) {
 	if (template.i) {

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

@@ -1,10 +1,3 @@
 import { type Tag } from "@marko/compiler/babel-utils";
-import { type Binding } from "../util/references";
-declare const kDOMBinding: unique symbol;
-declare module "@marko/compiler/dist/types" {
-    interface MarkoTagExtra {
-        [kDOMBinding]?: Binding;
-    }
-}
 declare const _default: Tag;
 export default _default;

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

@@ -1,10 +1,3 @@
 import { type Tag } from "@marko/compiler/babel-utils";
-import { type Binding } from "../util/references";
-declare const kDOMBinding: unique symbol;
-declare module "@marko/compiler/dist/types" {
-    interface MarkoTagExtra {
-        [kDOMBinding]?: Binding;
-    }
-}
 declare const _default: Tag;
 export default _default;

package/dist/translator/index.d.ts

@@ -129,7 +129,7 @@ declare module "@marko/compiler/dist/types" {
     }
     interface ArrowFunctionExpressionExtra {
     }
-    interface MarkoTagExtra {
+    interface MarkoTagExtra extends NodeExtra {
     }
     interface MarkoTagBodyExtra {
     }