@marko/runtime-tags 6.2.4 → 6.3.0

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}.`);
 }
@@ -431,9 +428,9 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
-		if (scope["#Gen"] === runId) if (id in scope) {
-			if (!--scope[id]) fn(scope);
-		} else scope[id] = defaultPending;
+		if (scope["#Gen"] === runId) if (~id in scope) {
+			if (!--scope[~id]) fn(scope);
+		} else scope[~id] = defaultPending;
 		else queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
@@ -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?.();
 	}
 }
@@ -1809,10 +1810,10 @@ const caughtError = /* @__PURE__ */ new WeakSet();
 const placeholderShown = /* @__PURE__ */ new WeakSet();
 let pendingEffects = [];
 let pendingRenders = [];
-const scopeKeyOffset = 1e3;
+const scopeKeyOffset = 1e6;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	let render;
-	if (signalKey >= 0 && (render = scope[signalKey + scopeKeyOffset])) {
+	if (signalKey >= 0 && (render = scope[signalKey])) {
 		render["value"] = value;
 		if (render["gen"] === runId || catchEnabled && render["pending"]) return;
 		render["gen"] = runId;
@@ -1824,7 +1825,7 @@ function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 			["value"]: value,
 			["gen"]: runId
 		};
-		if (signalKey >= 0) scope[signalKey + scopeKeyOffset] = render;
+		if (signalKey >= 0) scope[signalKey] = render;
 	}
 	queuePendingRender(render);
 }

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}.`);
 }
@@ -429,9 +426,9 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "#Id") {
 	return (scope) => {
-		if (scope["#Gen"] === runId) if (id in scope) {
-			if (!--scope[id]) fn(scope);
-		} else scope[id] = defaultPending;
+		if (scope["#Gen"] === runId) if (~id in scope) {
+			if (!--scope[~id]) fn(scope);
+		} else scope[~id] = defaultPending;
 		else queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
@@ -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?.();
 	}
 }
@@ -1807,10 +1808,10 @@ const caughtError = /* @__PURE__ */ new WeakSet();
 const placeholderShown = /* @__PURE__ */ new WeakSet();
 let pendingEffects = [];
 let pendingRenders = [];
-const scopeKeyOffset = 1e3;
+const scopeKeyOffset = 1e6;
 function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 	let render;
-	if (signalKey >= 0 && (render = scope[signalKey + scopeKeyOffset])) {
+	if (signalKey >= 0 && (render = scope[signalKey])) {
 		render["value"] = value;
 		if (render["gen"] === runId || catchEnabled && render["pending"]) return;
 		render["gen"] = runId;
@@ -1822,7 +1823,7 @@ function queueRender(scope, signal, signalKey, value, scopeKey = scope["#Id"]) {
 			["value"]: value,
 			["gen"]: runId
 		};
-		if (signalKey >= 0) scope[signalKey + scopeKeyOffset] = render;
+		if (signalKey >= 0) scope[signalKey] = render;
 	}
 	queuePendingRender(render);
 }

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;
@@ -2656,9 +2653,6 @@ 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 + "");
 }

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;
@@ -2654,9 +2651,6 @@ 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 + "");
 }

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

@@ -49,7 +49,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	};
 }, _for_of = /* @__PURE__ */ loop(([all, by = bySecondArg], cb) => {
 	typeof by == "string" ? forOf(all, (item, i) => cb(item[by], [item, i])) : forOf(all, (item, i) => cb(by(item, i), [item, i]));
-}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], scopeKeyOffset = 1e3, runEffects = ((effects) => {
+}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], runEffects = ((effects) => {
 	for (let i = 0; i < effects.length;) effects[i++](effects[i++]);
 }), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
@@ -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) {
@@ -299,7 +299,7 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L") {
 	return scopeIdAccessor !== "L" && (scopeIdAccessor = decodeAccessor(scopeIdAccessor)), (scope) => {
-		scope.H === runId ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+		scope.H === runId ? ~id in scope ? --scope[~id] || fn(scope) : scope[~id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
 function _for_closure(ownerLoopNodeAccessor, 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;
@@ -1117,16 +1117,16 @@ function byFirstArg(name) {
 //#region src/dom/queue.ts
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
 	let render;
-	if (signalKey >= 0 && (render = scope[signalKey + scopeKeyOffset])) {
+	if (signalKey >= 0 && (render = scope[signalKey])) {
 		if (render.d = value, render.e === runId || catchEnabled && render.f) return;
 		render.e = runId;
 	} else render = {
-		a: scopeKey * scopeKeyOffset + signalKey,
+		a: scopeKey * 1e6 + signalKey,
 		b: scope,
 		c: signal,
 		d: value,
 		e: runId
-	}, signalKey >= 0 && (scope[signalKey + scopeKeyOffset] = render);
+	}, signalKey >= 0 && (scope[signalKey] = render);
 	queuePendingRender(render);
 }
 function queuePendingRender(render) {

package/dist/dom.mjs

@@ -49,7 +49,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	};
 }, _for_of = /* @__PURE__ */ loop(([all, by = bySecondArg], cb) => {
 	typeof by == "string" ? forOf(all, (item, i) => cb(item[by], [item, i])) : forOf(all, (item, i) => cb(by(item, i), [item, i]));
-}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], scopeKeyOffset = 1e3, runEffects = ((effects) => {
+}), _for_in = /* @__PURE__ */ loop(([obj, by = byFirstArg], cb) => forIn(obj, (key, value) => cb(by(key, value), [key, value]))), _for_to = /* @__PURE__ */ loop(([to, from, step, by = byFirstArg], cb) => forTo(to, from, step, (v) => cb(by(v), [v]))), _for_until = /* @__PURE__ */ loop(([until, from, step, by = byFirstArg], cb) => forUntil(until, from, step, (v) => cb(by(v), [v]))), rendering, runId = 2, caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingRenders = [], runEffects = ((effects) => {
 	for (let i = 0; i < effects.length;) effects[i++](effects[i++]);
 }), runRender = (render) => render.c(render.b, render.d), catchEnabled, classIdToBranch = /* @__PURE__ */ new Map(), scopesByRender = /* @__PURE__ */ new WeakMap(), getRenderScopes = ($global) => {
 	let render = self[$global.runtimeId]?.[$global.renderId], scopes = render && scopesByRender.get(render);
@@ -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) {
@@ -298,7 +298,7 @@ function _const(valueAccessor, fn) {
 }
 function _or(id, fn, defaultPending = 1, scopeIdAccessor = "L") {
 	return scopeIdAccessor !== "L" && (scopeIdAccessor = decodeAccessor(scopeIdAccessor)), (scope) => {
-		scope.H === runId ? id in scope ? --scope[id] || fn(scope) : scope[id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
+		scope.H === runId ? ~id in scope ? --scope[~id] || fn(scope) : scope[~id] = defaultPending : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
 	};
 }
 function _for_closure(ownerLoopNodeAccessor, 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;
@@ -1116,16 +1116,16 @@ function byFirstArg(name) {
 //#region src/dom/queue.ts
 function queueRender(scope, signal, signalKey, value, scopeKey = scope.L) {
 	let render;
-	if (signalKey >= 0 && (render = scope[signalKey + scopeKeyOffset])) {
+	if (signalKey >= 0 && (render = scope[signalKey])) {
 		if (render.d = value, render.e === runId || catchEnabled && render.f) return;
 		render.e = runId;
 	} else render = {
-		a: scopeKey * scopeKeyOffset + signalKey,
+		a: scopeKey * 1e6 + signalKey,
 		b: scope,
 		c: signal,
 		d: value,
 		e: runId
-	}, signalKey >= 0 && (scope[signalKey + scopeKeyOffset] = render);
+	}, signalKey >= 0 && (scope[signalKey] = render);
 	queuePendingRender(render);
 }
 function queuePendingRender(render) {

package/dist/html.js

@@ -643,7 +643,7 @@ function writeObject(state, val, parent, accessor) {
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : 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);
@@ -769,10 +769,14 @@ function writeWeakMap(state) {
 }
 function writeError(state, val, ref) {
 	let result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
-	return val.cause === void 0 ? state.buf.push(result + ")") : (state.buf.push(result + ",{cause:"), writeProp(state, val.cause, ref, "cause"), state.buf.push("})")), !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) + ")";
+	} else state.buf.push(result + ")");
+	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	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;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -1744,9 +1748,6 @@ 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 + "");
 }

package/dist/html.mjs

@@ -642,7 +642,7 @@ function writeObject(state, val, parent, accessor) {
 	return wellKnownObject ? (state.buf.push(wellKnownObject), !0) : 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);
@@ -768,10 +768,14 @@ function writeWeakMap(state) {
 }
 function writeError(state, val, ref) {
 	let result = "new " + val.constructor.name + "(" + quote(val.message + "", 0);
-	return val.cause === void 0 ? state.buf.push(result + ")") : (state.buf.push(result + ",{cause:"), writeProp(state, val.cause, ref, "cause"), state.buf.push("})")), !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) + ")";
+	} else state.buf.push(result + ")");
+	return !0;
 }
 function writeAggregateError(state, val, ref) {
-	return state.buf.push("new AggregateError("), writeProp(state, val.errors, ref, "errors"), val.message ? state.buf.push("," + quote(val.message + "", 0) + ")") : state.buf.push(")"), !0;
+	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;
 }
 function writeURL(state, val) {
 	return state.buf.push("new URL(" + quote(val.toString(), 0) + ")"), !0;
@@ -1743,9 +1747,6 @@ 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 + "");
 }

package/dist/translator/index.js

@@ -48,6 +48,15 @@ function assertNoSpreadAttrs(tag) {
 		throw attr.buildCodeFrameError(`The [\`<${tagName}>\`](https://markojs.com/docs/reference/core-tag#${tagName}) tag does not support \`...spread\` attributes.`);
 	}
 }
+function assertNoTagVarMutation(tag) {
+	const tagVar = tag.node.var;
+	if (tagVar?.type === "Identifier") {
+		const constantViolations = tag.scope.getBinding(tagVar.name)?.constantViolations;
+		if (constantViolations?.length) {
+			for (const assignment of constantViolations) if (assignment.type !== "MarkoTag") throw assignment.buildCodeFrameError(`${tagVar.name} is readonly and cannot be mutated.`);
+		}
+	}
+}
 function assertNoBodyContent(tag) {
 	if (tag.node.body.body.length) {
 		const tagName = tag.get("name");
@@ -1919,9 +1928,6 @@ 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 + "");
 }
@@ -2821,7 +2827,7 @@ function setSectionSerializedValue(section, prop, expression) {
 }
 function setBindingSerializedValue(section, binding, expression, prefix) {
 	const reason = getSerializeReason(section, binding, prefix);
-	if (reason) getSerializedAccessors(section).set((prefix || "") + getScopeAccessor(binding), {
+	if (reason) getSerializedAccessors(section).set(prefix === void 0 ? getScopeAccessor(binding) : getPrefixedScopeAccessor(binding, prefix), {
 		expression,
 		reason
 	});
@@ -2905,7 +2911,7 @@ function getSignal(section, referencedBindings, name) {
 			const render = getSignalFn(signal);
 			const closureSignalBuilder = getClosureSignalBuilder(section);
 			if (closureSignalBuilder && !isDynamicClosure(section, closure)) return closureSignalBuilder(closure, render);
-			return callRuntime("_closure_get", getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
+			return callRuntime("_closure_get", isOptimize() ? _marko_compiler.types.numericLiteral(getClosureAccessorId(closure)) : getScopeAccessorLiteral(closure, true), render, isImmediateOwner(section, closure) ? void 0 : _marko_compiler.types.arrowFunctionExpression([scopeIdentifier], getScopeExpression(section, closure.section)), some(closure.closureSections, underTryPlaceholder) ? _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending")) : void 0);
 		};
 	}
 	return signal;
@@ -5243,7 +5249,11 @@ function preAnalyze$1(tag) {
 		for (const child of tag.node.body.body) if (child.type === "MarkoText" || child.type === "MarkoPlaceholder" && child.escape) parts.push(child.value);
 		else throw tag.hub.file.hub.buildError(child, "Unexpected content in textarea, only text and placeholders are supported.", SyntaxError);
 		const textValue = normalizeStringExpression(parts);
-		if (textValue) tag.node.attributes.push(_marko_compiler.types.markoAttribute("value", textValue));
+		if (textValue) {
+			const valueAttr = tag.node.attributes.find((attr) => _marko_compiler.types.isMarkoAttribute(attr) && attr.name === "value");
+			if (valueAttr) throw tag.hub.file.hub.buildError(valueAttr, "A textarea cannot have both a value attribute and body content.", SyntaxError);
+			tag.node.attributes.push(_marko_compiler.types.markoAttribute("value", textValue));
+		}
 		tag.node.body.body = [];
 	}
 }
@@ -6292,7 +6302,8 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 		nullable: !sameSection || excludeProperties === void 0,
 		pruned: void 0,
 		exposed: false,
-		forcePersist: false
+		forcePersist: false,
+		reserveSize: 0
 	};
 	if (property) {
 		if (declared) upstreamAlias.nullable = false;
@@ -6436,6 +6447,7 @@ function trackAssignment(assignment, binding) {
 				fnExtra.section = idExtra.section = section;
 			}
 			if (binding.upstreamAlias && binding.property !== void 0) {
+				if (binding.upstreamAlias === binding.section.params) throw assignment.buildCodeFrameError(`\`${binding.name}\` is a tag parameter and cannot be assigned to.`);
 				const changePropName = binding.property + "Change";
 				const changeBinding = binding.upstreamAlias.propertyAliases.get(changePropName) || createBinding(generateUid(changePropName), binding.type, binding.section, binding.upstreamAlias, changePropName, void 0, id.node.loc, true);
 				idExtra.assignmentTo = changeBinding;
@@ -6758,22 +6770,30 @@ function finalizeReferences() {
 			});
 		}
 		let intersectionIndex = 0;
-		let lastBindingIndex = 0;
+		let nextId = 0;
 		let intersection;
-		forEach(filter(bindings, isOwnedBinding), (binding, bindingIndex) => {
-			binding.id = (lastBindingIndex = bindingIndex) + intersectionIndex;
-			while (intersectionIndex < intersections.length && (intersection = intersections[intersectionIndex]).filter(isOwnedBinding).at(-1) === binding) intersectionMeta.set(intersection, {
-				id: bindingIndex + ++intersectionIndex,
-				scopeOffset: getMaxOwnSourceOffset(intersection, section)
-			});
+		forEach(filter(bindings, isOwnedBinding), (binding) => {
+			binding.id = nextId++;
+			nextId += binding.reserveSize;
+			while (intersectionIndex < intersections.length && (intersection = intersections[intersectionIndex]).filter(isOwnedBinding).at(-1) === binding) {
+				intersectionIndex++;
+				intersectionMeta.set(intersection, {
+					id: nextId++,
+					scopeOffset: getMaxOwnSourceOffset(intersection, section)
+				});
+			}
 		});
 		while (intersectionIndex < intersections.length) {
 			intersection = intersections[intersectionIndex];
+			intersectionIndex++;
 			intersectionMeta.set(intersection, {
-				id: lastBindingIndex + ++intersectionIndex,
+				id: nextId++,
 				scopeOffset: getMaxOwnSourceOffset(intersection, section)
 			});
 		}
+		forEach(filter(bindings, isOwnedBinding), (binding) => {
+			if (binding.closureSections) closureAccessorIds.set(binding, nextId++);
+		});
 	});
 	const programSection = (0, _marko_compiler_babel_utils.getProgram)().node.extra.section;
 	if (programSection.returnValueExpr) programSection.returnSerializeReason = getSerializeSourcesForExpr(programSection.returnValueExpr);
@@ -6793,6 +6813,7 @@ function getMaxOwnSourceOffset(intersection, section) {
 	return scopeOffset;
 }
 const intersectionMeta = /* @__PURE__ */ new WeakMap();
+const closureAccessorIds = /* @__PURE__ */ new WeakMap();
 const collapsedIntersectionSource = /* @__PURE__ */ new WeakMap();
 function getCollapsibleIntersectionSource(intersection, section) {
 	let sources;
@@ -7009,6 +7030,20 @@ function getScopeAccessor(binding, encoded, includeId) {
 	else if (includeId || canonicalBinding.type === 0) return `${canonicalBinding.name}/${canonicalBinding.id}`;
 	return canonicalBinding.scopeAccessor ?? canonicalBinding.name;
 }
+function getPrefixedScopeAccessor(binding, prefix) {
+	const canonicalBinding = getCanonicalBinding(binding);
+	if (isOptimize()) switch (prefix) {
+		case getAccessorPrefix().TagVariableChange: return decodeAccessor(canonicalBinding.id + 1);
+		case getAccessorPrefix().ClosureScopes: return decodeAccessor(getClosureAccessorId(canonicalBinding));
+		case getAccessorPrefix().ClosureSignalIndex: return prefix + decodeAccessor(getClosureAccessorId(canonicalBinding));
+	}
+	return prefix + getScopeAccessor(binding);
+}
+function getClosureAccessorId(binding) {
+	const id = closureAccessorIds.get(getCanonicalBinding(binding));
+	if (id === void 0) throw new Error(`No closure accessor id was reserved for "${binding.name}".`);
+	return id;
+}
 function getDebugScopeAccess(binding) {
 	let root = binding;
 	let access = "";
@@ -7540,12 +7575,7 @@ var const_default = {
 		if (upstreamAlias) dropNodes(valueAttr.value);
 		const binding = trackVarReferences(tag, 5, upstreamAlias);
 		if (binding) {
-			if (node.var.type === "Identifier") {
-				const constantViolations = tag.scope.getBinding(node.var.name)?.constantViolations;
-				if (constantViolations?.length) {
-					for (const assignment of constantViolations) if (assignment.type !== "MarkoTag") throw assignment.buildCodeFrameError(`${node.var.name} is readonly and cannot be mutated.`);
-				}
-			}
+			assertNoTagVarMutation(tag);
 			if (!valueExtra.nullable) binding.nullable = false;
 			if (!upstreamAlias) {
 				setBindingDownstream(binding, valueExtra);
@@ -7617,6 +7647,7 @@ var define_default = {
 			dropNodes(getAllTagReferenceNodes(tag.node));
 			return;
 		}
+		assertNoTagVarMutation(tag);
 		const paramsBinding = trackParamsReferences(tagBody, 3);
 		setTagDownstream(tag, varBinding);
 		if (bodySection) {
@@ -7834,7 +7865,10 @@ var id_default = {
 		if (!_marko_compiler.types.isIdentifier(node.var)) throw tag.get("var").buildCodeFrameError("The [`<id>` tag](https://markojs.com/docs/reference/core-tag#id) cannot be destructured.");
 		if (tag.node.attributes.length > 1 || tag.node.attributes.length === 1 && (!_marko_compiler.types.isMarkoAttribute(valueAttr) || !valueAttr.default && valueAttr.name !== "value")) throw tag.get("name").buildCodeFrameError("The [`<id>` tag](https://markojs.com/docs/reference/core-tag#id) only supports the [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value).");
 		const binding = trackVarReferences(tag, 5);
-		if (binding) setBindingDownstream(binding, !!valueAttr && evaluate(valueAttr.value));
+		if (binding) {
+			assertNoTagVarMutation(tag);
+			setBindingDownstream(binding, !!valueAttr && evaluate(valueAttr.value));
+		}
 		addSetupExpr(getOrCreateSection(tag), valueAttr?.value);
 	},
 	translate: { exit(tag) {
@@ -7888,9 +7922,13 @@ var let_default = {
 		const tagVar = node.var;
 		let valueAttr;
 		let valueChangeAttr;
-		for (const attr of node.attributes) if (_marko_compiler.types.isMarkoAttribute(attr)) if (attr.name === "value") valueAttr = attr;
-		else if (attr.name === "valueChange") valueChangeAttr = attr;
-		else {
+		for (const attr of node.attributes) if (_marko_compiler.types.isMarkoAttribute(attr)) if (attr.name === "value") {
+			if (valueAttr) throw tag.hub.buildError(attr, "Invalid duplicate value attribute.");
+			valueAttr = attr;
+		} else if (attr.name === "valueChange") {
+			if (valueChangeAttr) throw tag.hub.buildError(attr, "Invalid duplicate valueChange attribute.");
+			valueChangeAttr = attr;
+		} else {
 			const start = attr.loc?.start;
 			const end = attr.loc?.end;
 			const msg = "The [`<let>` tag](https://markojs.com/docs/reference/core-tag#let) only supports the [`value=` attribute](https://markojs.com/docs/reference/language#shorthand-value) and its change handler.";
@@ -7911,6 +7949,7 @@ var let_default = {
 		const binding = trackVarReferences(tag, 1);
 		const tagExtra = mergeReferences(tagSection, tag.node, [valueAttr?.value, valueChangeAttr?.value]);
 		if (valueChangeAttr) {
+			binding.reserveSize = 1;
 			setBindingDownstream(binding, tagExtra);
 			if (binding.assignmentSections) addSerializeReason(tagSection, true, binding, getAccessorPrefix().TagVariableChange);
 		} else setBindingDownstream(binding, false);

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

@@ -1,3 +1,4 @@
 import type { types as t } from "@marko/compiler";
 export declare function assertNoSpreadAttrs(tag: t.NodePath<t.MarkoTag>): void;
+export declare function assertNoTagVarMutation(tag: t.NodePath<t.MarkoTag>): void;
 export declare function assertNoBodyContent(tag: t.NodePath<t.MarkoTag>): void;

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

@@ -1,4 +1,5 @@
 import { types as t } from "@marko/compiler";
+import type { AccessorPrefix } from "../../common/accessor.debug";
 import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 import { type SerializeReason } from "./serialize-reasons";
@@ -50,6 +51,7 @@ export interface Binding {
     pruned: boolean | undefined;
     exposed: boolean;
     forcePersist: boolean;
+    reserveSize: number;
 }
 export interface InputBinding extends Binding {
     type: BindingType.input;
@@ -142,6 +144,8 @@ export declare function getCanonicalBinding(binding: Binding): Binding;
 export declare function getAllTagReferenceNodes(tag: t.MarkoTag, referenceNodes?: t.Node[]): t.Node[];
 export declare function getScopeAccessorLiteral(binding: Binding, encoded?: boolean, includeId?: boolean): t.NumericLiteral | t.StringLiteral;
 export declare function getScopeAccessor(binding: Binding, encoded?: boolean, includeId?: boolean): string;
+export declare function getPrefixedScopeAccessor(binding: Binding, prefix: AccessorPrefix): string;
+export declare function getClosureAccessorId(binding: Binding): number;
 export declare function getDebugScopeAccess(binding: Binding): {
     root: Binding;
     access: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.2.4",
+  "version": "6.3.0",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",

package/tags/lifecycle.d.marko

@@ -1,7 +1,10 @@
 /** File for types only, not actual implementation **/
 
-export type Input<T extends object> = T & {
-  onMount?(): unknown;
-  onUpdate?(): unknown;
-  onDestroy?(): unknown;
+export type Input<
+  T extends object,
+  R extends object = {},
+> = T & ThisType<T & R> & {
+  onMount?: () => R | void;
+  onUpdate?: () => void;
+  onDestroy?: () => void;
 };