marko 6.3.55 → 6.4.0

package/dist/html.mjs

@@ -1,10 +1,12 @@
 let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeStyleAttr = (c) => c === ";" ? "\\3B " : "\\\\", toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
 	let str = "", sep = "", part;
-	if (val) if (typeof val != "object") str += val;
-	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);
+	if (val) {
+		if (typeof val != "object") str += val;
+		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 = /[<&\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 = /* @__PURE__ */ Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (/* @__PURE__ */ (function* () {})()).constructor, AsyncGenerator = (/* @__PURE__ */ (async function* () {})()).constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = /* @__PURE__ */ (() => {
+}, K_SCOPE_ID = Symbol("Scope ID"), kTouchedIterator = /* @__PURE__ */ Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, objectProto = Object.prototype, arrayProto = Array.prototype, Generator = (/* @__PURE__ */ (function* () {})()).constructor, AsyncGenerator = (/* @__PURE__ */ (async function* () {})()).constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = /* @__PURE__ */ (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -80,7 +82,6 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	[Function, "Function"],
 	[globalThis.atob, "atob"],
 	[globalThis.btoa, "btoa"],
-	[globalThis.clearImmediate, "clearImmediate"],
 	[globalThis.clearInterval, "clearInterval"],
 	[globalThis.clearTimeout, "clearTimeout"],
 	[globalThis.crypto?.getRandomValues, "crypto.getRandomValues"],
@@ -88,7 +89,6 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	[globalThis.fetch, "fetch"],
 	[globalThis.performance?.now, "performance.now"],
 	[globalThis.queueMicrotask, "queueMicrotask"],
-	[globalThis.setImmediate, "setImmediate"],
 	[globalThis.setInterval, "setInterval"],
 	[globalThis.setTimeout, "setTimeout"],
 	[globalThis.structuredClone, "structuredClone"],
@@ -244,17 +244,17 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	if (ch === "\0") return "\\x00";
 	let code = ch.charCodeAt(0);
 	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
-}, 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) => {
+}, unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u, 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, $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;
-}, CLIENT_ALL = 715827883, 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) => {
+	return state.needsMainRuntime = !0, countResumeWrite($chunk), Object.assign(scope, partialScope), pending && pending !== partialScope ? Object.assign(pending, partialScope) : target.writeScopes[scopeId] = partialScope, target.flushScopes = !0, scope;
+}, CLIENT_ALL = 715827883, NOOP$2 = () => {}, tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb)), tickQueue, 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, 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) || {};
 		rendered = !0, (() => {
 			if (_scope_id(), _html(`<${renderer}${_attrs(input, "a", branchId, renderer)}>`), !voidElementsReg.test(renderer)) {
 				let renderContent = content || normalizeDynamicRenderer(input.content);
-				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
+				if (renderer === "textarea") _html(_attrs_textarea_value(branchId, "a", input));
 				else {
 					if (renderContent && typeof renderContent != "function") throw Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
 					renderer === "select" && ("value" in input || "valueChange" in input) ? _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1) : renderContent && _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
@@ -303,8 +303,8 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	},
 	onFlush(fn) {
 		let { flushHTML } = Chunk.prototype;
-		Chunk.prototype.flushHTML = function() {
-			return fn(this), flushHTML.call(this);
+		Chunk.prototype.flushHTML = function(boundary) {
+			return fn(this), flushHTML.call(this, boundary);
 		};
 	},
 	patchDynamicTag,
@@ -333,15 +333,13 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	},
 	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;
+		let { boundary } = chunk, scripts = boundary.flush() === 0 ? chunk.flushScript(boundary).scripts : "";
+		if (boundary.signal.aborted) throw boundary.signal.reason;
+		if (boundary.count) throw Error("Cannot serialize promise across tags/class compat layer.");
+		return 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;
+		let state = this.ensureState(classAPIOut.global), boundary = new Boundary(state), context = getChunk()?.context ?? null, head = new Chunk(boundary, new Chunk(boundary, null, context, state), context, state), normalizedInput = input;
 		if ("renderBody" in input) {
 			normalizedInput = {};
 			for (let key in input) normalizedInput[key === "renderBody" ? "content" : key] = input[key];
@@ -454,27 +452,44 @@ function _el_read_error() {}
 function _hoist_read_error() {}
 function _assert_hoist(value) {}
 //#endregion
-//#region src/html/content.ts
-function _to_text(val) {
-	return val || val === 0 ? val + "" : "";
+//#region src/common/for.ts
+function forIn(obj, cb) {
+	for (let key in obj) cb(key, obj[key]);
 }
-function _unescaped(val) {
-	return val ? val + "" : val === 0 ? "0" : "";
+function forOf(list, cb) {
+	if (list) {
+		let i = 0;
+		for (let item of list) cb(item, i++);
+	}
 }
-function _escape(val) {
-	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
+function forTo(to, from, step, cb) {
+	let start = from || 0, delta = step || 1;
+	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
 }
-function _escape_script(val) {
-	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
+function forUntil(until, from, step, cb) {
+	let start = from || 0, delta = step || 1;
+	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
 }
-function _escape_style(val) {
-	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
+//#endregion
+//#region src/common/opt.ts
+function forEach(opt, cb) {
+	if (opt) {
+		if (Array.isArray(opt)) for (let item of opt) cb(item);
+		else cb(opt);
+	}
 }
-function _escape_style_value(val) {
-	return val || val === 0 ? escapeStyleValue(val + "") : "";
+function push(opt, item) {
+	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
 }
-function _escape_comment(val) {
-	return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
+function concat(opt, other) {
+	if (!opt) return other;
+	if (!other) return opt;
+	if (Array.isArray(opt)) {
+		if (Array.isArray(other)) for (let item of other) opt.push(item);
+		else opt.push(other);
+		return opt;
+	}
+	return Array.isArray(other) ? [opt, ...other] : [opt, other];
 }
 patchIteratorNext(Generator.prototype), patchIteratorNext(AsyncGenerator.prototype);
 var State$1 = class {
@@ -485,7 +500,7 @@ var State$1 = class {
 	strs = /* @__PURE__ */ new Map();
 	refs = /* @__PURE__ */ new WeakMap();
 	pendingAssignments = /* @__PURE__ */ new Set();
-	boundary = void 0;
+	boundary;
 	channel = void 0;
 	channelDeps = null;
 	mutated = [];
@@ -514,6 +529,8 @@ var State$1 = class {
 	stringifyScopes(flushes, boundary, channel) {
 		try {
 			return this.#state.boundary = boundary, this.#state.channel = channel, writeScopesRoot(this.#state, flushes);
+		} catch (err) {
+			return abortRender(boundary, err), "";
 		} finally {
 			this.#state.flushId++, this.#state.buf = [];
 		}
@@ -593,10 +610,12 @@ function writeAssigned(state) {
 				objectRef && objectRef.scopeId === void 0 && (objectRef.id ? hasSeen || (state.buf[objectStartIndex] = "(" + state.buf[objectStartIndex], state.buf.push(")")) : (objectRef.id = nextRefAccess(state), state.buf[objectStartIndex] = "(" + objectRef.id + "=" + state.buf[objectStartIndex], state.buf.push(")")));
 			} else state.buf.push("void 0");
 			let valueStartIndex = state.buf.push(toAccess(toObjectKey(mutation.property)) + "(");
-			if (mutation.value !== void 0) if (writeProp(state, mutation.value, null, "")) {
-				let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
-				valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
-			} else state.buf.push("void 0");
+			if (mutation.value !== void 0) {
+				if (writeProp(state, mutation.value, null, "")) {
+					let valueRef = typeof mutation.value == "string" ? state.strs.get(mutation.value) : state.refs.get(mutation.value);
+					valueRef && !valueRef.id && valueRef.scopeId === void 0 && (valueRef.id = mutation.valueId || nextRefAccess(state), state.buf[valueStartIndex] = valueRef.id + "=" + state.buf[valueStartIndex]);
+				} else state.buf.push("void 0");
+			}
 			state.buf.push(")");
 		}
 		state.mutated = remaining;
@@ -716,7 +735,8 @@ function writeUnknownObject(state, val, ref) {
 	let proto = Object.getPrototypeOf(val);
 	if (proto === objectProto) return writePlainObject(state, val, ref);
 	if (proto === arrayProto) return writeArray(state, val, ref);
-	switch (proto?.constructor) {
+	let constructor = proto?.constructor;
+	switch (constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -733,7 +753,7 @@ function writeUnknownObject(state, val, ref) {
 		case ReferenceError:
 		case SyntaxError:
 		case TypeError:
-		case URIError: return writeError(state, val, ref);
+		case URIError: return writeError(state, val, constructor.name, ref);
 		case AggregateError: return writeAggregateError(state, val, ref);
 		case ArrayBuffer: return writeArrayBuffer(state, val);
 		case Int8Array:
@@ -746,7 +766,7 @@ function writeUnknownObject(state, val, ref) {
 		case Float32Array:
 		case Float64Array:
 		case BigInt64Array:
-		case BigUint64Array: return writeTypedArray(state, val, ref);
+		case BigUint64Array: return writeTypedArray(state, val, constructor.name, ref);
 		case DataView: return writeDataView(state, val, ref);
 		case WeakSet: return writeWeakSet(state);
 		case WeakMap: return writeWeakMap(state);
@@ -797,9 +817,7 @@ function writeRegExp(state, val) {
 	return source.includes("<") ? state.buf.push(`RegExp(${quote(source, 0)}${val.flags ? ",\"" + val.flags + "\"" : ""})`) : state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags), !0;
 }
 function writePromise(state, val, ref) {
-	let { boundary, channel } = state;
-	if (!boundary) return !1;
-	let pId = nextRefAccess(state), handle = newAsyncHandle(state, ref, pId);
+	let { boundary, channel } = state, pId = nextRefAccess(state), handle = newAsyncHandle(state, ref, pId);
 	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) {
@@ -886,12 +904,12 @@ function writeArrayBuffer(state, val) {
 	} else result = "new ArrayBuffer";
 	return state.buf.push(result), !0;
 }
-function writeTypedArray(state, val, ref) {
+function writeTypedArray(state, val, name, ref) {
 	if (val.byteOffset || val.byteLength < val.buffer.byteLength || state.refs.has(val.buffer)) {
 		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.flushId, null)), state.buf.push("new " + val.constructor.name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
+		state.buf.push("new " + 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.flushId, null)), state.buf.push("new " + name + (val.length === 0 ? "" : "(" + (hasOnlyZeros(val) ? val.length : typedArrayToInitString(val)) + ")"));
 	return !0;
 }
 function writeWeakSet(state) {
@@ -900,8 +918,8 @@ function writeWeakSet(state) {
 function writeWeakMap(state) {
 	return state.buf.push("new WeakMap"), !0;
 }
-function writeError(state, val, ref) {
-	let result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
+function writeError(state, val, name, ref) {
+	let result = "new " + name + "(" + quote(val.message + "", 0);
 	if (val.cause !== void 0) {
 		let pos = state.buf.push(result + ",{cause:") - 1;
 		writeProp(state, val.cause, ref, "cause") ? state.buf.push("})") : state.buf[pos] = state.buf[pos].slice(0, -8) + ")";
@@ -979,9 +997,8 @@ function writeTemporal(state, val, name) {
 	return state.buf.push("Temporal." + name + ".from(" + quote(val.toString(), 0) + ")"), !0;
 }
 function writeReadableStream(state, val, ref) {
-	let { boundary, channel } = state;
-	if (!boundary || val.locked) return !1;
-	let reader = val.getReader(), iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
+	if (val.locked) return !1;
+	let { boundary, channel } = state, reader = val.getReader(), iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
 		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.signal.aborted || (reader.read().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
 	}, onRejected = (reason) => {
 		writeAsyncCall(state, boundary, handle, "j", reason, channel);
@@ -1019,9 +1036,7 @@ function writeGenerator(state, iter, ref) {
 }
 function writeAsyncGenerator(state, iter, ref) {
 	if (iter[kTouchedIterator]) return state.buf.push("(async function*(){}())"), !0;
-	let { boundary, channel } = state;
-	if (!boundary) return !1;
-	let iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
+	let { boundary, channel } = state, iterId = nextRefAccess(state), handle = newAsyncHandle(state, ref, iterId), onFulfilled = ({ value, done }) => {
 		done ? writeAsyncCall(state, boundary, handle, "r", value, channel) : boundary.signal.aborted || (iter.next().then(onFulfilled, onRejected), boundary.startAsync(), writeAsyncCall(state, boundary, handle, "f", value, channel));
 	}, onRejected = (reason) => {
 		writeAsyncCall(state, boundary, handle, "j", reason, channel);
@@ -1071,6 +1086,10 @@ function trackChannel(state, ref) {
 	}
 	return !1;
 }
+function abortRender(boundary, err) {
+	for (; boundary.parent;) boundary = boundary.parent;
+	boundary.abort(err);
+}
 function isCircular(parent, ref) {
 	let cur = parent;
 	for (; cur;) {
@@ -1083,16 +1102,17 @@ function toObjectKey(name) {
 	if (name === "") return "\"\"";
 	if (name === "__proto__") return "[\"__proto__\"]";
 	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);
+	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);
+			}
+			if (len > 15 && "" + +name !== name) return quote(name, 0);
 		}
-		if (len > 15 && "" + +name !== name) return quote(name, 0);
-	}
-	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+	} 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);
 	}
@@ -1185,7 +1205,7 @@ function nextRefAccess(state) {
 function nextId(state) {
 	let c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", n = state.ids++, r = c[n % 53];
 	for (n = n / 53 | 0; n; n >>>= 6) r += c[n & 63];
-	return r;
+	return r === "name" ? nextId(state) : r;
 }
 function hasSymbolIterator(value) {
 	return Symbol.iterator in value;
@@ -1223,42 +1243,161 @@ function patchIteratorNext(proto) {
 	}, proto.next[kTouchedIterator] = !0;
 }
 //#endregion
-//#region src/common/for.ts
-function forIn(obj, cb) {
-	for (let key in obj) cb(key, obj[key]);
+//#region src/html/attrs.ts
+function _attr_class(value) {
+	return stringAttr("class", toDelimitedString(value, " ", stringifyClassObject));
 }
-function forOf(list, cb) {
-	if (list) {
-		let i = 0;
-		for (let item of list) cb(item, i++);
+function _attr_style(value) {
+	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
+}
+function _attr_option_value(value) {
+	let valueAttr = _attr("value", value), selectedValue = getContext(kSelectedValue);
+	return selectedValue !== void 0 && normalizedValueMatches(selectedValue, value) ? valueAttr + " selected" : valueAttr;
+}
+function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
+	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value ?? "", content);
+}
+function _attrs_select_value(scopeId, nodeAccessor, data, content) {
+	data && ("value" in data || data.valueChange) ? _attr_select_value(scopeId, nodeAccessor, data.value, data.valueChange, content, 1) : content();
+}
+function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
+	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _textarea_value(value);
+}
+function _attrs_textarea_value(scopeId, nodeAccessor, data) {
+	return _attr_textarea_value(scopeId, nodeAccessor, data?.value, data?.valueChange, 1);
+}
+function _textarea_value(value) {
+	let escaped = _escape(normalizeStrAttrValue(value));
+	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);
+}
+function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
+	return checkedChange && writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType), isNotVoid(checked) ? " checked" : "";
+}
+function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
+	let valueAttr = _attr("value", value);
+	return checkedValueChange && writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType), normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
+}
+function getCheckedValueRef(checkedValue) {
+	if (Array.isArray(checkedValue)) {
+		let ref = checkedValuesRefs.get(checkedValue);
+		return ref || (ref = [], checkedValuesRefs.set(checkedValue, ref)), ref;
 	}
 }
-function forTo(to, from, step, cb) {
-	let start = from || 0, delta = step || 1;
-	for (let steps = (to - start) / delta, i = 0; i <= steps; i++) cb(start + i * delta);
+function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
+	let normalizedOpen = isNotVoid(open);
+	return openChange && writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType), normalizedOpen ? " open" : "";
 }
-function forUntil(until, from, step, cb) {
-	let start = from || 0, delta = step || 1;
-	for (let steps = (until - start) / delta, i = 0; i < steps; i++) cb(start + i * delta);
+function _attr_nonce() {
+	return getChunk().boundary.state.nonceAttr;
 }
-//#endregion
-//#region src/common/opt.ts
-function forEach(opt, cb) {
-	if (opt) if (Array.isArray(opt)) for (let item of opt) cb(item);
-	else cb(opt);
+function _style_html(decls) {
+	let id = _id();
+	return `<style${_attr_nonce()} class=${id}>.${id}~*{${decls}}</style>`;
 }
-function push(opt, item) {
-	return opt ? Array.isArray(opt) ? (opt.push(item), opt) : [opt, item] : item;
+function _attr(name, value) {
+	return isVoid(value) ? "" : nonVoidAttr(name, value);
 }
-function concat(opt, other) {
-	if (!opt) return other;
-	if (!other) return opt;
-	if (Array.isArray(opt)) {
-		if (Array.isArray(other)) for (let item of other) opt.push(item);
-		else opt.push(other);
-		return opt;
+function _attr_and(name, value, attr) {
+	return value ? attr : _attr(name, value);
+}
+function _attr_or(name, value, attr) {
+	return value ? _attr(name, value) : attr;
+}
+function _attr_nullish(name, value, attr) {
+	return value == null ? attr : _attr(name, value);
+}
+function _attrs(data, nodeAccessor, scopeId, tagName) {
+	let result = "", skip = /[\s/>"'=]/, events;
+	switch (data && tagName) {
+		case "input":
+			data.checkedChange ? (result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1), skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/) : "checkedValue" in data || data.checkedValueChange ? (result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1), skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/) : data.valueChange && (result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1), skip = /^value(?:Change)?$|[\s/>"'=]/);
+			break;
+		case "select":
+		case "textarea":
+			("value" in data || data.valueChange) && (skip = /^value(?:Change)?$|[\s/>"'=]/);
+			break;
+		case "option":
+			"value" in data && (result += _attr_option_value(data.value), skip = /^value$|[\s/>"'=]/);
+			break;
+		case "details":
+		case "dialog": data.openChange && (result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1), skip = /^open(?:Change)?$|[\s/>"'=]/);
 	}
-	return Array.isArray(other) ? [opt, ...other] : [opt, other];
+	for (let name in data) {
+		let value = data[name];
+		switch (name) {
+			case "class":
+				result += _attr_class(value);
+				break;
+			case "style":
+				result += _attr_style(value);
+				break;
+			default: name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta") && (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, { ["I" + nodeAccessor]: events })), events[getEventHandlerName(name)] = value) : result += nonVoidAttr(name, value));
+		}
+	}
+	return result;
+}
+function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
+	_html(`${_attrs(data, nodeAccessor, scopeId, tagName)}>`), _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
+}
+function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
+	let partial = {};
+	for (let name in data) {
+		let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+		skip[key] || (partial[key] = data[name]);
+	}
+	return _attrs(partial, nodeAccessor, scopeId, tagName);
+}
+function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
+	_html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`), _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
+}
+function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
+	writeScope(scopeId, serializeType ? {
+		["F" + nodeAccessor]: type,
+		["G" + nodeAccessor]: value,
+		["E" + nodeAccessor]: valueChange
+	} : {
+		["G" + nodeAccessor]: value,
+		["E" + nodeAccessor]: valueChange
+	});
+}
+function stringAttr(name, value) {
+	return value && " " + name + attrAssignment(value);
+}
+function nonVoidAttr(name, value) {
+	switch (typeof value) {
+		case "string": return " " + name + attrAssignment(value);
+		case "boolean": return " " + name;
+		case "number": return " " + name + "=" + value;
+	}
+	return " " + name + attrAssignment(value + "");
+}
+function attrAssignment(value) {
+	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
+}
+function escapeSingleQuotedAttrValue(value) {
+	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
+}
+function replaceUnsafeSingleQuoteAttrChar(match) {
+	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;" : match === "\r" ? "&#13;" : "&amp;";
+}
+function normalizedValueMatches(a, b) {
+	let value = normalizeStrAttrValue(b);
+	if (Array.isArray(a)) {
+		for (let item of a) if (normalizeStrAttrValue(item) === value) return !0;
+	} else if (normalizeStrAttrValue(a) === value) return !0;
+	return !1;
+}
+function normalizeStrAttrValue(value) {
+	return isNotVoid(value) && value !== !0 ? value + "" : "";
 }
 //#endregion
 //#region src/html/for.ts
@@ -1324,14 +1463,20 @@ function withContext(key, value, cb, cbValue) {
 		ctx[kPendingContexts]--, ctx[key] = prev;
 	}
 }
+function captureContext(chunk) {
+	chunk.context?.[kPendingContexts] && (chunk.context = {
+		...chunk.context,
+		[kPendingContexts]: 0
+	});
+}
 function isInResumedBranch() {
 	return $chunk?.context?.[kBranchId] !== void 0;
 }
 function withBranchId(branchId, cb, cbValue) {
 	return withContext(kBranchId, branchId, cb, cbValue);
 }
-function withIsAsync(cb, value) {
-	return withContext(kIsAsync, !0, cb, value);
+function withIsAsync(async, cb, value) {
+	return withContext(kIsAsync, async, cb, value);
 }
 function _html(html) {
 	$chunk.writeHTML(html);
@@ -1468,11 +1613,12 @@ function applyBranchStart(chunk, beforeBranch, rendered) {
 }
 function writeBranchEnd(scopeId, accessor, serializeStateful, serializeMarker, parentEndTag, singleNode, branchIds) {
 	let endTag = parentEndTag || "";
-	if (serializeMarker !== 0) if (!parentEndTag || serializeStateful !== 0) {
-		let { state } = $chunk.boundary, mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
-		$chunk.writeHTML(mark + endTag);
-	} else $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
-	else $chunk.writeHTML(endTag);
+	if (serializeMarker !== 0) {
+		if (!parentEndTag || serializeStateful !== 0) {
+			let { state } = $chunk.boundary, mark = singleNode ? state.mark(parentEndTag ? "}" : "|", scopeId + " " + accessor + (branchIds || "")) : state.mark(parentEndTag ? ")" : "]", scopeId + " " + accessor + (branchIds || ""));
+			$chunk.writeHTML(mark + endTag);
+		} else $chunk.writeHTML(endTag + _el_resume(scopeId, accessor));
+	} else $chunk.writeHTML(endTag);
 }
 function _existing_scope(scopeId) {
 	return writeScope(scopeId, {});
@@ -1526,26 +1672,24 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 		} else content(promise);
 		return;
 	}
-	let chunk = $chunk, { boundary } = chunk;
-	chunk.next = $chunk = chunk.fork(boundary, chunk.next), chunk.async = !0, chunk.context?.[kPendingContexts] && (chunk.context = {
-		...chunk.context,
-		[kPendingContexts]: 0
-	}), boundary.startAsync(), promise.then((value) => {
+	let chunk = $chunk, { boundary } = chunk, startId = _peek_scope_id(), after = chunk.next = $chunk = chunk.fork(boundary, chunk.next);
+	chunk.async = !0, captureContext(chunk), boundary.startAsync(), promise.then((value) => {
 		chunk.async && (chunk.async = !1, boundary.signal.aborted || (chunk.render(() => {
 			if (resumeMarker) {
 				let branchId = _peek_scope_id();
-				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withBranchId(branchId, () => withIsAsync(content, value)), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
-			} else withIsAsync(content, value);
+				$chunk.writeHTML($chunk.boundary.state.mark("[", "")), withBranchId(branchId, () => withIsAsync({ parent: getAsyncContent(chunk) }, content, value)), $chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
+			} else {
+				let renderedSince = _peek_scope_id() !== startId, async = { parent: getAsyncContent(chunk) };
+				withIsAsync(async, content, value), async.visit = renderedSince && (after.html || after.next) ? $chunk.boundary.state.mark("]", scopeId + " " + accessor) : "", async.resumed && $chunk.writeHTML(async.visit), async.end = $chunk;
+			}
 		}), boundary.endAsync()));
 	}, (err) => {
 		chunk.async = !1, boundary.abort(err);
 	});
 }
-function _try(scopeId, accessor, content, input) {
-	let catchContent = input.catch ? normalizeDynamicRenderer(input.catch) || 0 : void 0, placeholderContent = normalizeDynamicRenderer(input.placeholder), placeholderBranchId = placeholderContent ? _scope_id() : 0, branchId = _peek_scope_id(), chunk = $chunk, { boundary } = chunk, { state } = boundary, { resumeWrites } = boundary, beforeBranch = deferBranchStart(chunk), renderersAtSettle = !1;
-	catchContent !== void 0 || placeholderContent ? renderersAtSettle = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, placeholderContent, branchId) : withBranchId(branchId, content);
-	let rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
-	applyBranchStart(chunk, beforeBranch, rendered), rendered && (renderersAtSettle || writeTryRenderers(branchId, catchContent, placeholderContent), $chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId)));
+function _try(scopeId, accessor, content, placeholderContent, catchContent, placeholderId, catchId) {
+	let placeholderBranchId = placeholderContent ? _scope_id() : 0, branchId = _peek_scope_id(), chunk = $chunk, { boundary } = chunk, { state } = boundary, { resumeWrites } = boundary, beforeBranch = deferBranchStart(chunk), renderers = () => writeTryRenderers(branchId, catchContent && _resume(catchContent, catchId), placeholderContent && _resume(placeholderContent, placeholderId)), renderersWritten = tryBoundary(placeholderContent ? () => tryPlaceholder(content, placeholderContent, branchId, scopeId, placeholderBranchId) : content, catchContent, branchId, renderers), rendered = chunk !== $chunk || boundary.resumeWrites !== resumeWrites;
+	applyBranchStart(chunk, beforeBranch, rendered), rendered && (renderersWritten || renderers(), $chunk.writeHTML(state.mark("]", scopeId + " " + accessor + " " + branchId)));
 }
 function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBranchId) {
 	let chunk = $chunk, { boundary } = chunk, body = chunk.fork(boundary, null);
@@ -1553,7 +1697,7 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		chunk.append(body);
 		return;
 	}
-	chunk.next = $chunk = chunk.fork(boundary, chunk.next), chunk.placeholder = {
+	chunk.next = $chunk = chunk.fork(boundary, chunk.next), captureContext(chunk), chunk.placeholder = {
 		body,
 		render: placeholder,
 		branchId,
@@ -1561,29 +1705,31 @@ function tryPlaceholder(content, placeholder, branchId, scopeId, placeholderBran
 		placeholderBranchId
 	};
 }
-function tryBoundary(content, catchContent, placeholderContent, branchId) {
-	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, boundary.signal, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = withBranchId(branchId, () => body.render(content));
-	if (catchBoundary.signal.aborted) return catchContent === void 0 ? boundary.abort(catchBoundary.signal.reason) : catchContent && catchContent(catchBoundary.signal.reason), !1;
+function tryBoundary(content, catchContent, branchId, renderers) {
+	let chunk = $chunk, { boundary } = chunk, { state } = boundary, catchBoundary = new Boundary(state, boundary.signal, boundary), body = chunk.fork(catchBoundary, null), bodyEnd = body.render(() => withBranchId(branchId, content));
+	if (catchBoundary.signal.aborted) return catchContent ? catchContent(catchBoundary.signal.reason) : boundary.abort(catchBoundary.signal.reason), !0;
 	if (body === bodyEnd) return chunk.append(body), !1;
 	let renderersAtSettle = !catchBoundary.resumeWrites, bodyNext = bodyEnd.next = $chunk = chunk.fork(boundary, chunk.next);
 	chunk.next = body, boundary.startAsync();
-	let reorderId = catchContent === void 0 ? "" : state.nextReorderId(), endMarker = reorderId && state.mark("!", reorderId);
-	return reorderId && (chunk.writeHTML(state.mark("!^", reorderId)), bodyEnd.writeHTML(endMarker)), catchBoundary.onNext = () => {
-		if (!boundary.signal.aborted) if (catchBoundary.signal.aborted) {
-			if (!reorderId) {
-				boundary.abort(catchBoundary.signal.reason);
-				return;
-			}
-			if (!bodyEnd.consumed) {
-				let cur = body, writeMarker = !0;
-				do {
-					let next = cur.next;
-					cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.needsWalk = !0, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholder = cur.reorderId = cur.deferredReady = null), cur = next;
-				} while (cur !== bodyNext);
-			}
-			let catchChunk = chunk.fork(boundary, null), { resumeWrites } = boundary;
-			catchChunk.reorderId = reorderId, (catchChunk.render(catchContent || NOOP$2, catchBoundary.signal.reason) !== catchChunk || boundary.resumeWrites !== resumeWrites) && renderersAtSettle && catchChunk.render(() => writeTryRenderers(branchId, catchContent, placeholderContent)), state.reorder(catchChunk), boundary.endAsync();
-		} else catchBoundary.count ? boundary.onNext() : (renderersAtSettle && catchBoundary.resumeWrites && bodyEnd.render(() => writeTryRenderers(branchId, catchContent, placeholderContent)), boundary.endAsync());
+	let reorderId = catchContent ? state.nextReorderId() : "", endMarker = reorderId && state.mark("!", reorderId);
+	return reorderId && (chunk.writeHTML(state.mark("!^", reorderId)), bodyEnd.writeHTML(endMarker), captureContext(chunk)), catchBoundary.onNext = () => {
+		if (!boundary.signal.aborted) {
+			if (catchBoundary.signal.aborted) {
+				if (!reorderId) {
+					boundary.abort(catchBoundary.signal.reason);
+					return;
+				}
+				if (!bodyEnd.consumed) {
+					let cur = body, writeMarker = !0;
+					do {
+						let next = cur.next;
+						cur.boundary !== catchBoundary && cur.boundary.abort(catchBoundary.signal.reason), writeMarker && !cur.consumed && (writeMarker = !1, cur.async = !1, cur.next = bodyNext, cur.needsWalk = !0, cur.html = endMarker, cur.scripts = cur.effects = cur.lastEffect = "", cur.placeholder = cur.reorderId = cur.deferredReady = null), cur = next;
+					} while (cur !== bodyNext);
+				}
+				let catchChunk = chunk.fork(boundary, null);
+				catchChunk.reorderId = reorderId, catchChunk.render(catchContent, catchBoundary.signal.reason), state.reorder(catchChunk), boundary.endAsync();
+			} else catchBoundary.count ? boundary.onNext() : (renderersAtSettle && catchBoundary.resumeWrites && bodyEnd.render(renderers), boundary.endAsync());
+		}
 	}, renderersAtSettle;
 }
 function writeTryRenderers(branchId, catchContent, placeholderContent) {
@@ -1592,8 +1738,12 @@ function writeTryRenderers(branchId, catchContent, placeholderContent) {
 		Q: placeholderContent
 	});
 }
-function countResumeWrite(boundary) {
-	for (; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+function countResumeWrite(chunk) {
+	for (let boundary = chunk.boundary; boundary; boundary = boundary.parent) boundary.resumeWrites++;
+	for (let async = getAsyncContent(chunk); async && !async.resumed; async = async.parent) async.resumed = !0, async.end?.writeHTML(async.visit);
+}
+function getAsyncContent(chunk) {
+	return chunk.context?.[kIsAsync];
 }
 var State = class {
 	tagId = 1;
@@ -1667,9 +1817,10 @@ var State = class {
 	constructor(state, signal, parent) {
 		super(), this.state = state, this.parent = parent, this.signal.addEventListener("abort", () => {
 			this.count = 0, this.state = new State(this.state.$global), this.onNext();
-		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", () => {
-			this.abort(signal.reason);
-		}));
+		}), signal && (signal.aborted ? this.abort(signal.reason) : signal.addEventListener("abort", this));
+	}
+	handleEvent(event) {
+		this.abort(event.target.reason);
 	}
 	flush() {
 		return this.signal.aborted || flushSerializer(this, this.state), this.count ? 1 : this.signal.aborted ? 2 : 0;
@@ -1678,7 +1829,7 @@ var State = class {
 		this.signal.aborted || this.count++;
 	}
 	endAsync() {
-		!this.signal.aborted && this.count && (this.count--, this.onNext());
+		this.signal.aborted || (this.count--, this.onNext());
 	}
 }, Chunk = class Chunk {
 	html = "";
@@ -1705,7 +1856,7 @@ var State = class {
 		this.html += html;
 	}
 	writeEffect(scopeId, registryId) {
-		countResumeWrite(this.boundary), this.lastEffect === registryId ? this.effects += " " + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
+		countResumeWrite(this), this.lastEffect === registryId ? this.effects += " " + scopeId : (this.lastEffect = registryId, this.effects = concatEffects(this.effects, registryId + " " + scopeId));
 	}
 	writeScript(script) {
 		this.scripts = concatScripts(this.scripts, script);
@@ -1726,14 +1877,16 @@ var State = class {
 	flushPlaceholder() {
 		let { placeholder } = this;
 		if (placeholder) {
+			this.placeholder = null;
 			let body = placeholder.body.consume();
 			if (body.async) {
 				let { state } = this.boundary, { branchId, scopeId, placeholderBranchId } = placeholder, reorderId = body.reorderId = branchId ? branchId + "" : state.nextReorderId();
 				this.writeHTML(state.mark("!^", reorderId));
-				let { effects } = this, beforeBranch = deferBranchStart(this), after = this.render(() => withBranchId(placeholderBranchId, placeholder.render)), stateful = after === this && this.effects !== effects;
-				applyBranchStart(this, beforeBranch, stateful), after === this ? stateful && (this.render(() => writeScope(branchId, { P: scopeWithId(state, placeholderBranchId) })), this.writeHTML(state.mark("]", scopeId + " " + ("P" + branchId) + " " + placeholderBranchId)), body.writeEffect(branchId, "_f")) : this.boundary.abort(/* @__PURE__ */ Error("An @placeholder cannot contain async content.")), this.writeHTML(state.mark("!", reorderId)), state.reorder(body);
+				let { effects } = this, beforeBranch = deferBranchStart(this);
+				if (this.render(() => withBranchId(placeholderBranchId, placeholder.render)) !== this && this.boundary.abort(/* @__PURE__ */ Error("An @placeholder cannot contain async content.")), this.boundary.signal.aborted) return;
+				let stateful = this.effects !== effects;
+				applyBranchStart(this, beforeBranch, stateful), stateful && (this.render(() => writeScope(branchId, { P: scopeWithId(state, placeholderBranchId) })), this.writeHTML(state.mark("]", scopeId + " " + ("P" + branchId) + " " + placeholderBranchId)), body.writeEffect(branchId, "_f")), this.writeHTML(state.mark("!", reorderId)), state.reorder(body);
 			} else body.next = this.next, this.next = body;
-			this.placeholder = null;
 		}
 	}
 	consume() {
@@ -1752,10 +1905,10 @@ var State = class {
 			$chunk = prev;
 		}
 	}
-	flushReadyScripts(reservations, holdEffects) {
-		let { boundary, serializeState } = this, { readyId } = serializeState, scripts = "";
+	flushReadyScripts(boundary, reservations, holdEffects) {
+		let { serializeState } = this, { readyId } = serializeState, scripts = "";
 		if (forEach(this.takeDeferredReady(), (chunk) => {
-			scripts = concatScripts(scripts, chunk.flushReadyScripts(reservations, holdEffects)), (chunk.effects || chunk.deferredReady) && (this.deferredReady = push(this.deferredReady, chunk));
+			scripts = concatScripts(scripts, chunk.flushReadyScripts(boundary, reservations, holdEffects)), (chunk.effects || chunk.deferredReady) && (this.deferredReady = push(this.deferredReady, chunk));
 		}), readyId && !this.async) {
 			let { state } = boundary;
 			flushSerializer(boundary, serializeState);
@@ -1772,11 +1925,11 @@ var State = class {
 		}
 		return scripts;
 	}
-	flushScript() {
-		let { boundary } = this, { state } = boundary, { $global, runtimePrefix } = state, needsWalk = state.walkOnNextFlush;
+	flushScript(boundary) {
+		let { state } = boundary, { $global, runtimePrefix } = state, needsWalk = state.walkOnNextFlush;
 		needsWalk && (state.walkOnNextFlush = !1);
-		let readyResumeScripts = this.flushReadyScripts(void 0, this.async);
-		for (let channel; channel = state.serializer.pendingReadyChannel();) {
+		let readyResumeScripts = this.flushReadyScripts(boundary, void 0, this.async);
+		for (let channel; !boundary.signal.aborted && (channel = state.serializer.pendingReadyChannel());) {
 			let resumes = state.serializer.stringifyScopes([], boundary, channel), deps = state.serializer.takeChannelDeps();
 			state.needsMainRuntime = !0, readyResumeScripts = concatScripts(readyResumeScripts, state.writeReady(channel.readyId, concatSequence(depsMarker(deps), resumes)));
 		}
@@ -1800,7 +1953,7 @@ var State = class {
 				let { reorderId } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", reorderScripts = "", cur = reorderedChunk;
 				for (reorderedChunk.reorderId = null;;) {
 					cur.flushPlaceholder(), cur.deferOwnReady();
-					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(readyReservations, this.async);
+					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(boundary, readyReservations, this.async);
 					if (this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), cur.consumed = !0, reorderHTML += cur.html, reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), state.reorder(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), next) cur = next;
 					else break;
 				}
@@ -1812,9 +1965,9 @@ var State = class {
 		}
 		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();
+	flushHTML(boundary) {
+		let { state } = boundary;
+		this.needsWalk && (this.needsWalk = !1, state.walkOnNextFlush = !0), this.flushScript(boundary);
 		let { html, scripts } = this;
 		return this.html = this.scripts = "", state.flushChunk(html, scripts, boundary.count);
 	}
@@ -1905,159 +2058,30 @@ function flushTickQueue() {
 	}
 }
 //#endregion
-//#region src/html/attrs.ts
-function _attr_class(value) {
-	return stringAttr("class", toDelimitedString(value, " ", stringifyClassObject));
-}
-function _attr_style(value) {
-	return stringAttr("style", toDelimitedString(value, ";", stringifyStyleObject));
-}
-function _attr_option_value(value) {
-	let valueAttr = _attr("value", value), selectedValue = getContext(kSelectedValue);
-	return selectedValue !== void 0 && normalizedValueMatches(selectedValue, value) ? valueAttr + " selected" : valueAttr;
-}
-function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
-	valueChange && writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType), content && withContext(kSelectedValue, value ?? "", content);
-}
-function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
-	return valueChange && writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType), _textarea_value(value);
-}
-function _textarea_value(value) {
-	let escaped = _escape(normalizeStrAttrValue(value));
-	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);
-}
-function _attr_input_checked(scopeId, nodeAccessor, checked, checkedChange, serializeType) {
-	return checkedChange && writeControlledScope(0, scopeId, nodeAccessor, void 0, checkedChange, serializeType), isNotVoid(checked) ? " checked" : "";
-}
-function _attr_input_checkedValue(scopeId, nodeAccessor, checkedValue, checkedValueChange, value, serializeType) {
-	let valueAttr = _attr("value", value);
-	return checkedValueChange && writeControlledScope(1, scopeId, nodeAccessor, getCheckedValueRef(checkedValue), checkedValueChange, serializeType), normalizedValueMatches(checkedValue, value) ? valueAttr + " checked" : valueAttr;
-}
-function getCheckedValueRef(checkedValue) {
-	if (Array.isArray(checkedValue)) {
-		let ref = checkedValuesRefs.get(checkedValue);
-		return ref || (ref = [], checkedValuesRefs.set(checkedValue, ref)), ref;
-	}
-}
-function _attr_details_or_dialog_open(scopeId, nodeAccessor, open, openChange, serializeType) {
-	let normalizedOpen = isNotVoid(open);
-	return openChange && writeControlledScope(4, scopeId, nodeAccessor, normalizedOpen || void 0, openChange, serializeType), normalizedOpen ? " open" : "";
-}
-function _attr_nonce() {
-	return getChunk().boundary.state.nonceAttr;
-}
-function _style_html(decls) {
-	let id = _id();
-	return `<style${_attr_nonce()} class=${id}>.${id}~*{${decls}}</style>`;
-}
-function _attr(name, value) {
-	return isVoid(value) ? "" : nonVoidAttr(name, value);
-}
-function _attr_and(name, value, attr) {
-	return value ? attr : _attr(name, value);
-}
-function _attr_or(name, value, attr) {
-	return value ? _attr(name, value) : attr;
-}
-function _attr_nullish(name, value, attr) {
-	return value == null ? attr : _attr(name, value);
-}
-function _attrs(data, nodeAccessor, scopeId, tagName) {
-	let result = "", skip = /[\s/>"'=]/, events;
-	switch (data && tagName) {
-		case "input":
-			data.checkedChange ? (result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1), skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/) : "checkedValue" in data || data.checkedValueChange ? (result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1), skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/) : data.valueChange && (result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1), skip = /^value(?:Change)?$|[\s/>"'=]/);
-			break;
-		case "select":
-		case "textarea":
-			("value" in data || data.valueChange) && (skip = /^value(?:Change)?$|[\s/>"'=]/);
-			break;
-		case "option":
-			"value" in data && (result += _attr_option_value(data.value), skip = /^value$|[\s/>"'=]/);
-			break;
-		case "details":
-		case "dialog":
-			data.openChange && (result += _attr_details_or_dialog_open(scopeId, nodeAccessor, data.open, data.openChange, 1), skip = /^open(?:Change)?$|[\s/>"'=]/);
-			break;
-	}
-	for (let name in data) {
-		let value = data[name];
-		switch (name) {
-			case "class":
-				result += _attr_class(value);
-				break;
-			case "style":
-				result += _attr_style(value);
-				break;
-			default:
-				name && !(isVoid(value) || skip.test(name) || name === "content" && tagName !== "meta") && (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, { ["I" + nodeAccessor]: events })), events[getEventHandlerName(name)] = value) : result += nonVoidAttr(name, value));
-				break;
-		}
-	}
-	return result;
-}
-function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
-	_html(`${_attrs(data, nodeAccessor, scopeId, tagName)}>`), _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
-}
-function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
-	let partial = {};
-	for (let name in data) {
-		let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
-		skip[key] || (partial[key] = data[name]);
-	}
-	return _attrs(partial, nodeAccessor, scopeId, tagName);
-}
-function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {
-	_html(`${_attrs_partial(data, skip, nodeAccessor, scopeId, tagName)}>`), _attr_content(nodeAccessor, scopeId, data?.content, serializeReason);
-}
-function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange, serializeType) {
-	writeScope(scopeId, serializeType ? {
-		["F" + nodeAccessor]: type,
-		["G" + nodeAccessor]: value,
-		["E" + nodeAccessor]: valueChange
-	} : {
-		["G" + nodeAccessor]: value,
-		["E" + nodeAccessor]: valueChange
-	});
-}
-function stringAttr(name, value) {
-	return value && " " + name + attrAssignment(value);
-}
-function nonVoidAttr(name, value) {
-	switch (typeof value) {
-		case "string": return " " + name + attrAssignment(value);
-		case "boolean": return " " + name;
-		case "number": return " " + name + "=" + value;
-	}
-	return " " + name + attrAssignment(value + "");
+//#region src/html/content.ts
+function _to_text(val) {
+	return val || val === 0 ? val + "" : "";
 }
-function attrAssignment(value) {
-	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
+function _unescaped(val) {
+	return val ? val + "" : val === 0 ? "0" : "";
 }
-function escapeSingleQuotedAttrValue(value) {
-	return singleQuoteAttrReplacements.test(value) ? value.replace(singleQuoteAttrReplacements, replaceUnsafeSingleQuoteAttrChar) : value;
+function _escape(val) {
+	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
 }
-function replaceUnsafeSingleQuoteAttrChar(match) {
-	return match === "'" ? "&#39;" : match === "\r" ? "&#13;" : "&amp;";
+function _escape_script(val) {
+	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-function escapeDoubleQuotedAttrValue(value) {
-	return doubleQuoteAttrReplacements.test(value) ? value.replace(doubleQuoteAttrReplacements, replaceUnsafeDoubleQuoteAttrChar) : value;
+function _escape_style(val) {
+	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
 }
-function replaceUnsafeDoubleQuoteAttrChar(match) {
-	return match === "\"" ? "&#34;" : match === "\r" ? "&#13;" : "&amp;";
+function _escape_style_value(val) {
+	return val || val === 0 ? escapeStyleValue(val + "") : "";
 }
-function normalizedValueMatches(a, b) {
-	let value = normalizeStrAttrValue(b);
-	if (Array.isArray(a)) {
-		for (let item of a) if (normalizeStrAttrValue(item) === value) return !0;
-	} else if (normalizeStrAttrValue(a) === value) return !0;
-	return !1;
+function escapeCommentStr(str) {
+	return unsafeCommentReg.test(str) && (str = str.replace(unsafeCommentReg, "&gt;")), str.startsWith(getState().commentPrefix) ? "&#" + str.charCodeAt(0) + ";" + str.slice(1) : str;
 }
-function normalizeStrAttrValue(value) {
-	return isNotVoid(value) && value !== !0 ? value + "" : "";
+function _escape_comment(val) {
+	return val ? escapeCommentStr(val + "") : val === 0 ? "0" : "";
 }
 //#endregion
 //#region src/html/dynamic-tag.ts
@@ -2131,11 +2155,11 @@ var ServerRendered = class {
 						done: !1
 					};
 					return value = "", Promise.resolve(result);
-				} else if (done) return Promise.resolve({
+				}
+				return done ? Promise.resolve({
 					value: "",
 					done
-				});
-				else return new Promise(exec);
+				}) : new Promise(exec);
 			},
 			throw(error) {
 				return done || aborted || boundary?.abort(error), Promise.resolve({
@@ -2194,49 +2218,64 @@ var ServerRendered = class {
 		return this.#cachedPromise ||= new Promise((resolve, reject) => {
 			let head = this.#head;
 			if (this.#head = null, !head) return reject(/* @__PURE__ */ Error(CONSUMED_RESULT_MESSAGE));
-			let { boundary } = head;
+			let { boundary } = head, html = "";
 			(boundary.onNext = () => {
 				switch (!boundary.count && boundary.flush()) {
 					case 2:
-						boundary.onNext = NOOP$1, reject(boundary.signal.reason);
-						break;
-					case 0: {
-						let consumed = head.consume();
-						boundary.signal.aborted || resolve(consumed.flushHTML());
+						settle(boundary), reject(boundary.signal.reason);
 						break;
-					}
+					case 0:
+						if (head = head.consume(), boundary.signal.aborted) break;
+						html += head.flushHTML(boundary), boundary.count || boundary.signal.aborted || (settle(boundary), resolve(html));
 				}
 			})();
 		});
 	}
 	#read(onWrite, onAbort, onClose) {
-		let tick = !0, head = this.#head;
+		let tick = !0, flushing = !1, again = !1, head = this.#head;
 		if (this.#head = null, !head) {
 			onAbort(/* @__PURE__ */ Error(CONSUMED_RESULT_MESSAGE));
 			return;
 		}
 		let { boundary } = head, onNext = boundary.onNext = (write) => {
-			let status = boundary.flush();
-			if (status === 2) tick || offTick(onNext), boundary.onNext = NOOP$1, onAbort(boundary.signal.reason);
-			else if (write || status === 0) {
-				if (head = head.consume(), boundary.signal.aborted) return;
-				let html = head.flushHTML();
-				html && onWrite(html), status === 0 ? (tick || offTick(onNext), onClose()) : tick = !0;
-			} else tick && (tick = !1, queueTick(onNext));
+			if (flushing) {
+				again = !0;
+				return;
+			}
+			flushing = !0;
+			do {
+				again = !1;
+				let status = boundary.flush();
+				if (status === 2) {
+					tick || offTick(onNext), settle(boundary), onAbort(boundary.signal.reason);
+					return;
+				}
+				if (write || status === 0) {
+					if (head = head.consume(), boundary.signal.aborted) continue;
+					let html = head.flushHTML(boundary);
+					if (boundary.signal.aborted) continue;
+					if (html && onWrite(html), !boundary.count) {
+						tick || offTick(onNext), settle(boundary), onClose();
+						return;
+					}
+					write && (tick = !0);
+				} else tick && (tick = !1, queueTick(onNext));
+			} while (again);
+			flushing = !1;
 		};
 		return onNext(), boundary;
 	}
 	toString() {
 		let head = this.#head;
 		if (this.#head = null, !head) throw Error(CONSUMED_RESULT_MESSAGE);
-		let { boundary } = head;
-		switch (boundary.flush()) {
-			case 2: throw boundary.signal.reason;
-			case 1: throw Error("Cannot consume asynchronous render with 'toString'");
-		}
-		return head.consume().flushHTML();
+		let { boundary } = head, html = boundary.flush() === 0 ? head.consume().flushHTML(boundary) : "";
+		if (boundary.count && boundary.abort(/* @__PURE__ */ Error("Cannot consume asynchronous render with 'toString'")), settle(boundary), boundary.signal.aborted) throw boundary.signal.reason;
+		return html;
 	}
 };
+function settle(boundary) {
+	boundary.onNext = NOOP$1, boundary.state.$global.signal?.removeEventListener("abort", boundary);
+}
 function NOOP$1() {}
 //#endregion
 //#region src/html/assets.ts
@@ -2249,7 +2288,7 @@ function withLoadAssets(renderer, assetId, triggers) {
 function withPageAssets(template, runtime, assetId, runtimeId) {
 	return assetFlush = runtime, Object.assign((input) => {
 		let g = $global();
-		return runtimeId && (g.runtimeId = runtimeId), addAsset(g, assetId), g.__flush__ ? (_html(flush(g, "")), writeWaitReady(assetId, template, input)) : (g.__flush__ = flush, template(input));
+		return runtimeId && (g[kAssets] || (g.runtimeId = runtimeId)), addAsset(g, assetId), g.__flush__ ? (_html(flush(g, "")), writeWaitReady(assetId, template, input)) : (g.__flush__ = flush, template(input));
 	}, template);
 }
 function _flush_head() {
@@ -2306,4 +2345,4 @@ function drainClassFunctions($global, writeScope) {
 }
 function NOOP() {}
 //#endregion
-export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _html_resume, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _text_resume, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, withLoadAssets, withPageAssets };
+export { $global, _assert_hoist, _attr, _attr_and, _attr_class, _attr_content, _attr_details_or_dialog_open as _attr_details_open, _attr_details_or_dialog_open as _attr_dialog_open, _attr_input_checked, _attr_input_checkedValue, _attr_input_value, _attr_nonce, _attr_nullish, _attr_option_value, _attr_or, _attr_select_value, _attr_style, _attr_textarea_value, _attrs, _attrs_content, _attrs_partial, _attrs_partial_content, _attrs_select_value, _attrs_textarea_value, _await, _content, _content_resume, _dynamic_tag, _el, _el_read_error, _el_resume, _escape, _escape_comment, _escape_script, _escape_style, _escape_style_value, _existing_scope, _flush_head, _for_in, _for_of, _for_to, _for_until, _hoist, _hoist_read_error, _html, _html_resume, _id, _if, _peek_scope_id, _resume, _resume_branch, _resume_locals, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _text_resume, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forOf, forTo, forUntil, withLoadAssets, withPageAssets };