marko 6.3.34 → 6.3.36

package/dist/translator/index.js

@@ -126,6 +126,7 @@ var accessor_prefix_debug_exports = /* @__PURE__ */ __exportAll({
 	ControlledValue: () => ControlledValue$1,
 	DynamicHTMLLastChild: () => DynamicHTMLLastChild$1,
 	EventAttributes: () => EventAttributes$1,
+	IdFallback: () => IdFallback$1,
 	KeyedScopes: () => KeyedScopes$1,
 	Lifecycle: () => Lifecycle$1,
 	Promise: () => Promise$2,
@@ -141,6 +142,7 @@ const ControlledType$1 = "ControlledType:";
 const ControlledValue$1 = "ControlledValue:";
 const DynamicHTMLLastChild$1 = "DynamicHTMLLastChild:";
 const EventAttributes$1 = "EventAttributes:";
+const IdFallback$1 = "IdFallback:";
 const KeyedScopes$1 = "KeyedScopes:";
 const Lifecycle$1 = "Lifecycle:";
 const Promise$2 = "Promise:";
@@ -203,6 +205,7 @@ const StartNode$1 = "#StartNode";
 const Subscriptions$1 = "#Subscriptions";
 const TagVariable$1 = "#TagVariable";
 const TagVariableChange$2 = "#TagVariableChange";
+const Owner$1 = "owner";
 //#endregion
 //#region src/translator/util/evaluate.ts
 function evaluate(value) {
@@ -374,6 +377,7 @@ const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
+const REGISTRY = /* @__PURE__ */ new WeakMap();
 (() => {
 	const KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (const name of Object.getOwnPropertyNames(Symbol)) {
@@ -384,10 +388,88 @@ patchIteratorNext(AsyncGenerator.prototype);
 })();
 Array.from, Array.isArray, Array.of, ArrayBuffer.isView, Atomics.add, Atomics.and, Atomics.compareExchange, Atomics.exchange, Atomics.isLockFree, Atomics.load, Atomics.notify, Atomics.or, Atomics.store, Atomics.sub, Atomics.wait, BigInt.asIntN, BigInt.asUintN, BigInt64Array, BigInt64Array.from, BigInt64Array.of, BigUint64Array, BigUint64Array.from, BigUint64Array.of, console.timeStamp, Date.now, Date.parse, Date.UTC, Float32Array.from, Float32Array.of, Float64Array.from, Float64Array.of, globalThis.atob, globalThis.btoa, globalThis.clearImmediate, globalThis.clearInterval, globalThis.clearTimeout, globalThis.crypto?.getRandomValues, globalThis.crypto?.randomUUID, globalThis.fetch, globalThis.performance?.now, globalThis.queueMicrotask, globalThis.setImmediate, globalThis.setInterval, globalThis.setTimeout, globalThis.structuredClone, globalThis.URL, globalThis.URLSearchParams, globalThis.WritableStream, Int16Array.from, Int16Array.of, Int32Array.from, Int32Array.of, Int8Array.from, Int8Array.of, Intl.Collator, Intl.DateTimeFormat, Intl.DisplayNames, Intl.getCanonicalLocales, Intl.ListFormat, Intl.Locale, Intl.NumberFormat, Intl.PluralRules, Intl.RelativeTimeFormat, Intl.Segmenter, Intl.supportedValuesOf, Map.groupBy, Number.isFinite, Number.isInteger, Number.isNaN, Number.isSafeInteger, Number.parseFloat, Number.parseInt, String.fromCharCode, String.fromCodePoint, String.raw, Symbol.for, Uint16Array.from, Uint16Array.of, Uint32Array.from, Uint32Array.of, Uint8Array.from, Uint8Array.of, Uint8ClampedArray.from, Uint8ClampedArray.of;
 Atomics, globalThis.crypto;
+function register(id, val, scope) {
+	REGISTRY.set(val, {
+		id,
+		scope,
+		access: "_._" + toAccess(toObjectKey(id))
+	});
+	return val;
+}
+function toObjectKey(name) {
+	if (name === "") return "\"\"";
+	if (name === "__proto__") return "[\"__proto__\"]";
+	const len = name.length;
+	const c0 = name.charCodeAt(0);
+	if (c0 >= 48 && c0 <= 57) if (c0 === 48) {
+		if (len !== 1) return quote(name, 1);
+	} else {
+		for (let i = 1; i < len; i++) {
+			const c = name.charCodeAt(i);
+			if (c < 48 || c > 57) return quote(name, i);
+		}
+		if (len > 15 && "" + +name !== name) return quote(name, 0);
+	}
+	else if (c0 >= 97 && c0 <= 122 || c0 >= 65 && c0 <= 90 || c0 === 95 || c0 === 36) for (let i = 1; i < len; i++) {
+		const c = name.charCodeAt(i);
+		if (!(c >= 97 && c <= 122 || c >= 65 && c <= 90 || c >= 48 && c <= 57 || c === 95 || c === 36)) return quote(name, i);
+	}
+	else return quote(name, 0);
+	return name;
+}
 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;
+		const code = str.charCodeAt(i);
+		switch (code) {
+			case 34:
+				replacement = "\\\"";
+				break;
+			case 92:
+				replacement = "\\\\";
+				break;
+			case 60:
+				replacement = "\\x3C";
+				break;
+			case 10:
+				replacement = "\\n";
+				break;
+			case 13:
+				replacement = "\\r";
+				break;
+			case 8232:
+				replacement = "\\u2028";
+				break;
+			case 8233:
+				replacement = "\\u2029";
+				break;
+			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;
+	}
+	return "\"" + (lastPos === startPos ? str : result + str.slice(lastPos)) + "\"";
+}
 function patchIteratorNext(proto) {
 	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
@@ -422,16 +504,37 @@ function traverseReplace(container, key, enter, state) {
 	}
 }
 function traverseContains(node, check) {
-	if (node) if (Array.isArray(node)) {
-		for (const item of node) if (traverseContains(item, check)) return true;
-	} else {
+	return !!traverseFind(node, check);
+}
+function traverseFind(node, check) {
+	if (node) if (Array.isArray(node)) for (const item of node) {
+		const found = traverseFind(item, check);
+		if (found) return found;
+	}
+	else {
 		switch (check(node)) {
-			case true: return true;
-			case skip: return false;
+			case true: return node;
+			case skip: return;
+		}
+		for (const key of _marko_compiler.types.VISITOR_KEYS[node.type]) {
+			const found = traverseFind(node[key], check);
+			if (found) return found;
 		}
-		for (const key of _marko_compiler.types.VISITOR_KEYS[node.type]) if (traverseContains(node[key], check)) return true;
 	}
-	return false;
+}
+function traverseFindAwait(node) {
+	return traverseFind(node, (child) => {
+		switch (child.type) {
+			case "ForOfStatement": return child.await;
+			case "FunctionDeclaration":
+			case "FunctionExpression":
+			case "ArrowFunctionExpression":
+			case "ClassMethod":
+			case "ObjectMethod":
+			case "ClassPrivateMethod": return skip;
+			case "AwaitExpression": return true;
+		}
+	});
 }
 function traverse(visit, node, parent, grandParent) {
 	if (node) {
@@ -933,6 +1036,7 @@ var accessor_prefix_exports = /* @__PURE__ */ __exportAll({
 	ControlledValue: () => "G",
 	DynamicHTMLLastChild: () => "H",
 	EventAttributes: () => "I",
+	IdFallback: () => "J",
 	KeyedScopes: () => "O",
 	Lifecycle: () => "K",
 	Promise: () => "L",
@@ -1439,7 +1543,7 @@ function getNodeContentType(path, extraMember, contentInfo) {
 				case "for":
 				case "if":
 				case "await":
-				case "try":
+				case "try": return 1;
 				case "show": return 1;
 				default: return null;
 			}
@@ -1561,6 +1665,13 @@ function isNativeNode(tag) {
 const [getReferencesByFn] = createProgramState(() => /* @__PURE__ */ new Map());
 const [getReferencesByImportedFn] = createProgramState(() => /* @__PURE__ */ new Map());
 var function_default = { analyze(fn) {
+	const awaitNode = isMarkoAttribute(fn.parentPath) && _marko_compiler.types.isFunctionExpression(fn.node) && !fn.node.async && traverseFindAwait(fn.node.body);
+	if (awaitNode) {
+		const file = (0, _marko_compiler_babel_utils.getFile)();
+		const start = file.code.indexOf("await", awaitNode.start ?? 0);
+		const highlight = start >= 0 && (awaitNode.end == null || start < awaitNode.end) ? (0, _marko_compiler_babel_utils.withLoc)(file, _marko_compiler.types.cloneNode(awaitNode), start, start + 5) : awaitNode;
+		throw fn.hub.buildError(highlight, "Attribute methods containing `await` must be `async`. Add `async` before the method name.");
+	}
 	if (fn !== getFnRoot(fn)) return;
 	const exprRoot = getExprRoot(fn);
 	const markoRoot = getMarkoRoot(exprRoot);
@@ -1924,8 +2035,6 @@ const regexpCharsReg = /[\\^$.*+?()[\]{}|]/g;
 function escapeRegExp(str) {
 	return str.replace(regexpCharsReg, "\\$&");
 }
-//#endregion
-//#region src/common/errors.ts
 function assertExclusiveAttrs(attrs, onError = throwErr) {
 	if (attrs) {
 		let exclusiveAttrs;
@@ -1937,7 +2046,10 @@ function assertExclusiveAttrs(attrs, onError = throwErr) {
 			(exclusiveAttrs ||= []).push("checkedValueChange");
 			if ("checked" in attrs) exclusiveAttrs.push("checked");
 		}
-		if (attrs.valueChange) (exclusiveAttrs ||= []).push("valueChange");
+		if (attrs.valueChange) {
+			(exclusiveAttrs ||= []).push("valueChange");
+			if ("checked" in attrs && !exclusiveAttrs.includes("checked")) exclusiveAttrs.push("checked");
+		}
 		if (exclusiveAttrs && exclusiveAttrs.length > 1) onError(`The attributes ${joinWithAnd(exclusiveAttrs)} are mutually exclusive.`);
 	}
 }
@@ -1957,8 +2069,8 @@ function joinWithAnd(a) {
 function _unescaped(val) {
 	return val ? val + "" : val === 0 ? "0" : "";
 }
-const unsafeXMLReg = /[<&]/g;
-const replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;";
+const unsafeXMLReg = /[<&\r]/g;
+const replaceUnsafeXML = (c) => c === "&" ? "&amp;" : c === "<" ? "&lt;" : "&#13;";
 const escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str;
 function _escape(val) {
 	return val ? escapeXMLStr(val + "") : val === 0 ? "0" : "";
@@ -1987,6 +2099,9 @@ function getContext(key) {
 function getState() {
 	return $chunk.boundary.state;
 }
+function rendererKey(renderer) {
+	return renderer?.["owner"] === void 0 ? renderer?.["id"] || renderer : renderer["id"] + " " + renderer[Owner$1];
+}
 function getScopeById(scopeId) {
 	if (scopeId !== void 0) return $chunk.boundary.state.scopes.get(scopeId);
 }
@@ -2022,6 +2137,12 @@ function _script(scopeId, registryId) {
 	$chunk.boundary.state.needsMainRuntime = true;
 	$chunk.writeEffect(scopeId, registryId);
 }
+function _resume(val, id, scopeId) {
+	return register(id, val, scopeId === void 0 ? void 0 : _scope_with_id(scopeId));
+}
+function _el(scopeId, id) {
+	return _resume(() => void 0, id, scopeId);
+}
 function _resume_branch(scopeId) {
 	const branchId = $chunk.context?.[kBranchId];
 	if (branchId !== void 0 && branchId !== scopeId) writeScope(scopeId, { [ClosestBranchId$1]: branchId });
@@ -2046,6 +2167,9 @@ let writeScope = (scopeId, partialScope) => {
 	target.flushScopes = true;
 	return scope;
 };
+function _scope_with_id(scopeId) {
+	return scopeWithId($chunk.boundary.state, scopeId);
+}
 function scopeWithId(state, scopeId) {
 	const { scopes } = state;
 	let scope = scopes.get(scopeId);
@@ -2081,7 +2205,7 @@ function _attr_textarea_value(scopeId, nodeAccessor, value, valueChange, seriali
 }
 function _textarea_value(value) {
 	const escaped = _escape(normalizeStrAttrValue(value));
-	return escaped[0] === "\n" || escaped[0] === "\r" ? "\n" + escaped : escaped;
+	return escaped[0] === "\n" ? "\n" + escaped : escaped;
 }
 function _attr_input_value(scopeId, nodeAccessor, value, valueChange, serializeType) {
 	if (valueChange) writeControlledScope(2, scopeId, nodeAccessor, void 0, valueChange, serializeType);
@@ -2240,10 +2364,10 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			if (!voidElementsReg.test(renderer)) {
 				const renderContent = content || normalizeDynamicRenderer(input.content);
 				if (renderer === "textarea") _html(_attr_textarea_value(branchId, "a", input.value, input.valueChange, 1));
-				else if (renderContent) {
-					if (typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
-					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent, 1);
-					else _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
+				else {
+					if (renderContent && typeof renderContent !== "function") throw new Error(`Body content is not supported for the \`<${renderer}>\` tag.`);
+					if (renderer === "select" && ("value" in input || "valueChange" in input)) _attr_select_value(branchId, "a", input.value, input.valueChange, renderContent ? () => _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason) : void 0, 1);
+					else if (renderContent) _dynamic_tag(branchId, "a", renderContent, void 0, 0, void 0, serializeReason);
 				}
 				_html(`</${renderer}>`);
 			}
@@ -2253,6 +2377,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 			if (shouldResume || needsScript) _html(state.mark("'", scopeId + " " + accessor + " " + branchId));
 		};
 		renderNative();
+		result = _el(branchId, "e");
 	} else {
 		const chunk = void 0;
 		const beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0;
@@ -2276,7 +2401,7 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 		}
 	}
 	if (rendered) {
-		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: renderer?.["id"] || renderer });
+		if (shouldResume) writeScope(scopeId, { [ConditionalRenderer$1 + accessor]: rendererKey(renderer) });
 	} else _scope_id();
 	return result;
 };
@@ -2324,10 +2449,17 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_load_media_trigger",
 	"_load_race_trigger"
 ]);
+const [getRuntimeImports] = createProgramState(() => /* @__PURE__ */ new Map());
 function importRuntime(name) {
 	if (!isTranslate()) throw new Error(`\`importRuntime(${JSON.stringify(name)})\` may only be called during the translate stage.`);
 	const { output } = getMarkoOpts();
-	return (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name);
+	const imports = getRuntimeImports();
+	let localName = imports.get(name);
+	if (!localName) {
+		localName = (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name).name;
+		imports.set(name, localName);
+	}
+	return _marko_compiler.types.identifier(localName);
 }
 function callRuntime(name, ...args) {
 	const callExpression = _marko_compiler.types.callExpression(importRuntime(name), filterArguments(args));
@@ -3012,10 +3144,25 @@ function setSectionSerializedValue(section, prop, expression) {
 }
 function setBindingSerializedValue(section, binding, expression, prefix) {
 	const reason = getSerializeReason(section, binding, prefix);
-	if (reason) getSerializedAccessors(section).set(prefix === void 0 ? getScopeAccessor(binding) : getPrefixedScopeAccessor(binding, prefix), {
+	if (reason) if (prefix === void 0) getSerializedAccessors(section).set(getScopeAccessor(binding), {
 		expression,
 		reason
 	});
+	else {
+		const accessor = getPrefixedScopeAccessor(binding, prefix);
+		getSerializedAccessors(section).set(accessor, {
+			expression,
+			reason
+		});
+		if (!isOptimize() && prefix === getAccessorPrefix().TagVariableChange) {
+			const { root, access } = getDebugScopeAccess(binding);
+			setSectionDebugVar(section, accessor, `${root.name + access}Change`, root.loc);
+		}
+	}
+}
+const [getSectionDebugVars] = createSectionState("sectionDebugVars", () => /* @__PURE__ */ new Map());
+function setSectionDebugVar(section, accessor, name, loc) {
+	if (!isOptimize()) getSectionDebugVars(section).set(accessor, loc ? [name, `${loc.start.line}:${loc.start.column + 1}`] : [name]);
 }
 const nonAnalyzedForceSerializedSection = /* @__PURE__ */ new WeakSet();
 function setSerializedValue(section, key, expression) {
@@ -3354,7 +3501,7 @@ function writeSignals(section) {
 		if (signal.build) {
 			let value = signal.build();
 			const buildsEagerForward = _marko_compiler.types.isIdentifier(value);
-			if (!value || !signal.register && _marko_compiler.types.isFunction(value) && _marko_compiler.types.isBlockStatement(value.body) && !value.body.body.length) return;
+			if (!value || !signal.register && !signal.referenced && _marko_compiler.types.isFunction(value) && _marko_compiler.types.isBlockStatement(value.body) && !value.body.body.length) return;
 			if (_marko_compiler.types.isCallExpression(value)) replaceNullishAndEmptyFunctionsWith0(value.arguments);
 			if (signal.register) value = callRuntime("_var_resume", _marko_compiler.types.stringLiteral(getResumeRegisterId(section, signal.referencedBindings, "var")), value);
 			if (buildsEagerForward) forEach(signal.forwards, writeSignal);
@@ -3401,7 +3548,8 @@ function writeRegisteredFns() {
 					params = [localsIdentifier];
 					if (registeredFn.referencedBindings || registeredFn.referencesScope) prologue = [_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(scopeIdentifier, _marko_compiler.types.memberExpression(localsIdentifier, _marko_compiler.types.identifier(getAccessorProp().Owner)))])];
 				} else params = [scopeIdentifier];
-				fn = _marko_compiler.types.functionDeclaration(_marko_compiler.types.identifier(registeredFn.id), params, _marko_compiler.types.blockStatement(toReturnedFunction(registeredFn.node, prologue)));
+				const body = toReturnedFunction(registeredFn.node, prologue);
+				fn = _marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(_marko_compiler.types.identifier(registeredFn.id), _marko_compiler.types.arrowFunctionExpression(params, body.length === 1 && body[0].type === "ReturnStatement" ? body[0].argument : _marko_compiler.types.blockStatement(body)))]);
 			} else if (registeredFn.node.type === "FunctionDeclaration" && registeredFn.node.id?.name === registeredFn.id) fn = registeredFn.node;
 			else fn = _marko_compiler.types.functionDeclaration(_marko_compiler.types.identifier(registeredFn.id), registeredFn.node.params, registeredFn.node.body.type === "BlockStatement" ? registeredFn.node.body : _marko_compiler.types.blockStatement([_marko_compiler.types.returnStatement(registeredFn.node.body)]), registeredFn.node.generator, registeredFn.node.async);
 			statements.push(fn);
@@ -3507,6 +3655,7 @@ function writeHTMLResumeStatements(path) {
 		const writeScopeArgs = [scopeIdIdentifier, _marko_compiler.types.objectExpression(serializedProperties)];
 		if (debug) {
 			writeScopeArgs.push(_marko_compiler.types.stringLiteral(path.hub.file.opts.filenameRelative), section.loc && section.loc.start.line != null ? _marko_compiler.types.stringLiteral(`${section.loc.start.line}:${section.loc.start.column + 1}`) : _marko_compiler.types.numericLiteral(0));
+			for (const [accessor, varLoc] of getSectionDebugVars(section)) (debugVars ||= []).push(toObjectProperty(accessor, _marko_compiler.types.valueToNode(varLoc)));
 			if (debugVars) writeScopeArgs.push(_marko_compiler.types.objectExpression(debugVars));
 		}
 		body.push(_marko_compiler.types.expressionStatement(getExprIfSerialized(section, sectionSerializeReason, writeScopeBuilder ? writeScopeBuilder(callRuntime("_scope", ...writeScopeArgs)) : callRuntime("_scope", ...writeScopeArgs))));
@@ -3560,7 +3709,7 @@ function replaceAssignedNode(node) {
 		case "UpdateExpression": {
 			const { extra } = node.argument;
 			if (isAssignedBindingExtra(extra)) {
-				let builtAssignment = getBuildAssignment(extra)?.(extra.section, _marko_compiler.types.binaryExpression(node.operator === "++" ? "+" : "-", createScopeReadExpression(extra.assignment, extra.section), _marko_compiler.types.numericLiteral(1)));
+				let builtAssignment = getBuildAssignment(extra)?.(extra.section, _marko_compiler.types.binaryExpression(node.operator === "++" ? "+" : "-", _marko_compiler.types.unaryExpression("+", createScopeReadExpression(extra.assignment, extra.section)), _marko_compiler.types.numericLiteral(1)));
 				if (builtAssignment) {
 					if (!node.prefix) {
 						builtAssignment = _marko_compiler.types.binaryExpression(node.operator === "++" ? "-" : "+", builtAssignment, _marko_compiler.types.numericLiteral(1));
@@ -4753,7 +4902,7 @@ function buildContent(body) {
 		}
 		if (dynamicSerializeReason) body.node.body.unshift(getScopeReasonDeclaration(bodySection));
 		else body.node.body.unshift(_marko_compiler.types.expressionStatement(callRuntime("_scope_reason")));
-		return callRuntime(serialized ? "_content_resume" : "_content", _marko_compiler.types.stringLiteral(getResumeRegisterId(bodySection, "content")), _marko_compiler.types.arrowFunctionExpression(body.node.params, _marko_compiler.types.blockStatement(body.node.body)), serialized ? getScopeIdIdentifier(getSection(getAttributeTagParent(body.parentPath))) : void 0);
+		return callRuntime(serialized ? "_content_resume" : "_content", _marko_compiler.types.stringLiteral(getResumeRegisterId(bodySection, "content")), _marko_compiler.types.arrowFunctionExpression(body.node.params, _marko_compiler.types.blockStatement(body.node.body)), getScopeIdIdentifier(getSection(getAttributeTagParent(body.parentPath))));
 	} else {
 		if (isSectionRendererElided(bodySection)) return;
 		return _marko_compiler.types.callExpression(_marko_compiler.types.identifier(bodySection.name), bodySection.referencedLocalClosures ? [scopeIdentifier, _marko_compiler.types.objectExpression(toArray(bodySection.referencedLocalClosures, (ref) => {
@@ -4849,6 +4998,11 @@ var native_tag_default = {
 				else if (!_marko_compiler.types.isMarkoText(child)) throw tag.hub.buildError(child, `Only text is allowed inside a \`<${tagName}>\`.`);
 			}
 			relatedControllable ||= getRelatedControllable(tagName, seen);
+			const valueChangeEval = tagName === "input" && seen.valueChange ? evaluate(seen.valueChange.value) : void 0;
+			if (valueChangeEval && !(valueChangeEval.confident && valueChangeEval.computed == null) && getInputValueMode(seen.type) === "attribute") {
+				const type = evaluate(seen.type.value).computed;
+				throw tag.hub.buildError(seen.valueChange, `\`valueChange\` cannot be used on a \`type="${type}"\` \`<input>\` — user interaction can never change its \`value\`.` + (/^[cr]/i.test(type) ? " Bind `checked` or `checkedValue` instead." : ""));
+			}
 			if (relatedControllable && relatedControllable.attrs[1]) hasEventHandlers = true;
 			if (node.var || hasDynamicAttributes || hasEventHandlers || textPlaceholders || injectNonce || seen.content && tagName !== "meta" && !node.body.body.length || isDynamicControllable(relatedControllable)) {
 				const tagExtra = node.extra ??= {};
@@ -4952,6 +5106,20 @@ var native_tag_default = {
 				const usedAttrs = getUsedAttrs(tagName, tag.node);
 				const { staticAttrs, staticControllable, staticContentAttr, skipExpression, injectNonce } = usedAttrs;
 				let { spreadExpression } = usedAttrs;
+				if (!isOptimize() && nodeBinding) {
+					const changeAttr = staticControllable?.attrs[1];
+					if (changeAttr) {
+						const handler = evaluate(changeAttr.value);
+						if (!(handler.confident && handler.computed == null)) setSectionDebugVar(tagSection, getPrefixedScopeAccessor(nodeBinding, getAccessorPrefix().ControlledHandler), changeAttr.name, changeAttr.loc);
+					} else if (spreadExpression) {
+						const spreads = tag.node.attributes.filter((attr) => _marko_compiler.types.isMarkoSpreadAttribute(attr));
+						const spreadLoc = spreads.length === 1 && spreads[0].value.loc;
+						if (spreadLoc && spreadLoc.start.index != null) {
+							const name = "..." + tag.hub.file.code.slice(spreadLoc.start.index, spreadLoc.end.index);
+							for (const prefix of [getAccessorPrefix().ControlledHandler, getAccessorPrefix().EventAttributes]) if (prefix !== getAccessorPrefix().ControlledHandler || getSpreadControllableValueProps(tagName)) setSectionDebugVar(tagSection, getPrefixedScopeAccessor(nodeBinding, prefix), name, spreadLoc);
+						}
+					}
+				}
 				if (tagName === "select" && (staticControllable || spreadExpression)) flushBefore(tag);
 				write`<${tagName}`;
 				if (injectNonce) write`${callRuntime("_attr_nonce")}`;
@@ -5128,7 +5296,7 @@ var native_tag_default = {
 										stmt = _marko_compiler.types.expressionStatement(callRuntime(`_attr_${name}_items`, nodeExpr, _marko_compiler.types.objectExpression(props)));
 									}
 								}
-								if (stmt) addStatement("render", tagSection, valueReferences, stmt, !!meta.dynamicItems);
+								if (stmt) addStatement("render", tagSection, valueReferences, stmt, true);
 							}
 							break;
 						}
@@ -6019,7 +6187,7 @@ function getChangeHandler(tag, attr) {
 		if (!existingChangedAttr) {
 			const bindingIdentifierPath = binding.path.getOuterBindingIdentifierPaths()[binding.identifier.name];
 			let changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value, modifier) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(bindingIdentifierPath.parentPath) : void 0 : void 0;
-			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, bindingIdentifierPath?.parentPath?.isArrayPattern() ? `Cannot two-way bind to \`${attr.value.name}\` because it comes from array destructuring, which has no change handler. Use object destructuring or pass an explicit \`${changeAttrName}\` attribute.` : "Unable to bind to value.");
+			if (!changeAttrExpr) throw tag.hub.buildError(attr.value, bindingIdentifierPath?.parentPath?.isArrayPattern() ? `Cannot two-way bind to \`${attr.value.name}\` because it comes from array destructuring, which has no change handler. Use object destructuring or pass an explicit \`${changeAttrName}\` attribute.` : bindingIdentifierPath?.parentPath?.isObjectProperty({ computed: true }) ? `Cannot two-way bind to \`${attr.value.name}\` because it is destructured with a dynamically computed key, so its change handler cannot be derived. Use a static key or pass an explicit \`${changeAttrName}\` attribute.` : "Unable to bind to value.");
 			if (modifier && _marko_compiler.types.isIdentifier(changeAttrExpr)) changeAttrExpr = _marko_compiler.types.logicalExpression("&&", changeAttrExpr, buildModifierForwarder(_marko_compiler.types.cloneNode(changeAttrExpr), modifier));
 			const changeHandlerAttr = _marko_compiler.types.markoAttribute(changeAttrName, changeAttrExpr);
 			handlerByModifier.set(modifierKey, changeHandlerAttr);
@@ -6060,25 +6228,21 @@ function buildChangeHandlerFunction(id, modifier) {
 function getChangeHandlerFromObjectPattern(parent) {
 	let changeKey;
 	const pattern = parent.parentPath;
-	if (parent.node.computed) {
-		changeKey = generateUidIdentifier("dynamicChange");
-		pattern.pushContainer("properties", _marko_compiler.types.objectProperty(_marko_compiler.types.binaryExpression("+", parent.get("key").node, _marko_compiler.types.stringLiteral("Change")), changeKey, true));
-	} else {
-		const searchKey = `${getStringOrIdentifierValue(parent.get("key"))}Change`;
-		for (const prop of pattern.get("properties")) if (prop.isObjectProperty()) {
-			const propKey = prop.get("key");
-			const propValue = prop.get("value");
-			if (!prop.node.computed && getStringOrIdentifierValue(propKey) === searchKey && propValue.isIdentifier()) {
-				changeKey = propValue.node;
-				break;
-			}
+	const keyName = getStaticKeyName(parent.node);
+	if (keyName === void 0) return;
+	const searchKey = `${keyName}Change`;
+	for (const prop of pattern.get("properties")) if (prop.isObjectProperty()) {
+		const propValue = prop.get("value");
+		if (getStaticKeyName(prop.node) === searchKey && propValue.isIdentifier()) {
+			changeKey = propValue.node;
+			break;
 		}
-		if (!changeKey) pattern.unshiftContainer("properties", _marko_compiler.types.objectProperty(_marko_compiler.types.stringLiteral(searchKey), changeKey = generateUidIdentifier(searchKey)));
 	}
+	if (!changeKey) pattern.unshiftContainer("properties", _marko_compiler.types.objectProperty(_marko_compiler.types.stringLiteral(searchKey), changeKey = generateUidIdentifier(searchKey)));
 	return changeKey;
 }
-function getStringOrIdentifierValue(path) {
-	return getLiteralName(path.node);
+function getStaticKeyName(prop) {
+	return prop.computed && !_marko_compiler.types.isStringLiteral(prop.key) ? void 0 : getLiteralName(prop.key);
 }
 function getLiteralName(node) {
 	switch (node.type) {
@@ -6272,7 +6436,7 @@ function crawlSectionsAndSetBinding(tag, binding, properties, skip) {
 }
 //#endregion
 //#region src/translator/util/translate-var.ts
-function translateVar(tag, initialValue, kind = "const") {
+function translateVar(tag, initialValue, kind = "const", statements) {
 	const { node: { var: tagVar } } = tag;
 	if (!tagVar) return;
 	const tagSection = getOrCreateSection(tag);
@@ -6307,7 +6471,9 @@ function translateVar(tag, initialValue, kind = "const") {
 			restPath.remove();
 		}
 	});
-	tag.insertBefore(_marko_compiler.types.variableDeclaration(kind, [_marko_compiler.types.variableDeclarator(tagVar, initialValue)]));
+	const declaration = _marko_compiler.types.variableDeclaration(kind, [_marko_compiler.types.variableDeclarator(tagVar, initialValue)]);
+	if (statements) statements.push(declaration);
+	else tag.insertBefore(declaration);
 }
 function getDestructurePattern(id) {
 	let cur = id;
@@ -6362,13 +6528,13 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
 		statements: []
 	};
 	const childScopeBinding = tagExtra[kChildScopeBinding];
-	if (getSerializeReason(section, childScopeBinding)) {
+	const childScopeSerializeReason = getSerializeReason(section, childScopeBinding);
+	let varStatement;
+	if (childScopeSerializeReason) {
 		const peekScopeId = generateUidIdentifier(childScopeBinding?.name);
-		const peekScopeDeclaration = _marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(peekScopeId, callRuntime("_peek_scope_id"))]);
-		if (tagVar) tag.insertBefore(peekScopeDeclaration);
-		else statements.push(peekScopeDeclaration);
+		statements.push(_marko_compiler.types.variableDeclaration("const", [_marko_compiler.types.variableDeclarator(peekScopeId, callRuntime("_peek_scope_id"))]));
 		setBindingSerializedValue(section, childScopeBinding, callRuntime("_existing_scope", peekScopeId));
-		if (tagVar) statements.push(_marko_compiler.types.expressionStatement(callRuntime("_var", getScopeIdIdentifier(section), getScopeAccessorLiteral(tag.node.extra[kChildOffsetScopeBinding$1]), peekScopeId, _marko_compiler.types.stringLiteral(getResumeRegisterId(section, tagVar.extra?.binding, "var")))));
+		if (tagVar) varStatement = _marko_compiler.types.expressionStatement(callRuntime("_var", getScopeIdIdentifier(section), getScopeAccessorLiteral(tag.node.extra[kChildOffsetScopeBinding$1]), peekScopeId, _marko_compiler.types.stringLiteral(getResumeRegisterId(section, tagVar.extra?.binding, "var"))));
 	}
 	if (contentSection.paramReasonGroups) {
 		let childSerializeReasonExpr;
@@ -6406,8 +6572,10 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
 		if (!tag.node.arguments?.length || properties.length) renderArgs.push(propsToExpression(properties));
 		return renderArgs;
 	};
-	if (tagVar) translateVar(tag, callExpression(tagIdentifier, ...getArgs()), "let");
-	else statements.push(callStatement(tagIdentifier, ...getArgs()));
+	if (tagVar) {
+		translateVar(tag, callExpression(tagIdentifier, ...getArgs()), "let", statements);
+		if (varStatement) statements.push(varStatement);
+	} else statements.push(callStatement(tagIdentifier, ...getArgs()));
 	for (const replacement of tag.replaceWithMultiple(statements)) replacement.skip();
 }
 function knownTagTranslateDOM(tag, propTree, getBindingIdentifier, callSetup) {
@@ -6417,7 +6585,8 @@ function knownTagTranslateDOM(tag, propTree, getBindingIdentifier, callSetup) {
 	if (node.var) {
 		const varBinding = node.var.extra.binding;
 		const source = initValue(varBinding);
-		source.register = !!getSerializeReason(tagSection, childScopeBinding) || !signalHasStatements(source);
+		source.register = !!getSerializeReason(tagSection, childScopeBinding);
+		source.referenced = true;
 		source.buildAssignment = (valueSection, value) => {
 			const changeArgs = [createScopeReadExpression(childScopeBinding, valueSection), value];
 			if (!isOptimize()) changeArgs.push(_marko_compiler.types.stringLiteral(varBinding.name));
@@ -6919,6 +7088,7 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 	const declared = sameSection && refDeclared;
 	const binding = {
 		id,
+		uid: id,
 		name,
 		originalName: void 0,
 		type,
@@ -6994,9 +7164,9 @@ function trackVarReferences(tag, type, upstreamAlias) {
 		const section = getOrCreateSection(tag);
 		let canonicalUpstreamAlias = upstreamAlias && getCanonicalBinding(upstreamAlias);
 		if (canonicalUpstreamAlias) {
-			const { excludeProperties } = canonicalUpstreamAlias;
+			const { excludeProperties, restOffset } = canonicalUpstreamAlias;
 			if (excludeProperties !== void 0) canonicalUpstreamAlias = canonicalUpstreamAlias.upstreamAlias;
-			createBindingsAndTrackReferences(tagVar, canonicalUpstreamAlias.type, tag.scope, section, canonicalUpstreamAlias, void 0, excludeProperties);
+			createBindingsAndTrackReferences(tagVar, canonicalUpstreamAlias.type, tag.scope, section, canonicalUpstreamAlias, void 0, excludeProperties, restOffset);
 			return canonicalUpstreamAlias;
 		}
 		createBindingsAndTrackReferences(tagVar, type, tag.scope, section, void 0, void 0, void 0);
@@ -7049,7 +7219,7 @@ function trackReferencesForBinding(babelBinding, binding) {
 	for (const ref of referencePaths) {
 		const refSection = getOrCreateSection(ref);
 		const markoRoot = getMarkoRoot(ref);
-		if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path) throw ref.buildCodeFrameError(`\`${ref.node.name}\` is the [tag variable](https://markojs.com/docs/reference/language#tag-variables) this tag declares, so its own attributes cannot read it.`);
+		if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path && !getFnRoot(ref)) throw ref.buildCodeFrameError(`\`${ref.node.name}\` is the [tag variable](https://markojs.com/docs/reference/language#tag-variables) this tag declares, so its own attributes cannot read it.`);
 		else if (isReferenceHoisted(babelBinding.path, ref)) {
 			const invoked = isInvokedFunction(ref);
 			if (invoked) setReferencesScope(ref);
@@ -7080,12 +7250,13 @@ function trackReferencesForBinding(babelBinding, binding) {
 				const left = ref.get("left");
 				if (left.isIdentifier()) trackReference(left, binding);
 			}
-		}
+		} else if (ref.isForXStatement()) throw ref.get("left").buildCodeFrameError(`\`${binding.name}\` is a [tag variable](https://markojs.com/docs/reference/language#tag-variables), so a \`for...${ref.isForOfStatement() ? "of" : "in"}\` cannot assign to it. Loop into a local variable and assign \`${binding.name}\` from it instead.`);
 	}
 }
 function trackAssignment(assignment, binding) {
 	const fnParent = getFnParent(assignment);
 	if (!fnParent) throw assignment.buildCodeFrameError(`\`${binding.name}\` is a tag ${binding.type === 3 ? "parameter" : "variable"} and can only be assigned within a script or function.`);
+	if (binding.type === 4) throw assignment.buildCodeFrameError(`\`${binding.name}\` is a tag parameter and cannot be assigned to.`);
 	const fnRoot = getFnRoot(fnParent);
 	const fnExtra = fnRoot && (fnRoot.node.extra ??= {});
 	const section = getOrCreateSection(assignment);
@@ -7145,14 +7316,14 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
 		}
 		case "ArrayPattern": {
 			const patternBinding = (property ? upstreamAlias.propertyAliases.get(property) : upstreamAlias) || ((lVal.extra ??= {}).binding = createBinding(generateUid(property || "pattern"), type, section, upstreamAlias, property, excludeProperties, lVal.loc));
-			let i = -1;
+			let index = (restOffset || 0) - 1;
 			for (const element of lVal.elements) {
-				i++;
+				index++;
 				if (element) {
 					if (element.type === "RestElement") {
-						excludeProperties = i > 0 ? addNumericPropertiesUntil(excludeProperties, i) : void 0;
-						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, void 0, excludeProperties, i);
-					} else if (_marko_compiler.types.isLVal(element)) createBindingsAndTrackReferences(element, type, scope, section, patternBinding, `${i}`, void 0);
+						excludeProperties = index > 0 ? addNumericPropertiesUntil(excludeProperties, index) : void 0;
+						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, void 0, excludeProperties, index);
+					} else if (_marko_compiler.types.isLVal(element)) createBindingsAndTrackReferences(element, type, scope, section, patternBinding, `${index}`, void 0);
 				}
 			}
 			break;
@@ -7610,7 +7781,7 @@ function unionParamSources(a, b) {
 	return merged;
 }
 const bindingUtil = new Sorted(function compareBindings(a, b) {
-	return a === b ? 0 : a.section.id - b.section.id || (a.type !== b.type && (a.type === 0 || b.type === 0) ? a.type - b.type || a.id - b.id : a.id - b.id);
+	return a === b ? 0 : a.section.id - b.section.id || (a.type !== b.type && (a.type === 0 || b.type === 0) ? a.type - b.type || a.id - b.id : a.id - b.id) || a.uid - b.uid;
 });
 const propsUtil = new Sorted(function compareProps(a, b) {
 	return a < b ? -1 : a > b ? 1 : 0;
@@ -8419,8 +8590,8 @@ var define_default = {
 			if (isOutputHTML()) {
 				flushInto(tag);
 				writeHTMLResumeStatements(tag.get("body"));
+				translateVar(tag, propsToExpression(translatedAttrs.properties), "const", translatedAttrs.statements);
 				tag.insertBefore(translatedAttrs.statements);
-				translateVar(tag, propsToExpression(translatedAttrs.properties));
 			} else {
 				if (_marko_compiler.types.isIdentifier(node.var)) {
 					const babelBinding = tag.scope.getBinding(node.var.name);
@@ -8642,7 +8813,7 @@ var id_default = {
 			const source = initValue(node.var.extra.binding);
 			if (valueAttr) {
 				const { value } = valueAttr;
-				addValue(section, value.extra?.referencedBindings, source, _marko_compiler.types.logicalExpression("||", value, id));
+				addValue(section, value.extra?.referencedBindings, source, _marko_compiler.types.logicalExpression("||", value, evaluate(value).confident ? id : callRuntime("_id", scopeIdentifier, _marko_compiler.types.stringLiteral(getPrefixedScopeAccessor(node.var.extra.binding, getAccessorPrefix().IdFallback)))));
 			} else addValue(section, void 0, source, id);
 			tag.remove();
 		}
@@ -8833,7 +9004,7 @@ var script_default = {
 			const end = body[body.length - 1]?.end;
 			const bodyStatements = (0, _marko_compiler_babel_utils.parseStatements)(tag.hub.file, code, start, end);
 			if (bodyStatements.length) {
-				const valueFn = _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(bodyStatements), traverseContains(bodyStatements, isAwaitExpression));
+				const valueFn = _marko_compiler.types.arrowFunctionExpression([], _marko_compiler.types.blockStatement(bodyStatements), !!traverseFindAwait(bodyStatements));
 				node.attributes.push(_marko_compiler.types.markoAttribute("value", valueFn));
 			}
 			node.body.body = [];
@@ -8894,19 +9065,6 @@ var script_default = {
 	}],
 	types: runtime_info_default.name + "/tags/script.d.marko"
 };
-function isAwaitExpression(node) {
-	switch (node.type) {
-		case "ForOfStatement": return node.await;
-		case "FunctionDeclaration":
-		case "FunctionExpression":
-		case "ArrowFunctionExpression":
-		case "ClassMethod":
-		case "ObjectMethod":
-		case "ClassPrivateMethod": return skip;
-		case "AwaitExpression": return true;
-		default: return false;
-	}
-}
 function isReturnedFunction(node) {
 	switch (node.type) {
 		case "FunctionDeclaration":
@@ -9114,6 +9272,7 @@ function checkStyleInterpolations(tag) {
 	let stringQuote = "";
 	let inComment = false;
 	let groupDepth = 0;
+	let urlDepth = 0;
 	let blockDepth = 0;
 	let valueColon = false;
 	let runPlaceholder;
@@ -9128,6 +9287,7 @@ function checkStyleInterpolations(tag) {
 		const child = body[i];
 		if (_marko_compiler.types.isMarkoPlaceholder(child)) {
 			if (stringQuote) throw tag.hub.buildError(child, styleStringMsg);
+			if (urlDepth) throw tag.hub.buildError(child, styleUrlMsg);
 			if (!runPlaceholder) {
 				runPlaceholder = child;
 				runAfterColon = valueColon;
@@ -9155,9 +9315,14 @@ function checkStyleInterpolations(tag) {
 				inComment = true;
 				j++;
 			} else if (c === "\"" || c === "'") stringQuote = c;
-			else if (c === "(" || c === "[") groupDepth++;
-			else if (c === ")" || c === "]") {
-				if (groupDepth) groupDepth--;
+			else if (c === "(" || c === "[") {
+				groupDepth++;
+				if (!urlDepth && cssUrlBefore.test(text.slice(0, j + 1)) && !cssQuotedArg.test(text.slice(j + 1))) urlDepth = groupDepth;
+			} else if (c === ")" || c === "]") {
+				if (groupDepth) {
+					if (urlDepth === groupDepth) urlDepth = 0;
+					groupDepth--;
+				}
 			} else if (!groupDepth) switch (c) {
 				case ":":
 					if (blockDepth) valueColon = true;
@@ -9182,10 +9347,13 @@ const styleInterpolationMsg = "A `${...}` interpolation in a [`<style>` tag](htt
 const styleSelectorMsg = `${styleInterpolationMsg} only resolves in a declaration value, not in a selector or at-rule prelude. For a native html [\`<style>\` tag](https://markojs.com/docs/reference/core-tag#style) use the \`html-style\` core tag instead.`;
 const stylePropertyMsg = `${styleInterpolationMsg} cannot be used as a property name. For a native html [\`<style>\` tag](https://markojs.com/docs/reference/core-tag#style) use the \`html-style\` core tag instead.`;
 const styleStringMsg = `${styleInterpolationMsg} is not substituted inside a quoted CSS string — the literal text \`var(--…)\` would be rendered instead of the value. For a native html [\`<style>\` tag](https://markojs.com/docs/reference/core-tag#style) use the \`html-style\` core tag instead.`;
+const styleUrlMsg = `${styleInterpolationMsg} is not substituted inside an unquoted \`url()\` — the raw url token consumes the \`var(--…)\` text literally, invalidating the declaration. Move the whole \`url(...)\` into the interpolated value. For a native html [\`<style>\` tag](https://markojs.com/docs/reference/core-tag#style) use the \`html-style\` core tag instead.`;
 const styleGluedMsg = `${styleInterpolationMsg} CSS does not re-tokenize, so a unit written directly after it (eg \`\${x}px\`) becomes the invalid \`var(--…)px\`. Move the unit into the interpolated value (so it resolves to eg \`"10px"\`) or use \`calc(var(--…) * 1px)\`.`;
 const styleGluedBeforeMsg = `${styleInterpolationMsg} CSS does not re-tokenize, so text written directly before it (eg \`10\${x}\`) merges with the \`var(--…)\` into a single invalid token. Add whitespace before the interpolation or move the text into the interpolated value.`;
 const cssGluedValue = /^(?:[%.\d]|(?:p[xtc]|in|[cm]m|q|r?em|ex|ch|r?lh|v[whib]|vmin|vmax|fr|deg|g?rad|turn|m?s|k?hz|dp(?:i|cm|px)|cq[whib]|cqmin|cqmax)(?![\w-]))/i;
 const cssGluedBefore = /[\w%]$/;
+const cssUrlBefore = /(?:^|[^\w-])url\($/i;
+const cssQuotedArg = /^\s*["']/;
 //#endregion
 //#region src/translator/core/style.ts
 const STYLE_EXT_REG = /^style((?:\.[a-zA-Z0-9$_-]+)+)?/;
@@ -9534,6 +9702,27 @@ function isBeforeHtmlOrHead(documentType) {
 	return false;
 }
 //#endregion
+//#region src/translator/visitors/export-declaration.ts
+var export_declaration_default = {
+	analyze(exportDecl) {
+		const { node } = exportDecl;
+		const { source } = node;
+		if (source) {
+			const tagImport = (0, _marko_compiler_babel_utils.resolveTagImport)(exportDecl, source.value);
+			if (tagImport) {
+				(node.extra ??= {}).tagImport = tagImport;
+				const tags = exportDecl.hub.file.metadata.marko.tags;
+				if (!tags.includes(tagImport)) tags.push(tagImport);
+			}
+		}
+	},
+	translate: { exit(exportDecl) {
+		const { node } = exportDecl;
+		const tagImport = node.extra?.tagImport;
+		if (tagImport) node.source.value = tagImport;
+	} }
+};
+//#endregion
 //#region src/translator/visitors/import-declaration.ts
 const triggerRegExp = /\s*([\w-]+)\s*([^?|]+?)?\s*(?:\?([^|]*?))?\s*(?:\||$)/g;
 const [getHtmlLoadWrapped] = createProgramState(() => /* @__PURE__ */ new Map());
@@ -10149,6 +10338,7 @@ function optionalValueToNode(value) {
 const kDOMBinding = Symbol("dynamic tag dom binding");
 const kChildOffsetScopeBinding = Symbol("custom tag scope offset");
 const importedDynamicTagResume = /* @__PURE__ */ new WeakSet();
+const importedDynamicTagVarResume = /* @__PURE__ */ new WeakSet();
 const [getCompatRegistrations] = createProgramState(() => /* @__PURE__ */ new Set());
 const [getCompatBoundaryCalls] = createProgramState(() => /* @__PURE__ */ new Map());
 function pushCompatRegistration(key, statement) {
@@ -10287,7 +10477,7 @@ var dynamic_tag_default = {
 				if (tag.node.var) {
 					const varBinding = tag.node.var.extra.binding;
 					tagVarSignal = initValue(varBinding);
-					tagVarSignal.register = true;
+					tagVarSignal.register = tagVarSignal.referenced = true;
 					tagVarSignal.buildAssignment = (valueSection, value) => {
 						const changeArgs = [_marko_compiler.types.memberExpression(getScopeExpression(tagVarSignal.section, valueSection), _marko_compiler.types.stringLiteral(getAccessorPrefix().BranchScopes + getScopeAccessor(nodeBinding)), true), value];
 						if (!isOptimize()) changeArgs.push(_marko_compiler.types.stringLiteral(varBinding.name));
@@ -10305,6 +10495,7 @@ var dynamic_tag_default = {
 				}
 				if (!isClassAPI) {
 					enableDynamicTagResume(tag);
+					enableDynamicTagVarResume(tag);
 					enableDynamicTagControllables(tag);
 				}
 				addValue(section, tagExtra.referencedBindings, signal, tagExpression);
@@ -10322,6 +10513,13 @@ function enableDynamicTagControllables(tag) {
 		return;
 	}
 }
+function enableDynamicTagVarResume(tag) {
+	const program = (0, _marko_compiler_babel_utils.getProgram)().node;
+	if (tag.node.var && !importedDynamicTagVarResume.has(program) && analyzeTagNameType(tag, true) !== 1) {
+		importedDynamicTagVarResume.add(program);
+		importRuntimeFeature("dynamic-tag-var");
+	}
+}
 function enableDynamicTagResume(tag) {
 	const program = (0, _marko_compiler_babel_utils.getProgram)().node;
 	if (!importedDynamicTagResume.has(program) && analyzeTagNameType(tag, true) !== 1) {
@@ -10488,7 +10686,7 @@ function isTagsAPI(file = (0, _marko_compiler_babel_utils.getFile)()) {
 	let { featureType } = programExtra;
 	if (!featureType) {
 		const lookup = (0, _marko_compiler_babel_utils.getTaglibLookup)(file);
-		const tagsDir = getTagsDir(file.opts.filename);
+		const tagsDir = getTagsDir(lookup, file.opts.filename);
 		const state = {};
 		if (tagsDir && !lookup.manualTagsDirs?.has(tagsDir)) addFeature(state, Tags, "Template file within a tags directory", program);
 		scanBody(state, program.get("body"));
@@ -10496,24 +10694,10 @@ function isTagsAPI(file = (0, _marko_compiler_babel_utils.getFile)()) {
 	}
 	return featureType === Tags;
 }
-function getTagsDir(filename) {
-	const pathSeparator = /\/|\\/.exec(filename)?.[0];
-	if (pathSeparator) {
-		let previousIndex = filename.length - 1;
-		while (previousIndex > 0) {
-			const index = filename.lastIndexOf(pathSeparator, previousIndex);
-			switch (previousIndex - index) {
-				case 4:
-					if (filename.startsWith("tags", index + 1)) return filename.slice(0, index + 5);
-					break;
-				case 10:
-					if (filename.startsWith("components", index + 1)) return false;
-					break;
-			}
-			previousIndex = index - 1;
-		}
-	}
-	return false;
+function getTagsDir(lookup, filename) {
+	let nearest;
+	for (const dir of lookup.discoveryDirs || []) if (filename.startsWith(dir) && (filename[dir.length] === "/" || filename[dir.length] === "\\") && (!nearest || dir.length > nearest.length)) nearest = dir;
+	return !!nearest && /[/\\]tags$/.test(nearest) && nearest;
 }
 function scanBody(state, body) {
 	if (body?.length) for (const child of body) switch (child.type) {
@@ -10801,6 +10985,8 @@ const visitors = extractVisitors({
 	Function: function_default,
 	ReferencedIdentifier: referenced_identifier_default,
 	ImportDeclaration: import_declaration_default,
+	ExportNamedDeclaration: export_declaration_default,
+	ExportAllDeclaration: export_declaration_default,
 	MarkoDocumentType: document_type_default,
 	MarkoDeclaration: declaration_default,
 	MarkoCDATA: cdata_default,