marko 6.3.33 → 6.3.35

package/dist/html/compat.d.ts

@@ -1,6 +1,6 @@
 import { register } from "./serializer";
 import type { ServerRenderer } from "./template";
-import { _await, _html, _peek_scope_id, _scope_id, $global, Chunk, isInResumedBranch, State, withChunk, writeScript } from "./writer";
+import { _await, _html, _peek_scope_id, _scope_id, $global, Chunk, getChunk, isInResumedBranch, State, withChunk, writeScript } from "./writer";
 export declare const compat: {
     $global: typeof $global;
     fork: typeof _await;
@@ -10,13 +10,15 @@ export declare const compat: {
     peekNextScopeId: typeof _peek_scope_id;
     isInResumedBranch: typeof isInResumedBranch;
     withChunk: typeof withChunk;
+    getChunk: typeof getChunk;
     ensureState($global: any): State;
     isTagsAPI(fn: any): boolean;
     onFlush(fn: (chunk: Chunk) => void): void;
     patchDynamicTag: (patch: (tag: unknown, scopeId: number, accessor: import("../common/types").Accessor) => unknown) => void;
     writeSetScopeForComponent(branchId: number, m5c: string, m5i: unknown): void;
     toJSON(): (this: WeakKey) => [registryId: string, scopeId: unknown] | undefined;
-    flushScript($global: any): string;
+    createChunk($global: any): Chunk;
+    flushScript($global: any, chunk?: Chunk): string;
     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/dynamic-tag.d.ts

@@ -5,7 +5,7 @@ interface BodyContentObject {
     content: ServerRenderer;
 }
 export declare let _dynamic_tag: (scopeId: number, accessor: Accessor, tag: unknown | string | ServerRenderer | BodyContentObject, inputOrArgs: unknown, content?: (() => void) | 0, inputIsArgs?: 1, serializeReason?: 1 | 0) => unknown;
-export declare function _content(id: string, fn: ServerRenderer): ServerRenderer;
+export declare function _content(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare function _content_resume(id: string, fn: ServerRenderer, scopeId?: number): ServerRenderer;
 export declare const patchDynamicTag: (patch: (tag: unknown, scopeId: number, accessor: Accessor) => unknown) => void;
 export {};

package/dist/html/serializer.d.ts

@@ -5,7 +5,14 @@ export interface SerializeChannel {
     readyId?: string;
     parent?: SerializeChannel;
 }
-export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): void;
+interface Debug {
+    file: string;
+    loc: string | 0;
+    vars: Record<string, string | [name: string, loc?: string]> | undefined;
+    slots?: Record<string, string>;
+}
+export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Debug["vars"]): void;
+export declare function setDebugSlotName(obj: WeakKey, accessor: string, name: string): void;
 export declare class Serializer {
     #private;
     pending(channel?: SerializeChannel): boolean;
@@ -23,3 +30,4 @@ export declare function getRegistered(val: WeakKey): {
 export declare function toObjectKey(name: string): string;
 export declare function toAccess(accessor: string): string;
 export declare function quote(str: string, startPos: number): string;
+export {};

package/dist/html/template.d.ts

@@ -1,6 +1,7 @@
 import { RendererProp, type Template } from "../common/types";
 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;

package/dist/html/writer.d.ts

@@ -21,6 +21,7 @@ export declare function getChunk(): Chunk | undefined;
 export declare function withChunk<T>(chunk: Chunk, cb: () => T): T;
 export declare function getContext(key: keyof NonNullable<Chunk["context"]>): unknown;
 export declare function getState(): State;
+export declare function rendererKey(renderer: unknown): unknown;
 export declare function getScopeId(scope: unknown): number | undefined;
 export declare function getScopeById(scopeId: number | undefined): ScopeInternals | undefined;
 export declare function $global(): $Global & {

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	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$1") : 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 } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&\r]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;", 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$1") : 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 } = {}, 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];
@@ -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, 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 = /'|&(?=[#a-zA-Z])/g, doubleQuoteAttrReplacements = /"|&(?=[#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) => {
+}, 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) || {};
@@ -278,7 +278,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 		};
 		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))));
 	}
-	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: renderer?.a || renderer }) : _scope_id(), result;
+	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = ((originalDynamicTag) => (patch) => {
 	_dynamic_tag = (scopeId, accessor, tag, input, content, inputIsArgs, resume) => {
 		let patched = patch(tag, scopeId, accessor);
@@ -293,6 +293,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	peekNextScopeId: _peek_scope_id,
 	isInResumedBranch,
 	withChunk,
+	getChunk,
 	ensureState($global) {
 		let state = $global[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
 		return state || ($global.runtimeId ||= "M", $global.renderId ||= $global.componentIdPrefix || $global.widgetIdPrefix || "_", $global[K_TAGS_API_STATE] = state = new State($global)), state;
@@ -326,10 +327,18 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			return compatRegistered;
 		};
 	},
-	flushScript($global) {
-		let state = this.ensureState($global), boundary = new Boundary(state);
-		if (boundary.flush() === 1) throw Error("Cannot serialize promise across tags/class compat layer.");
-		return new Chunk(boundary, null, null, state).flushScript().scripts;
+	createChunk($global) {
+		let state = this.ensureState($global);
+		return new Chunk(new Boundary(state), null, null, state);
+	},
+	flushScript($global, chunk) {
+		chunk ||= this.createChunk($global);
+		let { boundary } = chunk;
+		switch (boundary.flush()) {
+			case 2: throw boundary.signal.reason;
+			case 1: throw Error("Cannot serialize promise across tags/class compat layer.");
+		}
+		return chunk.flushScript().scripts;
 	},
 	render(renderer, willRerender, classAPIOut, component, input, completeChunks, registerChildScope) {
 		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), head = new Chunk(boundary, null, getChunk()?.context ?? null, state), normalizedInput = input;
@@ -450,28 +459,28 @@ function _escape_comment(val) {
 patchIteratorNext(Generator.prototype), patchIteratorNext(AsyncGenerator.prototype);
 var State$1 = class {
 	ids = 0;
-	flush = 0;
+	flushId = 0;
 	wroteUndefined = !1;
 	buf = [];
 	strs = /* @__PURE__ */ new Map();
 	refs = /* @__PURE__ */ new WeakMap();
-	assigned = /* @__PURE__ */ new Set();
+	pendingAssignments = /* @__PURE__ */ new Set();
 	boundary = void 0;
 	channel = void 0;
 	channelDeps = null;
 	mutated = [];
 }, Reference = class {
-	assigns = null;
+	assignments = null;
 	calls = null;
 	scopeId = void 0;
 	channel = void 0;
 	parent;
 	accessor;
-	flush;
+	flushId;
 	pos;
 	id;
-	constructor(parent, accessor, flush, pos = null, id = null) {
-		this.parent = parent, this.accessor = accessor, this.flush = flush, this.pos = pos, this.id = id;
+	constructor(parent, accessor, flushId, pos = null, id = null) {
+		this.parent = parent, this.accessor = accessor, this.flushId = flushId, this.pos = pos, this.id = id;
 	}
 }, Serializer = class {
 	#state = new State$1();
@@ -485,7 +494,7 @@ var State$1 = class {
 		try {
 			return this.#state.boundary = boundary, this.#state.channel = channel, writeScopesRoot(this.#state, flushes);
 		} finally {
-			this.#state.flush++, this.#state.buf = [];
+			this.#state.flushId++, this.#state.buf = [];
 		}
 	}
 	written(val) {
@@ -526,20 +535,20 @@ function writeScopesRoot(state, flushes) {
 	}
 	nextSlotId !== -1 && buf.push("]");
 	let extras = "";
-	(state.assigned.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_(" + buf[fillIndex], buf.push(")")), writeAssigned(state));
+	(state.pendingAssignments.size || hasChannelMutations(state)) && (extras = ",0)", fillIndex !== -1 && (buf[fillIndex] = "_(" + buf[fillIndex], buf.push(")")), writeAssigned(state));
 	let result = extras && "(";
 	for (let chunk of buf) result += chunk;
 	return result += extras, result ? state.wroteUndefined ? (state.wroteUndefined = !1, "(_,$)=>" + result) : "_=>" + result : "";
 }
 function writeAssigned(state) {
 	let sep = state.buf.length ? "," : "";
-	if (state.assigned.size) {
-		let assigned = state.assigned;
-		state.assigned = /* @__PURE__ */ new Set();
+	if (state.pendingAssignments.size) {
+		let pending = state.pendingAssignments;
+		state.pendingAssignments = /* @__PURE__ */ new Set();
 		let buf = "", hasCalls = !1;
-		for (let ref of assigned) ref.assigns && (buf += sep + assignsToString(ref.assigns, ref.id), ref.assigns = null, sep = ","), hasCalls ||= ref.calls !== null;
+		for (let ref of pending) ref.assignments && (buf += sep + assignmentsToString(ref.assignments, ref.id), ref.assignments = null, sep = ","), hasCalls ||= ref.calls !== null;
 		if (buf && state.buf.push(buf), hasCalls) {
-			for (let ref of assigned) if (ref.calls) {
+			for (let ref of pending) if (ref.calls) {
 				for (let { method, args } of ref.calls) {
 					state.buf.push((state.buf.length ? "," : "") + ref.id + "." + method + "(");
 					for (let a = 0; a < args.length; a++) a && state.buf.push(","), writeCallArg(state, args[a]);
@@ -570,10 +579,14 @@ function writeAssigned(state) {
 		}
 		state.mutated = remaining;
 	}
-	state.assigned.size && writeAssigned(state);
+	state.pendingAssignments.size && writeAssigned(state);
 }
 function writeCallArg(state, val) {
-	val === void 0 ? (state.wroteUndefined = !0, state.buf.push("$")) : writeProp(state, val, null, "") || state.buf.push("void 0");
+	if (val === void 0) state.wroteUndefined = !0, state.buf.push("$");
+	else if (writeProp(state, val, null, "")) {
+		let ref = state.refs.get(val) || state.strs.get(val);
+		ref && ref.id === null && assignId(state, ref);
+	} else state.buf.push("void 0");
 }
 function hasChannelMutations(state) {
 	return hasMatchingMutations(state.mutated, state.channel?.readyId);
@@ -599,22 +612,22 @@ 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.assigned.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) : (state.buf.push(ensureId(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.flush, state.buf.length)), ref.channel = state.channel, write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
+	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));
 }
 function trackScope(state, val, scopeId) {
 	let ref = state.refs.get(val);
 	ref ? trackChannel(state, ref) : newScopeReference(state, val, scopeId);
 }
 function newScopeReference(state, val, scopeId) {
-	let ref = new Reference(null, null, state.flush);
+	let ref = new Reference(null, null, state.flushId);
 	return ref.scopeId = scopeId, ref.channel = state.channel, state.refs.set(val, ref), ref;
 }
 function writeRegistered(state, val, parent, accessor, registered) {
 	let { scope } = registered;
 	if (scope) {
-		let ref = new Reference(parent, accessor, state.flush, state.buf.length);
+		let ref = new Reference(parent, accessor, state.flushId, state.buf.length);
 		ref.channel = state.channel, state.refs.set(val, ref);
 		let scopeId = scope[K_SCOPE_ID];
 		trackScope(state, scope, scopeId), state.buf.push("_(" + scopeId + "," + quote(registered.id, 0) + ")");
@@ -627,7 +640,7 @@ function writeString(state, val, parent, accessor) {
 		if (ref) {
 			if (trackChannel(state, ref)) return state.buf.push(ensureId(state, ref)), !0;
 		} else {
-			let ref = new Reference(parent, accessor, state.flush, state.buf.length);
+			let ref = new Reference(parent, accessor, state.flushId, state.buf.length);
 			ref.channel = state.channel, state.strs.set(val, ref);
 		}
 	}
@@ -759,44 +772,44 @@ function writePromise(state, val, ref) {
 	return state.buf.push("(p=>p=new Promise((f,r)=>" + pId + "={f,r(e){p.catch(_=>0);r(e)}}))()"), val.then((v) => writeAsyncCall(state, boundary, handle, "f", v, channel, pId), (v) => writeAsyncCall(state, boundary, handle, "r", v, channel, pId)), boundary.startAsync(), !0;
 }
 function newAsyncHandle(state, parent, id) {
-	let handle = {}, handleRef = new Reference(parent, null, state.flush, null, id);
+	let handle = {}, handleRef = new Reference(parent, null, state.flushId, null, id);
 	return handleRef.channel = state.channel, state.refs.set(handle, handleRef), handle;
 }
 function writeMap(state, val, ref) {
 	if (!val.size) return state.buf.push("new Map"), !0;
-	let items = [], assigns, needsId, deferring = !1, i = 0;
+	let items = [], assignments, needsId, deferring = !1, i = 0;
 	if (val.size < 25) {
 		for (let [itemKey, itemValue] of val) {
 			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) && (deferring = !0), deferring) {
 				deferCall(state, ref, "set", [itemKey, itemValue]);
 				continue;
 			}
-			itemKey === val && (itemKey = void 0, (assigns ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assigns ||= []).push("a[" + i + "][1]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
+			itemKey === val && (itemKey = void 0, (assignments ||= []).push("a[" + i + "][0]")), itemValue === val && (itemValue = void 0, (assignments ||= []).push("a[" + i + "][1]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemValue === void 0 ? itemKey === void 0 ? [] : [itemKey] : [itemKey, itemValue]);
 		}
-		writeArrayArg(state, ref, items, assigns && "((m,a)=>(" + assignsToString(assigns, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map,", "new Map(", needsId);
+		writeArrayArg(state, ref, items, assignments && "((m,a)=>(" + assignmentsToString(assignments, "m") + ",a.forEach(i=>m.set(i[0],i[1])),m))(new Map,", "new Map(", needsId);
 	} else {
 		for (let [itemKey, itemValue] of val) {
 			if (!deferring && (itemKey !== val && isAncestorMember(state, ref, itemKey) || itemValue !== val && isAncestorMember(state, ref, itemValue)) && (deferring = !0), deferring) {
 				deferCall(state, ref, "set", [itemKey, itemValue]);
 				continue;
 			}
-			itemKey === val && (itemKey = 0, (assigns ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assigns ||= []).push("a[" + (i + 1) + "]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemKey, itemValue);
+			itemKey === val && (itemKey = 0, (assignments ||= []).push("a[" + i + "]")), itemValue === val && (itemValue = 0, (assignments ||= []).push("a[" + (i + 1) + "]")), needsId ||= isDedupedMember(itemKey) || isDedupedMember(itemValue), i = items.push(itemKey, itemValue);
 		}
-		writeArrayArg(state, ref, items, assigns && "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignsToString(assigns, "new Map") + "))(", "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(", needsId);
+		writeArrayArg(state, ref, items, assignments && "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1])," + assignmentsToString(assignments, "new Map") + "))(", "(a=>a.reduce((m,v,i)=>i%2?m:m.set(v,a[i+1]),new Map))(", needsId);
 	}
 	return !0;
 }
 function writeSet(state, val, ref) {
 	if (!val.size) return state.buf.push("new Set"), !0;
-	let items = [], assigns, needsId, deferring = !1, i = 0;
+	let items = [], assignments, needsId, deferring = !1, i = 0;
 	for (let item of val) {
 		if (!deferring && item !== val && isAncestorMember(state, ref, item) && (deferring = !0), deferring) {
 			deferCall(state, ref, "add", [item]);
 			continue;
 		}
-		item === val ? (item = 0, (assigns ||= []).push("i[" + i + "]")) : needsId ||= isDedupedMember(item), i = items.push(item);
+		item === val ? (item = 0, (assignments ||= []).push("i[" + i + "]")) : needsId ||= isDedupedMember(item), i = items.push(item);
 	}
-	return writeArrayArg(state, ref, items, assigns && "((s,i)=>(" + assignsToString(assigns, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId), !0;
+	return writeArrayArg(state, ref, items, assignments && "((s,i)=>(" + assignmentsToString(assignments, "s") + ",i.forEach(i=>s.add(i)),s))(new Set,", "new Set(", needsId), !0;
 }
 function isAncestorMember(state, container, member) {
 	if (member === null || typeof member != "object" && typeof member != "function") return !1;
@@ -807,13 +820,13 @@ function deferCall(state, ref, method, args) {
 	ensureId(state, ref), (ref.calls ||= []).push({
 		method,
 		args
-	}), state.assigned.add(ref);
+	}), state.pendingAssignments.add(ref);
 }
 function writeArrayArg(state, ref, items, assignsPrefix, plainPrefix, needsId) {
 	if (assignsPrefix || needsId) {
-		let arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		let arrayRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
 		state.buf.push((assignsPrefix || plainPrefix) + arrayRef.id + "="), writeArray(state, items, arrayRef);
-	} else state.buf.push(plainPrefix), writeArray(state, items, new Reference(ref, null, state.flush, state.buf.length));
+	} else state.buf.push(plainPrefix), writeArray(state, items, new Reference(ref, null, state.flushId, state.buf.length));
 	state.buf.push(")");
 }
 function isDedupedMember(val) {
@@ -847,7 +860,7 @@ function writeTypedArray(state, val, ref) {
 		if (!canWriteBuffer(state, val.buffer, ref)) return !1;
 		let needsLength = val.byteOffset + val.byteLength < val.buffer.byteLength;
 		state.buf.push("new " + val.constructor.name + "("), writeProp(state, val.buffer, ref, "buffer"), state.buf.push((val.byteOffset || needsLength ? "," + val.byteOffset + (needsLength ? "," + val.length : "") : "") + ")");
-	} else state.refs.set(val.buffer, new Reference(ref, "buffer", state.flush, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
+	} else state.refs.set(val.buffer, new Reference(ref, "buffer", state.flushId, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
 	return !0;
 }
 function writeWeakSet(state) {
@@ -869,7 +882,7 @@ function writeAggregateError(state, val, ref) {
 	let inlined = writeProp(state, val.errors, ref, "errors");
 	if (inlined || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), inlined) {
 		let errorsRef = state.refs.get(val.errors);
-		errorsRef?.id && (state.assigned.add(errorsRef), addAssignment(errorsRef, accessId(state, ref) + toAccess("errors")));
+		errorsRef?.id && (state.pendingAssignments.add(errorsRef), addAssignment(errorsRef, accessId(state, ref) + toAccess("errors")));
 	}
 	return !0;
 }
@@ -900,7 +913,7 @@ function writeRequest(state, val, ref) {
 	let seenHeaders = state.refs.get(val.headers);
 	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders), sep = ",";
 	else {
-		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flushId, null));
 		let headers = stringEntriesToHeadersInit(val.headers);
 		headers && (options += sep + "headers:" + headers, sep = ",");
 	}
@@ -912,7 +925,7 @@ function writeResponse(state, val, ref) {
 	let seenHeaders = state.refs.get(val.headers);
 	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders);
 	else {
-		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flushId, null));
 		let headers = stringEntriesToHeadersInit(val.headers);
 		headers && (options += sep + "headers:" + headers);
 	}
@@ -926,7 +939,7 @@ function writeIntl(state, val, name, ref) {
 	}
 	state.buf.push("new Intl." + name + "(" + quote(locale, 0) + ",");
 	let optionsRef;
-	return needsId ? (optionsRef = new Reference(ref, null, state.flush, null, nextRefAccess(state)), state.buf.push(optionsRef.id + "={")) : (optionsRef = new Reference(ref, null, state.flush, state.buf.length), state.buf.push("{")), writeObjectProps(state, options, optionsRef), state.buf.push("})"), !0;
+	return needsId ? (optionsRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state)), state.buf.push(optionsRef.id + "={")) : (optionsRef = new Reference(ref, null, state.flushId, state.buf.length), state.buf.push("{")), writeObjectProps(state, options, optionsRef), state.buf.push("})"), !0;
 }
 function writeIntlLocale(state, val) {
 	return state.buf.push("new Intl.Locale(" + quote(val.toString(), 0) + ")"), !0;
@@ -958,11 +971,11 @@ function writeGenerator(state, iter, ref) {
 	if (returnValue === void 0 && !yields.length) return state.buf.push("(function*(){})()"), !0;
 	let heldReturn = returnValue !== void 0 && isAncestorMember(state, ref, returnValue);
 	if (state.buf.push(returnValue === void 0 ? "(function*(a){yield*a})(" : heldReturn ? "(function*(a,r){yield*a;return r.v})(" : "(function*(a,r){yield*a;return r})("), needsId) {
-		let arrayRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		let arrayRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
 		state.buf.push(arrayRef.id + "="), writeArray(state, yields, arrayRef);
-	} else writeArray(state, yields, new Reference(ref, null, state.flush, state.buf.length));
+	} else writeArray(state, yields, new Reference(ref, null, state.flushId, state.buf.length));
 	if (heldReturn) {
-		let holder = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+		let holder = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
 		state.buf.push("," + holder.id + "={}"), writeProp(state, returnValue, holder, "v");
 	} else if (returnValue !== void 0) {
 		let sepIndex = state.buf.push(",") - 1;
@@ -1001,7 +1014,7 @@ function writeMaybeIterableProps(state, val, ref) {
 		let yieldSelf = "", iterArr = [];
 		for (let item of val) item === val && !(yieldSelf || iterArr.length) ? yieldSelf = "yield this;" : iterArr.push(item);
 		if (iterArr.length) {
-			let iterRef = new Reference(ref, null, state.flush, null, nextRefAccess(state));
+			let iterRef = new Reference(ref, null, state.flushId, null, nextRefAccess(state));
 			state.buf.push(sep + "*[(" + iterRef.id + "="), writeArray(state, iterArr, iterRef), state.buf.push(",Symbol.iterator)](){" + yieldSelf + "yield*" + iterRef.id + "}");
 		} else state.buf.push(sep + "*[Symbol.iterator](){" + yieldSelf.slice(0, -1) + "}");
 		sep = ",";
@@ -1113,7 +1126,7 @@ function accessId(state, ref) {
 }
 function assignId(state, ref) {
 	let { pos } = ref;
-	if (ref.id = nextRefAccess(state), pos !== null && ref.flush === state.flush) return pos === 0 ? state.buf[0] = ref.id + "=" + state.buf[0] : state.buf[pos - 1] += ref.id + "=", ref.id;
+	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;
 	let cur = ref, accessPrevValue = "";
 	do {
@@ -1123,7 +1136,7 @@ function assignId(state, ref) {
 			accessPrevValue = parent.id + accessPrevValue;
 			break;
 		}
-		if (parent.flush === state.flush || parent.scopeId !== void 0) {
+		if (parent.flushId === state.flushId || parent.scopeId !== void 0) {
 			accessPrevValue = accessId(state, parent) + accessPrevValue;
 			break;
 		}
@@ -1131,11 +1144,11 @@ function assignId(state, ref) {
 	} while (cur);
 	return ref.id + "=" + accessPrevValue;
 }
-function assignsToString(assigns, value) {
-	return assigns.length > 100 ? "($=>(" + assigns.join("=$,") + "=$))(" + value + ")" : assigns.join("=") + "=" + value;
+function assignmentsToString(assignments, value) {
+	return assignments.length > 100 ? "($=>(" + assignments.join("=$,") + "=$))(" + value + ")" : assignments.join("=") + "=" + value;
 }
 function addAssignment(ref, assign) {
-	ref.assigns ? ref.assigns.push(assign) : ref.assigns = [assign];
+	ref.assignments ? ref.assignments.push(assign) : ref.assignments = [assign];
 }
 function nextRefAccess(state) {
 	return "_." + nextId(state);
@@ -1251,6 +1264,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.e === void 0 ? renderer?.a || renderer : renderer.a + " " + renderer.e;
+}
 function getScopeId(scope) {
 	return scope[K_SCOPE_ID];
 }
@@ -1329,7 +1345,7 @@ function _attr_content(nodeAccessor, scopeId, content, serializeReason) {
 	let shouldResume = serializeReason !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
 	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
-		["D" + nodeAccessor]: render?.a
+		["D" + nodeAccessor]: rendererKey(render)
 	});
 }
 function normalizeServerRender(value) {
@@ -1816,7 +1832,13 @@ function offTick(cb) {
 function flushTickQueue() {
 	let queue = tickQueue;
 	tickQueue = void 0;
-	for (let cb of queue) cb(!0);
+	for (let cb of queue) try {
+		cb(!0);
+	} catch (err) {
+		tick(() => {
+			throw err;
+		});
+	}
 }
 //#endregion
 //#region src/html/attrs.ts
@@ -1838,7 +1860,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	let escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _attr("value", value);
@@ -1955,13 +1977,13 @@ function escapeSingleQuotedAttrValue(value) {
 	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
 }
 function replaceUnsafeSingleQuoteAttrChar(match) {
-	return match === "'" ? "&#39;" : "&amp;";
+	return match === "'" ? "&#39;" : match === "\r" ? "&#13;" : "&amp;";
 }
 function escapeDoubleQuotedAttrValue(value) {
 	return doubleQuoteAttrReplacements.test(value) ? value.replace(doubleQuoteAttrReplacements, replaceUnsafeDoubleQuoteAttrChar) : value;
 }
 function replaceUnsafeDoubleQuoteAttrChar(match) {
-	return match === "\"" ? "&#34;" : "&amp;";
+	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
 }
 function normalizedValueMatches(a, b) {
 	let value = normalizeStrAttrValue(b);
@@ -1975,11 +1997,11 @@ function normalizeStrAttrValue(value) {
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
-function _content(id, fn) {
-	return fn.a = id, fn;
+function _content(id, fn, scopeId) {
+	return fn.a = id, fn.e = scopeId, fn;
 }
 function _content_resume(id, fn, scopeId) {
-	return _resume(_content(id, fn), id, scopeId);
+	return _resume(_content(id, fn, scopeId), id, scopeId);
 }
 //#endregion
 //#region src/html/template.ts
@@ -2190,14 +2212,17 @@ function writeTriggerScript(html, triggers) {
 	let htmlStr = _escape_script(JSON.stringify(html)), exprs = triggers.map((trigger) => {
 		let options = trigger.options && toObjectExpression(trigger.options);
 		switch (trigger.type) {
-			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			case "visible": return `(e=>e&&new IntersectionObserver((e,i)=>e.some(e=>e.isIntersecting)&&i.disconnect()+l()${options ? `,${options}` : ""}).observe(e))(${querySelectorOrLoad(trigger.selector)})`;
 			case "idle": return `(self.requestIdleCallback||l)(l${options ? `,${options}` : ""})`;
 			case "media": return `(m=>m.matches?l():m.addEventListener("change",l,{once:1}))(matchMedia(${JSON.stringify(trigger.selector)}))`;
-			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
+			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(${querySelectorOrLoad(trigger.selector)})`;
 		}
 	});
 	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
+function querySelectorOrLoad(selector) {
+	return `document.querySelector(${JSON.stringify(selector)})||l()`;
+}
 function toObjectExpression(options) {
 	let result = "{", sep = "";
 	for (let key in options) Object.hasOwn(options, key) && (result += sep + toObjectKey(key) + ":" + JSON.stringify(options[key]), sep = ",");