marko 6.3.17 → 6.3.19

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 = "";
@@ -1105,7 +1110,7 @@ function _attr_select_value_script(scope, nodeAccessor) {
 	syncControllableFormInput(el, hasSelectChanged, onChange);
 	new MutationObserver(() => {
 		const value = scope["ControlledValue:" + nodeAccessor];
-		if (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value, i) => value != el.selectedOptions[i].value) : el.value !== value) onChange();
+		if (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((_, i) => !value.includes(el.selectedOptions[i].value)) : el.value !== value) onChange();
 	}).observe(el, {
 		childList: true,
 		subtree: true

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 = "";
@@ -1103,7 +1108,7 @@ function _attr_select_value_script(scope, nodeAccessor) {
 	syncControllableFormInput(el, hasSelectChanged, onChange);
 	new MutationObserver(() => {
 		const value = scope["ControlledValue:" + nodeAccessor];
-		if (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value, i) => value != el.selectedOptions[i].value) : el.value !== value) onChange();
+		if (Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((_, i) => !value.includes(el.selectedOptions[i].value)) : el.value !== value) onChange();
 	}).observe(el, {
 		childList: true,
 		subtree: true

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 = "";
@@ -1056,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) {
@@ -1113,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);
@@ -1158,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(");
@@ -3160,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 = "{";

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 = "";
@@ -1054,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) {
@@ -1111,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);
@@ -1156,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(");
@@ -3158,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 = "{";

package/dist/dom.js

@@ -1,4 +1,4 @@
-let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
+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);
@@ -136,7 +136,10 @@ function stringifyClassObject(name, value) {
 	return value ? name : "";
 }
 function stringifyStyleObject(name, value) {
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "", result = str.replace(/[\\"'{};<>]|\/(?=\*)/g, (c) => c === "<" ? "\\3C " : c === ";" ? "\\3B " : c === "{" ? "\\7B " : "\\" + c);
@@ -691,7 +694,7 @@ function _attr_select_value_script(scope, nodeAccessor) {
 	}
 	syncControllableFormInput(el, hasSelectChanged, onChange), new MutationObserver(() => {
 		let value = scope["G" + nodeAccessor];
-		(Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value, i) => value != el.selectedOptions[i].value) : el.value !== value) && onChange();
+		(Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((_, i) => !value.includes(el.selectedOptions[i].value)) : el.value !== value) && onChange();
 	}).observe(el, {
 		childList: !0,
 		subtree: !0

package/dist/dom.mjs

@@ -1,4 +1,4 @@
-let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
+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);
@@ -135,7 +135,10 @@ function stringifyClassObject(name, value) {
 	return value ? name : "";
 }
 function stringifyStyleObject(name, value) {
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "", result = str.replace(/[\\"'{};<>]|\/(?=\*)/g, (c) => c === "<" ? "\\3C " : c === ";" ? "\\3B " : c === "{" ? "\\7B " : "\\" + c);
@@ -690,7 +693,7 @@ function _attr_select_value_script(scope, nodeAccessor) {
 	}
 	syncControllableFormInput(el, hasSelectChanged, onChange), new MutationObserver(() => {
 		let value = scope["G" + nodeAccessor];
-		(Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((value, i) => value != el.selectedOptions[i].value) : el.value !== value) && onChange();
+		(Array.isArray(value) ? value.length !== el.selectedOptions.length || value.some((_, i) => !value.includes(el.selectedOptions[i].value)) : el.value !== value) && onChange();
 	}).observe(el, {
 		childList: !0,
 		subtree: !0

package/dist/html.js

@@ -1,4 +1,4 @@
-let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
+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);
@@ -381,7 +381,10 @@ function stringifyClassObject(name, value) {
 	return value ? name : "";
 }
 function stringifyStyleObject(name, value) {
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "", result = str.replace(/[\\"'{};<>]|\/(?=\*)/g, (c) => c === "<" ? "\\3C " : c === ";" ? "\\3B " : c === "{" ? "\\7B " : "\\" + c);
@@ -789,7 +792,13 @@ function writeError(state, val, ref) {
 	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors") || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	state.buf.push("new AggregateError(");
+	let inlined = writeProp(state, val.errors, ref, "errors");
+	if (inlined || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), inlined) {
+		let errorsRef = state.refs.get(val.errors);
+		errorsRef?.id && (state.assigned.add(errorsRef), addAssignment(errorsRef, accessId(state, ref) + toAccess("errors")));
+	}
+	return !0;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -815,14 +824,26 @@ function writeRequest(state, val, ref) {
 	state.buf.push("new Request(" + quote(val.url, 0)), hasBody && (state.buf.push(",{body:"), writeProp(state, val.body, ref, "body") ? (state.buf.push(",duplex:\"half\""), sep = ",", bodySerialized = !0) : state.buf.pop());
 	let options = "";
 	val.cache !== "default" && (options += sep + "cache:" + quote(val.cache, 0), sep = ","), val.credentials !== "same-origin" && (options += sep + "credentials:" + quote(val.credentials, 0), sep = ",");
-	let headers = stringEntriesToHeadersInit(val.headers);
-	return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:" + headers, sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(bodySerialized ? options + "})" : options ? ",{" + options + "})" : ")"), !0;
+	let seenHeaders = state.refs.get(val.headers);
+	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders), sep = ",";
+	else {
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		let headers = stringEntriesToHeadersInit(val.headers);
+		headers && (options += sep + "headers:" + headers, sep = ",");
+	}
+	return val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(bodySerialized ? options + "})" : options ? ",{" + options + "})" : ")"), !0;
 }
 function writeResponse(state, val, ref) {
 	let sep = "", options = "";
 	val.status !== 200 && (options += "status:" + val.status, sep = ","), val.statusText && (options += sep + "statusText:" + quote(val.statusText, 0), sep = ",");
-	let headers = stringEntriesToHeadersInit(val.headers);
-	return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:" + headers), !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
+	let seenHeaders = state.refs.get(val.headers);
+	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders);
+	else {
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		let headers = stringEntriesToHeadersInit(val.headers);
+		headers && (options += sep + "headers:" + headers);
+	}
+	return !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
 }
 function writeReadableStream(state, val, ref) {
 	let { boundary, channel } = state;
@@ -2055,7 +2076,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 = "{", sep = "";

package/dist/html.mjs

@@ -1,4 +1,4 @@
-let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
+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);
@@ -380,7 +380,10 @@ function stringifyClassObject(name, value) {
 	return value ? name : "";
 }
 function stringifyStyleObject(name, value) {
-	return value || value === 0 ? name + ":" + value : "";
+	return value || value === 0 ? escapeStyleAttr(name) + ":" + escapeStyleAttr(value + "") : "";
+}
+function escapeStyleAttr(str) {
+	return unsafeStyleAttrReg.test(str) ? str.replace(unsafeStyleAttrReg, replaceUnsafeStyleAttr) : str;
 }
 function escapeStyleValue(str) {
 	let closers = "", result = str.replace(/[\\"'{};<>]|\/(?=\*)/g, (c) => c === "<" ? "\\3C " : c === ";" ? "\\3B " : c === "{" ? "\\7B " : "\\" + c);
@@ -788,7 +791,13 @@ function writeError(state, val, ref) {
 	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors") || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	state.buf.push("new AggregateError(");
+	let inlined = writeProp(state, val.errors, ref, "errors");
+	if (inlined || state.buf.push("[]"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), inlined) {
+		let errorsRef = state.refs.get(val.errors);
+		errorsRef?.id && (state.assigned.add(errorsRef), addAssignment(errorsRef, accessId(state, ref) + toAccess("errors")));
+	}
+	return !0;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -814,14 +823,26 @@ function writeRequest(state, val, ref) {
 	state.buf.push("new Request(" + quote(val.url, 0)), hasBody && (state.buf.push(",{body:"), writeProp(state, val.body, ref, "body") ? (state.buf.push(",duplex:\"half\""), sep = ",", bodySerialized = !0) : state.buf.pop());
 	let options = "";
 	val.cache !== "default" && (options += sep + "cache:" + quote(val.cache, 0), sep = ","), val.credentials !== "same-origin" && (options += sep + "credentials:" + quote(val.credentials, 0), sep = ",");
-	let headers = stringEntriesToHeadersInit(val.headers);
-	return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:" + headers, sep = ","), val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(bodySerialized ? options + "})" : options ? ",{" + options + "})" : ")"), !0;
+	let seenHeaders = state.refs.get(val.headers);
+	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders), sep = ",";
+	else {
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		let headers = stringEntriesToHeadersInit(val.headers);
+		headers && (options += sep + "headers:" + headers, sep = ",");
+	}
+	return val.integrity && (options += sep + "integrity:" + quote(val.integrity, 0), sep = ","), val.keepalive && (options += sep + "keepalive:true", sep = ","), val.method !== "GET" && (options += sep + "method:" + quote(val.method, 0), sep = ","), val.mode !== "cors" && (options += sep + "mode:" + quote(val.mode, 0), sep = ","), val.redirect !== "follow" && (options += sep + "redirect:" + quote(val.redirect, 0), sep = ","), val.referrer !== "about:client" && (options += sep + "referrer:" + quote(val.referrer, 0), sep = ","), val.referrerPolicy && (options += sep + "referrerPolicy:" + quote(val.referrerPolicy, 0)), state.buf.push(bodySerialized ? options + "})" : options ? ",{" + options + "})" : ")"), !0;
 }
 function writeResponse(state, val, ref) {
 	let sep = "", options = "";
 	val.status !== 200 && (options += "status:" + val.status, sep = ","), val.statusText && (options += sep + "statusText:" + quote(val.statusText, 0), sep = ",");
-	let headers = stringEntriesToHeadersInit(val.headers);
-	return state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null)), headers && (options += sep + "headers:" + headers), !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
+	let seenHeaders = state.refs.get(val.headers);
+	if (seenHeaders) options += sep + "headers:" + ensureId(state, seenHeaders);
+	else {
+		state.refs.set(val.headers, new Reference(ref, "headers", state.flush, null));
+		let headers = stringEntriesToHeadersInit(val.headers);
+		headers && (options += sep + "headers:" + headers);
+	}
+	return !val.body || val.bodyUsed ? state.buf.push("new Response" + (options ? "(null,{" + options + "})" : "")) : (state.buf.push("new Response("), state.buf.push((writeProp(state, val.body, ref, "body") ? "" : "null") + (options ? ",{" + options + "})" : ")"))), !0;
 }
 function writeReadableStream(state, val, ref) {
 	let { boundary, channel } = state;
@@ -2054,7 +2075,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 = "{", sep = "";

package/dist/translator/index.js

@@ -253,7 +253,12 @@ function stringifyClassObject(name, value) {
 	return value ? name : "";
 }
 function stringifyStyleObject(name, value) {
-	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;
 }
 const toDelimitedString = function toDelimitedString(val, delimiter, stringify) {
 	let str = "";
@@ -2711,6 +2716,7 @@ function detectForSelector(bodySection, keyBinding) {
 }
 function onlyComparesKey(closure, canonical, bodySection, keyBinding) {
 	let found = false;
+	const keyReads = /* @__PURE__ */ new Map();
 	for (let chain = closure; chain; chain = chain.upstreamAlias) for (const expr of chain.reads) {
 		if (expr.section !== bodySection) continue;
 		let other = false;
@@ -2718,13 +2724,23 @@ function onlyComparesKey(closure, canonical, bodySection, keyBinding) {
 			const resolved = read.extra.read;
 			const at = resolved && resolvesTo(resolved, canonical);
 			if (!at) return;
-			if (at === 2 || resolved.getter || !readsKey(read.comparedTo?.extra?.read, keyBinding)) other = true;
-			else found = true;
+			const keyRead = read.comparedTo?.extra?.read;
+			if (at === 2 || resolved.getter || !readsKey(keyRead, keyBinding)) other = true;
+			else {
+				found = true;
+				if (keyRead && !keyRead.props && getCanonicalBinding(keyRead.binding) === getCanonicalBinding(keyBinding)) keyReads.set(expr, bindingUtil.add(keyReads.get(expr), keyRead.binding));
+			}
 		});
 		if (other) return false;
 	}
+	if (found) for (const [expr, dropped] of keyReads) dropKeyReferences(expr, dropped);
 	return found;
 }
+function dropKeyReferences(expr, dropped) {
+	if (dropReferencedBindings(expr, dropped)) forEach(dropped, (binding) => {
+		binding.forcePersist = true;
+	});
+}
 function resolvesTo(read, canonical) {
 	let binding = read.binding;
 	let through = 0;
@@ -6922,6 +6938,15 @@ function finalizeReferences() {
 	readsByExpression.clear();
 	fnReadsByExpression.clear();
 }
+function dropReferencedBindings(expr, drop) {
+	let kept;
+	forEach(expr.referencedBindings, (binding) => {
+		if (!bindingUtil.has(drop, binding)) kept = bindingUtil.add(kept, binding);
+	});
+	if (Array.isArray(kept)) return false;
+	expr.referencedBindings = kept;
+	return true;
+}
 function getMaxOwnSourceOffset(intersection, section) {
 	let scopeOffset;
 	const trackScopeOffset = (source) => {

package/dist/translator/util/references.d.ts

@@ -125,6 +125,7 @@ export declare function setReferencesScope(path: t.NodePath<any>): void;
 export declare function mergeReferences<T extends t.Node>(section: Section, target: T, nodes: (t.Node | undefined)[]): NonNullable<T["extra"]> & ReferencedExtra;
 export declare function compareReferences(a: ReferencedBindings, b: ReferencedBindings): number;
 export declare function finalizeReferences(): void;
+export declare function dropReferencedBindings(expr: ReferencedExtra, drop: ReferencedBindings): boolean;
 export declare const intersectionMeta: WeakMap<Intersection, {
     id: number;
     scopeOffset: Binding | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.3.17",
+  "version": "6.3.19",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -54,7 +54,7 @@
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.3.17",
+    "@marko/runtime-tags": "npm:marko@6.3.19",
     "marko": "5.39.26"
   },
   "engines": {