@swiftuijs/twill 0.3.0 → 0.4.0

package/dist/{compiler-CbNSBUI2.js → compiler-DI0H4d1R.js}

@@ -3,7 +3,7 @@ import { Parser, tokTypes } from "acorn";
 import { tsPlugin } from "acorn-typescript";
 import jsx from "acorn-jsx";
 import { GREATEST_LOWER_BOUND, TraceMap, decodedMappings, encodedMappings, generatedPositionFor, originalPositionFor } from "@jridgewell/trace-mapping";
-//#region src/parser.js
+// src/parser.js
 var options = {
 	ecmaVersion: "latest",
 	sourceType: "module",
@@ -19,9 +19,12 @@ function guardAt(input, offset, implicitMember = false) {
 	const lexer = Parser.tokenizer(input.slice(offset), { ecmaVersion: "latest" });
 	const stack = [];
 	let first = true;
+	let missingElse = false;
+	let afterNonNull = false;
 	try {
 		for (;;) {
-			const label = lexer.getToken().type.label;
+			const token = lexer.getToken();
+			const label = token.type.label;
 			if (first && [
 				"=",
 				".",
@@ -35,6 +38,22 @@ function guardAt(input, offset, implicitMember = false) {
 				"in",
 				"instanceof"
 			].includes(label) && !(implicitMember && label === ".")) return false;
+			if (first || afterNonNull) {
+				missingElse = !/[\r\n\u2028\u2029]/.test(input.slice(offset, offset + token.start)) && (token.type === tokTypes.name && !["as", "satisfies"].includes(token.value) || [
+					"const",
+					"num",
+					"string",
+					"true",
+					"false",
+					"null",
+					"this",
+					"new",
+					"typeof",
+					"void",
+					"delete"
+				].includes(label) || token.type === tokTypes.prefix && token.value === "~" || implicitMember && first && label === ".");
+				afterNonNull = token.type === tokTypes.prefix && token.value === "!";
+			}
 			if (!stack.length && [
 				"if",
 				"for",
@@ -45,15 +64,12 @@ function guardAt(input, offset, implicitMember = false) {
 				"throw",
 				"var",
 				"export"
-			].includes(label)) return false;
-			if (!first && !stack.length && label === "const") return false;
+			].includes(label)) return missingElse ? "missingElse" : false;
+			if (!first && !stack.length && label === "const") return missingElse ? "missingElse" : false;
 			first = false;
 			if (!stack.length && label === "else") return true;
-			if (!stack.length && [
-				"eof",
-				";",
-				"}"
-			].includes(label)) return false;
+			if (label === "eof") return !stack.length && missingElse ? "missingElse" : false;
+			if (!stack.length && [";", "}"].includes(label)) return missingElse ? "missingElse" : false;
 			if ([
 				"(",
 				"[",
@@ -290,7 +306,9 @@ function parserFor(language) {
 				node.cleanup = cleanup;
 				return this.finishNode(node, "DeferStatement");
 			}
-			if (!this.isContextual("guard") || !guardAt(this.input, this.end, !!this.implicitClosure)) {
+			const guard = this.isContextual("guard") && guardAt(this.input, this.end, !!this.implicitClosure);
+			if (guard === "missingElse") this.raise(this.start, "Missing 'else' in guard statement. Put 'else' before the failure block: 'guard condition else { return ...; }'.");
+			if (!guard) {
 				const statement = super.parseStatement(context, ...args);
 				if (context && statement.type === "TwillEnumDeclaration") this.raise(statement.start, "An associated-value enum requires a block; add braces around this body.");
 				return statement;
@@ -299,6 +317,7 @@ function parserFor(language) {
 			node.singleStatement = !!context;
 			this.next();
 			node.binding = null;
+			if (this.type === tokTypes._else) this.raise(this.start, "Guard needs a condition or 'const' binding before 'else'.");
 			if (this.type === tokTypes._const) {
 				if (context) this.raise(node.start, "A guard binding requires a block; add braces around this body.");
 				const declaration = this.startNode();
@@ -308,8 +327,9 @@ function parserFor(language) {
 				if (node.binding.declarations.length !== 1) this.raise(node.start, "guard const requires one binding declaration.");
 			} else node.test = this.parseExpression();
 			node.elseStart = this.start;
-			this.expect(tokTypes._else);
-			if (this.type !== tokTypes.braceL) this.unexpected();
+			if (this.type !== tokTypes._else) this.raise(this.start, "Expected 'else' after the guard condition or binding.");
+			this.next();
+			if (this.type !== tokTypes.braceL) this.raise(this.start, "Guard 'else' must be followed by a block, for example 'else { return ...; }'.");
 			node.failure = this.parseBlock();
 			if (!exits(node.failure)) this.raise(node.failure.start, "Every guard else path must exit with return, throw, break or continue.");
 			return this.finishNode(node, "GuardStatement");
@@ -694,13 +714,11 @@ function parse(source, language = "ts", sourceType = "module") {
 		}))
 	};
 }
-//#endregion
-//#region src/defer-helper.ts
+// src/defer-helper.ts
 function syncDeferBody(names) {
 	return "\n  let " + names.failed + " = false,\n    " + names.failure + ";\n  while (" + names.stack + "?.length) {\n    const " + names.cleanup + " = " + names.stack + ".pop();\n    if (" + names.cleanup + ") {\n      try {\n        " + names.cleanup + "();\n      } catch (" + names.error + ") {\n        " + names.failed + " = true;\n        " + names.failure + " = " + names.error + ";\n      }\n    }\n  }\n  if (" + names.failed + ") throw " + names.failure + ";\n";
 }
-//#endregion
-//#region src/defer.ts
+// src/defer.ts
 var functions = /* @__PURE__ */ new Set([
 	"FunctionDeclaration",
 	"FunctionExpression",
@@ -876,8 +894,7 @@ function lowerDefers(source, ast, code, language, usedNames, contentStarts, comm
 		code.prependLeft(start, `\nimport { runDefers as ${sharedHelper} } from '@swiftuijs/twill-runtime/helpers/v1';\n`);
 	}
 }
-//#endregion
-//#region src/branches.ts
+// src/branches.ts
 function suspension(node) {
 	if (["AwaitExpression", "YieldExpression"].includes(node.type)) return node;
 	if ([
@@ -897,10 +914,53 @@ function suspension(node) {
 		}
 	}
 }
+function directEval(node) {
+	if ([
+		"FunctionDeclaration",
+		"FunctionExpression",
+		"ArrowFunctionExpression"
+	].includes(node.type)) return false;
+	if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "eval" && !node.optional) return true;
+	return Object.entries(node).some(([key, value]) => ![
+		"loc",
+		"trailing",
+		"tag"
+	].includes(key) && (Array.isArray(value) ? value : [value]).some((child) => child?.type && directEval(child)));
+}
+/** Preserve the existing expression boundary for direct eval and suspension. */
+function canInlineSwitchExpression(node) {
+	return !directEval(node) && !suspension(node);
+}
+/** Reuse authored blocks only when no direct eval (including a captured one)
+* can observe the added temporary's broader lifetime/temporal dead zone.
+* Memoize shared parser nodes so this analysis stays linear in the AST size. */
+function reusableStatements(ast, usedNames) {
+	const reusable = /* @__PURE__ */ new Set();
+	const observed = /* @__PURE__ */ new Map();
+	const visit = (node) => {
+		const known = observed.get(node);
+		if (known !== void 0) return known;
+		if (node.type === "Identifier" || node.type === "JSXIdentifier") usedNames.add(node.name);
+		let observable = node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "eval";
+		for (const [key, value] of Object.entries(node)) {
+			if (["loc", "trailing"].includes(key)) continue;
+			for (const child of Array.isArray(value) ? value : [value]) if (child?.type && visit(child)) observable = true;
+		}
+		if (!observable && node.type === "BlockStatement") {
+			for (const statement of node.body) if (statement.type === "TwillIfBinding" || (statement.argument ?? statement.expression)?.type === "TwillSwitchExpression") reusable.add(statement);
+		}
+		observed.set(node, observable);
+		return observable;
+	};
+	visit(ast);
+	return reusable;
+}
 /** Native switches with per-arm scopes. Direct returns and standalone variable
 * initializers need no extra function; other expressions keep a lexical IIFE. */
-function lowerSwitchExpressions(source, ast, switches, code, language, usedNames, comments, fail) {
+function lowerSwitchExpressions(source, ast, switches, code, language, usedNames, comments, fail, implicitReturns = [], reusable = /* @__PURE__ */ new Set()) {
 	const returns = /* @__PURE__ */ new Set();
+	const implicit = new Set(implicitReturns);
+	const sharedScopes = /* @__PURE__ */ new Set();
 	const initializers = /* @__PURE__ */ new Map();
 	const leadingDoc = (start) => {
 		let low = 0, high = comments.length;
@@ -912,19 +972,6 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 		const comment = comments[low - 1];
 		return comment && /^\s*$/.test(source.slice(comment.end, start)) ? comment : void 0;
 	};
-	const directEval = (node) => {
-		if ([
-			"FunctionDeclaration",
-			"FunctionExpression",
-			"ArrowFunctionExpression"
-		].includes(node.type)) return false;
-		if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "eval" && !node.optional) return true;
-		return Object.entries(node).some(([key, value]) => ![
-			"loc",
-			"trailing",
-			"tag"
-		].includes(key) && (Array.isArray(value) ? value : [value]).some((child) => child?.type && directEval(child)));
-	};
 	const grouping = (start, end, initializer = false) => {
 		const parentheses = [];
 		const tokens = Parser.tokenizer(source.slice(start, end), { ecmaVersion: "latest" });
@@ -937,6 +984,15 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 		for (const token of parentheses) code.remove(start + token.start, start + token.end);
 	};
 	const visit = (node, parent) => {
+		if (node.type === "BlockStatement") for (const statement of node.body) {
+			const value = statement.type === "ReturnStatement" ? statement.argument : statement.expression;
+			if (value?.type === "TwillSwitchExpression" && (node.body.length === 1 || reusable.has(statement)) && (statement.type === "ReturnStatement" || implicit.has(value))) sharedScopes.add(value);
+		}
+		if (node.type === "ExpressionStatement" && implicit.has(node.expression)) {
+			grouping(node.start, node.expression.start);
+			grouping(node.expression.end, node.end);
+			if (source[node.end - 1] === ";") code.remove(node.end - 1, node.end);
+		}
 		if (node.type === "VariableDeclaration" && node.declarations.length === 1) {
 			const declaration = node.declarations[0];
 			if (declaration.id.type === "Identifier" && declaration.init?.type === "TwillSwitchExpression" && [
@@ -958,6 +1014,7 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 		if (node.type === "ReturnStatement" && node.argument?.type === "TwillSwitchExpression") {
 			returns.add(node.argument);
 			code.remove(node.start, node.start + 6);
+			if (source[node.end - 1] === ";") code.remove(node.end - 1, node.end);
 			for (const [start, end] of [[node.start + 6, node.argument.start], [node.argument.end, node.end]]) grouping(start, end);
 		}
 		for (const [key, value] of Object.entries(node)) {
@@ -980,8 +1037,8 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 		return name;
 	};
 	for (const node of switches) {
-		const direct = returns.has(node);
-		const suspended = !direct && suspension(node);
+		const direct = returns.has(node) || implicit.has(node);
+		const suspended = !returns.has(node) && suspension(node);
 		if (suspended) fail(suspended, `await/yield inside a ${node.keyword} expression requires a direct return. Bind the subject first, or await the whole result explicitly.`);
 		const initializer = initializers.get(node);
 		const result = initializer ? fresh("Result") : void 0;
@@ -1000,7 +1057,10 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 		const valuePrefix = result ? `${result} = (` : "return ";
 		const valueSuffix = result ? `); break ${exit};` : ";";
 		const kind = node.cases.some((branch) => branch.enumPattern) ? fresh("Kind") : void 0;
-		if (!initializer) code.appendLeft(node.start, `${direct ? "{" : "(() => {"}const ${subject} = `);
+		if (!initializer) {
+			const opening = direct ? sharedScopes.has(node) ? "" : "{" : "(() => {";
+			code.appendLeft(node.start, `${opening}const ${subject} = `);
+		}
 		code.remove(node.parenStart, node.parenStart + 1);
 		if (node.keyword === "match") {
 			const tokens = Parser.tokenizer(source.slice(node.discriminant.end, node.parenEnd), { ecmaVersion: "latest" });
@@ -1057,13 +1117,13 @@ function lowerSwitchExpressions(source, ast, switches, code, language, usedNames
 			}
 		}
 		const hasDefault = node.cases.some((branch) => !branch.pattern && !branch.enumPattern && branch.test === null);
-		const check = !hasDefault && language.startsWith("ts") ? ` ${kind ? `(0 as unknown as typeof ${kind})` : subject} satisfies never;` : "";
-		const failure = hasDefault ? "" : `${check} throw new TypeError('Non-exhaustive switch expression');`;
-		code.overwrite(node.end - 1, node.end, `}${failure}${direct || initializer ? "}" : "})()"}`, { contentOnly: true });
+		const check = !hasDefault && language.startsWith("ts") ? fresh("Check") : void 0;
+		const failure = hasDefault ? "" : `${check ? ` type ${check}<T extends never = typeof ${kind ?? subject}> = T & never;` : ""} throw new TypeError('Non-exhaustive switch expression'${check ? ` as ${check}` : ""});`;
+		const closing = initializer || direct && !sharedScopes.has(node) ? "}" : direct ? "" : "})()";
+		code.overwrite(node.end - 1, node.end, `}${failure}${closing}`, { contentOnly: true });
 	}
 }
-//#endregion
-//#region src/enums.ts
+// src/enums.ts
 /** Find free type references, respecting generic function/mapped/infer binders. */
 function references(node, names, found = /* @__PURE__ */ new Set(), bound = /* @__PURE__ */ new Set()) {
 	const local = new Set(bound);
@@ -1242,8 +1302,7 @@ function mapEnumCopies(source, generated, map, insertions) {
 	}));
 	return copies;
 }
-//#endregion
-//#region src/compiler.ts
+// src/compiler.ts
 function inferLanguage(filename) {
 	if (/\.(?:twillx|tsx)$/.test(filename)) return "tsx";
 	if (/\.jsx$/.test(filename)) return "jsx";
@@ -1268,6 +1327,25 @@ var TwillSyntaxError = class extends SyntaxError {
 		this.frame = `${source.split(/\r\n|[\r\n\u2028\u2029]/)[line - 1] ?? ""}\n${" ".repeat(column)}^`;
 	}
 };
+function closureExpression(body) {
+	if (body.length !== 1) return;
+	return body[0].type === "ReturnStatement" ? body[0].argument : body[0].expression;
+}
+function conciseExpression(body) {
+	const expression = closureExpression(body);
+	return !!expression && (expression.type !== "TwillSwitchExpression" || !canInlineSwitchExpression(expression));
+}
+function expressionGrouping(expression, source, start) {
+	while ([
+		"TSAsExpression",
+		"TSSatisfiesExpression",
+		"TSNonNullExpression"
+	].includes(expression.type)) expression = expression.expression;
+	if (!["ObjectExpression", "SequenceExpression"].includes(expression.type)) return "";
+	const tokens = Parser.tokenizer(source.slice(start, expression.start), { ecmaVersion: "latest" });
+	for (let token = tokens.getToken(); token.type !== tokTypes.eof; token = tokens.getToken()) if (token.type === tokTypes.parenL) return "";
+	return "(";
+}
 function walk(node, visit) {
 	visit(node);
 	for (const key of Object.keys(node)) {
@@ -1297,7 +1375,9 @@ function transform(source, options = {}) {
 	const code = new MagicString(source);
 	const enumInsertions = parsed.enums.length ? lowerEnums(source, parsed.ast, parsed.enums, code) : [];
 	const usedNames = /* @__PURE__ */ new Set();
-	if (parsed.guards.filter((guard) => guard.binding && guard.binding.declarations[0].id.type !== "Identifier").length || parsed.ifBindings.length || parsed.switches.length || parsed.defers.length || parsed.closures.some((closure) => closure.implicitMembers.length) || /\.twillx$/.test(filename.split(/[?#]/, 1)[0])) walk(parsed.ast, (node) => {
+	const reusable = parsed.ifBindings.length || parsed.switches.length ? reusableStatements(parsed.ast, usedNames) : /* @__PURE__ */ new Set();
+	const patternGuards = parsed.guards.filter((guard) => guard.binding && guard.binding.declarations[0].id.type !== "Identifier");
+	if (!parsed.ifBindings.length && !parsed.switches.length && (patternGuards.length || parsed.defers.length || parsed.closures.some((closure) => closure.implicitMembers.length) || /\.twillx$/.test(filename.split(/[?#]/, 1)[0]))) walk(parsed.ast, (node) => {
 		if (node.type === "Identifier" || node.type === "JSXIdentifier") usedNames.add(node.name);
 	});
 	let guardCounter = 0;
@@ -1310,12 +1390,13 @@ function transform(source, options = {}) {
 		while (usedNames.has(temporary));
 		usedNames.add(temporary);
 		const patternEnd = binding.typeAnnotation?.start ?? binding.end;
-		code.overwrite(statement.start, binding.start, `{const ${temporary}`);
+		const reuseScope = reusable.has(statement);
+		code.overwrite(statement.start, binding.start, `${reuseScope ? "" : "{"}const ${temporary}`);
 		code.move(binding.start, patternEnd, statement.consequent.start + 1);
 		code.prependRight(binding.start, "const ");
 		code.appendLeft(patternEnd, ` = ${temporary};`);
 		code.prependLeft(statement.consequent.start, `; if (${temporary} !== null && ${temporary} !== void 0) `);
-		code.appendLeft(statement.end, "}");
+		if (!reuseScope) code.appendLeft(statement.end, "}");
 	}
 	for (const guard of parsed.guards) {
 		if (guard.singleStatement) {
@@ -1324,22 +1405,24 @@ function transform(source, options = {}) {
 		}
 		if (guard.binding) {
 			const binding = guard.binding.declarations[0].id;
-			if (binding.type === "Identifier") code.remove(guard.start, guard.start + 5);
-			else {
+			let name;
+			if (binding.type === "Identifier") {
+				name = binding.name;
+				code.remove(guard.start, guard.start + 5);
+			} else {
 				let temporary;
 				do
 					temporary = `__twillGuard${guardCounter++}`;
 				while (usedNames.has(temporary));
 				usedNames.add(temporary);
+				name = temporary;
 				const patternEnd = binding.typeAnnotation?.start ?? binding.end;
 				code.overwrite(guard.start, binding.start, `const ${temporary}`);
 				code.move(binding.start, patternEnd, guard.end);
 				code.prependRight(binding.start, "; const ");
 				code.appendLeft(patternEnd, ` = ${temporary};`);
-				code.overwrite(guard.elseStart, guard.elseStart + 4, `; if (${temporary} == null)`);
-				continue;
 			}
-			code.overwrite(guard.elseStart, guard.elseStart + 4, `; if (${binding.name} == null)`);
+			code.overwrite(guard.elseStart, guard.elseStart + 4, `; if (${name} === null || ${name} === void 0)`);
 		} else {
 			code.overwrite(guard.start, guard.start + 5, "if (!(");
 			code.overwrite(guard.elseStart, guard.elseStart + 4, "))");
@@ -1370,7 +1453,9 @@ function transform(source, options = {}) {
 			name = `__twillArg${implicitCounter++}`;
 		while (usedNames.has(name));
 		usedNames.add(name);
-		code.overwrite(metadata.node.start, metadata.node.start + 1, `(${name}) => {`);
+		const body = metadata.node.body.body;
+		const opening = (options.implicitReturn !== false || body[0]?.type === "ReturnStatement") && conciseExpression(body) ? expressionGrouping(closureExpression(body), source, metadata.header?.end ?? metadata.node.start + 1) : "{";
+		code.overwrite(metadata.node.start, metadata.node.start + 1, `(${name}) => ${opening}`);
 		for (const offset of metadata.implicitMembers) code.appendLeft(offset, name);
 	}
 	const pragma = [...parsed.comments.filter((comment) => comment.start < (parsed.ast.body[0]?.start ?? source.length)).map((comment) => comment.value).join("\n").matchAll(/@jsxImportSource\s+(\S+)/g)].at(-1)?.[1];
@@ -1398,9 +1483,13 @@ function transform(source, options = {}) {
 		return edits.toString();
 	};
 	let counter = 0;
+	const directReturns = [];
 	for (const node of parsed.calls) {
 		const { callEnd, hadParens, originalArgs, closures } = node.trailing;
 		const component = componentCalls.has(node);
+		const slotObject = vue && (options.vueDefaultSlot !== "function" || closures.length > 1);
+		let nativeChild = false;
+		let bareChild = false;
 		if (component) {
 			if (originalArgs.length > 1 || originalArgs[0]?.type === "SpreadElement" || node.optional || node.callee.optional) throw new TwillSyntaxError(source, filename, {
 				message: "Component syntax accepts one props object and children; optional calls use ordinary callbacks.",
@@ -1425,8 +1514,13 @@ function transform(source, options = {}) {
 					labels.add(name);
 				}
 			}
-			const opening = vue ? ">{({default: " : ">{(";
 			const tagEnd = node.typeParameters?.end ?? node.callee.end;
+			const child = closures[0];
+			const expression = child.body.body[0]?.expression;
+			nativeChild = !vue && !metadataByNode.get(child).header && child.body.body.length === 1 && (expression?.type === "JSXElement" || expression?.type === "JSXFragment") && source.slice(child.start + 1, expression.start).trim() === "" && /^\s*;?\s*$/.test(source.slice(expression.end, child.end - 1)) && source.slice(callEnd, child.start).trim() === "" && (!hadParens || originalArgs.length > 0 || /^\s*\(\s*\)$/.test(source.slice(tagEnd, callEnd)));
+			bareChild = !vue && (!!metadataByNode.get(child).header || child.body.body.length === 1 && expression !== void 0 && expression.type !== "SequenceExpression");
+			let opening = nativeChild ? ">" : bareChild ? ">{" : ">{(";
+			if (vue) opening = slotObject ? ">{{default: " : ">{";
 			code.appendLeft(node.callee.start, "(<");
 			const props = originalArgs[0];
 			if (!vue && props?.type === "ObjectExpression" && props.properties.every((property) => property.type === "SpreadElement" || property.kind === "init" && !property.method && !property.computed && (property.key.name ?? property.key.value) !== "__proto__" && /^[A-Za-z_$][\w$.:-]*$/.test(String(property.key.name ?? property.key.value)))) {
@@ -1473,7 +1567,7 @@ function transform(source, options = {}) {
 				const tokens = Parser.tokenizer(gap, { ecmaVersion: "latest" });
 				const first = tokens.getToken();
 				const last = tokens.getToken();
-				code.overwrite(tagEnd, callEnd, opening + gap.slice(first.end, last.start));
+				code.overwrite(tagEnd, callEnd, opening + (nativeChild ? "" : gap.slice(first.end, last.start)));
 			} else code.appendLeft(callEnd, opening);
 		} else if (hadParens) {
 			const tailStart = originalArgs.at(-1)?.end ?? callEnd - 1;
@@ -1496,24 +1590,40 @@ function transform(source, options = {}) {
 				"DeferStatement",
 				"EmptyStatement"
 			].includes(statement.type)) && body.filter((statement) => statement.type !== "EmptyStatement").at(-1) === expressions[0];
+			const explicitReturn = !content && body.length === 1 && body[0].type === "ReturnStatement" && body[0].argument;
+			const returnsValue = explicitReturn || singleContent || options.implicitReturn !== false && body.length === 1 && body[0].type === "ExpressionStatement";
+			const conciseBody = returnsValue && conciseExpression(body);
+			const grouping = conciseBody ? expressionGrouping(closureExpression(body), source, metadata.header?.end ?? closure.start + 1) : "{";
 			if (singleContent && body.length === 1 && !vue) {
 				directChild = true;
-				code.remove(closure.start, closure.start + 1);
-				code.remove(closure.end - 1, closure.end);
 				const statement = expressions[0];
-				if (source[statement.end - 1] === ";") code.remove(statement.end - 1, statement.end);
+				if (nativeChild) {
+					code.remove(callEnd, statement.expression.start);
+					code.overwrite(statement.expression.end, closure.end, "", { contentOnly: true });
+				} else {
+					code.remove(closure.start, closure.start + 1);
+					code.overwrite(closure.end - 1, closure.end, "", { contentOnly: true });
+					if (source[statement.end - 1] === ";") code.remove(statement.end - 1, statement.end);
+				}
 				continue;
 			}
 			if (metadata.label) {
 				const label = source.slice(metadata.label.start, metadata.label.end).replace(/\s*:\s*$/, "");
-				code.overwrite(metadata.label.start, closure.start, component && vue ? `, [${JSON.stringify(label)}]: ` : ", ");
+				code.overwrite(metadata.label.start, closure.start, component && vue ? `, ${label === "__proto__" ? `[${JSON.stringify(label)}]` : JSON.stringify(label)}: ` : ", ");
 			}
 			if (metadata.header) {
 				const header = metadata.header;
 				code.overwrite(closure.start, closure.start + 1, header.parenthesized || metadata.async ? "" : "(");
 				if (metadata.async && !header.parenthesized) code.appendLeft(header.asyncEnd, " (");
-				code.overwrite(header.inStart, header.end, `${header.parenthesized ? "" : ") "}=> {`);
-			} else if (!metadata.implicitMembers.length) code.overwrite(closure.start, closure.start + 1, "() => {");
+				code.overwrite(header.inStart, header.end, `${header.parenthesized ? "" : ") "}=> ${grouping}`);
+			} else if (!metadata.implicitMembers.length) code.overwrite(closure.start, closure.start + 1, `() => ${grouping}`);
+			if (conciseBody) {
+				const statement = body[0];
+				if (explicitReturn) code.remove(statement.start, statement.start + 6);
+				if (source[statement.end - 1] === ";") code.remove(statement.end - 1, statement.end);
+				code.overwrite(closure.end - 1, closure.end, grouping ? ")" : "", { contentOnly: true });
+				continue;
+			}
 			if (content && !singleContent) {
 				let collector;
 				do
@@ -1566,13 +1676,16 @@ function transform(source, options = {}) {
 				body.forEach(collect);
 				code.prependLeft(bodyStart, `const ${collector} = [];`);
 				code.prependLeft(closure.end - 1, vue ? `;return ${collector};` : `;return ${collector}.length === 1 ? ${collector}[0] : ${collector};`);
-			} else if (singleContent || options.implicitReturn !== false && body.length === 1 && body[0].type === "ExpressionStatement") {
+			} else if (returnsValue && !explicitReturn) {
 				const statement = singleContent ? expressions[0] : body[0];
-				code.prependLeft(statement.start, "return (");
-				code.appendLeft(source[statement.end - 1] === ";" ? statement.end - 1 : statement.end, ")");
+				if (statement.expression.type === "TwillSwitchExpression" && canInlineSwitchExpression(statement.expression)) directReturns.push(statement.expression);
+				else {
+					code.prependLeft(statement.start, "return (");
+					code.appendLeft(source[statement.end - 1] === ";" ? statement.end - 1 : statement.end, ")");
+				}
 			}
 		}
-		if (component) code.prependLeft(closures.at(-1).end, (vue ? "})}" : directChild || metadataByNode.get(closures[0]).header ? ")}" : ")()}") + `</${calleeName(node.callee)}>)`);
+		if (component) code.prependLeft(closures.at(-1).end, (vue ? slotObject ? "}}" : "}" : nativeChild ? "" : bareChild ? "}" : directChild ? ")}" : ")()}") + `</${calleeName(node.callee)}>)`);
 		else code.appendLeft(closures.at(-1).end, ")");
 	}
 	if (parsed.switches.length) lowerSwitchExpressions(source, parsed.ast, parsed.switches, code, options.language ?? inferLanguage(filename), usedNames, parsed.comments, (node, message) => {
@@ -1581,7 +1694,7 @@ function transform(source, options = {}) {
 			pos: node.start,
 			loc: node.loc.start
 		});
-	});
+	}, directReturns, reusable);
 	for (const end of attributeClosings) code.appendLeft(end, "}");
 	if (parsed.defers.length) {
 		const starts = /* @__PURE__ */ new Map();
@@ -1640,7 +1753,6 @@ function generatedPosition(result, line, column) {
 		bias: GREATEST_LOWER_BOUND
 	});
 }
-//#endregion
 export { transform as a, originalPosition as i, generatedPosition as n, parse as o, inferLanguage as r, TwillSyntaxError as t };
 
-//# sourceMappingURL=compiler-CbNSBUI2.js.map
+//# sourceMappingURL=compiler-DI0H4d1R.js.map