marko 6.3.16 → 6.3.18

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright 2024 eBay Inc. and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/dist/common/accessor.d.ts

@@ -30,6 +30,7 @@ export declare enum AccessorProp {
     Id = "L",
     Load = "X",
     LoopKey = "M",
+    LoopIndex = "I",
     ParentBranch = "N",
     PendingEffects = "J",
     PendingRenders = "W",

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

@@ -30,6 +30,7 @@ export declare enum AccessorProp {
     Id = "#Id",
     Load = "#Load",
     LoopKey = "#LoopKey",
+    LoopIndex = "#LoopIndex",
     ParentBranch = "#ParentBranch",
     PendingEffects = "#PendingEffects",
     PendingRenders = "#PendingRenders",

package/dist/common/types.d.ts

@@ -50,7 +50,6 @@ export declare enum NodeType {
 }
 export declare enum WalkCode {
     Get = 32,
-    Inside = 36,
     Replace = 37,
     EndChild = 38,
     BeginChild = 47,

package/dist/debug/dom.js

@@ -73,7 +73,12 @@ function stringifyStyleObject(name, value) {
 		warnedStyleKeys.add(name);
 		console.warn(`\`${name}\` is not a CSS property name; \`style\` object keys are written verbatim, so it renders as invalid CSS. Use \`${name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()).replace(/^ms-/, "-ms-")}\`.`);
 	}
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+const unsafeStyleAttrReg = /[\\;]/g;
+const replaceUnsafeStyleAttr = (c) => c === ";" ? "\\3B " : "\\\\";
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "";
@@ -991,9 +996,12 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		if (checkedValueChange) {
 			const controlledValueKey = "ControlledValue:" + nodeAccessor;
 			const oldValue = scope[controlledValueKey];
-			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			let newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) {
+					if (newValue === void 0 && radio.defaultChecked) newValue = radio.value;
+					radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				}
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -1500,7 +1508,9 @@ function _await_promise(nodeAccessor, params) {
 			}
 		}, (error) => {
 			if (thisPromise === scope[promiseAccessor]) {
-				awaitCounter.i = scope[promiseAccessor] = 0;
+				scope[promiseAccessor] = 0;
+				if (tryPlaceholder && !awaitCounter.m) awaitCounter.c();
+				else awaitCounter.i = 0;
 				queueAsyncRender(scope, renderCatch, error);
 			}
 		});
@@ -1733,12 +1743,17 @@ function loop(forEach) {
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
 			let hasPotentialMoves;
+			let start = 0;
 			var seenKeys = /* @__PURE__ */ new Set();
 			forEach(value, (key, args) => {
 				assertValidLoopKey(key, seenKeys);
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope["#LoopKey"] ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				if (branch) hasPotentialMoves = oldScopesByKey.delete(key);
-				else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
+				const i = newScopes.length;
+				const oldScope = oldScopes[i];
+				let branch = oldLen && (oldScopesByKey || key !== (oldScope?.["#LoopKey"] ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope["#LoopIndex"] = j, map.set(scope["#LoopKey"] ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				if (branch) {
+					hasPotentialMoves = true;
+					oldScopesByKey?.delete(key);
+				} else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
 				branch["#LoopKey"] = key;
 				newScopes.push(branch);
 				params?.(branch, args);
@@ -1748,7 +1763,6 @@ function loop(forEach) {
 			let afterReference = null;
 			let oldEnd = oldLen - 1;
 			let newEnd = newLen - 1;
-			let start = 0;
 			if (hasSiblings) {
 				if (oldLen) {
 					afterReference = oldScopes[oldEnd]["#EndNode"].nextSibling;
@@ -1766,19 +1780,18 @@ function loop(forEach) {
 				for (const newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (const branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			while (start < oldLen && start < newLen && oldScopes[start] === newScopes[start]) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			while (oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd]) {
 				oldEnd--;
 				newEnd--;
 			}
 			if (oldEnd + 1 < oldLen) afterReference = oldScopes[oldEnd + 1]["#StartNode"];
-			if (start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
+			}
 			const diffLen = newEnd - start + 1;
-			const oldPos = /* @__PURE__ */ new Map();
 			const sources = new Array(diffLen);
 			const pred = new Array(diffLen);
 			const tails = [];
@@ -1786,8 +1799,7 @@ function loop(forEach) {
 			let lo;
 			let hi;
 			let mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
 				if (~tail) pred[i] = tails[tail];
 				tails[++tail] = i;
@@ -2217,7 +2229,8 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
+		if (awaitCounter) if (awaitCounter.m) awaitCounter.i = 0;
+		else awaitCounter.c();
 		queueAsyncRender(scope, renderCatch, error);
 	};
 }

package/dist/debug/dom.mjs

@@ -71,7 +71,12 @@ function stringifyStyleObject(name, value) {
 		warnedStyleKeys.add(name);
 		console.warn(`\`${name}\` is not a CSS property name; \`style\` object keys are written verbatim, so it renders as invalid CSS. Use \`${name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()).replace(/^ms-/, "-ms-")}\`.`);
 	}
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+const unsafeStyleAttrReg = /[\\;]/g;
+const replaceUnsafeStyleAttr = (c) => c === ";" ? "\\3B " : "\\\\";
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "";
@@ -989,9 +994,12 @@ function _attr_input_checkedValue_script(scope, nodeAccessor) {
 		if (checkedValueChange) {
 			const controlledValueKey = "ControlledValue:" + nodeAccessor;
 			const oldValue = scope[controlledValueKey];
-			const newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
+			let newValue = Array.isArray(oldValue) ? updateList(oldValue, el.value, el.checked) : el.checked ? el.value : void 0;
 			if (el.name && el.type[0] === "r") {
-				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				for (const radio of document.querySelectorAll(`[type=radio][name=${CSS.escape(el.name)}]`)) if (radio.form === el.form) {
+					if (newValue === void 0 && radio.defaultChecked) newValue = radio.value;
+					radio.checked = Array.isArray(oldValue) ? oldValue.includes(radio.value) : controlledValueKey in scope ? oldValue === radio.value : radio.defaultChecked;
+				}
 			} else el.checked = !el.checked;
 			checkedValueChange(newValue);
 			run();
@@ -1498,7 +1506,9 @@ function _await_promise(nodeAccessor, params) {
 			}
 		}, (error) => {
 			if (thisPromise === scope[promiseAccessor]) {
-				awaitCounter.i = scope[promiseAccessor] = 0;
+				scope[promiseAccessor] = 0;
+				if (tryPlaceholder && !awaitCounter.m) awaitCounter.c();
+				else awaitCounter.i = 0;
 				queueAsyncRender(scope, renderCatch, error);
 			}
 		});
@@ -1731,12 +1741,17 @@ function loop(forEach) {
 			const parentNode = referenceNode.nodeType > 1 ? referenceNode.parentNode || oldScopes[0]?.["#StartNode"].parentNode : referenceNode;
 			let oldScopesByKey;
 			let hasPotentialMoves;
+			let start = 0;
 			var seenKeys = /* @__PURE__ */ new Set();
 			forEach(value, (key, args) => {
 				assertValidLoopKey(key, seenKeys);
-				let branch = oldLen && (oldScopesByKey ||= oldScopes.reduce((map, scope, i) => map.set(scope["#LoopKey"] ?? i, scope), /* @__PURE__ */ new Map())).get(key);
-				if (branch) hasPotentialMoves = oldScopesByKey.delete(key);
-				else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
+				const i = newScopes.length;
+				const oldScope = oldScopes[i];
+				let branch = oldLen && (oldScopesByKey || key !== (oldScope?.["#LoopKey"] ?? i) ? (oldScopesByKey ||= oldScopes.reduce((map, scope, j) => j < i ? map : (scope["#LoopIndex"] = j, map.set(scope["#LoopKey"] ?? j, scope)), /* @__PURE__ */ new Map())).get(key) : oldScope && (start++, oldScope));
+				if (branch) {
+					hasPotentialMoves = true;
+					oldScopesByKey?.delete(key);
+				} else branch = createAndSetupBranch(scope["$global"], renderer, scope, parentNode);
 				branch["#LoopKey"] = key;
 				newScopes.push(branch);
 				params?.(branch, args);
@@ -1746,7 +1761,6 @@ function loop(forEach) {
 			let afterReference = null;
 			let oldEnd = oldLen - 1;
 			let newEnd = newLen - 1;
-			let start = 0;
 			if (hasSiblings) {
 				if (oldLen) {
 					afterReference = oldScopes[oldEnd]["#EndNode"].nextSibling;
@@ -1764,19 +1778,18 @@ function loop(forEach) {
 				for (const newScope of newScopes) insertBranchBefore(newScope, parentNode, afterReference);
 				return;
 			}
-			for (const branch of oldScopesByKey.values()) removeAndDestroyBranch(branch);
-			while (start < oldLen && start < newLen && oldScopes[start] === newScopes[start]) start++;
+			if (oldScopesByKey) oldScopesByKey.forEach(removeAndDestroyBranch);
+			else for (let i = newLen; i < oldLen; i++) removeAndDestroyBranch(oldScopes[i]);
 			while (oldEnd >= start && newEnd >= start && oldScopes[oldEnd] === newScopes[newEnd]) {
 				oldEnd--;
 				newEnd--;
 			}
 			if (oldEnd + 1 < oldLen) afterReference = oldScopes[oldEnd + 1]["#StartNode"];
-			if (start > oldEnd) {
-				if (start <= newEnd) for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
+			if (start > oldEnd || start > newEnd) {
+				for (let i = start; i <= newEnd; i++) insertBranchBefore(newScopes[i], parentNode, afterReference);
 				return;
-			} else if (start > newEnd) return;
+			}
 			const diffLen = newEnd - start + 1;
-			const oldPos = /* @__PURE__ */ new Map();
 			const sources = new Array(diffLen);
 			const pred = new Array(diffLen);
 			const tails = [];
@@ -1784,8 +1797,7 @@ function loop(forEach) {
 			let lo;
 			let hi;
 			let mid;
-			for (let i = start; i <= oldEnd; i++) oldPos.set(oldScopes[i], i);
-			for (let i = diffLen; i--;) sources[i] = oldPos.get(newScopes[start + i]) ?? -1;
+			for (let i = diffLen; i--;) sources[i] = newScopes[start + i]["#LoopIndex"] ?? -1;
 			for (let i = 0; i < diffLen; i++) if (~sources[i]) if (tail < 0 || sources[tails[tail]] < sources[i]) {
 				if (~tail) pred[i] = tails[tail];
 				tails[++tail] = i;
@@ -2215,7 +2227,8 @@ function insertLoaded(renderer, branch, marker, awaitCounter) {
 }
 function loadFailed(scope, awaitCounter) {
 	return (error) => {
-		if (awaitCounter) awaitCounter.i = 0;
+		if (awaitCounter) if (awaitCounter.m) awaitCounter.i = 0;
+		else awaitCounter.c();
 		queueAsyncRender(scope, renderCatch, error);
 	};
 }

package/dist/debug/html.js

@@ -69,7 +69,12 @@ function stringifyStyleObject(name, value) {
 		warnedStyleKeys.add(name);
 		console.warn(`\`${name}\` is not a CSS property name; \`style\` object keys are written verbatim, so it renders as invalid CSS. Use \`${name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()).replace(/^ms-/, "-ms-")}\`.`);
 	}
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+const unsafeStyleAttrReg = /[\\;]/g;
+const replaceUnsafeStyleAttr = (c) => c === ";" ? "\\3B " : "\\\\";
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "";
@@ -239,8 +244,8 @@ function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	assertValidTextValue(val);
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
@@ -906,11 +911,18 @@ function writeDate(state, val) {
 	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
-const unsafeRegExpSourceReg = /\\[\s\S]|</g;
-const replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match;
+const unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu;
+const unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u;
+const replaceUnsafeRegExpSourceChar = (match) => {
+	const ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	const code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+};
 function writeRegExp(state, val) {
 	const { source } = val;
-	state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
+	state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
 	return true;
 }
 function writePromise(state, val, ref) {
@@ -1049,9 +1061,17 @@ function writeError(state, val, ref) {
 }
 function writeAggregateError(state, val, ref) {
 	state.buf.push("new AggregateError(");
-	if (!writeProp(state, val.errors, ref, "errors")) state.buf.push("[]");
+	const inlined = writeProp(state, val.errors, ref, "errors");
+	if (!inlined) state.buf.push("[]");
 	if (val.message) state.buf.push("," + quote(val.message + "", 0) + ")");
 	else state.buf.push(")");
+	if (inlined) {
+		const errorsRef = state.refs.get(val.errors);
+		if (errorsRef?.id) {
+			state.assigned.add(errorsRef);
+			addAssignment(errorsRef, accessId(state, ref) + toAccess("errors"));
+		}
+	}
 	return true;
 }
 function writeURL(state, val) {
@@ -1106,11 +1126,17 @@ function writeRequest(state, val, ref) {
 		options += sep + "credentials:" + quote(val.credentials, 0);
 		sep = ",";
 	}
-	const headers = stringEntriesToHeadersInit(val.headers);
-	state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
-	if (headers) {
-		options += sep + "headers:" + headers;
+	const 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));
+		const headers = stringEntriesToHeadersInit(val.headers);
+		if (headers) {
+			options += sep + "headers:" + headers;
+			sep = ",";
+		}
 	}
 	if (val.integrity) {
 		options += sep + "integrity:" + quote(val.integrity, 0);
@@ -1151,9 +1177,13 @@ function writeResponse(state, val, ref) {
 		options += sep + "statusText:" + quote(val.statusText, 0);
 		sep = ",";
 	}
-	const headers = stringEntriesToHeadersInit(val.headers);
-	state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
-	if (headers) options += sep + "headers:" + headers;
+	const 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));
+		const headers = stringEntriesToHeadersInit(val.headers);
+		if (headers) options += sep + "headers:" + headers;
+	}
 	if (!val.body || val.bodyUsed) state.buf.push("new Response" + (options ? "(null,{" + options + "})" : ""));
 	else {
 		state.buf.push("new Response(");
@@ -2582,15 +2612,21 @@ const kSelectedValue = Symbol("selectedValue");
 const kSelectedValueMatched = Symbol("selectedValueMatched");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
 	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	if (content) if (valueChange) {
-		const matched = { value: false };
-		withContext(kSelectedValue, value, () => withContext(kSelectedValueMatched, matched, content));
-		if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
-	} else withContext(kSelectedValue, value, content);
+	if (content) {
+		const selectedValue = value ?? "";
+		if (valueChange) {
+			const matched = { value: false };
+			withContext(kSelectedValue, selectedValue, () => withContext(kSelectedValueMatched, matched, content));
+			if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
+		} else withContext(kSelectedValue, selectedValue, content);
+	}
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -3147,7 +3183,7 @@ function writeTriggerScript(html, triggers) {
 			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
 		}
 	});
-	writeScript(`((p,h,d,l=$=>d||p.after(new Range().createContextualFragment(d=h)))=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
+	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
 function toObjectExpression(options) {
 	let result = "{";
@@ -3344,6 +3380,7 @@ exports._show_start = _show_start;
 exports._style_html = _style_html;
 exports._subscribe = _subscribe;
 exports._template = _template;
+exports._textarea_value = _textarea_value;
 exports._to_text = _to_text;
 exports._trailers = _trailers;
 exports._try = _try;

package/dist/debug/html.mjs

@@ -67,7 +67,12 @@ function stringifyStyleObject(name, value) {
 		warnedStyleKeys.add(name);
 		console.warn(`\`${name}\` is not a CSS property name; \`style\` object keys are written verbatim, so it renders as invalid CSS. Use \`${name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()).replace(/^ms-/, "-ms-")}\`.`);
 	}
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+const unsafeStyleAttrReg = /[\\;]/g;
+const replaceUnsafeStyleAttr = (c) => c === ";" ? "\\3B " : "\\\\";
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "";
@@ -237,8 +242,8 @@ function _escape_script(val) {
 	assertValidTextValue(val);
 	return val ? escapeScriptStr(val + "") : val === 0 ? "0" : "";
 }
-const unsafeStyleReg = /<\/style/gi;
-const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str;
+const unsafeStyleReg = /<(\/style)/gi;
+const escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C$1") : str;
 function _escape_style(val) {
 	assertValidTextValue(val);
 	return val ? escapeStyleStr(val + "") : val === 0 ? "0" : "";
@@ -904,11 +909,18 @@ function writeDate(state, val) {
 	state.buf.push("new Date(" + +val + ")");
 	return true;
 }
-const unsafeRegExpSourceReg = /\\[\s\S]|</g;
-const replaceUnsafeRegExpSourceChar = (match) => match === "<" || match === "\\<" ? "\\x3C" : match;
+const unsafeRegExpSourceReg = /\\[\s\S]|[<\0\ud800-\udfff]/gu;
+const unsafeRegExpSourceDetect = /[<\0\ud800-\udfff]/u;
+const replaceUnsafeRegExpSourceChar = (match) => {
+	const ch = match.length === 3 ? "" : match[match.length - 1];
+	if (ch === "<") return "\\x3C";
+	if (ch === "\0") return "\\x00";
+	const code = ch.charCodeAt(0);
+	return code >= 55296 && code <= 57343 ? "\\u" + code.toString(16).padStart(4, "0") : match;
+};
 function writeRegExp(state, val) {
 	const { source } = val;
-	state.buf.push("/" + (source.includes("<") ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
+	state.buf.push("/" + (unsafeRegExpSourceDetect.test(source) ? source.replace(unsafeRegExpSourceReg, replaceUnsafeRegExpSourceChar) : source) + "/" + val.flags);
 	return true;
 }
 function writePromise(state, val, ref) {
@@ -1047,9 +1059,17 @@ function writeError(state, val, ref) {
 }
 function writeAggregateError(state, val, ref) {
 	state.buf.push("new AggregateError(");
-	if (!writeProp(state, val.errors, ref, "errors")) state.buf.push("[]");
+	const inlined = writeProp(state, val.errors, ref, "errors");
+	if (!inlined) state.buf.push("[]");
 	if (val.message) state.buf.push("," + quote(val.message + "", 0) + ")");
 	else state.buf.push(")");
+	if (inlined) {
+		const errorsRef = state.refs.get(val.errors);
+		if (errorsRef?.id) {
+			state.assigned.add(errorsRef);
+			addAssignment(errorsRef, accessId(state, ref) + toAccess("errors"));
+		}
+	}
 	return true;
 }
 function writeURL(state, val) {
@@ -1104,11 +1124,17 @@ function writeRequest(state, val, ref) {
 		options += sep + "credentials:" + quote(val.credentials, 0);
 		sep = ",";
 	}
-	const headers = stringEntriesToHeadersInit(val.headers);
-	state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
-	if (headers) {
-		options += sep + "headers:" + headers;
+	const 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));
+		const headers = stringEntriesToHeadersInit(val.headers);
+		if (headers) {
+			options += sep + "headers:" + headers;
+			sep = ",";
+		}
 	}
 	if (val.integrity) {
 		options += sep + "integrity:" + quote(val.integrity, 0);
@@ -1149,9 +1175,13 @@ function writeResponse(state, val, ref) {
 		options += sep + "statusText:" + quote(val.statusText, 0);
 		sep = ",";
 	}
-	const headers = stringEntriesToHeadersInit(val.headers);
-	state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
-	if (headers) options += sep + "headers:" + headers;
+	const 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));
+		const headers = stringEntriesToHeadersInit(val.headers);
+		if (headers) options += sep + "headers:" + headers;
+	}
 	if (!val.body || val.bodyUsed) state.buf.push("new Response" + (options ? "(null,{" + options + "})" : ""));
 	else {
 		state.buf.push("new Response(");
@@ -2580,15 +2610,21 @@ const kSelectedValue = Symbol("selectedValue");
 const kSelectedValueMatched = Symbol("selectedValueMatched");
 function _attr_select_value(scopeId, nodeAccessor, value, valueChange, content, serializeType) {
 	if (valueChange) writeControlledScope(3, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	if (content) if (valueChange) {
-		const matched = { value: false };
-		withContext(kSelectedValue, value, () => withContext(kSelectedValueMatched, matched, content));
-		if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
-	} else withContext(kSelectedValue, value, content);
+	if (content) {
+		const selectedValue = value ?? "";
+		if (valueChange) {
+			const matched = { value: false };
+			withContext(kSelectedValue, selectedValue, () => withContext(kSelectedValueMatched, matched, content));
+			if (!matched.value && (Array.isArray(value) ? value.some((v) => normalizeStrAttrValue(v) !== "") : normalizeStrAttrValue(value) !== "")) console.error("A controlled `<select>`'s `value` has no matching `<option>`:", value);
+		} else withContext(kSelectedValue, selectedValue, content);
+	}
 }
 function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
-	return _escape(value);
+	return _textarea_value(value);
+}
+function _textarea_value(value) {
+	return _escape(normalizeStrAttrValue(value));
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -3145,7 +3181,7 @@ function writeTriggerScript(html, triggers) {
 			default: return `(e=>e?.addEventListener("${trigger.type.slice(3)}",l,{once:1}))(document.querySelector(${JSON.stringify(trigger.selector)})||l())`;
 		}
 	});
-	writeScript(`((p,h,d,l=$=>d||p.after(new Range().createContextualFragment(d=h)))=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
+	writeScript(`((p,h,d,l=$=>{d||p.after(new Range().createContextualFragment(d=h))})=>${exprs.length > 1 ? `{${exprs.join(";")}}` : exprs[0]})(document.currentScript,${htmlStr})`);
 }
 function toObjectExpression(options) {
 	let result = "{";
@@ -3270,4 +3306,4 @@ const compat = {
 };
 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, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, 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, _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, _id, _if, _peek_scope_id, _resume, _resume_branch, writeScope as _scope, _scope_id, _scope_reason, _scope_with_id, _script, _sep, _serialize_guard, _serialize_if, _set_serialize_reason, _show_end, _show_start, _style_html, _subscribe, _template, _textarea_value, _to_text, _trailers, _try, _unescaped, _var, attrTag, attrTags, compat, forIn, forInBy, forOf, forOfBy, forStepBy, forTo, forUntil, withLoadAssets, withPageAssets };