alchemy 2.0.0-beta.77 → 2.0.0-beta.78

package/bin/alchemy.js

@@ -1,4 +1,4 @@
 import { runMain } from "alchemy/Util/PlatformServices";
-import { main } from "alchemy/Cli";
+import { main } from "alchemy/Cli/main";
 main.pipe(runMain);
 //# sourceMappingURL=alchemy.js.map

package/bin/alchemy.js.map

@@ -1 +1 @@
-{"version":3,"file":"alchemy.js","sourceRoot":"","sources":["alchemy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"alchemy.js","sourceRoot":"","sources":["alchemy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC"}

package/bin/alchemy.ts

@@ -1,5 +1,5 @@
 import { runMain } from "alchemy/Util/PlatformServices";
 
-import { main } from "alchemy/Cli";
+import { main } from "alchemy/Cli/main";
 
 main.pipe(runMain);

package/bin/cli.js

@@ -2,10 +2,13 @@
 // @ts-check
 // alchemy CLI launcher
 //
-// Resolves the alchemy CLI entrypoint via node module resolution and execs it
-// under whichever runtime the user invoked us with. The shebang forces this
-// launcher to run as node even when bun was the invoker, but bun forwards
-// signals about itself via env vars on every child it spawns:
+// Resolves the alchemy CLI entrypoint and runs it under whichever runtime the
+// user invoked us with — in this very process whenever that is possible, by
+// replacing this process with bun when the CLI needs no flags, and as a
+// foreground child only when it does (see the bottom of this file). The
+// shebang forces this launcher to run as node even when bun was the
+// invoker, but bun forwards signals about itself via env vars on every child
+// it spawns:
 //
 //   - `npm_execpath`           → path to bun (set for `bun run <script>`)
 //   - `npm_config_user_agent`  → "bun/<version> ..." (set for `bun run`,
@@ -20,12 +23,14 @@
 // exports point at .ts source), but consumers install into `node_modules/`,
 // so the path check sends them to the bundled `alchemy.js` regardless.
 //
-// Own the spawn so runtime diagnostics can be filtered while signals, IPC
-// messages, and the child's exit status are forwarded.
+// When a child is needed, own the spawn so runtime diagnostics can be
+// filtered while signals, IPC messages, and the child's exit status are
+// forwarded.
 import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
+import { accessSync, constants as fsConstants, existsSync } from "node:fs";
+import * as NodeModule from "node:module";
 import { constants } from "node:os";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "pathe";
 
 /**
@@ -41,10 +46,7 @@ import path from "pathe";
 const foregroundChild = (program, args, stderrFilter) => {
   /** @type {import("node:child_process").StdioOptions} */
   const stdio = process.send ? [0, 1, "pipe", "ipc"] : [0, 1, "pipe"];
-  const child = spawn(program, args, {
-    env: { ...process.env, NODE_ENV: "production" },
-    stdio,
-  });
+  const child = spawn(program, args, { stdio });
   /** @type {Map<NodeJS.Signals, () => void>} */
   const listeners = new Map();
 
@@ -107,6 +109,34 @@ const foregroundChild = (program, args, stderrFilter) => {
   });
 };
 
+/**
+ * The bun executable, as an absolute path, or `undefined` when it cannot be
+ * found. `bun run` names itself in `npm_execpath`; otherwise walk `PATH`.
+ * `process.execve` does no lookup of its own and aborts the process on a
+ * missing file, so this must be certain before handing off.
+ *
+ * @returns {string | undefined}
+ */
+const findBun = () => {
+  const execpath = process.env.npm_execpath;
+  if (execpath && path.basename(execpath).startsWith("bun")) {
+    return existsSync(execpath) ? execpath : undefined;
+  }
+  for (const directory of (process.env.PATH ?? "").split(path.delimiter)) {
+    if (directory === "") continue;
+    const candidate = path.join(directory, "bun");
+    try {
+      accessSync(candidate, fsConstants.X_OK);
+      return candidate;
+    } catch {}
+  }
+  return undefined;
+};
+
+// Namespace access, not a named import: this launcher must still reach the
+// version error below on Nodes that predate the compile cache (< 22.1).
+NodeModule.enableCompileCache?.();
+
 const execpath = (process.env.npm_execpath ?? "").toLowerCase();
 const userAgent = (process.env.npm_config_user_agent ?? "").toLowerCase();
 // `typeof Bun`: someone ran `bun bin/cli.js` directly (no bun env markers,
@@ -160,32 +190,6 @@ if (runtime === "node" && !nodeSupportsHooks) {
   process.exit(1);
 }
 
-const args = [];
-
-if (runtime === "bun" && isDev) {
-  // Pin bun's tsconfig to alchemy's, not whatever happens to be in the
-  // invoking workspace's cwd. Bun's default is `$cwd/tsconfig.json`, which
-  // means invoking `alchemy` from e.g. `examples/cloudflare-solidstart`
-  // would transpile alchemy's own .tsx files with that example's JSX
-  // settings (jsx: "preserve", jsxImportSource: "solid-js"), breaking the
-  // React files inside the alchemy CLI.
-  args.push(`--tsconfig-override=${path.join(binDir, "..", "tsconfig.json")}`);
-}
-
-if (runtime === "node") {
-  // Checkout: run the source directly, no build required — the
-  // register-dev-mode hooks load .ts/.tsx through Oxc AND resolve the
-  // monorepo's own packages (`alchemy/*`, `@alchemy.run/*`,
-  // `@distilled.cloud/*`) through their `bun` export condition onto src/,
-  // so the CLI, the user's stack, and every workspace dependency load one
-  // source universe instead of whatever built lib/ happens to be around.
-  // Published: only the Oxc loader, for the user's own .ts/.tsx.
-  args.push(
-    "--import",
-    new URL(isDev ? "register-dev-mode.js" : "register-oxc.js", import.meta.url)
-      .href,
-  );
-}
 const entry = runtime === "bun" || isDev ? tsEntry : jsEntry;
 if (entry === jsEntry && !existsSync(jsEntry)) {
   process.stderr.write(
@@ -194,33 +198,83 @@ if (entry === jsEntry && !existsSync(jsEntry)) {
   );
   process.exit(1);
 }
-args.push(entry, ...process.argv.slice(2));
 
-// Substring match (not regex) — bun may wrap the line in ANSI color codes
-// when stderr is piped to a TTY-aware parent, so anchored regex is fragile.
+// Set for the CLI's React renderer. Children inherit it exactly as they did
+// from the spawned child's env; the user's own dev servers get it stripped
+// again (see Cloudflare/Workers/ViteChild.ts).
+process.env.NODE_ENV = "production";
+
+// The launcher IS the right runtime in two cases, and then simply becomes
+// the CLI instead of paying for a second process that only relays signals:
 //
-// "directory mismatch for directory" is bun's known-benign internal warning
-// triggered by --tsconfig-override (oven-sh/bun#25730): the resolver openat()s
-// the tsconfig basename against a cached dir fd that isn't its parent, falls
-// back to an absolute open, and logs. Bun's own tsconfig-override tests
-// tolerate the same line. Only our dev path passes --tsconfig-override, which
-// is why published installs never see it.
-// For node, spawn the launcher's OWN binary rather than whatever PATH
-// resolves: the version gates above interrogated process.versions, so the
-// flags must go to that exact node (an explicit `/opt/node24/bin/node
-// bin/cli.js` with an older PATH node would otherwise die on unknown
-// options). `runtime === "node"` implies the launcher IS node — a bun
-// launcher forces the bun branch. For bun, the usual shebang case means the
-// launcher is node and bun comes from PATH; a direct `bun bin/cli.js` run
-// reuses that same bun via execPath.
-const program =
-  runtime === "bun"
-    ? typeof globalThis.Bun !== "undefined"
-      ? process.execPath
-      : "bun"
-    : process.execPath;
-foregroundChild(
-  program,
-  args,
-  (line) => !line.includes("directory mismatch for directory"),
-);
+//   - node: the loader hooks are ordinary runtime-installable module hooks
+//     (`module.registerHooks`); `--import` was only ever a way to run them
+//     first. Checkout: register-dev-mode loads .ts/.tsx through Oxc AND
+//     resolves the monorepo's own packages (`alchemy/*`, `@alchemy.run/*`,
+//     `@distilled.cloud/*`) through their `bun` export condition onto src/,
+//     so the CLI, the user's stack, and every workspace dependency load one
+//     source universe instead of whatever built lib/ happens to be around.
+//     Published: only the Oxc loader, for the user's own .ts/.tsx.
+//   - bun on a published install: the bundled `alchemy.js` needs no flags.
+//
+// Otherwise the CLI must start as bun. On a published install that bun
+// needs no flags and prints nothing of its own, so this node launcher (the
+// shebang) under `bun run` becomes it in place where node can
+// (`process.execve`: POSIX, 22.15+) — same pid, same fds, no relay. A
+// checkout instead needs `--tsconfig-override` (below), a flag that makes
+// bun print a benign internal warning only a parent can filter, so there —
+// and on Windows, and with an IPC channel from a node parent that bun would
+// not pick up — bun runs as a foreground child.
+if (runtime === "node" || (typeof globalThis.Bun !== "undefined" && !isDev)) {
+  if (runtime === "node") {
+    await import(
+      new URL(
+        isDev ? "register-dev-mode.js" : "register-oxc.js",
+        import.meta.url,
+      ).href
+    );
+  }
+  await import(pathToFileURL(entry).href);
+} else {
+  const args = [];
+  if (isDev) {
+    // Pin bun's tsconfig to alchemy's, not whatever happens to be in the
+    // invoking workspace's cwd. Bun's default is `$cwd/tsconfig.json` — it
+    // does not consult a file's own nearest tsconfig — which means invoking
+    // `alchemy` from e.g. `examples/cloudflare-solidstart` would transpile
+    // alchemy's own .tsx files with that example's JSX settings
+    // (jsx: "preserve", jsxImportSource: "solid-js"), breaking the React
+    // files inside the alchemy CLI. Pragmas do not cover it: under a
+    // `preserve` tsconfig bun emits `jsxDEV` even in production, which
+    // React's production build leaves undefined.
+    args.push(
+      `--tsconfig-override=${path.join(binDir, "..", "tsconfig.json")}`,
+    );
+  }
+  args.push(entry, ...process.argv.slice(2));
+  const bun =
+    typeof globalThis.Bun !== "undefined" ? process.execPath : findBun();
+  if (
+    !isDev &&
+    bun !== undefined &&
+    typeof process.execve === "function" &&
+    process.platform !== "win32" &&
+    !process.send
+  ) {
+    process.execve(bun, ["bun", ...args], process.env);
+  }
+  // Stderr filter — substring match (not regex), bun may wrap the line in
+  // ANSI color codes when stderr is piped to a TTY-aware parent, so anchored
+  // regex is fragile. "directory mismatch for directory" is bun's
+  // known-benign internal warning triggered by --tsconfig-override
+  // (oven-sh/bun#25730): the resolver openat()s the tsconfig basename
+  // against a cached dir fd that isn't its parent, falls back to an
+  // absolute open, and logs. Bun's own tsconfig-override tests tolerate the
+  // same line. Only the checkout path passes --tsconfig-override, which is
+  // why published installs never see it.
+  foregroundChild(
+    bun ?? "bun",
+    args,
+    (line) => !line.includes("directory mismatch for directory"),
+  );
+}