@marko/runtime-tags 6.2.5 → 6.3.1

package/dist/debug/dom.js

@@ -128,10 +128,7 @@ function normalizeDynamicRenderer(value) {
 const lowercaseEventHandlerReg = /^on[a-z]/;
 function assertValidAttrValue(name, value) {
 	if (value && typeof value !== "string" && lowercaseEventHandlerReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
-	if (typeof value === "function") {
-		if (name === "content" || /^on/i.test(name) || /Change$/.test(name)) return;
-		throw new Error(`The \`${name}\` attribute cannot be a function.`);
-	}
+	if (typeof value === "function") throw new Error(`The \`${name}\` attribute cannot be a function.${/Change$/.test(name) ? " A change handler is only used when its matching controllable attribute combination applies." : ""}`);
 	const unrenderable = describeUnrenderable(value);
 	if (unrenderable) throw new Error(`The \`${name}\` attribute cannot be ${unrenderable}.`);
 }
@@ -1362,7 +1359,11 @@ function _lifecycle(scope, thisObj, index = 0) {
 		instance.onUpdate?.();
 	} else {
 		scope[accessor] = thisObj;
-		thisObj.onMount?.();
+		{
+			const snapshot = { ...thisObj };
+			Object.assign(thisObj, thisObj.onMount?.());
+			for (const prop in snapshot) if (!Object.is(snapshot[prop], thisObj[prop])) throw new Error(`Tried to overwrite existing property "${prop}" in <lifecycle> onMount.`);
+		}
 		$signal(scope, accessor).onabort = () => thisObj.onDestroy?.();
 	}
 }

package/dist/debug/dom.mjs

@@ -126,10 +126,7 @@ function normalizeDynamicRenderer(value) {
 const lowercaseEventHandlerReg = /^on[a-z]/;
 function assertValidAttrValue(name, value) {
 	if (value && typeof value !== "string" && lowercaseEventHandlerReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
-	if (typeof value === "function") {
-		if (name === "content" || /^on/i.test(name) || /Change$/.test(name)) return;
-		throw new Error(`The \`${name}\` attribute cannot be a function.`);
-	}
+	if (typeof value === "function") throw new Error(`The \`${name}\` attribute cannot be a function.${/Change$/.test(name) ? " A change handler is only used when its matching controllable attribute combination applies." : ""}`);
 	const unrenderable = describeUnrenderable(value);
 	if (unrenderable) throw new Error(`The \`${name}\` attribute cannot be ${unrenderable}.`);
 }
@@ -1360,7 +1357,11 @@ function _lifecycle(scope, thisObj, index = 0) {
 		instance.onUpdate?.();
 	} else {
 		scope[accessor] = thisObj;
-		thisObj.onMount?.();
+		{
+			const snapshot = { ...thisObj };
+			Object.assign(thisObj, thisObj.onMount?.());
+			for (const prop in snapshot) if (!Object.is(snapshot[prop], thisObj[prop])) throw new Error(`Tried to overwrite existing property "${prop}" in <lifecycle> onMount.`);
+		}
 		$signal(scope, accessor).onabort = () => thisObj.onDestroy?.();
 	}
 }

package/dist/debug/html.js

@@ -127,10 +127,7 @@ function normalizeDynamicRenderer(value) {
 const lowercaseEventHandlerReg = /^on[a-z]/;
 function assertValidAttrValue(name, value) {
 	if (value && typeof value !== "string" && lowercaseEventHandlerReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
-	if (typeof value === "function") {
-		if (name === "content" || /^on/i.test(name) || /Change$/.test(name)) return;
-		throw new Error(`The \`${name}\` attribute cannot be a function.`);
-	}
+	if (typeof value === "function") throw new Error(`The \`${name}\` attribute cannot be a function.${/Change$/.test(name) ? " A change handler is only used when its matching controllable attribute combination applies." : ""}`);
 	const unrenderable = describeUnrenderable(value);
 	if (unrenderable) throw new Error(`The \`${name}\` attribute cannot be ${unrenderable}.`);
 }
@@ -822,7 +819,7 @@ function writeObject(state, val, parent, accessor) {
 	return writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (val.constructor) {
+	switch (Object.getPrototypeOf(val)?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -1024,15 +1021,15 @@ function writeWeakMap(state) {
 function writeError(state, val, ref) {
 	const result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
 	if (val.cause !== void 0) {
-		state.buf.push(result + ",{cause:");
-		writeProp(state, val.cause, ref, "cause");
-		state.buf.push("})");
+		const pos = state.buf.push(result + ",{cause:") - 1;
+		if (writeProp(state, val.cause, ref, "cause")) state.buf.push("})");
+		else state.buf[pos] = state.buf[pos].slice(0, -8) + ")";
 	} else state.buf.push(result + ")");
 	return true;
 }
 function writeAggregateError(state, val, ref) {
 	state.buf.push("new AggregateError(");
-	writeProp(state, val.errors, ref, "errors");
+	if (!writeProp(state, val.errors, ref, "errors")) state.buf.push("[]");
 	if (val.message) state.buf.push("," + quote(val.message + "", 0) + ")");
 	else state.buf.push(")");
 	return true;
@@ -1326,34 +1323,49 @@ function toAccess(accessor) {
 	const start = accessor[0];
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
+const unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u;
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "";
 	let lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
 		let replacement;
-		switch (str[i]) {
-			case "\"":
+		const code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					const next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement;
 		lastPos = i + 1;
@@ -1920,7 +1932,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
-				boundary.endAsync(chunk);
+				boundary.endAsync();
 			}
 		}
 	}, (err) => {
@@ -1962,7 +1974,7 @@ function tryCatch(content, catchContent) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
-	const catchBoundary = new Boundary(state);
+	const catchBoundary = new Boundary(state, void 0, boundary);
 	const body = chunk.fork(catchBoundary, null);
 	const bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
@@ -2076,19 +2088,21 @@ var State = class {
 };
 var Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
+	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();
 		});
-		if (parent) if (parent.aborted) this.abort(parent.reason);
-		else parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		if (signal) if (signal.aborted) this.abort(signal.reason);
+		else signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		});
 	}
 	flush() {
@@ -2098,10 +2112,9 @@ var Boundary = class extends AbortController {
 	startAsync() {
 		if (!this.signal.aborted) this.count++;
 	}
-	endAsync(chunk) {
+	endAsync() {
 		if (!this.signal.aborted && this.count) {
 			this.count--;
-			if (chunk?.reorderId) this.state.reorder(chunk);
 			this.onNext();
 		}
 	}
@@ -2288,12 +2301,22 @@ var Chunk = class Chunk {
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
 		if (state.writeReorders) {
-			needsWalk = true;
-			if (!state.hasReorderRuntime) {
-				state.hasReorderRuntime = true;
-				scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
-			}
+			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					while (aborted && !aborted.signal.aborted) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = false;
+				}
+				needsWalk = true;
+				if (!state.hasReorderRuntime) {
+					state.hasReorderRuntime = true;
+					scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
+				}
 				const { reorderId } = reorderedChunk;
 				const readyReservations = [];
 				let reorderHTML = "";
@@ -2312,6 +2335,7 @@ var Chunk = class Chunk {
 					reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts));
 					if (cur.async) {
 						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
+						state.reorder(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
 					}
@@ -2329,7 +2353,7 @@ var Chunk = class Chunk {
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
@@ -2656,15 +2680,12 @@ function nonVoidAttr(name, value) {
 		case "string": return " " + name + attrAssignment(value);
 		case "boolean": return " " + name;
 		case "number": return " " + name + "=" + value;
-		case "object":
-			if (value instanceof RegExp) return " " + name + attrAssignment(value.source);
-			break;
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }

package/dist/debug/html.mjs

@@ -125,10 +125,7 @@ function normalizeDynamicRenderer(value) {
 const lowercaseEventHandlerReg = /^on[a-z]/;
 function assertValidAttrValue(name, value) {
 	if (value && typeof value !== "string" && lowercaseEventHandlerReg.test(name)) throw new Error(`The \`${name}\` attribute must be a string or a falsey value (\`null\`, \`undefined\`, \`false\`, \`0\`, …), but received type "${typeof value}". To attach an event listener, use the \`on${name[2].toUpperCase()}${name.slice(3)}\` event handler instead.`);
-	if (typeof value === "function") {
-		if (name === "content" || /^on/i.test(name) || /Change$/.test(name)) return;
-		throw new Error(`The \`${name}\` attribute cannot be a function.`);
-	}
+	if (typeof value === "function") throw new Error(`The \`${name}\` attribute cannot be a function.${/Change$/.test(name) ? " A change handler is only used when its matching controllable attribute combination applies." : ""}`);
 	const unrenderable = describeUnrenderable(value);
 	if (unrenderable) throw new Error(`The \`${name}\` attribute cannot be ${unrenderable}.`);
 }
@@ -820,7 +817,7 @@ function writeObject(state, val, parent, accessor) {
 	return writeReferenceOr(state, writeUnknownObject, val, parent, accessor);
 }
 function writeUnknownObject(state, val, ref) {
-	switch (val.constructor) {
+	switch (Object.getPrototypeOf(val)?.constructor) {
 		case void 0: return writeNullObject(state, val, ref);
 		case Object: return writePlainObject(state, val, ref);
 		case Array: return writeArray(state, val, ref);
@@ -1022,15 +1019,15 @@ function writeWeakMap(state) {
 function writeError(state, val, ref) {
 	const result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
 	if (val.cause !== void 0) {
-		state.buf.push(result + ",{cause:");
-		writeProp(state, val.cause, ref, "cause");
-		state.buf.push("})");
+		const pos = state.buf.push(result + ",{cause:") - 1;
+		if (writeProp(state, val.cause, ref, "cause")) state.buf.push("})");
+		else state.buf[pos] = state.buf[pos].slice(0, -8) + ")";
 	} else state.buf.push(result + ")");
 	return true;
 }
 function writeAggregateError(state, val, ref) {
 	state.buf.push("new AggregateError(");
-	writeProp(state, val.errors, ref, "errors");
+	if (!writeProp(state, val.errors, ref, "errors")) state.buf.push("[]");
 	if (val.message) state.buf.push("," + quote(val.message + "", 0) + ")");
 	else state.buf.push(")");
 	return true;
@@ -1324,34 +1321,49 @@ function toAccess(accessor) {
 	const start = accessor[0];
 	return start === "[" ? accessor : start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
+const unsafeQuoteReg = /["\\<\n\r\u2028\u2029\0\ud800-\udfff]/u;
 function quote(str, startPos) {
+	if (!unsafeQuoteReg.test(str)) return "\"" + str + "\"";
 	let result = "";
 	let lastPos = 0;
 	for (let i = startPos; i < str.length; i++) {
 		let replacement;
-		switch (str[i]) {
-			case "\"":
+		const code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
 				replacement = "\\\"";
 				break;
-			case "\\":
+			case 92:
 				replacement = "\\\\";
 				break;
-			case "<":
+			case 60:
 				replacement = "\\x3C";
 				break;
-			case "\n":
+			case 10:
 				replacement = "\\n";
 				break;
-			case "\r":
+			case 13:
 				replacement = "\\r";
 				break;
-			case "\u2028":
+			case 8232:
 				replacement = "\\u2028";
 				break;
-			case "\u2029":
+			case 8233:
 				replacement = "\\u2029";
 				break;
-			default: continue;
+			case 0:
+				replacement = "\\x00";
+				break;
+			default:
+				if (code < 55296 || code > 57343) continue;
+				if (code < 56320) {
+					const next = str.charCodeAt(i + 1);
+					if (next >= 56320 && next <= 57343) {
+						i++;
+						continue;
+					}
+				}
+				replacement = "\\u" + code.toString(16);
 		}
 		result += str.slice(lastPos, i) + replacement;
 		lastPos = i + 1;
@@ -1918,7 +1930,7 @@ function _await(scopeId, accessor, promise, content, serializeMarker) {
 						$chunk.writeHTML($chunk.boundary.state.mark("]", scopeId + " " + accessor + " " + branchId));
 					} else withIsAsync(content, value);
 				});
-				boundary.endAsync(chunk);
+				boundary.endAsync();
 			}
 		}
 	}, (err) => {
@@ -1960,7 +1972,7 @@ function tryCatch(content, catchContent) {
 	const chunk = $chunk;
 	const { boundary } = chunk;
 	const { state } = boundary;
-	const catchBoundary = new Boundary(state);
+	const catchBoundary = new Boundary(state, void 0, boundary);
 	const body = chunk.fork(catchBoundary, null);
 	const bodyEnd = body.render(content);
 	if (catchBoundary.signal.aborted) {
@@ -2074,19 +2086,21 @@ var State = class {
 };
 var Boundary = class extends AbortController {
 	state;
+	parent;
 	onNext = NOOP$2;
 	count = 0;
-	constructor(state, parent) {
+	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();
 		});
-		if (parent) if (parent.aborted) this.abort(parent.reason);
-		else parent.addEventListener("abort", () => {
-			this.abort(parent.reason);
+		if (signal) if (signal.aborted) this.abort(signal.reason);
+		else signal.addEventListener("abort", () => {
+			this.abort(signal.reason);
 		});
 	}
 	flush() {
@@ -2096,10 +2110,9 @@ var Boundary = class extends AbortController {
 	startAsync() {
 		if (!this.signal.aborted) this.count++;
 	}
-	endAsync(chunk) {
+	endAsync() {
 		if (!this.signal.aborted && this.count) {
 			this.count--;
-			if (chunk?.reorderId) this.state.reorder(chunk);
 			this.onNext();
 		}
 	}
@@ -2286,12 +2299,22 @@ var Chunk = class Chunk {
 			scripts = concatScripts(scripts, runtimePrefix + ".r=[" + state.resumes + "]");
 		}
 		if (state.writeReorders) {
-			needsWalk = true;
-			if (!state.hasReorderRuntime) {
-				state.hasReorderRuntime = true;
-				scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
-			}
+			let carried = null;
 			for (const reorderedChunk of state.writeReorders) {
+				if (reorderedChunk.async && reorderedChunk.consumed) {
+					let aborted = reorderedChunk.boundary;
+					while (aborted && !aborted.signal.aborted) aborted = aborted.parent;
+					if (!aborted) {
+						(carried ||= []).push(reorderedChunk);
+						continue;
+					}
+					reorderedChunk.async = false;
+				}
+				needsWalk = true;
+				if (!state.hasReorderRuntime) {
+					state.hasReorderRuntime = true;
+					scripts = concatScripts(scripts, REORDER_RUNTIME_CODE + "(" + runtimePrefix + ")");
+				}
 				const { reorderId } = reorderedChunk;
 				const readyReservations = [];
 				let reorderHTML = "";
@@ -2310,6 +2333,7 @@ var Chunk = class Chunk {
 					reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts));
 					if (cur.async) {
 						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
+						state.reorder(cur);
 						cur.html = cur.effects = cur.scripts = cur.lastEffect = "";
 						cur.next = null;
 					}
@@ -2327,7 +2351,7 @@ var Chunk = class Chunk {
 				scripts = concatScripts(scripts, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}");
 				html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
 			}
-			state.writeReorders = null;
+			state.writeReorders = carried;
 		}
 		if (needsWalk) scripts = concatScripts(scripts, runtimePrefix + ".w()");
 		this.html = html;
@@ -2654,15 +2678,12 @@ function nonVoidAttr(name, value) {
 		case "string": return " " + name + attrAssignment(value);
 		case "boolean": return " " + name;
 		case "number": return " " + name + "=" + value;
-		case "object":
-			if (value instanceof RegExp) return " " + name + attrAssignment(value.source);
-			break;
 	}
 	return " " + name + attrAssignment(value + "");
 }
-const singleQuoteAttrReplacements = /'|&(?=#?\w+;)/g;
-const doubleQuoteAttrReplacements = /"|&(?=#?\w+;)/g;
-const needsQuotedAttr = /["'>\s]|&#?\w+;|\/$/g;
+const singleQuoteAttrReplacements = /'|&(?=[#a-zA-Z])/g;
+const doubleQuoteAttrReplacements = /"|&(?=[#a-zA-Z])/g;
+const needsQuotedAttr = /["'>\s]|&[#a-zA-Z]|\/$/g;
 function attrAssignment(value) {
 	return value ? needsQuotedAttr.test(value) ? value[needsQuotedAttr.lastIndex - 1] === (needsQuotedAttr.lastIndex = 0, "\"") ? "='" + escapeSingleQuotedAttrValue(value) + "'" : "=\"" + escapeDoubleQuotedAttrValue(value) + "\"" : "=" + value : "";
 }

package/dist/dom/dom.d.ts

@@ -21,7 +21,7 @@ export declare function _attrs_script(scope: Scope, nodeAccessor: Accessor): voi
 export declare function _html(scope: Scope, value: unknown, accessor: Accessor): void;
 export declare function normalizeAttrValue(value: unknown): string | undefined;
 export declare function _lifecycle(scope: Scope, thisObj: Record<string, unknown> & {
-    onMount?: (this: unknown) => void;
+    onMount?: (this: unknown) => Record<string, unknown> | void;
     onUpdate?: (this: unknown) => void;
     onDestroy?: (this: unknown) => void;
 }, index?: number): void;

package/dist/dom.js

@@ -289,7 +289,7 @@ function _let(id, fn) {
 	return (scope, value) => (rendering ? scope.H === runId && (scope[valueAccessor] = value, fn?.(scope)) : (scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn) && (schedule(), queueRender(scope, fn, id)), value);
 }
 function _let_change(id, fn) {
-	let valueAccessor = decodeAccessor(id), valueChangeAccessor = "M" + valueAccessor, base = _let(id, fn);
+	let valueAccessor = decodeAccessor(id), valueChangeAccessor = decodeAccessor(id + 1), base = _let(id, fn);
 	return (scope, value, valueChange) => (rendering ? (scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope)) ? (scope[valueAccessor] = value, fn?.(scope)) : base(scope, value) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : base(scope, value), value);
 }
 function _const(valueAccessor, fn) {
@@ -366,7 +366,7 @@ function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
 	let closureSignal = ((scope) => {
 		scope[closureSignal.b] = closureSignal.c, fn(scope), subscribeToScopeSet(getOwnerScope ? getOwnerScope(scope) : scope._, closureSignal.a, scope);
 	});
-	return closureSignal.a = "B" + valueAccessor, closureSignal.b = "C" + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
+	return closureSignal.a = valueAccessor, closureSignal.b = "C" + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
 }
 function _child_setup(setup) {
 	return setup._ = (scope, owner) => {
@@ -894,7 +894,7 @@ function normalizeAttrValue(value) {
 }
 function _lifecycle(scope, thisObj, index = 0) {
 	let accessor = "K" + index, instance = scope[accessor];
-	instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, thisObj.onMount?.(), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());
+	instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, Object.assign(thisObj, thisObj.onMount?.()), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());
 }
 function removeChildNodes(startNode, endNode) {
 	let stop = endNode.nextSibling;

package/dist/dom.mjs

@@ -288,7 +288,7 @@ function _let(id, fn) {
 	return (scope, value) => (rendering ? scope.H === runId && (scope[valueAccessor] = value, fn?.(scope)) : (scope[valueAccessor] !== value || !(valueAccessor in scope)) && (scope[valueAccessor] = value, fn) && (schedule(), queueRender(scope, fn, id)), value);
 }
 function _let_change(id, fn) {
-	let valueAccessor = decodeAccessor(id), valueChangeAccessor = "M" + valueAccessor, base = _let(id, fn);
+	let valueAccessor = decodeAccessor(id), valueChangeAccessor = decodeAccessor(id + 1), base = _let(id, fn);
 	return (scope, value, valueChange) => (rendering ? (scope[valueChangeAccessor] = valueChange) && (scope[valueAccessor] !== value || !(valueAccessor in scope)) ? (scope[valueAccessor] = value, fn?.(scope)) : base(scope, value) : scope[valueChangeAccessor] ? scope[valueChangeAccessor](value) : base(scope, value), value);
 }
 function _const(valueAccessor, fn) {
@@ -365,7 +365,7 @@ function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
 	let closureSignal = ((scope) => {
 		scope[closureSignal.b] = closureSignal.c, fn(scope), subscribeToScopeSet(getOwnerScope ? getOwnerScope(scope) : scope._, closureSignal.a, scope);
 	});
-	return closureSignal.a = "B" + valueAccessor, closureSignal.b = "C" + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
+	return closureSignal.a = valueAccessor, closureSignal.b = "C" + valueAccessor, resumeId && _resume(resumeId, closureSignal), closureSignal;
 }
 function _child_setup(setup) {
 	return setup._ = (scope, owner) => {
@@ -893,7 +893,7 @@ function normalizeAttrValue(value) {
 }
 function _lifecycle(scope, thisObj, index = 0) {
 	let accessor = "K" + index, instance = scope[accessor];
-	instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, thisObj.onMount?.(), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());
+	instance ? (Object.assign(instance, thisObj), instance.onUpdate?.()) : (scope[accessor] = thisObj, Object.assign(thisObj, thisObj.onMount?.()), $signal(scope, accessor).onabort = () => thisObj.onDestroy?.());
 }
 function removeChildNodes(startNode, endNode) {
 	let stop = endNode.nextSibling;

package/dist/html/writer.d.ts

@@ -121,12 +121,13 @@ export declare enum FlushStatus {
 }
 export declare class Boundary extends AbortController {
     state: State;
+    parent?: Boundary | undefined;
     onNext: () => void;
     count: number;
-    constructor(state: State, parent?: AbortSignal);
+    constructor(state: State, signal?: AbortSignal, parent?: Boundary | undefined);
     flush(): FlushStatus;
     startAsync(): void;
-    endAsync(chunk?: Chunk): void;
+    endAsync(): void;
 }
 export declare class Chunk {
     boundary: Boundary;