sproutboat 0.5.0 → 0.6.1

package/src/broker.ts

@@ -80,8 +80,19 @@ export type BrokerOptions = {
 
 type SqlParam = string | number | null;
 /** The `{ results, meta }` shape Cloudflare's D1 client expects back per statement. */
-type D1Result = { results: JsonValue[]; meta: { duration: number; changes: number; last_row_id: number; rows_read: number } };
-type R2Row = { key: string; body: string; size: number; etag: string; uploaded: string; http_json: string; custom_json: string };
+type D1Result = {
+  results: JsonValue[];
+  meta: { duration: number; changes: number; last_row_id: number; rows_read: number };
+};
+type R2Row = {
+  key: string;
+  body: string;
+  size: number;
+  etag: string;
+  uploaded: string;
+  http_json: string;
+  custom_json: string;
+};
 const isNumber = (v: JsonValue | undefined): v is number => Number.isFinite(v);
 const sqlParams = (v: JsonValue | undefined): SqlParam[] => {
   if (!Array.isArray(v)) return [];
@@ -103,7 +114,20 @@ export type Broker = {
 };
 
 export function createBroker(opts: BrokerOptions = {}): Broker {
-  const bindings: Bindings = { kv: [], secrets: [], outbound: [], d1: [], r2: [], queues: [], analytics: [], do: [], crons: [], assets: "", resources: {}, ...opts.bindings };
+  const bindings: Bindings = {
+    kv: [],
+    secrets: [],
+    outbound: [],
+    d1: [],
+    r2: [],
+    queues: [],
+    analytics: [],
+    do: [],
+    crons: [],
+    assets: "",
+    resources: {},
+    ...opts.bindings,
+  };
   const secrets = opts.secrets ?? {};
 
   // Static assets: read the manifest once. Files are read from disk per request
@@ -143,7 +167,9 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
     const conn = new Database(path, { create: true });
     conn.exec("PRAGMA journal_mode = WAL");
     conn.exec("PRAGMA synchronous = NORMAL");
-    conn.exec("CREATE TABLE IF NOT EXISTS kv (ns TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (ns, key))");
+    conn.exec(
+      "CREATE TABLE IF NOT EXISTS kv (ns TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (ns, key))",
+    );
     conn.exec(
       "CREATE TABLE IF NOT EXISTS r2 (bucket TEXT NOT NULL, key TEXT NOT NULL, body TEXT NOT NULL, size INTEGER NOT NULL, " +
         "etag TEXT NOT NULL, uploaded TEXT NOT NULL, http_json TEXT NOT NULL DEFAULT '{}', custom_json TEXT NOT NULL DEFAULT '{}', " +
@@ -204,20 +230,26 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
     if (!stmts) {
       stmts = {
         get: store.query<{ value: string }, [string, string]>("SELECT value FROM kv WHERE ns = ? AND key = ?"),
-        put: store.query("INSERT INTO kv (ns, key, value) VALUES (?1, ?2, ?3) ON CONFLICT (ns, key) DO UPDATE SET value = ?3"),
+        put: store.query(
+          "INSERT INTO kv (ns, key, value) VALUES (?1, ?2, ?3) ON CONFLICT (ns, key) DO UPDATE SET value = ?3",
+        ),
         del: store.query("DELETE FROM kv WHERE ns = ? AND key = ?"),
-        list: store.query<{ key: string }, [string, string]>("SELECT key FROM kv WHERE ns = ? AND key LIKE ? || '%' ORDER BY key LIMIT 1000"),
+        list: store.query<{ key: string }, [string, string]>(
+          "SELECT key FROM kv WHERE ns = ? AND key LIKE ? || '%' ORDER BY key LIMIT 1000",
+        ),
       };
       kvStmtCache.set(store, stmts);
     }
     return stmts;
   };
 
-  const bound = (list: string[], kind: string) => (name: JsonValue | undefined): string => {
-    const n = str(name);
-    if (!list.includes(n)) throw new Error(`${kind} not bound: ${n}`);
-    return n;
-  };
+  const bound =
+    (list: string[], kind: string) =>
+    (name: JsonValue | undefined): string => {
+      const n = str(name);
+      if (!list.includes(n)) throw new Error(`${kind} not bound: ${n}`);
+      return n;
+    };
   const requireKv = bound(bindings.kv, "KV namespace");
   const requireD1 = bound(bindings.d1, "D1 database");
   const requireR2 = bound(bindings.r2, "R2 bucket");
@@ -256,12 +288,19 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
     const started = performance.now();
     // SQLite hands back column->(string|number|null|blob) rows, i.e. a JSON object.
     const results = conn.query<JsonObject, SqlParam[]>(sql).all(...params);
-    const m = conn.query<{ changes: number; last_row_id: number }, []>(
-      "SELECT changes() AS changes, last_insert_rowid() AS last_row_id",
-    ).get();
+    const m = conn
+      .query<{ changes: number; last_row_id: number }, []>(
+        "SELECT changes() AS changes, last_insert_rowid() AS last_row_id",
+      )
+      .get();
     return {
       results,
-      meta: { duration: performance.now() - started, changes: m?.changes ?? 0, last_row_id: m?.last_row_id ?? 0, rows_read: results.length },
+      meta: {
+        duration: performance.now() - started,
+        changes: m?.changes ?? 0,
+        last_row_id: m?.last_row_id ?? 0,
+        rows_read: results.length,
+      },
     };
   };
 
@@ -323,7 +362,12 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
       }
       case "kv.list": {
         const { store, part } = storeFor("kv", requireKv(msg.ns));
-        return { ok: true, keys: kvStmts(store).list.all(part, str(msg.prefix)).map((r) => r.key) };
+        return {
+          ok: true,
+          keys: kvStmts(store)
+            .list.all(part, str(msg.prefix))
+            .map((r) => r.key),
+        };
       }
       case "secret.get": {
         const name = str(msg.name);
@@ -354,25 +398,32 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         const { store, part: bucket } = storeFor("r2", requireR2(msg.bucket));
         const body = str(msg.body);
         const etag = createHash("sha256").update(body).digest("hex");
-        store.query(
-          "INSERT INTO r2 (bucket, key, body, size, etag, uploaded, http_json, custom_json) VALUES (?1,?2,?3,?4,?5,?6,?7,?8) " +
-            "ON CONFLICT (bucket, key) DO UPDATE SET body=?3, size=?4, etag=?5, uploaded=?6, http_json=?7, custom_json=?8",
-        ).run(
-          bucket,
-          str(msg.key),
-          body,
-          Buffer.byteLength(body),
-          etag,
-          new Date().toISOString(),
-          JSON.stringify(msg.httpMetadata ?? {}),
-          JSON.stringify(msg.customMetadata ?? {}),
-        );
-        return { ok: true, object: { key: str(msg.key), size: Buffer.byteLength(body), etag, uploaded: new Date().toISOString() } };
+        store
+          .query(
+            "INSERT INTO r2 (bucket, key, body, size, etag, uploaded, http_json, custom_json) VALUES (?1,?2,?3,?4,?5,?6,?7,?8) " +
+              "ON CONFLICT (bucket, key) DO UPDATE SET body=?3, size=?4, etag=?5, uploaded=?6, http_json=?7, custom_json=?8",
+          )
+          .run(
+            bucket,
+            str(msg.key),
+            body,
+            Buffer.byteLength(body),
+            etag,
+            new Date().toISOString(),
+            JSON.stringify(msg.httpMetadata ?? {}),
+            JSON.stringify(msg.customMetadata ?? {}),
+          );
+        return {
+          ok: true,
+          object: { key: str(msg.key), size: Buffer.byteLength(body), etag, uploaded: new Date().toISOString() },
+        };
       }
       case "r2.get":
       case "r2.head": {
         const { store, part: bucket } = storeFor("r2", requireR2(msg.bucket));
-        const row = store.query<R2Row, [string, string]>("SELECT * FROM r2 WHERE bucket = ? AND key = ?").get(bucket, str(msg.key));
+        const row = store
+          .query<R2Row, [string, string]>("SELECT * FROM r2 WHERE bucket = ? AND key = ?")
+          .get(bucket, str(msg.key));
         if (!row) return { ok: true, found: false };
         return { ok: true, found: true, object: r2Row(row), body: msg.op === "r2.get" ? row.body : undefined };
       }
@@ -386,9 +437,11 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         const prefix = str(msg.prefix);
         const cursor = str(msg.cursor);
         const limit = Math.min(Math.max(Number(msg.limit) || 1000, 1), 1000);
-        const rows = store.query<R2Row, [string, string, string, number]>(
-          "SELECT * FROM r2 WHERE bucket = ? AND key LIKE ? || '%' AND key > ? ORDER BY key LIMIT ?",
-        ).all(bucket, prefix, cursor, limit + 1);
+        const rows = store
+          .query<R2Row, [string, string, string, number]>(
+            "SELECT * FROM r2 WHERE bucket = ? AND key LIKE ? || '%' AND key > ? ORDER BY key LIMIT ?",
+          )
+          .all(bucket, prefix, cursor, limit + 1);
         const truncated = rows.length > limit;
         const page = truncated ? rows.slice(0, limit) : rows;
         return {
@@ -402,7 +455,9 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
       case "queue.send": {
         const { store, part: q } = storeFor("queue", requireQueue(msg.queue));
         const at = Date.now() + Math.max(0, Number(msg.delaySeconds) || 0) * 1000;
-        store.query("INSERT INTO mq (queue, id, body, visible_at) VALUES (?, ?, ?, ?)").run(q, newId(), str(msg.body), at);
+        store
+          .query("INSERT INTO mq (queue, id, body, visible_at) VALUES (?, ?, ?, ?)")
+          .run(q, newId(), str(msg.body), at);
         return { ok: true };
       }
       case "queue.send_batch": {
@@ -410,7 +465,8 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         const msgs = Array.isArray(msg.messages) ? msg.messages.map((m) => jsonObject(m) ?? {}) : [];
         const ins = store.query("INSERT INTO mq (queue, id, body, visible_at) VALUES (?, ?, ?, ?)");
         store.transaction(() => {
-          for (const m of msgs) ins.run(q, newId(), str(m.body), Date.now() + Math.max(0, Number(m.delaySeconds) || 0) * 1000);
+          for (const m of msgs)
+            ins.run(q, newId(), str(m.body), Date.now() + Math.max(0, Number(m.delaySeconds) || 0) * 1000);
         })();
         return { ok: true, count: msgs.length };
       }
@@ -431,9 +487,11 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         // query it via the SQL API). Exposed here so a dashboard can read back.
         const ds = requireAe(msg.dataset);
         const limit = Math.min(Math.max(Number(msg.limit) || 20, 1), 200);
-        const rows = db.query<{ ts: number; indexes_json: string; blobs_json: string; doubles_json: string }, [string, number]>(
-          "SELECT ts, indexes_json, blobs_json, doubles_json FROM ae WHERE dataset = ? ORDER BY ts DESC, rowid DESC LIMIT ?",
-        ).all(ds, limit);
+        const rows = db
+          .query<{ ts: number; indexes_json: string; blobs_json: string; doubles_json: string }, [string, number]>(
+            "SELECT ts, indexes_json, blobs_json, doubles_json FROM ae WHERE dataset = ? ORDER BY ts DESC, rowid DESC LIMIT ?",
+          )
+          .all(ds, limit);
         const total = db.query<{ n: number }, [string]>("SELECT count(*) AS n FROM ae WHERE dataset = ?").get(ds);
         return {
           ok: true,
@@ -449,9 +507,11 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
 
       case "do.storage.get": {
         const cls = requireDoClass(msg.cls);
-        const row = db.query<{ value: string }, [string, string, string]>(
-          "SELECT value FROM do_storage WHERE cls = ? AND id = ? AND key = ?",
-        ).get(cls, str(msg.id), str(msg.key));
+        const row = db
+          .query<{ value: string }, [string, string, string]>(
+            "SELECT value FROM do_storage WHERE cls = ? AND id = ? AND key = ?",
+          )
+          .get(cls, str(msg.id), str(msg.key));
         return row ? { ok: true, found: true, value: row.value } : { ok: true, found: false };
       }
       case "do.storage.put":
@@ -461,9 +521,9 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         ).run(requireDoClass(msg.cls), str(msg.id), str(msg.key), str(msg.value));
         return { ok: true };
       case "do.storage.delete": {
-        const r = db.query("DELETE FROM do_storage WHERE cls = ? AND id = ? AND key = ?").run(
-          requireDoClass(msg.cls), str(msg.id), str(msg.key),
-        );
+        const r = db
+          .query("DELETE FROM do_storage WHERE cls = ? AND id = ? AND key = ?")
+          .run(requireDoClass(msg.cls), str(msg.id), str(msg.key));
         return { ok: true, deleted: r.changes > 0 };
       }
       case "do.storage.delete_all":
@@ -472,9 +532,11 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
       case "do.storage.list": {
         const cls = requireDoClass(msg.cls);
         const limit = Math.min(Math.max(Number(msg.limit) || 1000, 1), 10000);
-        const rows = db.query<{ key: string; value: string }, [string, string, string, number]>(
-          "SELECT key, value FROM do_storage WHERE cls = ? AND id = ? AND key LIKE ? || '%' ORDER BY key LIMIT ?",
-        ).all(cls, str(msg.id), str(msg.prefix), limit);
+        const rows = db
+          .query<{ key: string; value: string }, [string, string, string, number]>(
+            "SELECT key, value FROM do_storage WHERE cls = ? AND id = ? AND key LIKE ? || '%' ORDER BY key LIMIT ?",
+          )
+          .all(cls, str(msg.id), str(msg.prefix), limit);
         return { ok: true, entries: rows.map((r) => [r.key, r.value]) };
       }
 
@@ -487,7 +549,8 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
         const nfh = assetManifest?.notFound ?? "none";
         if (nfh === "single-page-application") {
           const shell = readAsset("/index.html");
-          if (shell) return { ok: true, found: true, status: 200, type: shell.type, hash: shell.hash, body: shell.body };
+          if (shell)
+            return { ok: true, found: true, status: 200, type: shell.type, hash: shell.hash, body: shell.body };
         }
         if (nfh === "404-page") {
           const page = readAsset("/404.html");
@@ -540,9 +603,11 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
       // `store`/`part` route the rows to this queue's backing file (#74); the
       // trigger payload still carries the binding name the sprout matches on.
       const { store, part } = storeFor("queue", binding);
-      const rows = store.query<{ id: string; body: string; attempts: number }, [string, number, number]>(
-        "SELECT id, body, attempts FROM mq WHERE queue = ? AND dead = 0 AND visible_at <= ? ORDER BY visible_at LIMIT ?",
-      ).all(part, now, QUEUE_BATCH);
+      const rows = store
+        .query<{ id: string; body: string; attempts: number }, [string, number, number]>(
+          "SELECT id, body, attempts FROM mq WHERE queue = ? AND dead = 0 AND visible_at <= ? ORDER BY visible_at LIMIT ?",
+        )
+        .all(part, now, QUEUE_BATCH);
       if (rows.length === 0) continue;
       // hide the batch so the next tick doesn't re-deliver it while in flight
       const hideUntil = now + 30_000;
@@ -561,9 +626,12 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
             const ids = (value: JsonValue | undefined) => (Array.isArray(value) ? value.filter(isString) : null);
             ack = (parsed && ids(parsed.ack)) ?? ack;
             retry = (parsed && ids(parsed.retry)) ?? [];
-          } catch { /* keep defaults */ }
+          } catch {
+            /* keep defaults */
+          }
         } else {
-          ack = []; retry = rows.map((r) => r.id); // delivery failed → retry all
+          ack = [];
+          retry = rows.map((r) => r.id); // delivery failed → retry all
         }
         const del = store.query("DELETE FROM mq WHERE id = ?");
         for (const id of ack) del.run(id);
@@ -579,15 +647,17 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
     if (bindings.queues.length > 0) timers.push(setInterval(drainQueuesOnce, 500));
     if (bindings.crons.length > 0) {
       let lastTick = "";
-      timers.push(setInterval(() => {
-        const now = new Date();
-        const stamp = `${now.getUTCFullYear()}-${now.getUTCMonth()}-${now.getUTCDate()}-${now.getUTCHours()}-${now.getUTCMinutes()}`;
-        if (stamp === lastTick) return; // once per minute
-        lastTick = stamp;
-        for (const expr of bindings.crons) {
-          if (cronMatches(expr, now)) void deliverTrigger("scheduled", { cron: expr, scheduledTime: now.getTime() });
-        }
-      }, 15_000));
+      timers.push(
+        setInterval(() => {
+          const now = new Date();
+          const stamp = `${now.getUTCFullYear()}-${now.getUTCMonth()}-${now.getUTCDate()}-${now.getUTCHours()}-${now.getUTCMinutes()}`;
+          if (stamp === lastTick) return; // once per minute
+          lastTick = stamp;
+          for (const expr of bindings.crons) {
+            if (cronMatches(expr, now)) void deliverTrigger("scheduled", { cron: expr, scheduledTime: now.getTime() });
+          }
+        }, 15_000),
+      );
     }
   }
 
@@ -610,7 +680,13 @@ export function createBroker(opts: BrokerOptions = {}): Broker {
 export function cronMatches(expr: string, when: Date): boolean {
   const parts = expr.trim().split(/\s+/);
   if (parts.length !== 5) return false;
-  const fields = [when.getUTCMinutes(), when.getUTCHours(), when.getUTCDate(), when.getUTCMonth() + 1, when.getUTCDay()];
+  const fields = [
+    when.getUTCMinutes(),
+    when.getUTCHours(),
+    when.getUTCDate(),
+    when.getUTCMonth() + 1,
+    when.getUTCDay(),
+  ];
   const inField = (spec: string, value: number): boolean =>
     spec.split(",").some((token) => {
       if (token === "*") return true;
@@ -699,5 +775,7 @@ if (import.meta.main) {
     assetsDir: values["assets-dir"],
   });
   const { port } = listen(broker, "127.0.0.1", Number(values.port ?? process.env.SB_BROKER_PORT ?? 0));
-  console.log(`sproutboat broker: 127.0.0.1:${port} db=${values.db ?? ":memory:"} sprout=${values["sprout-url"] ?? process.env.SB_SPROUT_URL ?? "(none)"}`);
+  console.log(
+    `sproutboat broker: 127.0.0.1:${port} db=${values.db ?? ":memory:"} sprout=${values["sprout-url"] ?? process.env.SB_SPROUT_URL ?? "(none)"}`,
+  );
 }

package/src/build.ts

@@ -4,7 +4,14 @@ import { resolve } from "node:path";
 import { walkAssets, type AssetManifest } from "./assets";
 import { resourceRefs, type SproutboatConfig } from "./config";
 import { compileSprout } from "./compile";
-import { ARTIFACT_SCHEMA_VERSION, CAPABILITY_PROFILE, DEPLOY_TARGET, hostTarget, RUNTIME, type ArtifactManifest } from "./manifest";
+import {
+  ARTIFACT_SCHEMA_VERSION,
+  CAPABILITY_PROFILE,
+  DEPLOY_TARGET,
+  hostTarget,
+  RUNTIME,
+  type ArtifactManifest,
+} from "./manifest";
 import { ensureZig, esbuildVersion, porfforVersion, toolchainStamp } from "./toolchain";
 
 export type BuildInput = {
@@ -41,7 +48,7 @@ function digest(value: Uint8Array | string): `sha256:${string}` {
  * does not come up.
  */
 export async function buildArtifact(input: BuildInput): Promise<BuildOutput> {
-  const source = input.source ?? await readFile(input.sourcePath);
+  const source = input.source ?? (await readFile(input.sourcePath));
   const sourceHash = digest(source);
   const artifactId = sourceHash.slice("sha256:".length, 24);
   const artifactDir = resolve(input.projectDir, ".sproutboat/dist", artifactId);
@@ -72,6 +79,11 @@ export async function buildArtifact(input: BuildInput): Promise<BuildOutput> {
     do: Object.entries(input.config.durable_objects ?? {}).map(([binding, className]) => ({ binding, className })),
     crons: input.config.triggers?.crons ?? [],
     assets: input.config.assets?.binding ?? "",
+    // Baked plain values, read as env.NAME. The broker never serves these (they
+    // are compiled in via SPROUTBOAT_VARS_JSON); they ride along so the control
+    // plane can show what a version was built with. Not secret — `secrets` is
+    // that, and it carries names only.
+    vars: input.config.vars ?? {},
     resources,
   };
 
@@ -109,8 +121,10 @@ export async function buildArtifact(input: BuildInput): Promise<BuildOutput> {
   // frozen at v2. The control plane reads this to configure the per-deployment
   // broker (KV / D1 / R2 / queue names, secret names, outbound allowlist, cron
   // schedules, Durable Object classes).
-  const hasBindings = Object.values(bindings).some((value) => Array.isArray(value) && value.length > 0)
-    || Object.keys(bindings.resources).length > 0;
+  const hasBindings =
+    Object.values(bindings).some((value) => Array.isArray(value) && value.length > 0) ||
+    Object.keys(bindings.resources).length > 0 ||
+    Object.keys(bindings.vars).length > 0;
   if (hasBindings) {
     await writeFile(resolve(artifactDir, "bindings.json"), `${JSON.stringify(bindings, null, 2)}\n`);
   }
@@ -121,7 +135,11 @@ export async function buildArtifact(input: BuildInput): Promise<BuildOutput> {
   if (input.config.assets) {
     const srcDir = resolve(input.projectDir, input.config.assets.directory);
     const outDir = resolve(artifactDir, "assets");
-    if (!(await stat(srcDir).then((s) => s.isDirectory()).catch(() => false))) {
+    if (
+      !(await stat(srcDir)
+        .then((s) => s.isDirectory())
+        .catch(() => false))
+    ) {
       throw new Error(`assets.directory "${input.config.assets.directory}" not found — run your site build first`);
     }
     await cp(srcDir, outDir, { recursive: true });

package/src/bundle.ts

@@ -30,7 +30,8 @@ const entryLabel = (entryPath: string, projectDir: string): string => relative(p
 /** Bun reports resolution failures on `AggregateError.errors`; its own message is just "Bundle failed". */
 function bundleDetail(cause: unknown): string {
   const errors = cause instanceof AggregateError ? cause.errors : [];
-  if (errors.length > 0) return errors.map((error) => `  ${error instanceof Error ? error.message : String(error)}`).join("\n");
+  if (errors.length > 0)
+    return errors.map((error) => `  ${error instanceof Error ? error.message : String(error)}`).join("\n");
   return `  ${cause instanceof Error ? cause.message : String(cause)}`;
 }
 

package/src/compile.ts

@@ -51,13 +51,15 @@ export async function compileSprout(input: CompileInput): Promise<void> {
     const haveGit = Bun.which("git");
     const haveMake = Bun.which("make");
     if (haveGit && haveMake) {
-      console.warn(`prebuilt uWebSockets unusable (${error.message.split("\n")[0]}); falling back to git + make (slower, one-time)`);
+      console.warn(
+        `prebuilt uWebSockets unusable (${error.message.split("\n")[0]}); falling back to git + make (slower, one-time)`,
+      );
     } else {
       const missing = [!haveGit && "git", !haveMake && "make"].filter(Boolean).join(" and ");
       throw new Error(
         `${error.message}\n\nThe prebuilt uWebSockets is unusable, and ${missing} ` +
-        `${missing.includes("and") ? "are" : "is"} not on PATH for the fallback build. ` +
-        `Install ${missing}, or set SPROUTBOAT_UWS_TARBALL to a valid archive.`,
+          `${missing.includes("and") ? "are" : "is"} not on PATH for the fallback build. ` +
+          `Install ${missing}, or set SPROUTBOAT_UWS_TARBALL to a valid archive.`,
       );
     }
   }
@@ -95,7 +97,10 @@ export async function compileSprout(input: CompileInput): Promise<void> {
     { cwd: outDir, stdout: "pipe", stderr: "pipe", env: { ...process.env, PATH: path } },
   );
   let timedOut = false;
-  const timer = setTimeout(() => { timedOut = true; child.kill(); }, COMPILE_TIMEOUT_MS);
+  const timer = setTimeout(() => {
+    timedOut = true;
+    child.kill();
+  }, COMPILE_TIMEOUT_MS);
   const [code, stdout, stderr] = await Promise.all([
     child.exited,
     new Response(child.stdout).text(),

package/src/config.ts

@@ -11,7 +11,9 @@ export type ResourceRef = string | ResourceBinding;
 
 /** Normalizes a storage-binding array to `{ binding, id? }` rows. */
 export function resourceRefs(field: readonly ResourceRef[] | undefined): Array<{ binding: string; id?: string }> {
-  return (field ?? []).map((entry) => (isString(entry) ? { binding: entry } : { binding: entry.binding, id: entry.id }));
+  return (field ?? []).map((entry) =>
+    isString(entry) ? { binding: entry } : { binding: entry.binding, id: entry.id },
+  );
 }
 
 /**
@@ -73,9 +75,7 @@ export type AssetsConfig = {
   run_sprout_first?: boolean | string[];
 };
 
-export type ConfigValidation =
-  | { ok: true; value: SproutboatConfig }
-  | { ok: false; errors: string[] };
+export type ConfigValidation = { ok: true; value: SproutboatConfig } | { ok: false; errors: string[] };
 
 type JsonValue = string | number | boolean | null | ConfigJsonObject | JsonValue[];
 
@@ -86,8 +86,7 @@ interface ConfigJsonObject {
 type ConfigInput = JsonValue | undefined;
 
 function isRecord(value: ConfigInput): value is ConfigJsonObject {
-  return value !== null && Object(value) === value && !Array.isArray(value)
-    && !(value instanceof Function);
+  return value !== null && Object(value) === value && !Array.isArray(value) && !(value instanceof Function);
 }
 
 function isString(value: ConfigInput): value is string {
@@ -102,9 +101,21 @@ function validateConfig(value: ConfigInput): ConfigValidation {
   const errors: string[] = [];
   if (!isRecord(value)) return { ok: false, errors: ["config must be an object"] };
   const allowed = new Set([
-    "$schema", "name", "main", "compatibility_date", "vars",
-    "kv_namespaces", "secrets", "outbound", "d1_databases", "r2_buckets",
-    "queues", "analytics_engine_datasets", "durable_objects", "triggers", "assets",
+    "$schema",
+    "name",
+    "main",
+    "compatibility_date",
+    "vars",
+    "kv_namespaces",
+    "secrets",
+    "outbound",
+    "d1_databases",
+    "r2_buckets",
+    "queues",
+    "analytics_engine_datasets",
+    "durable_objects",
+    "triggers",
+    "assets",
   ]);
   for (const key of Object.keys(value)) if (!allowed.has(key)) errors.push(`unsupported config field: ${key}`);
   const name = isString(value.name) && isProjectSlug(value.name) ? value.name : null;
@@ -115,7 +126,10 @@ function validateConfig(value: ConfigInput): ConfigValidation {
   if (main === null) {
     errors.push("main must be a relative entry point under src/");
   }
-  const compatibility_date = isString(value.compatibility_date) && /^\d{4}-\d{2}-\d{2}$/.test(value.compatibility_date) ? value.compatibility_date : null;
+  const compatibility_date =
+    isString(value.compatibility_date) && /^\d{4}-\d{2}-\d{2}$/.test(value.compatibility_date)
+      ? value.compatibility_date
+      : null;
   if (compatibility_date === null) {
     errors.push("compatibility_date must use YYYY-MM-DD");
   }
@@ -127,7 +141,8 @@ function validateConfig(value: ConfigInput): ConfigValidation {
     else {
       vars = {};
       for (const [key, item] of Object.entries(value.vars)) {
-        if (!/^[A-Z][A-Z0-9_]*$/.test(key) || !isString(item)) errors.push(`vars.${key} must be a string environment name`);
+        if (!/^[A-Z][A-Z0-9_]*$/.test(key) || !isString(item))
+          errors.push(`vars.${key} must be a string environment name`);
         else vars[key] = item;
       }
     }
@@ -174,9 +189,14 @@ function validateConfig(value: ConfigInput): ConfigValidation {
       if (isString(entry)) {
         if (bindingName.test(entry)) out.push(entry);
         else errors.push(`${field}: "${entry}" must be an UPPER_SNAKE binding name`);
-      } else if (isRecord(entry) && isString(entry.binding) && isString(entry.id)
-        && bindingName.test(entry.binding) && idPattern.test(entry.id)
-        && Object.keys(entry).every((key) => key === "binding" || key === "id")) {
+      } else if (
+        isRecord(entry) &&
+        isString(entry.binding) &&
+        isString(entry.id) &&
+        bindingName.test(entry.binding) &&
+        idPattern.test(entry.id) &&
+        Object.keys(entry).every((key) => key === "binding" || key === "id")
+      ) {
         out.push({ binding: entry.binding, id: entry.id });
       } else {
         errors.push(`${field} entries must be an UPPER_SNAKE name or { binding: "NAME", id: "${kind}_…" }`);
@@ -189,7 +209,11 @@ function validateConfig(value: ConfigInput): ConfigValidation {
   const outbound = stringArray("outbound", hostPattern, "hostnames");
   // Analytics Engine datasets aren't provisioned — the dataset name springs into
   // existence on first writeDataPoint(), so there's no resource id to bind (#74).
-  const analytics_engine_datasets = stringArray("analytics_engine_datasets", bindingName, "binding names (UPPER_SNAKE_CASE)");
+  const analytics_engine_datasets = stringArray(
+    "analytics_engine_datasets",
+    bindingName,
+    "binding names (UPPER_SNAKE_CASE)",
+  );
   const kv_namespaces = resourceArray("kv_namespaces", "kv");
   const d1_databases = resourceArray("d1_databases", "d1");
   const r2_buckets = resourceArray("r2_buckets", "r2");
@@ -198,7 +222,7 @@ function validateConfig(value: ConfigInput): ConfigValidation {
   let durable_objects: Record<string, string> | undefined;
   if (value.durable_objects !== undefined) {
     if (!isRecord(value.durable_objects)) {
-      errors.push("durable_objects must be an object of { BINDING_NAME: \"ClassName\" }");
+      errors.push('durable_objects must be an object of { BINDING_NAME: "ClassName" }');
     } else {
       durable_objects = {};
       for (const [binding, className] of Object.entries(value.durable_objects)) {
@@ -230,15 +254,24 @@ function validateConfig(value: ConfigInput): ConfigValidation {
       errors.push("assets must be an object with a `directory`");
     } else {
       const raw = value.assets;
-      const dir = isString(raw.directory) && raw.directory.length > 0 && !raw.directory.includes("..")
-        ? raw.directory.replace(/^\.\//, "").replace(/\/$/, "")
-        : null;
+      const dir =
+        isString(raw.directory) && raw.directory.length > 0 && !raw.directory.includes("..")
+          ? raw.directory.replace(/^\.\//, "").replace(/\/$/, "")
+          : null;
       if (dir === null) errors.push("assets.directory must be a project-relative path");
-      const binding = raw.binding === undefined ? undefined
-        : isString(raw.binding) && bindingName.test(raw.binding) ? raw.binding : null;
+      const binding =
+        raw.binding === undefined
+          ? undefined
+          : isString(raw.binding) && bindingName.test(raw.binding)
+            ? raw.binding
+            : null;
       if (binding === null) errors.push("assets.binding must be a binding name (UPPER_SNAKE_CASE)");
-      const nfh = raw.not_found_handling === "none" || raw.not_found_handling === "single-page-application"
-        || raw.not_found_handling === "404-page" ? raw.not_found_handling : undefined;
+      const nfh =
+        raw.not_found_handling === "none" ||
+        raw.not_found_handling === "single-page-application" ||
+        raw.not_found_handling === "404-page"
+          ? raw.not_found_handling
+          : undefined;
       if (raw.not_found_handling !== undefined && nfh === undefined) {
         errors.push('assets.not_found_handling must be "none", "single-page-application", or "404-page"');
       }
@@ -259,16 +292,22 @@ function validateConfig(value: ConfigInput): ConfigValidation {
     }
   }
 
-  const resourceNames = (refs: ResourceRef[] | undefined): string[] =>
-    resourceRefs(refs).map((ref) => ref.binding);
+  const resourceNames = (refs: ResourceRef[] | undefined): string[] => resourceRefs(refs).map((ref) => ref.binding);
   const bindingSlots = [
-    ...resourceNames(kv_namespaces), ...(secrets ?? []), ...resourceNames(d1_databases), ...resourceNames(r2_buckets),
-    ...resourceNames(queues), ...(analytics_engine_datasets ?? []), ...Object.keys(durable_objects ?? {}), ...Object.keys(vars ?? {}),
+    ...resourceNames(kv_namespaces),
+    ...(secrets ?? []),
+    ...resourceNames(d1_databases),
+    ...resourceNames(r2_buckets),
+    ...resourceNames(queues),
+    ...(analytics_engine_datasets ?? []),
+    ...Object.keys(durable_objects ?? {}),
+    ...Object.keys(vars ?? {}),
     ...(assets?.binding ? [assets.binding] : []),
   ];
   if (new Set(bindingSlots).size !== bindingSlots.length) errors.push("vars and binding names must not collide");
 
-  if (errors.length || name === null || main === null || compatibility_date === null || schema === null) return { ok: false, errors };
+  if (errors.length || name === null || main === null || compatibility_date === null || schema === null)
+    return { ok: false, errors };
   const config: SproutboatConfig = { name, main, compatibility_date };
   if ("$schema" in value) config.$schema = schema;
   if ("vars" in value) config.vars = vars;
@@ -307,6 +346,9 @@ export function parseConfig(source: string): ConfigValidation {
     json = json.replace(/,\s*([}\]])/g, "$1");
     return validateConfig(JSON.parse(json));
   } catch (error) {
-    return { ok: false, errors: [`invalid sproutboat.jsonc: ${error instanceof Error ? error.message : String(error)}`] };
+    return {
+      ok: false,
+      errors: [`invalid sproutboat.jsonc: ${error instanceof Error ? error.message : String(error)}`],
+    };
   }
 }