@swiftuijs/twill 0.3.1 → 0.4.0

package/README.md

@@ -1,5 +1,10 @@
 # <img src="https://twill.evecalm.com/logo.png" alt="Twill hummingbird" align="right" width="40" height="40" /> Twill
 
+[![npm version](https://img.shields.io/npm/v/%40swiftuijs%2Ftwill)](https://www.npmjs.com/package/@swiftuijs/twill)
+[![npm monthly downloads](https://img.shields.io/npm/dm/%40swiftuijs%2Ftwill)](https://www.npmjs.com/package/@swiftuijs/twill)
+[![CI](https://img.shields.io/github/actions/workflow/status/swiftuijs/twill/ci.yml?branch=main&label=CI)](https://github.com/swiftuijs/twill/actions/workflows/ci.yml)
+[![License](https://img.shields.io/npm/l/%40swiftuijs%2Ftwill)](https://github.com/swiftuijs/twill/blob/main/LICENSE)
+
 **TypeScript. Clearer flow.**
 
 Twill is a **TypeScript-based language with Swift-inspired syntax extensions**, built by [forth.ink](https://forth.ink). It extends TypeScript and TSX with guards, `defer`, trailing closures and checked switch expressions. Use TypeScript's type system and existing JavaScript libraries; compile to ordinary JavaScript.
@@ -73,8 +78,8 @@ The [playground](https://twill.evecalm.com/playground) runs the actual compiler
 Install the compiler as a development dependency in your application. Use Node 24 LTS for a new setup; the package supports `^20.19.0 || >=22.12.0`. Run from the directory containing your `package.json` (run `npm init -y` first for a new project). Default inline emission introduces no language runtime dependency into your application bundle. The [optional runtime](https://twill.evecalm.com/runtime) in 0.2.0 shares dynamic synchronous cleanup when explicitly selected.
 
 ```sh
-pnpm add -D @swiftuijs/twill@0.3.1
-# npm install --save-dev @swiftuijs/twill@0.3.1
+pnpm add -D @swiftuijs/twill@0.4.0
+# npm install --save-dev @swiftuijs/twill@0.4.0
 ```
 
 Add the Vite adapter to your existing configuration:
@@ -103,7 +108,7 @@ For a project-local command, install the compiler above, save this as `hello.twi
 console.log(process.argv.slice(2));
 ```
 
-Expected output is `[ 'hello world' ]`. On Linux/macOS, use `chmod +x hello.twill` then `npm exec --call './hello.twill "hello world"'` or `pnpm exec ./hello.twill 'hello world'` for a local shebang. For direct `./hello.twill` execution, install `@swiftuijs/twill` globally with `npm install --global @swiftuijs/twill@0.3.1` and keep `twill` on PATH. Windows uses the explicit CLI.
+Expected output is `[ 'hello world' ]`. On Linux/macOS, use `chmod +x hello.twill` then `npm exec --call './hello.twill "hello world"'` or `pnpm exec ./hello.twill 'hello world'` for a local shebang. For direct `./hello.twill` execution, install `@swiftuijs/twill` globally with `npm install --global @swiftuijs/twill@0.4.0` and keep `twill` on PATH. Windows uses the explicit CLI.
 
 Install `@swiftuijs/twill-shell` in the script's project only when using its subprocess API; a global compiler does not install project imports. Follow [shell scripting](https://twill.evecalm.com/scripting) for complete installation, a portable subprocess example, Node type checking and troubleshooting. Native JS/TS consumers need only the SDK.
 

package/dist/branches.d.ts

@@ -6,10 +6,16 @@ type Node = {
     end: number;
     [key: string]: any;
 };
+/** Preserve the existing expression boundary for direct eval and suspension. */
+export declare function canInlineSwitchExpression(node: Node): boolean;
+/** 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. */
+export declare function reusableStatements(ast: Node, usedNames: Set<string>): Set<Node>;
 /** Native switches with per-arm scopes. Direct returns and standalone variable
  * initializers need no extra function; other expressions keep a lexical IIFE. */
 export declare function lowerSwitchExpressions(source: string, ast: Node, switches: Node[], code: MagicString, language: Language, usedNames: Set<string>, comments: {
     start: number;
     end: number;
-}[], fail: (node: Node, message: string) => never): void;
+}[], fail: (node: Node, message: string) => never, implicitReturns?: Node[], reusable?: Set<Node>): void;
 export {};

package/dist/cli.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
-import { a as transform } from "./compiler-BdkU4Ruh.js";
-import { n as loadConfig } from "./configuration-BVMf6Q_j.js";
-import { t as TwillProject } from "./project-ZmlpFooa.js";
-import { t as inspectProject } from "./doctor-Co_pdZtt.js";
-import { t as emitDeclarations } from "./declarations-BTAS8Mb_.js";
-import { t as transpile } from "./transpile-CLNavDUr.js";
+import { a as transform } from "./compiler-DI0H4d1R.js";
+import { t as transpile } from "./transpile--6CFGUm0.js";
+import { n as loadConfig } from "./configuration-ppqhmuy4.js";
+import { t as TwillProject } from "./project-DYXf2Kgt.js";
+import { t as inspectProject } from "./doctor-BHwU_YBw.js";
+import { t as emitDeclarations } from "./declarations-DXtb1AHP.js";
 import { createRequire } from "node:module";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { parseArgs } from "node:util";
-//#region src/cli.ts
+// src/cli.ts
 async function main(args = process.argv.slice(2)) {
 	const { values, positionals, tokens } = parseArgs({
 		args,
@@ -129,7 +129,6 @@ async function main(args = process.argv.slice(2)) {
 	} else process.stdout.write(result.code + "\n");
 	return 0;
 }
-//#endregion
 export { main };
 
 //# sourceMappingURL=cli.js.map

package/dist/{compilation-cache-7SugqJ4n.js → compilation-cache-BrV71YKt.js}

@@ -4,7 +4,7 @@ import { dirname, isAbsolute, join, resolve } from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
-//#region src/compilation-cache.ts
+// src/compilation-cache.ts
 var limit = 524288;
 var packages = [
 	"typescript",
@@ -166,7 +166,6 @@ function openCompilationCache() {
 		if (identity) return new CompilationCache(resolve(directory), identity);
 	} catch {}
 }
-//#endregion
 export { openCompilationCache as i, observationsMatch as n, observe as r, digest as t };
 
-//# sourceMappingURL=compilation-cache-7SugqJ4n.js.map
+//# sourceMappingURL=compilation-cache-BrV71YKt.js.map

package/dist/{compilation-cache-7SugqJ4n.js.map → compilation-cache-BrV71YKt.js.map}

@@ -1 +1 @@
-{"version":3,"file":"compilation-cache-7SugqJ4n.js","names":[],"sources":["../src/compilation-cache.ts"],"sourcesContent":["import {\n  closeSync,\n  constants,\n  existsSync,\n  fstatSync,\n  lstatSync,\n  mkdirSync,\n  openSync,\n  readFileSync,\n  readdirSync,\n  realpathSync,\n  statSync,\n  renameSync,\n  unlinkSync,\n  writeFileSync,\n  type Stats,\n} from 'node:fs';\nimport { createHash, randomUUID } from 'node:crypto';\nimport { createRequire } from 'node:module';\nimport { homedir } from 'node:os';\nimport { dirname, isAbsolute, join, resolve } from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nexport type ConfigurationObservation = {\n  path: string;\n  kind: 'file' | 'directory';\n  value: string;\n};\nconst limit = 512 * 1024;\nconst packages = [\n  'typescript',\n  'acorn',\n  'acorn-typescript',\n  'acorn-jsx',\n  'magic-string',\n  '@ampproject/remapping',\n  '@jridgewell/trace-mapping',\n];\nexport const digest = (source: string | Uint8Array) =>\n  createHash('sha256').update(source).digest('hex');\n\nexport function observe(path: string, kind: ConfigurationObservation['kind']): string {\n  try {\n    if (kind === 'directory') return statSync(path).isDirectory() ? 'directory' : 'absent';\n    return digest(readFileSync(path));\n  } catch (error) {\n    return ['ENOENT', 'ENOTDIR'].includes((error as NodeJS.ErrnoException).code ?? '')\n      ? 'absent'\n      : 'unavailable';\n  }\n}\nexport function observationsMatch(observations: ConfigurationObservation[]): boolean {\n  return observations.every(({ path, kind, value }) => {\n    const current = observe(path, kind);\n    return current !== 'unavailable' && current === value;\n  });\n}\n\n/** Hash actual installed code without evaluating any compiler or dependency module. */\nexport function toolchainIdentity(\n  location = import.meta.url,\n  names = packages,\n): string | undefined {\n  try {\n    const hash = createHash('sha256').update('twill-loader-cache-v1\\0' + process.version);\n    const add = (path: string, bytes: Uint8Array) =>\n      hash.update(JSON.stringify([path, digest(bytes)]));\n    const directory = dirname(fileURLToPath(location));\n    for (const file of readdirSync(directory).sort())\n      if (file.endsWith('.js')) add(file, readFileSync(join(directory, file)));\n    const seen = new Set<string>();\n    const visit = (name: string, from: string) => {\n      const require = createRequire(from);\n      let root = dirname(require.resolve(name));\n      for (;;) {\n        const metadata = join(root, 'package.json');\n        if (existsSync(metadata) && JSON.parse(readFileSync(metadata, 'utf8')).name === name) break;\n        const parent = dirname(root);\n        if (parent === root) throw new Error('Package metadata unavailable');\n        root = parent;\n      }\n      root = realpathSync(root);\n      if (seen.has(root)) return;\n      seen.add(root);\n      const metadata = join(root, 'package.json');\n      const value = JSON.parse(readFileSync(metadata, 'utf8'));\n      add(name, readFileSync(metadata));\n      const walk = (folder: string) => {\n        for (const entry of readdirSync(folder, { withFileTypes: true }).sort((a, b) =>\n          a.name.localeCompare(b.name),\n        )) {\n          const path = join(folder, entry.name);\n          if (entry.isSymbolicLink() && statSync(path).isDirectory())\n            throw new Error('Directory symlink requires uncached compilation');\n          if (entry.isDirectory() && entry.name !== 'node_modules') walk(path);\n          else if (/\\.(?:[cm]?js|json)$/.test(entry.name))\n            add(path.slice(root.length), readFileSync(path));\n        }\n      };\n      // TypeScript emission/configuration executes this single compiler bundle;\n      // hashing its CLI/server copies would add unrelated cold-start work.\n      if (name === 'typescript')\n        add('typescript/lib/typescript.js', readFileSync(require.resolve(name)));\n      else walk(root);\n      for (const dependency of Object.keys(value.dependencies ?? {}).sort())\n        visit(dependency, metadata);\n    };\n    for (const name of names) visit(name, location);\n    return hash.digest('hex');\n  } catch {\n    return undefined;\n  }\n}\n\nfunction safeDirectory(directory: string): boolean {\n  const info = lstatSync(directory);\n  if (!info.isDirectory() || info.isSymbolicLink()) return false;\n  if (process.platform === 'win32') return true; // User-selected/profile ACL, not a POSIX mode claim.\n  const uid = process.getuid!();\n  if (info.uid !== uid || (info.mode & 0o077) !== 0) return false;\n  let path = realpathSync(directory);\n  for (;;) {\n    const parent = lstatSync(path);\n    if (parent.uid !== uid && parent.uid !== 0) return false;\n    if ((parent.mode & 0o022) !== 0 && (parent.mode & 0o1000) === 0) return false;\n    const next = dirname(path);\n    if (next === path) return true;\n    path = next;\n  }\n}\nfunction safeFile(info: Stats): boolean {\n  return (\n    info.isFile() &&\n    info.nlink === 1 &&\n    info.size <= limit &&\n    (process.platform === 'win32' || (info.uid === process.getuid!() && (info.mode & 0o077) === 0))\n  );\n}\n\n/** Fixed slots bound completed storage; collisions are misses, never shared module results. */\nexport class CompilationCache {\n  constructor(\n    private readonly directory: string,\n    private readonly identity: string,\n  ) {}\n\n  private key(url: string, source: string, dialect: boolean) {\n    return digest(JSON.stringify([this.identity, url, digest(source), dialect, 'ES2022']));\n  }\n  private slot(url: string) {\n    return join(this.directory, (parseInt(digest(url).slice(0, 2), 16) % 128) + '.json');\n  }\n  read(url: string, source: string, dialect: boolean): string | undefined {\n    let fd: number | undefined;\n    try {\n      if (!safeDirectory(this.directory)) return;\n      const file = this.slot(url);\n      if (lstatSync(file).isSymbolicLink()) return;\n      fd = openSync(file, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));\n      if (!safeFile(fstatSync(fd))) return;\n      const value = JSON.parse(readFileSync(fd, 'utf8'));\n      if (\n        value.key !== this.key(url, source, dialect) ||\n        typeof value.source !== 'string' ||\n        value.digest !== digest(value.source) ||\n        !Array.isArray(value.observations) ||\n        !value.observations.every(\n          (entry: ConfigurationObservation) =>\n            entry &&\n            typeof entry.path === 'string' &&\n            isAbsolute(entry.path) &&\n            ['file', 'directory'].includes(entry.kind) &&\n            typeof entry.value === 'string',\n        ) ||\n        !observationsMatch(value.observations)\n      )\n        return;\n      return value.source;\n    } catch {\n      return;\n    } finally {\n      if (fd !== undefined) {\n        try {\n          closeSync(fd);\n        } catch {\n          /* Cache cleanup is optional too. */\n        }\n      }\n    }\n  }\n  write(\n    url: string,\n    source: string,\n    dialect: boolean,\n    emitted: string,\n    observations: ConfigurationObservation[],\n  ): void {\n    let temporary: string | undefined;\n    try {\n      const value = JSON.stringify({\n        key: this.key(url, source, dialect),\n        source: emitted,\n        digest: digest(emitted),\n        observations,\n      });\n      if (\n        Buffer.byteLength(value) > limit ||\n        !safeDirectory(this.directory) ||\n        !observationsMatch(observations)\n      )\n        return;\n      temporary = join(this.directory, randomUUID() + '.tmp');\n      writeFileSync(temporary, value, { flag: 'wx', mode: 0o600 });\n      renameSync(temporary, this.slot(url));\n    } catch {\n      // An executable cache is optional; its failure never changes script behavior.\n    } finally {\n      if (temporary !== undefined) {\n        try {\n          unlinkSync(temporary);\n        } catch {\n          // Renamed, concurrently removed, or inaccessible; never replace the program's result.\n        }\n      }\n    }\n  }\n}\n\nexport function openCompilationCache(): CompilationCache | undefined {\n  try {\n    const directory = process.env.TWILL_CACHE_DIR ?? join(homedir(), '.twill', 'script-cache-v1');\n    if (!isAbsolute(directory)) return;\n    mkdirSync(directory, { recursive: true, mode: 0o700 });\n    if (!safeDirectory(directory)) return;\n    const identity = toolchainIdentity();\n    if (identity) return new CompilationCache(resolve(directory), identity);\n  } catch {\n    // Permissions, unsupported environment or unavailable identity: compile normally.\n  }\n}\n"],"mappings":";;;;;;;AA4BA,IAAM,QAAQ;AACd,IAAM,WAAW;CACf;CACA;CACA;CACA;CACA;CACA;CACA;AACF;AACA,IAAa,UAAU,WACrB,WAAW,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC,CAAC,OAAO,KAAK;AAElD,SAAgB,QAAQ,MAAc,MAAgD;CACpF,IAAI;EACF,IAAI,SAAS,aAAa,OAAO,SAAS,IAAI,CAAC,CAAC,YAAY,IAAI,cAAc;EAC9E,OAAO,OAAO,aAAa,IAAI,CAAC;CAClC,SAAS,OAAO;EACd,OAAO,CAAC,UAAU,SAAS,CAAC,CAAC,SAAU,MAAgC,QAAQ,EAAE,IAC7E,WACA;CACN;AACF;AACA,SAAgB,kBAAkB,cAAmD;CACnF,OAAO,aAAa,OAAO,EAAE,MAAM,MAAM,YAAY;EACnD,MAAM,UAAU,QAAQ,MAAM,IAAI;EAClC,OAAO,YAAY,iBAAiB,YAAY;CAClD,CAAC;AACH;;AAGA,SAAgB,kBACd,WAAW,YAAY,KACvB,QAAQ,UACY;CACpB,IAAI;EACF,MAAM,OAAO,WAAW,QAAQ,CAAC,CAAC,OAAO,4BAA4B,QAAQ,OAAO;EACpF,MAAM,OAAO,MAAc,UACzB,KAAK,OAAO,KAAK,UAAU,CAAC,MAAM,OAAO,KAAK,CAAC,CAAC,CAAC;EACnD,MAAM,YAAY,QAAQ,cAAc,QAAQ,CAAC;EACjD,KAAK,MAAM,QAAQ,YAAY,SAAS,CAAC,CAAC,KAAK,GAC7C,IAAI,KAAK,SAAS,KAAK,GAAG,IAAI,MAAM,aAAa,KAAK,WAAW,IAAI,CAAC,CAAC;EACzE,MAAM,uBAAO,IAAI,IAAY;EAC7B,MAAM,SAAS,MAAc,SAAiB;GAC5C,MAAM,UAAU,cAAc,IAAI;GAClC,IAAI,OAAO,QAAQ,QAAQ,QAAQ,IAAI,CAAC;GACxC,SAAS;IACP,MAAM,WAAW,KAAK,MAAM,cAAc;IAC1C,IAAI,WAAW,QAAQ,KAAK,KAAK,MAAM,aAAa,UAAU,MAAM,CAAC,CAAC,CAAC,SAAS,MAAM;IACtF,MAAM,SAAS,QAAQ,IAAI;IAC3B,IAAI,WAAW,MAAM,MAAM,IAAI,MAAM,8BAA8B;IACnE,OAAO;GACT;GACA,OAAO,aAAa,IAAI;GACxB,IAAI,KAAK,IAAI,IAAI,GAAG;GACpB,KAAK,IAAI,IAAI;GACb,MAAM,WAAW,KAAK,MAAM,cAAc;GAC1C,MAAM,QAAQ,KAAK,MAAM,aAAa,UAAU,MAAM,CAAC;GACvD,IAAI,MAAM,aAAa,QAAQ,CAAC;GAChC,MAAM,QAAQ,WAAmB;IAC/B,KAAK,MAAM,SAAS,YAAY,QAAQ,EAAE,eAAe,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,MACxE,EAAE,KAAK,cAAc,EAAE,IAAI,CAC7B,GAAG;KACD,MAAM,OAAO,KAAK,QAAQ,MAAM,IAAI;KACpC,IAAI,MAAM,eAAe,KAAK,SAAS,IAAI,CAAC,CAAC,YAAY,GACvD,MAAM,IAAI,MAAM,iDAAiD;KACnE,IAAI,MAAM,YAAY,KAAK,MAAM,SAAS,gBAAgB,KAAK,IAAI;UAC9D,IAAI,sBAAsB,KAAK,MAAM,IAAI,GAC5C,IAAI,KAAK,MAAM,KAAK,MAAM,GAAG,aAAa,IAAI,CAAC;IACnD;GACF;GAGA,IAAI,SAAS,cACX,IAAI,gCAAgC,aAAa,QAAQ,QAAQ,IAAI,CAAC,CAAC;QACpE,KAAK,IAAI;GACd,KAAK,MAAM,cAAc,OAAO,KAAK,MAAM,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,GAClE,MAAM,YAAY,QAAQ;EAC9B;EACA,KAAK,MAAM,QAAQ,OAAO,MAAM,MAAM,QAAQ;EAC9C,OAAO,KAAK,OAAO,KAAK;CAC1B,QAAQ;EACN;CACF;AACF;AAEA,SAAS,cAAc,WAA4B;CACjD,MAAM,OAAO,UAAU,SAAS;CAChC,IAAI,CAAC,KAAK,YAAY,KAAK,KAAK,eAAe,GAAG,OAAO;CACzD,IAAI,QAAQ,aAAa,SAAS,OAAO;CACzC,MAAM,MAAM,QAAQ,OAAQ;CAC5B,IAAI,KAAK,QAAQ,QAAQ,KAAK,OAAO,QAAW,GAAG,OAAO;CAC1D,IAAI,OAAO,aAAa,SAAS;CACjC,SAAS;EACP,MAAM,SAAS,UAAU,IAAI;EAC7B,IAAI,OAAO,QAAQ,OAAO,OAAO,QAAQ,GAAG,OAAO;EACnD,KAAK,OAAO,OAAO,QAAW,MAAM,OAAO,OAAO,SAAY,GAAG,OAAO;EACxE,MAAM,OAAO,QAAQ,IAAI;EACzB,IAAI,SAAS,MAAM,OAAO;EAC1B,OAAO;CACT;AACF;AACA,SAAS,SAAS,MAAsB;CACtC,OACE,KAAK,OAAO,KACZ,KAAK,UAAU,KACf,KAAK,QAAQ,UACZ,QAAQ,aAAa,WAAY,KAAK,QAAQ,QAAQ,OAAQ,MAAM,KAAK,OAAO,QAAW;AAEhG;;AAGA,IAAa,mBAAb,MAA8B;CAET;CACA;CAFnB,YACE,WACA,UACA;EAFiB,KAAA,YAAA;EACA,KAAA,WAAA;CAChB;CAEH,IAAY,KAAa,QAAgB,SAAkB;EACzD,OAAO,OAAO,KAAK,UAAU;GAAC,KAAK;GAAU;GAAK,OAAO,MAAM;GAAG;GAAS;EAAQ,CAAC,CAAC;CACvF;CACA,KAAa,KAAa;EACxB,OAAO,KAAK,KAAK,WAAY,SAAS,OAAO,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,EAAE,IAAI,MAAO,OAAO;CACrF;CACA,KAAK,KAAa,QAAgB,SAAsC;EACtE,IAAI;EACJ,IAAI;GACF,IAAI,CAAC,cAAc,KAAK,SAAS,GAAG;GACpC,MAAM,OAAO,KAAK,KAAK,GAAG;GAC1B,IAAI,UAAU,IAAI,CAAC,CAAC,eAAe,GAAG;GACtC,KAAK,SAAS,MAAM,UAAU,YAAY,UAAU,cAAc,EAAE;GACpE,IAAI,CAAC,SAAS,UAAU,EAAE,CAAC,GAAG;GAC9B,MAAM,QAAQ,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC;GACjD,IACE,MAAM,QAAQ,KAAK,IAAI,KAAK,QAAQ,OAAO,KAC3C,OAAO,MAAM,WAAW,YACxB,MAAM,WAAW,OAAO,MAAM,MAAM,KACpC,CAAC,MAAM,QAAQ,MAAM,YAAY,KACjC,CAAC,MAAM,aAAa,OACjB,UACC,SACA,OAAO,MAAM,SAAS,YACtB,WAAW,MAAM,IAAI,KACrB,CAAC,QAAQ,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,KACzC,OAAO,MAAM,UAAU,QAC3B,KACA,CAAC,kBAAkB,MAAM,YAAY,GAErC;GACF,OAAO,MAAM;EACf,QAAQ;GACN;EACF,UAAU;GACR,IAAI,OAAO,KAAA,GACT,IAAI;IACF,UAAU,EAAE;GACd,QAAQ,CAER;EAEJ;CACF;CACA,MACE,KACA,QACA,SACA,SACA,cACM;EACN,IAAI;EACJ,IAAI;GACF,MAAM,QAAQ,KAAK,UAAU;IAC3B,KAAK,KAAK,IAAI,KAAK,QAAQ,OAAO;IAClC,QAAQ;IACR,QAAQ,OAAO,OAAO;IACtB;GACF,CAAC;GACD,IACE,OAAO,WAAW,KAAK,IAAI,SAC3B,CAAC,cAAc,KAAK,SAAS,KAC7B,CAAC,kBAAkB,YAAY,GAE/B;GACF,YAAY,KAAK,KAAK,WAAW,WAAW,IAAI,MAAM;GACtD,cAAc,WAAW,OAAO;IAAE,MAAM;IAAM,MAAM;GAAM,CAAC;GAC3D,WAAW,WAAW,KAAK,KAAK,GAAG,CAAC;EACtC,QAAQ,CAER,UAAU;GACR,IAAI,cAAc,KAAA,GAChB,IAAI;IACF,WAAW,SAAS;GACtB,QAAQ,CAER;EAEJ;CACF;AACF;AAEA,SAAgB,uBAAqD;CACnE,IAAI;EACF,MAAM,YAAY,QAAQ,IAAI,mBAAmB,KAAK,QAAQ,GAAG,UAAU,iBAAiB;EAC5F,IAAI,CAAC,WAAW,SAAS,GAAG;EAC5B,UAAU,WAAW;GAAE,WAAW;GAAM,MAAM;EAAM,CAAC;EACrD,IAAI,CAAC,cAAc,SAAS,GAAG;EAC/B,MAAM,WAAW,kBAAkB;EACnC,IAAI,UAAU,OAAO,IAAI,iBAAiB,QAAQ,SAAS,GAAG,QAAQ;CACxE,QAAQ,CAER;AACF"}
+{"version":3,"file":"compilation-cache-BrV71YKt.js","names":[],"sources":["../src/compilation-cache.ts"],"sourcesContent":["import {\n  closeSync,\n  constants,\n  existsSync,\n  fstatSync,\n  lstatSync,\n  mkdirSync,\n  openSync,\n  readFileSync,\n  readdirSync,\n  realpathSync,\n  statSync,\n  renameSync,\n  unlinkSync,\n  writeFileSync,\n  type Stats,\n} from 'node:fs';\nimport { createHash, randomUUID } from 'node:crypto';\nimport { createRequire } from 'node:module';\nimport { homedir } from 'node:os';\nimport { dirname, isAbsolute, join, resolve } from 'node:path';\nimport { fileURLToPath } from 'node:url';\n\nexport type ConfigurationObservation = {\n  path: string;\n  kind: 'file' | 'directory';\n  value: string;\n};\nconst limit = 512 * 1024;\nconst packages = [\n  'typescript',\n  'acorn',\n  'acorn-typescript',\n  'acorn-jsx',\n  'magic-string',\n  '@ampproject/remapping',\n  '@jridgewell/trace-mapping',\n];\nexport const digest = (source: string | Uint8Array) =>\n  createHash('sha256').update(source).digest('hex');\n\nexport function observe(path: string, kind: ConfigurationObservation['kind']): string {\n  try {\n    if (kind === 'directory') return statSync(path).isDirectory() ? 'directory' : 'absent';\n    return digest(readFileSync(path));\n  } catch (error) {\n    return ['ENOENT', 'ENOTDIR'].includes((error as NodeJS.ErrnoException).code ?? '')\n      ? 'absent'\n      : 'unavailable';\n  }\n}\nexport function observationsMatch(observations: ConfigurationObservation[]): boolean {\n  return observations.every(({ path, kind, value }) => {\n    const current = observe(path, kind);\n    return current !== 'unavailable' && current === value;\n  });\n}\n\n/** Hash actual installed code without evaluating any compiler or dependency module. */\nexport function toolchainIdentity(\n  location = import.meta.url,\n  names = packages,\n): string | undefined {\n  try {\n    const hash = createHash('sha256').update('twill-loader-cache-v1\\0' + process.version);\n    const add = (path: string, bytes: Uint8Array) =>\n      hash.update(JSON.stringify([path, digest(bytes)]));\n    const directory = dirname(fileURLToPath(location));\n    for (const file of readdirSync(directory).sort())\n      if (file.endsWith('.js')) add(file, readFileSync(join(directory, file)));\n    const seen = new Set<string>();\n    const visit = (name: string, from: string) => {\n      const require = createRequire(from);\n      let root = dirname(require.resolve(name));\n      for (;;) {\n        const metadata = join(root, 'package.json');\n        if (existsSync(metadata) && JSON.parse(readFileSync(metadata, 'utf8')).name === name) break;\n        const parent = dirname(root);\n        if (parent === root) throw new Error('Package metadata unavailable');\n        root = parent;\n      }\n      root = realpathSync(root);\n      if (seen.has(root)) return;\n      seen.add(root);\n      const metadata = join(root, 'package.json');\n      const value = JSON.parse(readFileSync(metadata, 'utf8'));\n      add(name, readFileSync(metadata));\n      const walk = (folder: string) => {\n        for (const entry of readdirSync(folder, { withFileTypes: true }).sort((a, b) =>\n          a.name.localeCompare(b.name),\n        )) {\n          const path = join(folder, entry.name);\n          if (entry.isSymbolicLink() && statSync(path).isDirectory())\n            throw new Error('Directory symlink requires uncached compilation');\n          if (entry.isDirectory() && entry.name !== 'node_modules') walk(path);\n          else if (/\\.(?:[cm]?js|json)$/.test(entry.name))\n            add(path.slice(root.length), readFileSync(path));\n        }\n      };\n      // TypeScript emission/configuration executes this single compiler bundle;\n      // hashing its CLI/server copies would add unrelated cold-start work.\n      if (name === 'typescript')\n        add('typescript/lib/typescript.js', readFileSync(require.resolve(name)));\n      else walk(root);\n      for (const dependency of Object.keys(value.dependencies ?? {}).sort())\n        visit(dependency, metadata);\n    };\n    for (const name of names) visit(name, location);\n    return hash.digest('hex');\n  } catch {\n    return undefined;\n  }\n}\n\nfunction safeDirectory(directory: string): boolean {\n  const info = lstatSync(directory);\n  if (!info.isDirectory() || info.isSymbolicLink()) return false;\n  if (process.platform === 'win32') return true; // User-selected/profile ACL, not a POSIX mode claim.\n  const uid = process.getuid!();\n  if (info.uid !== uid || (info.mode & 0o077) !== 0) return false;\n  let path = realpathSync(directory);\n  for (;;) {\n    const parent = lstatSync(path);\n    if (parent.uid !== uid && parent.uid !== 0) return false;\n    if ((parent.mode & 0o022) !== 0 && (parent.mode & 0o1000) === 0) return false;\n    const next = dirname(path);\n    if (next === path) return true;\n    path = next;\n  }\n}\nfunction safeFile(info: Stats): boolean {\n  return (\n    info.isFile() &&\n    info.nlink === 1 &&\n    info.size <= limit &&\n    (process.platform === 'win32' || (info.uid === process.getuid!() && (info.mode & 0o077) === 0))\n  );\n}\n\n/** Fixed slots bound completed storage; collisions are misses, never shared module results. */\nexport class CompilationCache {\n  constructor(\n    private readonly directory: string,\n    private readonly identity: string,\n  ) {}\n\n  private key(url: string, source: string, dialect: boolean) {\n    return digest(JSON.stringify([this.identity, url, digest(source), dialect, 'ES2022']));\n  }\n  private slot(url: string) {\n    return join(this.directory, (parseInt(digest(url).slice(0, 2), 16) % 128) + '.json');\n  }\n  read(url: string, source: string, dialect: boolean): string | undefined {\n    let fd: number | undefined;\n    try {\n      if (!safeDirectory(this.directory)) return;\n      const file = this.slot(url);\n      if (lstatSync(file).isSymbolicLink()) return;\n      fd = openSync(file, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));\n      if (!safeFile(fstatSync(fd))) return;\n      const value = JSON.parse(readFileSync(fd, 'utf8'));\n      if (\n        value.key !== this.key(url, source, dialect) ||\n        typeof value.source !== 'string' ||\n        value.digest !== digest(value.source) ||\n        !Array.isArray(value.observations) ||\n        !value.observations.every(\n          (entry: ConfigurationObservation) =>\n            entry &&\n            typeof entry.path === 'string' &&\n            isAbsolute(entry.path) &&\n            ['file', 'directory'].includes(entry.kind) &&\n            typeof entry.value === 'string',\n        ) ||\n        !observationsMatch(value.observations)\n      )\n        return;\n      return value.source;\n    } catch {\n      return;\n    } finally {\n      if (fd !== undefined) {\n        try {\n          closeSync(fd);\n        } catch {\n          /* Cache cleanup is optional too. */\n        }\n      }\n    }\n  }\n  write(\n    url: string,\n    source: string,\n    dialect: boolean,\n    emitted: string,\n    observations: ConfigurationObservation[],\n  ): void {\n    let temporary: string | undefined;\n    try {\n      const value = JSON.stringify({\n        key: this.key(url, source, dialect),\n        source: emitted,\n        digest: digest(emitted),\n        observations,\n      });\n      if (\n        Buffer.byteLength(value) > limit ||\n        !safeDirectory(this.directory) ||\n        !observationsMatch(observations)\n      )\n        return;\n      temporary = join(this.directory, randomUUID() + '.tmp');\n      writeFileSync(temporary, value, { flag: 'wx', mode: 0o600 });\n      renameSync(temporary, this.slot(url));\n    } catch {\n      // An executable cache is optional; its failure never changes script behavior.\n    } finally {\n      if (temporary !== undefined) {\n        try {\n          unlinkSync(temporary);\n        } catch {\n          // Renamed, concurrently removed, or inaccessible; never replace the program's result.\n        }\n      }\n    }\n  }\n}\n\nexport function openCompilationCache(): CompilationCache | undefined {\n  try {\n    const directory = process.env.TWILL_CACHE_DIR ?? join(homedir(), '.twill', 'script-cache-v1');\n    if (!isAbsolute(directory)) return;\n    mkdirSync(directory, { recursive: true, mode: 0o700 });\n    if (!safeDirectory(directory)) return;\n    const identity = toolchainIdentity();\n    if (identity) return new CompilationCache(resolve(directory), identity);\n  } catch {\n    // Permissions, unsupported environment or unavailable identity: compile normally.\n  }\n}\n"],"mappings":"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"}

package/dist/{compiler-BdkU4Ruh.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",
@@ -714,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",
@@ -896,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 ([
@@ -917,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;
@@ -932,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" });
@@ -957,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" && [
@@ -978,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)) {
@@ -1000,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;
@@ -1020,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" });
@@ -1077,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);
@@ -1262,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";
@@ -1288,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)) {
@@ -1317,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;
@@ -1330,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) {
@@ -1344,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, "))");
@@ -1390,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];
@@ -1418,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.",
@@ -1445,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)))) {
@@ -1493,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;
@@ -1516,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
@@ -1586,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) => {
@@ -1601,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();
@@ -1660,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-BdkU4Ruh.js.map
+//# sourceMappingURL=compiler-DI0H4d1R.js.map