sproutboat 0.4.6 → 0.4.7

package/SURFACE.md

@@ -3,7 +3,7 @@
 > Generated by `src/surface.test.ts` from `src/surface.ts` + the pinned
 > toolchain constants. Do not edit by hand — run `UPDATE_SURFACE=1 bun test`.
 
-**Package:** `sproutboat` 0.4.6 · runs on Bun (use `bunx`, not `npx`)
+**Package:** `sproutboat` 0.4.7 · runs on Bun (use `bunx`, not `npx`)
 
 ## Commands
 
@@ -12,7 +12,7 @@
 | `init` | `[name]` | Scaffold sproutboat.jsonc + src/index.js in ./<name>. |
 | `check` | `[project-dir]` | Validate the config and entry point without building. |
 | `build` | `[project-dir]` | Cross-compile the native-fetch sprout (Porffor + Zig). |
-| `deploy` | `[project-dir] [--dry-run] [--artifact <dir>] [--no-wait]` | Build (unless --artifact), print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check. |
+| `deploy` | `[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision]` | Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores. |
 | `versions` | `list [project-dir]` | List the project's deployed versions. |
 | `rollback` | `<version-id> [project-dir]` | Re-activate a previous version. |
 | `tail` | `[project-dir] [--sprout]` | Print recent request logs; --sprout prints the running sprout + broker stdout/stderr instead. |
@@ -23,7 +23,7 @@
 | `login` | `[--api-url <url>] [--token <token>]` | Device-code browser flow, or store <token> for <url> directly. |
 
 ```
-usage: sproutboat <init [name] | check [project-dir] | build [project-dir] | deploy [project-dir] [--dry-run] [--artifact <dir>] [--no-wait] | versions list [project-dir] | rollback <version-id> [project-dir] | tail [project-dir] [--sprout] | domains [list | add <host> | verify <host> | rm <host>] [project-dir] | secrets [list | set <NAME> [value] | rm <NAME>] [project-dir] | resource [list [kind] | create <kind> <name> | rename <id> <name> | delete <id>] | delete [project-dir] [--name <project>] --yes | login [--api-url <url>] [--token <token>]>
+usage: sproutboat <init [name] | check [project-dir] | build [project-dir] | deploy [project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision] | versions list [project-dir] | rollback <version-id> [project-dir] | tail [project-dir] [--sprout] | domains [list | add <host> | verify <host> | rm <host>] [project-dir] | secrets [list | set <NAME> [value] | rm <NAME>] [project-dir] | resource [list [kind] | create <kind> <name> | rename <id> <name> | delete <id>] | delete [project-dir] [--name <project>] --yes | login [--api-url <url>] [--token <token>]>
 ```
 
 ## Environment variables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sproutboat",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Wrangler-shaped CLI for Sproutboat. Deploys workers to any control plane via --api-url / SPROUTBOAT_API_URL.",
   "license": "MIT",
   "type": "module",

package/src/config.ts

@@ -14,6 +14,26 @@ export function resourceRefs(field: readonly ResourceRef[] | undefined): Array<{
   return (field ?? []).map((entry) => (isString(entry) ? { binding: entry } : { binding: entry.binding, id: entry.id }));
 }
 
+/**
+ * Rewrite a bare `"BINDING"` token inside `<field>: [ … ]` to
+ * `{ "binding": "BINDING", "id": "<id>" }`, leaving the rest of the source
+ * (comments, spacing) untouched — used by `deploy`'s auto-provisioner to pin an
+ * id back into `sproutboat.jsonc`. Binding names are UPPER_SNAKE, so a plain
+ * `"BINDING"` match inside the array is unambiguous. No-op if not found.
+ */
+export function pinBindingId(source: string, field: string, binding: string, id: string): string {
+  const array = new RegExp(`("${field}"\\s*:\\s*\\[)([\\s\\S]*?)(\\])`);
+  // the bare token must be a whole array element — at the start of the array or
+  // right after a comma — never `"binding": "NAME"` inside an already-pinned
+  // { … } object.
+  const element = new RegExp(`(^\\s*|,\\s*)"${binding}"(\\s*,|\\s*$)`);
+  return source.replace(array, (whole, open: string, inner: string, close: string) =>
+    element.test(inner)
+      ? open + inner.replace(element, `$1{ "binding": "${binding}", "id": "${id}" }$2`) + close
+      : whole,
+  );
+}
+
 export type SproutboatConfig = {
   $schema?: string;
   name: string;

package/src/main.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { basename, resolve } from "node:path";
-import { parseConfig, type SproutboatConfig } from "./config";
+import { parseConfig, pinBindingId, resourceRefs, type SproutboatConfig } from "./config";
 import { validateHttpSyncSource } from "./source";
 import { buildArtifact } from "./build";
 import { validateManifest, type ArtifactManifest } from "./manifest";
@@ -177,6 +177,52 @@ async function build(directory?: string) {
   return { project, artifact };
 }
 
+const PROVISION_FIELDS = [
+  ["kv_namespaces", "kv"],
+  ["d1_databases", "d1"],
+  ["r2_buckets", "r2"],
+  ["queues", "queue"],
+] as const;
+
+/**
+ * #74 auto-provisioning, wrangler-style. A bare-string KV/D1/R2/queue binding
+ * with no id gets an account-level resource created (`<project>-<binding>`) on
+ * deploy, and the id is written back into `sproutboat.jsonc`. `--no-provision`
+ * skips this — those bindings then get an ephemeral deploy-scoped store.
+ */
+async function provisionBindings(directory = process.cwd()): Promise<void> {
+  const configPath = resolve(directory, "sproutboat.jsonc");
+  let source = await readFile(configPath, "utf8");
+  const parsed = parseConfig(source);
+  if (!parsed.ok) return; // build() re-reads and reports the config error
+
+  const bare: Array<{ field: string; kind: string; binding: string }> = [];
+  for (const [field, kind] of PROVISION_FIELDS) {
+    for (const ref of resourceRefs(parsed.value[field])) {
+      if (!ref.id) bare.push({ field, kind, binding: ref.binding });
+    }
+  }
+  if (bare.length === 0) return;
+
+  const { apiUrl, token } = await apiCredentials();
+  for (const { field, kind, binding } of bare) {
+    const name = `${parsed.value.name}-${binding.toLowerCase().replace(/_/g, "-")}`;
+    const body = await responseText(
+      await fetch(`${apiUrl}/api/resources`, {
+        method: "POST",
+        headers: { "x-api-key": token, "content-type": "application/json" },
+        body: JSON.stringify({ kind, name, ifExists: "return" }),
+      }),
+      `could not provision a ${kind} resource for env.${binding}`,
+    );
+    const record = jsonObject(jsonObject(parseJsonValue(body))?.resource ?? null);
+    if (!record || !isString(record.id)) fail(`provision response for env.${binding} was not a resource`);
+    source = pinBindingId(source, field, binding, record.id);
+    console.log(ok(`provisioned ${kind} ${bold(name)} → ${record.id}`));
+  }
+  await writeFile(configPath, source);
+}
+
 async function deploy(args: string[]) {
   const artifactIndex = args.indexOf("--artifact");
   const dryRun = args.includes("--dry-run");
@@ -190,6 +236,9 @@ async function deploy(args: string[]) {
       : usageError("deploy: --artifact needs a directory", "deploy [project-dir] [--dry-run] [--artifact <dir>] [--no-wait]");
     projectName = "";
   } else {
+    // wrangler-style: create resources for id-less bindings and pin the ids
+    // back into sproutboat.jsonc before the build bakes them into the artifact.
+    if (!args.includes("--no-provision") && !dryRun) await provisionBindings(directory);
     const built = await build(directory);
     projectName = built.project.config.name;
     artifactDir = built.artifact.artifactDir;

package/src/report.ts

@@ -35,7 +35,7 @@ function bindingRows(config: SproutboatConfig): string[][] {
   };
   const resourceList = (refs: Parameters<typeof resourceRefs>[0], type: string) => {
     for (const ref of resourceRefs(refs)) {
-      rows.push([`env.${ref.binding}`, type, ref.id ?? "no id — local dev only, a deploy needs `sproutboat resource create`"]);
+      rows.push([`env.${ref.binding}`, type, ref.id ?? "deploy-scoped store (--no-provision) — drop the flag to auto-provision a persistent resource"]);
     }
   };
   resourceList(config.kv_namespaces, "kv");

package/src/surface.ts

@@ -31,8 +31,8 @@ export const COMMANDS: readonly Command[] = [
     summary: "Cross-compile the native-fetch sprout (Porffor + Zig)." },
 
   { name: "deploy", group: "Ship", emoji: "🚀",
-    args: "[project-dir] [--dry-run] [--artifact <dir>] [--no-wait]", brief: "[project-dir] [--dry-run]",
-    summary: "Build (unless --artifact), print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check." },
+    args: "[project-dir] [--dry-run] [--artifact <dir>] [--no-wait] [--no-provision]", brief: "[project-dir] [--dry-run]",
+    summary: "Build (unless --artifact), auto-provision id-less storage bindings and pin their ids into sproutboat.jsonc, print the report, upload, wait until the URL serves. --dry-run stops before upload; --no-wait skips the health check; --no-provision leaves id-less bindings as ephemeral deploy-scoped stores." },
   { name: "versions", group: "Ship", emoji: "📜", args: "list [project-dir]",
     summary: "List the project's deployed versions." },
   { name: "rollback", group: "Ship", emoji: "⏮", args: "<version-id> [project-dir]", brief: "<version-id>",