@smoothbricks/cli 0.9.0 → 0.10.0

package/dist/wrangler/prepare-env.d.ts

@@ -1,26 +1,33 @@
 export declare function isRecord(v: unknown): v is Record<string, unknown>;
-/** First `[env.<name>]` header, or `null` when the config declares no envs (top-level bindings only). */
+/** First `[env.<name>]` (source order; also derived from a nested `[env.<name>.*]`), or null when no env declared. */
 export declare function firstWranglerEnv(toml: string): string | null;
-/** True if the toml declares `[env.<env>]`. */
+/** True if the toml declares `[env.<env>]` (or any `[env.<env>.*]` sub-table). */
 export declare function hasEnvBlock(toml: string, env: string): boolean;
 /** A `[env.<env>.vars]` value, or null if unset/empty. Reads committed public config. */
 export declare function getVar(toml: string, env: string, name: string): string | null;
-/** Set a `[env.<env>.vars]` value, preserving any trailing comment. Throws if the key isn't present (scaffold first). */
+/** Set a `[env.<env>.vars]` value (JSON-encoded), preserving any trailing comment. Throws if the key is absent (scaffold first). */
 export declare function setVar(toml: string, env: string, name: string, value: string): string;
 /** The id written for `[[env.<env>.kv_namespaces]]` binding, or null if absent/empty. */
 export declare function getKvId(toml: string, env: string, binding: string): string | null;
-/** Rewrite the `id = ...` line of the `[[env.<env>.kv_namespaces]]` table whose binding matches. Throws if absent. */
+/** Rewrite the `id = ...` line (value + trailing comment) of the kv_namespaces table whose binding matches. Throws if absent. */
 export declare function setKvId(toml: string, env: string, binding: string, id: string, title: string): string;
 /**
- * Append a copy of the whole `[env.<from>]` … block-group (every `[env.<from>...]`
- * table up to the next non-`from` env or EOF) rewritten for `<to>`. Returns the new
- * toml. Throws if `<from>` is absent or `<to>` already exists (blank/fill instead).
+ * Append a copy of every `[env.<from>...]` table rewritten for `<to>` (headers
+ * only — values copied verbatim). Throws if `<from>` is absent or `<to>` exists.
  */
 export declare function cloneEnvBlock(toml: string, from: string, to: string): string;
-/** Blank every `NAME = "..."` under `[env.<env>.vars]` whose key is in `keys` (env-specific values to re-fill). */
+/** Blank the named `[env.<env>.vars]` values to `""` (preserving comments), skipping absent keys. */
 export declare function blankEnvVars(toml: string, env: string, keys: string[]): string;
-/** Blank every `id = ...` line under the env's `[[env.<env>.kv_namespaces]]` tables (per-env resource ids). */
+/** Blank every kv_namespaces `id` under the env to `""` (drops trailing comment; binding/name survive). */
 export declare function blankKvIds(toml: string, env: string): string;
+/** The database_id written for `[[env.<env>.d1_databases]]` binding, or null if absent/empty. */
+export declare function getD1Id(toml: string, env: string, binding: string): string | null;
+/** The `database_name` for `[[env.<env>.d1_databases]]` binding, or null. Source of truth for which DB to create/reuse. */
+export declare function getD1Name(toml: string, env: string, binding: string): string | null;
+/** Rewrite the `database_id = ...` line (value + trailing comment) of the d1 table whose binding matches; the name line is untouched. Throws if absent. */
+export declare function setD1Id(toml: string, env: string, binding: string, id: string, name: string): string;
+/** Blank every d1 `database_id` under the env to `""` (drops trailing comment; binding/name survive). */
+export declare function blankD1Ids(toml: string, env: string): string;
 /** Parse-guard: throws if `toml` no longer parses, so a bad edit can't be written to disk. */
 export declare function assertToml(toml: string): void;
 /** Persist a toml string after confirming it still parses. */
@@ -28,6 +35,8 @@ export declare function saveToml(path: string, toml: string): void;
 export interface Manifest {
     /** KV binding names declared under `[[env.<env>.kv_namespaces]]` (resources to provision). */
     kvBindings: string[];
+    /** D1 binding names declared under `[[env.<env>.d1_databases]]` (resources to provision). */
+    d1Bindings: string[];
     /** Public var names declared in `[env.<env>.vars]` (committed config). */
     vars: string[];
     /** Secret names declared in `.dev.vars.example` (values live on the worker, never in the repo). */
@@ -61,6 +70,18 @@ export declare function listNamespaces(cwd: string): Promise<KvNamespace[]>;
  * so we re-list rather than scrape. Returns the id, or null on failure.
  */
 export declare function ensureNamespace(logical: string, existing: KvNamespace[], cwd: string): Promise<string | null>;
+export interface D1Database {
+    uuid: string;
+    name: string;
+}
+/** Live D1 databases on the account (`d1 list --json`); `[]` when offline/unauthenticated. */
+export declare function listD1Databases(cwd: string): Promise<D1Database[]>;
+/**
+ * Reuse the D1 database whose name matches, else create it. The uuid comes from
+ * the structured `list` JSON (create prints freeform text), so we re-list rather
+ * than scrape. Returns the uuid, or null on failure.
+ */
+export declare function ensureD1Database(name: string, existing: D1Database[], cwd: string): Promise<string | null>;
 /** Current secret names on the worker for `env`; `[]` when none/unreachable (Cloudflare allows setting pre-deploy). */
 export declare function listSecretNames(env: string, cwd: string): Promise<string[]>;
 /** `wrangler secret put <name> --env <env>` piping `value` on stdin (never a CLI arg). Returns success. */

package/dist/wrangler/prepare-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-env.d.ts","sourceRoot":"","sources":["../../src/wrangler/prepare-env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-env.d.ts","sourceRoot":"","sources":["../../src/wrangler/prepare-env.ts"],"names":[],"mappings":"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"}

package/dist/wrangler/prepare-env.js

@@ -19,23 +19,68 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { $ } from 'bun';
-import { parse } from 'smol-toml';
-// ── runtime narrowing (wrangler JSON + parsed toml are external data — no casts) ─
+import { getStaticTOMLValue, parseTOML } from 'toml-eslint-parser';
+// ── runtime narrowing (wrangler JSON is external data — no casts) ─────────────
 export function isRecord(v) {
     return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
-function escapeRe(s) {
-    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+// ── wrangler.toml editors (CST: read via getStaticTOMLValue, write via
+// node-range splice — comment/format-preserving by construction, no regex) ─────
+/** All top-level tables (`[env.x]`, `[env.x.vars]`, `[[env.x.d1_databases]]`, …) — each carries `resolvedKey` (incl. array index). */
+function tables(toml) {
+    return parseTOML(toml).body[0].body.filter((n) => n.type === 'TOMLTable');
 }
-// ── pure wrangler.toml editors (no I/O — unit-testable) ──────────────────────
-/** First `[env.<name>]` header, or `null` when the config declares no envs (top-level bindings only). */
+/** Whole doc as a JS object (comments/format dropped — reads only). */
+function tomlValue(toml) {
+    const value = getStaticTOMLValue(parseTOML(toml));
+    return isRecord(value) ? value : {};
+}
+function envRecord(toml, env) {
+    const envs = tomlValue(toml).env;
+    const block = isRecord(envs) ? envs[env] : undefined;
+    return isRecord(block) ? block : null;
+}
+function sameKey(a, b) {
+    return a.length === b.length && a.every((x, i) => x === b[i]);
+}
+/** The `key = value` node named `key` in a table (single-segment keys; matched by source text). */
+function kvIn(toml, table, key) {
+    for (const kv of table.body) {
+        if (toml.slice(kv.key.range[0], kv.key.range[1]).trim() === key)
+            return kv;
+    }
+    return null;
+}
+/** The `<field>` KV of the `[[env.<env>.<arrayKey>]]` table whose `binding` matches, or null. */
+function arrayTableKv(toml, env, arrayKey, binding, field) {
+    const block = envRecord(toml, env);
+    const rows = isRecord(block) && Array.isArray(block[arrayKey]) ? block[arrayKey] : [];
+    const index = rows.findIndex((r) => isRecord(r) && r.binding === binding);
+    if (index < 0)
+        return null;
+    const table = tables(toml).find((t) => t.kind === 'array' && sameKey(t.resolvedKey, ['env', env, arrayKey, index]));
+    return table ? kvIn(toml, table, field) : null;
+}
+function splice(toml, start, end, text) {
+    return toml.slice(0, start) + text + toml.slice(end);
+}
+/** End of the physical line containing `offset` (exclusive of the newline). */
+function endOfLine(toml, offset) {
+    const nl = toml.indexOf('\n', offset);
+    return nl === -1 ? toml.length : nl;
+}
+/** First `[env.<name>]` (source order; also derived from a nested `[env.<name>.*]`), or null when no env declared. */
 export function firstWranglerEnv(toml) {
-    const match = toml.match(/^\s*\[env\.([A-Za-z0-9_-]+)/m);
-    return match ? match[1] : null;
+    const envs = tomlValue(toml).env;
+    if (!isRecord(envs))
+        return null;
+    const [first] = Object.keys(envs);
+    return first ?? null;
 }
-/** True if the toml declares `[env.<env>]`. */
+/** True if the toml declares `[env.<env>]` (or any `[env.<env>.*]` sub-table). */
 export function hasEnvBlock(toml, env) {
-    return new RegExp(`^\\[env\\.${escapeRe(env)}\\]`, 'm').test(toml);
+    const envs = tomlValue(toml).env;
+    return isRecord(envs) && env in envs;
 }
 /** A `[env.<env>.vars]` value, or null if unset/empty. Reads committed public config. */
 export function getVar(toml, env, name) {
@@ -44,95 +89,118 @@ export function getVar(toml, env, name) {
     const value = vars[name];
     return typeof value === 'string' && value ? value : null;
 }
-/** Set a `[env.<env>.vars]` value, preserving any trailing comment. Throws if the key isn't present (scaffold first). */
+/** Set a `[env.<env>.vars]` value (JSON-encoded), preserving any trailing comment. Throws if the key is absent (scaffold first). */
 export function setVar(toml, env, name, value) {
-    const re = new RegExp(`(\\[env\\.${escapeRe(env)}\\.vars\\][\\s\\S]*?\\n${escapeRe(name)} = )"[^"]*"`);
-    if (!re.test(toml)) {
+    const table = tables(toml).find((t) => sameKey(t.resolvedKey, ['env', env, 'vars']));
+    const kv = table ? kvIn(toml, table, name) : null;
+    if (!kv)
         throw new Error(`vars key "${name}" not found under [env.${env}.vars]`);
-    }
-    return toml.replace(re, (_m, prefix) => `${prefix}${JSON.stringify(value)}`);
+    return splice(toml, kv.value.range[0], kv.value.range[1], JSON.stringify(value));
 }
 /** The id written for `[[env.<env>.kv_namespaces]]` binding, or null if absent/empty. */
 export function getKvId(toml, env, binding) {
     const block = envRecord(toml, env);
     const rows = isRecord(block) && Array.isArray(block.kv_namespaces) ? block.kv_namespaces : [];
     for (const row of rows) {
-        if (isRecord(row) && row.binding === binding && typeof row.id === 'string') {
+        if (isRecord(row) && row.binding === binding && typeof row.id === 'string')
             return row.id || null;
-        }
     }
     return null;
 }
-/** Rewrite the `id = ...` line of the `[[env.<env>.kv_namespaces]]` table whose binding matches. Throws if absent. */
+/** Rewrite the `id = ...` line (value + trailing comment) of the kv_namespaces table whose binding matches. Throws if absent. */
 export function setKvId(toml, env, binding, id, title) {
-    const re = new RegExp(`(\\[\\[env\\.${escapeRe(env)}\\.kv_namespaces\\]\\]\\s*\\n\\s*binding = "${escapeRe(binding)}"\\s*\\n\\s*id = )[^\\n]*`);
-    if (!re.test(toml)) {
+    const kv = arrayTableKv(toml, env, 'kv_namespaces', binding, 'id');
+    if (!kv)
         throw new Error(`kv_namespaces binding "${binding}" not found under [env.${env}]`);
-    }
-    return toml.replace(re, `$1"${id}" # ${title}`);
+    return splice(toml, kv.value.range[0], endOfLine(toml, kv.value.range[1]), `${JSON.stringify(id)} # ${title}`);
 }
 /**
- * Append a copy of the whole `[env.<from>]` … block-group (every `[env.<from>...]`
- * table up to the next non-`from` env or EOF) rewritten for `<to>`. Returns the new
- * toml. Throws if `<from>` is absent or `<to>` already exists (blank/fill instead).
+ * Append a copy of every `[env.<from>...]` table rewritten for `<to>` (headers
+ * only — values copied verbatim). Throws if `<from>` is absent or `<to>` exists.
  */
 export function cloneEnvBlock(toml, from, to) {
     if (!hasEnvBlock(toml, from))
         throw new Error(`source [env.${from}] not found`);
     if (hasEnvBlock(toml, to))
         throw new Error(`target [env.${to}] already exists — blank/fill it instead`);
-    const lines = toml.split('\n');
-    const isFromHeader = (l) => new RegExp(`^\\[+env\\.${escapeRe(from)}(\\.|\\])`).test(l);
-    const isAnyEnvHeader = (l) => /^\[+env\.[A-Za-z0-9_-]+(\.|\])/.test(l);
-    const out = [];
-    let capturing = false;
-    for (const line of lines) {
-        if (isFromHeader(line)) {
-            capturing = true;
-            out.push(line);
-        }
-        else if (capturing && isAnyEnvHeader(line) && !isFromHeader(line)) {
-            capturing = false; // a different env began — stop
-        }
-        else if (capturing) {
-            out.push(line);
-        }
-    }
-    const cloned = out
-        .map((l) => l.replace(new RegExp(`(\\[+env\\.)${escapeRe(from)}(\\.|\\])`, 'g'), `$1${to}$2`))
-        .join('\n');
-    return `${toml.replace(/\s*$/, '')}\n\n${cloned}\n`;
+    const cloned = tables(toml)
+        .filter((t) => t.resolvedKey[0] === 'env' && t.resolvedKey[1] === from)
+        .map((t) => {
+        const seg = t.key.keys[1].range; // the `<from>` segment of this table's header
+        const text = toml.slice(t.range[0], t.range[1]);
+        return text.slice(0, seg[0] - t.range[0]) + to + text.slice(seg[1] - t.range[0]);
+    });
+    return `${toml.replace(/\s*$/, '')}\n\n${cloned.join('\n\n')}\n`;
 }
-/** Blank every `NAME = "..."` under `[env.<env>.vars]` whose key is in `keys` (env-specific values to re-fill). */
+/** Blank the named `[env.<env>.vars]` values to `""` (preserving comments), skipping absent keys. */
 export function blankEnvVars(toml, env, keys) {
-    let out = toml;
-    for (const key of keys) {
-        const re = new RegExp(`(\\[env\\.${escapeRe(env)}\\.vars\\][\\s\\S]*?\\n${escapeRe(key)} = )"[^"]*"`);
-        if (re.test(out))
-            out = out.replace(re, '$1""');
-    }
-    return out;
+    const table = tables(toml).find((t) => sameKey(t.resolvedKey, ['env', env, 'vars']));
+    if (!table)
+        return toml;
+    const edits = keys
+        .map((key) => kvIn(toml, table, key))
+        .flatMap((kv) => (kv ? [{ start: kv.value.range[0], end: kv.value.range[1] }] : []));
+    return applyBlanks(toml, edits);
 }
-/** Blank every `id = ...` line under the env's `[[env.<env>.kv_namespaces]]` tables (per-env resource ids). */
+/** Blank every kv_namespaces `id` under the env to `""` (drops trailing comment; binding/name survive). */
 export function blankKvIds(toml, env) {
-    const re = new RegExp(`(\\[\\[env\\.${escapeRe(env)}\\.kv_namespaces\\]\\]\\s*\\n\\s*binding = "[^"]*"\\s*\\n\\s*id = )[^\\n]*`, 'g');
-    return toml.replace(re, '$1""');
+    return blankArrayField(toml, env, 'kv_namespaces', 'id');
+}
+/** The database_id written for `[[env.<env>.d1_databases]]` binding, or null if absent/empty. */
+export function getD1Id(toml, env, binding) {
+    const block = envRecord(toml, env);
+    const rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+    for (const row of rows) {
+        if (isRecord(row) && row.binding === binding && typeof row.database_id === 'string')
+            return row.database_id || null;
+    }
+    return null;
+}
+/** The `database_name` for `[[env.<env>.d1_databases]]` binding, or null. Source of truth for which DB to create/reuse. */
+export function getD1Name(toml, env, binding) {
+    const block = envRecord(toml, env);
+    const rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+    for (const row of rows) {
+        if (isRecord(row) && row.binding === binding && typeof row.database_name === 'string')
+            return row.database_name || null;
+    }
+    return null;
+}
+/** Rewrite the `database_id = ...` line (value + trailing comment) of the d1 table whose binding matches; the name line is untouched. Throws if absent. */
+export function setD1Id(toml, env, binding, id, name) {
+    const kv = arrayTableKv(toml, env, 'd1_databases', binding, 'database_id');
+    if (!kv)
+        throw new Error(`d1_databases binding "${binding}" not found under [env.${env}]`);
+    return splice(toml, kv.value.range[0], endOfLine(toml, kv.value.range[1]), `${JSON.stringify(id)} # ${name}`);
+}
+/** Blank every d1 `database_id` under the env to `""` (drops trailing comment; binding/name survive). */
+export function blankD1Ids(toml, env) {
+    return blankArrayField(toml, env, 'd1_databases', 'database_id');
+}
+/** Blank one field across every `[[env.<env>.<arrayKey>]]` table (value..EOL -> `""`). */
+function blankArrayField(toml, env, arrayKey, field) {
+    const edits = tables(toml)
+        .filter((t) => t.kind === 'array' && t.resolvedKey[0] === 'env' && t.resolvedKey[1] === env && t.resolvedKey[2] === arrayKey)
+        .map((t) => kvIn(toml, t, field))
+        .flatMap((kv) => (kv ? [{ start: kv.value.range[0], end: endOfLine(toml, kv.value.range[1]) }] : []));
+    return applyBlanks(toml, edits);
+}
+/** Apply `""` at each range, descending so earlier offsets stay valid. */
+function applyBlanks(toml, edits) {
+    let out = toml;
+    for (const e of [...edits].sort((a, b) => b.start - a.start))
+        out = splice(out, e.start, e.end, '""');
+    return out;
 }
 /** Parse-guard: throws if `toml` no longer parses, so a bad edit can't be written to disk. */
 export function assertToml(toml) {
-    parse(toml);
+    parseTOML(toml);
 }
 /** Persist a toml string after confirming it still parses. */
 export function saveToml(path, toml) {
     assertToml(toml);
     writeFileSync(path, toml);
 }
-function envRecord(toml, env) {
-    const parsed = parse(toml);
-    const envs = isRecord(parsed) && isRecord(parsed.env) ? parsed.env : {};
-    const block = envs[env];
-    return isRecord(block) ? block : null;
-}
 /** Secret NAMES from a `.dev.vars.example` file (KEY=... / KEY="..."), ignoring comments/blanks. */
 export function parseDevVarsExample(text) {
     const names = [];
@@ -158,9 +226,11 @@ export function readManifest(root, env) {
     const vars = Object.keys(varsRec);
     const kvRows = isRecord(block) && Array.isArray(block.kv_namespaces) ? block.kv_namespaces : [];
     const kvBindings = kvRows.flatMap((row) => (isRecord(row) && typeof row.binding === 'string' ? [row.binding] : []));
+    const d1Rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+    const d1Bindings = d1Rows.flatMap((row) => (isRecord(row) && typeof row.binding === 'string' ? [row.binding] : []));
     const examplePath = join(root, '.dev.vars.example');
     const secrets = existsSync(examplePath) ? parseDevVarsExample(readFileSync(examplePath, 'utf8')) : [];
-    return { kvBindings, vars, secrets };
+    return { kvBindings, d1Bindings, vars, secrets };
 }
 // ── PEM (a standard, reusable) ───────────────────────────────────────────────
 /** True if `value` looks like a PEM block (any `-----BEGIN ...-----`). */
@@ -232,6 +302,46 @@ export async function ensureNamespace(logical, existing, cwd) {
 async function reList(logical, cwd) {
     return (await listNamespaces(cwd)).find((n) => n.title === logical)?.id ?? null;
 }
+function asD1Databases(json) {
+    if (!Array.isArray(json))
+        return [];
+    const out = [];
+    for (const row of json) {
+        if (isRecord(row) && typeof row.uuid === 'string' && typeof row.name === 'string') {
+            out.push({ uuid: row.uuid, name: row.name });
+        }
+    }
+    return out;
+}
+/** Live D1 databases on the account (`d1 list --json`); `[]` when offline/unauthenticated. */
+export async function listD1Databases(cwd) {
+    try {
+        return asD1Databases(await $ `bunx wrangler d1 list --json`.cwd(cwd).quiet().json());
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Reuse the D1 database whose name matches, else create it. The uuid comes from
+ * the structured `list` JSON (create prints freeform text), so we re-list rather
+ * than scrape. Returns the uuid, or null on failure.
+ */
+export async function ensureD1Database(name, existing, cwd) {
+    const match = existing.find((d) => d.name === name);
+    if (match)
+        return match.uuid;
+    try {
+        await $ `bunx wrangler d1 create ${name}`.cwd(cwd).quiet();
+    }
+    catch (err) {
+        return errText(err).includes('already') ? reListD1(name, cwd) : null;
+    }
+    return reListD1(name, cwd);
+}
+async function reListD1(name, cwd) {
+    return (await listD1Databases(cwd)).find((d) => d.name === name)?.uuid ?? null;
+}
 /** Current secret names on the worker for `env`; `[]` when none/unreachable (Cloudflare allows setting pre-deploy). */
 export async function listSecretNames(env, cwd) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smoothbricks/cli",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "type": "module",
   "description": "SmoothBricks monorepo automation CLI",
   "bin": {
@@ -58,7 +58,7 @@
     "publint": "^0.3.18",
     "semver": "^7.7.4",
     "sherif": "^1.11.1",
-    "smol-toml": "^1.6.1",
+    "toml-eslint-parser": "^1.0.3",
     "tslib": "^2.8.1"
   },
   "devDependencies": {

package/src/wrangler/prepare-env.test.ts

@@ -4,10 +4,13 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import {
   assertToml,
+  blankD1Ids,
   blankEnvVars,
   blankKvIds,
   cloneEnvBlock,
   firstWranglerEnv,
+  getD1Id,
+  getD1Name,
   getKvId,
   getVar,
   hasEnvBlock,
@@ -16,6 +19,7 @@ import {
   parseDevVarsExample,
   readManifest,
   readPemFile,
+  setD1Id,
   setKvId,
   setVar,
 } from './prepare-env.js';
@@ -161,6 +165,81 @@ describe('blankEnvVars / blankKvIds', () => {
   });
 });
 
+// D1 shell-outs (listD1Databases / ensureD1Database) invoke `bunx wrangler d1`
+// against a live account and are integration-only — deliberately not exercised.
+
+describe('getD1Id / getD1Name', () => {
+  const toml =
+    '[env.staging]\n\n' +
+    '[[env.staging.d1_databases]]\nbinding = "DB"\ndatabase_id = "abc123"\ndatabase_name = "app-staging-db"\n\n' +
+    '[env.production]\n\n' +
+    '[[env.production.d1_databases]]\nbinding = "DB"\ndatabase_id = ""\ndatabase_name = "app-db"\n';
+
+  it('reads the id for a matching binding and null for empty id, absent binding, and absent env', () => {
+    expect(getD1Id(toml, 'staging', 'DB')).toBe('abc123');
+    expect(getD1Id(toml, 'production', 'DB')).toBeNull(); // production id is ""
+    expect(getD1Id(toml, 'staging', 'MISSING')).toBeNull(); // absent binding
+    expect(getD1Id(toml, 'qa', 'DB')).toBeNull(); // absent env
+  });
+
+  it('reads the database_name for a matching binding and null when the binding or env is absent', () => {
+    expect(getD1Name(toml, 'staging', 'DB')).toBe('app-staging-db');
+    expect(getD1Name(toml, 'production', 'DB')).toBe('app-db'); // present even though its id is blank
+    expect(getD1Name(toml, 'staging', 'MISSING')).toBeNull();
+    expect(getD1Name(toml, 'qa', 'DB')).toBeNull();
+  });
+});
+
+describe('setD1Id', () => {
+  const toml =
+    '[[env.staging.d1_databases]]\nbinding = "DB"\ndatabase_id = ""\ndatabase_name = "app-staging-db"\n\n' +
+    '[[env.staging.d1_databases]]\nbinding = "ANALYTICS"\ndatabase_id = ""\ndatabase_name = "app-staging-analytics"\n\n' +
+    '[[env.production.d1_databases]]\nbinding = "DB"\ndatabase_id = "prod-existing"\ndatabase_name = "app-db"\n';
+
+  it('writes "<id>" # <name> against the matching env+binding, leaving siblings and other envs intact', () => {
+    const out = setD1Id(toml, 'staging', 'DB', 'new-staging-id', 'app-staging-db');
+    expect(out).toContain('"new-staging-id" # app-staging-db');
+    expect(getD1Id(out, 'staging', 'DB')).toBe('new-staging-id'); // round-trip
+    expect(getD1Id(out, 'staging', 'ANALYTICS')).toBeNull(); // sibling binding untouched
+    expect(getD1Id(out, 'production', 'DB')).toBe('prod-existing'); // other env untouched
+  });
+
+  it('tolerates database_name preceding database_id and preserves the name', () => {
+    const nameFirst =
+      '[[env.staging.d1_databases]]\nbinding = "DB"\ndatabase_name = "app-staging-db"\ndatabase_id = "old"\n';
+    const out = setD1Id(nameFirst, 'staging', 'DB', 'fresh', 'app-staging-db');
+    expect(getD1Id(out, 'staging', 'DB')).toBe('fresh');
+    expect(getD1Name(out, 'staging', 'DB')).toBe('app-staging-db'); // name line not clobbered
+    expect(() => assertToml(out)).not.toThrow();
+  });
+
+  it('throws when the binding or the env is absent', () => {
+    expect(() => setD1Id(toml, 'staging', 'MISSING', 'x', 'n')).toThrow();
+    expect(() => setD1Id(toml, 'qa', 'DB', 'x', 'n')).toThrow();
+  });
+});
+
+describe('blankD1Ids', () => {
+  const toml =
+    '[[env.staging.d1_databases]]\nbinding = "DB"\ndatabase_id = "staging-db-id"\ndatabase_name = "app-staging-db"\n\n' +
+    '[[env.staging.d1_databases]]\nbinding = "ANALYTICS"\ndatabase_id = "staging-an-id"\ndatabase_name = "app-staging-analytics"\n\n' +
+    '[[env.production.d1_databases]]\nbinding = "DB"\ndatabase_id = "prod-db-id"\ndatabase_name = "app-db"\n';
+
+  it('blanks every d1 id under the env while names, bindings, and the other env survive', () => {
+    const out = blankD1Ids(toml, 'staging');
+    expect(getD1Id(out, 'staging', 'DB')).toBeNull();
+    expect(getD1Id(out, 'staging', 'ANALYTICS')).toBeNull();
+    // names survive the blanking
+    expect(getD1Name(out, 'staging', 'DB')).toBe('app-staging-db');
+    expect(getD1Name(out, 'staging', 'ANALYTICS')).toBe('app-staging-analytics');
+    // other env's id is untouched
+    expect(getD1Id(out, 'production', 'DB')).toBe('prod-db-id');
+    // bindings survived: setD1Id still resolves them and re-fills an id
+    const refilled = setD1Id(out, 'staging', 'DB', 're-provisioned', 'app-staging-db');
+    expect(getD1Id(refilled, 'staging', 'DB')).toBe('re-provisioned');
+  });
+});
+
 describe('assertToml', () => {
   it('returns for valid toml', () => {
     expect(() => assertToml('name = "svc"\n[env.production]\n')).not.toThrow();
@@ -192,6 +271,7 @@ describe('readManifest', () => {
       await writeFile(join(root, '.dev.vars.example'), '# secrets\nAPI_KEY=\nJWT_SECRET=""\n');
       expect(readManifest(root, 'staging')).toEqual({
         kvBindings: ['CACHE', 'SESSIONS'],
+        d1Bindings: [],
         vars: ['PUBLIC_URL', 'FEATURE_FLAG'],
         secrets: ['API_KEY', 'JWT_SECRET'],
       });
@@ -212,6 +292,27 @@ describe('readManifest', () => {
       await rm(root, { recursive: true, force: true });
     }
   });
+
+  it('reports d1 bindings alongside kv bindings and vars without dropping the existing fields', async () => {
+    const withD1 =
+      'name = "svc"\n\n' +
+      '[env.staging.vars]\nPUBLIC_URL = "https://staging"\n\n' +
+      '[[env.staging.kv_namespaces]]\nbinding = "CACHE"\nid = "abc"\n\n' +
+      '[[env.staging.d1_databases]]\nbinding = "DB"\ndatabase_id = "id-1"\ndatabase_name = "app-staging-db"\n\n' +
+      '[[env.staging.d1_databases]]\nbinding = "ANALYTICS"\ndatabase_id = ""\ndatabase_name = "app-analytics-db"\n';
+    const root = await mkdtemp(join(tmpdir(), 'smoo-prepare-env-'));
+    try {
+      await writeFile(join(root, 'wrangler.toml'), withD1);
+      expect(readManifest(root, 'staging')).toEqual({
+        kvBindings: ['CACHE'],
+        d1Bindings: ['DB', 'ANALYTICS'],
+        vars: ['PUBLIC_URL'],
+        secrets: [],
+      });
+    } finally {
+      await rm(root, { recursive: true, force: true });
+    }
+  });
 });
 
 describe('isPem / readPemFile / looksLikeFileSecret', () => {

package/src/wrangler/prepare-env.ts

@@ -19,29 +19,78 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { $ } from 'bun';
-import { parse } from 'smol-toml';
+import { type AST, getStaticTOMLValue, parseTOML } from 'toml-eslint-parser';
 
-// ── runtime narrowing (wrangler JSON + parsed toml are external data — no casts) ─
+// ── runtime narrowing (wrangler JSON is external data — no casts) ─────────────
 
 export function isRecord(v: unknown): v is Record<string, unknown> {
   return typeof v === 'object' && v !== null && !Array.isArray(v);
 }
 
-function escapeRe(s: string): string {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+// ── wrangler.toml editors (CST: read via getStaticTOMLValue, write via
+// node-range splice — comment/format-preserving by construction, no regex) ─────
+
+/** All top-level tables (`[env.x]`, `[env.x.vars]`, `[[env.x.d1_databases]]`, …) — each carries `resolvedKey` (incl. array index). */
+function tables(toml: string): AST.TOMLTable[] {
+  return parseTOML(toml).body[0].body.filter((n): n is AST.TOMLTable => n.type === 'TOMLTable');
+}
+
+/** Whole doc as a JS object (comments/format dropped — reads only). */
+function tomlValue(toml: string): Record<string, unknown> {
+  const value = getStaticTOMLValue(parseTOML(toml));
+  return isRecord(value) ? value : {};
+}
+
+function envRecord(toml: string, env: string): Record<string, unknown> | null {
+  const envs = tomlValue(toml).env;
+  const block = isRecord(envs) ? envs[env] : undefined;
+  return isRecord(block) ? block : null;
+}
+
+function sameKey(a: (string | number)[], b: (string | number)[]): boolean {
+  return a.length === b.length && a.every((x, i) => x === b[i]);
+}
+
+/** The `key = value` node named `key` in a table (single-segment keys; matched by source text). */
+function kvIn(toml: string, table: AST.TOMLTable, key: string): AST.TOMLKeyValue | null {
+  for (const kv of table.body) {
+    if (toml.slice(kv.key.range[0], kv.key.range[1]).trim() === key) return kv;
+  }
+  return null;
+}
+
+/** The `<field>` KV of the `[[env.<env>.<arrayKey>]]` table whose `binding` matches, or null. */
+function arrayTableKv(toml: string, env: string, arrayKey: string, binding: string, field: string): AST.TOMLKeyValue | null {
+  const block = envRecord(toml, env);
+  const rows = isRecord(block) && Array.isArray(block[arrayKey]) ? block[arrayKey] : [];
+  const index = rows.findIndex((r) => isRecord(r) && r.binding === binding);
+  if (index < 0) return null;
+  const table = tables(toml).find((t) => t.kind === 'array' && sameKey(t.resolvedKey, ['env', env, arrayKey, index]));
+  return table ? kvIn(toml, table, field) : null;
 }
 
-// ── pure wrangler.toml editors (no I/O — unit-testable) ──────────────────────
+function splice(toml: string, start: number, end: number, text: string): string {
+  return toml.slice(0, start) + text + toml.slice(end);
+}
 
-/** First `[env.<name>]` header, or `null` when the config declares no envs (top-level bindings only). */
+/** End of the physical line containing `offset` (exclusive of the newline). */
+function endOfLine(toml: string, offset: number): number {
+  const nl = toml.indexOf('\n', offset);
+  return nl === -1 ? toml.length : nl;
+}
+
+/** First `[env.<name>]` (source order; also derived from a nested `[env.<name>.*]`), or null when no env declared. */
 export function firstWranglerEnv(toml: string): string | null {
-  const match = toml.match(/^\s*\[env\.([A-Za-z0-9_-]+)/m);
-  return match ? match[1] : null;
+  const envs = tomlValue(toml).env;
+  if (!isRecord(envs)) return null;
+  const [first] = Object.keys(envs);
+  return first ?? null;
 }
 
-/** True if the toml declares `[env.<env>]`. */
+/** True if the toml declares `[env.<env>]` (or any `[env.<env>.*]` sub-table). */
 export function hasEnvBlock(toml: string, env: string): boolean {
-  return new RegExp(`^\\[env\\.${escapeRe(env)}\\]`, 'm').test(toml);
+  const envs = tomlValue(toml).env;
+  return isRecord(envs) && env in envs;
 }
 
 /** A `[env.<env>.vars]` value, or null if unset/empty. Reads committed public config. */
@@ -52,13 +101,12 @@ export function getVar(toml: string, env: string, name: string): string | null {
   return typeof value === 'string' && value ? value : null;
 }
 
-/** Set a `[env.<env>.vars]` value, preserving any trailing comment. Throws if the key isn't present (scaffold first). */
+/** Set a `[env.<env>.vars]` value (JSON-encoded), preserving any trailing comment. Throws if the key is absent (scaffold first). */
 export function setVar(toml: string, env: string, name: string, value: string): string {
-  const re = new RegExp(`(\\[env\\.${escapeRe(env)}\\.vars\\][\\s\\S]*?\\n${escapeRe(name)} = )"[^"]*"`);
-  if (!re.test(toml)) {
-    throw new Error(`vars key "${name}" not found under [env.${env}.vars]`);
-  }
-  return toml.replace(re, (_m: string, prefix: string) => `${prefix}${JSON.stringify(value)}`);
+  const table = tables(toml).find((t) => sameKey(t.resolvedKey, ['env', env, 'vars']));
+  const kv = table ? kvIn(toml, table, name) : null;
+  if (!kv) throw new Error(`vars key "${name}" not found under [env.${env}.vars]`);
+  return splice(toml, kv.value.range[0], kv.value.range[1], JSON.stringify(value));
 }
 
 /** The id written for `[[env.<env>.kv_namespaces]]` binding, or null if absent/empty. */
@@ -66,75 +114,101 @@ export function getKvId(toml: string, env: string, binding: string): string | nu
   const block = envRecord(toml, env);
   const rows = isRecord(block) && Array.isArray(block.kv_namespaces) ? block.kv_namespaces : [];
   for (const row of rows) {
-    if (isRecord(row) && row.binding === binding && typeof row.id === 'string') {
-      return row.id || null;
-    }
+    if (isRecord(row) && row.binding === binding && typeof row.id === 'string') return row.id || null;
   }
   return null;
 }
 
-/** Rewrite the `id = ...` line of the `[[env.<env>.kv_namespaces]]` table whose binding matches. Throws if absent. */
+/** Rewrite the `id = ...` line (value + trailing comment) of the kv_namespaces table whose binding matches. Throws if absent. */
 export function setKvId(toml: string, env: string, binding: string, id: string, title: string): string {
-  const re = new RegExp(
-    `(\\[\\[env\\.${escapeRe(env)}\\.kv_namespaces\\]\\]\\s*\\n\\s*binding = "${escapeRe(binding)}"\\s*\\n\\s*id = )[^\\n]*`,
-  );
-  if (!re.test(toml)) {
-    throw new Error(`kv_namespaces binding "${binding}" not found under [env.${env}]`);
-  }
-  return toml.replace(re, `$1"${id}" # ${title}`);
+  const kv = arrayTableKv(toml, env, 'kv_namespaces', binding, 'id');
+  if (!kv) throw new Error(`kv_namespaces binding "${binding}" not found under [env.${env}]`);
+  return splice(toml, kv.value.range[0], endOfLine(toml, kv.value.range[1]), `${JSON.stringify(id)} # ${title}`);
 }
 
 /**
- * Append a copy of the whole `[env.<from>]` … block-group (every `[env.<from>...]`
- * table up to the next non-`from` env or EOF) rewritten for `<to>`. Returns the new
- * toml. Throws if `<from>` is absent or `<to>` already exists (blank/fill instead).
+ * Append a copy of every `[env.<from>...]` table rewritten for `<to>` (headers
+ * only — values copied verbatim). Throws if `<from>` is absent or `<to>` exists.
  */
 export function cloneEnvBlock(toml: string, from: string, to: string): string {
   if (!hasEnvBlock(toml, from)) throw new Error(`source [env.${from}] not found`);
   if (hasEnvBlock(toml, to)) throw new Error(`target [env.${to}] already exists — blank/fill it instead`);
-  const lines = toml.split('\n');
-  const isFromHeader = (l: string) => new RegExp(`^\\[+env\\.${escapeRe(from)}(\\.|\\])`).test(l);
-  const isAnyEnvHeader = (l: string) => /^\[+env\.[A-Za-z0-9_-]+(\.|\])/.test(l);
-  const out: string[] = [];
-  let capturing = false;
-  for (const line of lines) {
-    if (isFromHeader(line)) {
-      capturing = true;
-      out.push(line);
-    } else if (capturing && isAnyEnvHeader(line) && !isFromHeader(line)) {
-      capturing = false; // a different env began — stop
-    } else if (capturing) {
-      out.push(line);
-    }
-  }
-  const cloned = out
-    .map((l) => l.replace(new RegExp(`(\\[+env\\.)${escapeRe(from)}(\\.|\\])`, 'g'), `$1${to}$2`))
-    .join('\n');
-  return `${toml.replace(/\s*$/, '')}\n\n${cloned}\n`;
+  const cloned = tables(toml)
+    .filter((t) => t.resolvedKey[0] === 'env' && t.resolvedKey[1] === from)
+    .map((t) => {
+      const seg = t.key.keys[1].range; // the `<from>` segment of this table's header
+      const text = toml.slice(t.range[0], t.range[1]);
+      return text.slice(0, seg[0] - t.range[0]) + to + text.slice(seg[1] - t.range[0]);
+    });
+  return `${toml.replace(/\s*$/, '')}\n\n${cloned.join('\n\n')}\n`;
 }
 
-/** Blank every `NAME = "..."` under `[env.<env>.vars]` whose key is in `keys` (env-specific values to re-fill). */
+/** Blank the named `[env.<env>.vars]` values to `""` (preserving comments), skipping absent keys. */
 export function blankEnvVars(toml: string, env: string, keys: string[]): string {
-  let out = toml;
-  for (const key of keys) {
-    const re = new RegExp(`(\\[env\\.${escapeRe(env)}\\.vars\\][\\s\\S]*?\\n${escapeRe(key)} = )"[^"]*"`);
-    if (re.test(out)) out = out.replace(re, '$1""');
-  }
-  return out;
+  const table = tables(toml).find((t) => sameKey(t.resolvedKey, ['env', env, 'vars']));
+  if (!table) return toml;
+  const edits = keys
+    .map((key) => kvIn(toml, table, key))
+    .flatMap((kv) => (kv ? [{ start: kv.value.range[0], end: kv.value.range[1] }] : []));
+  return applyBlanks(toml, edits);
 }
 
-/** Blank every `id = ...` line under the env's `[[env.<env>.kv_namespaces]]` tables (per-env resource ids). */
+/** Blank every kv_namespaces `id` under the env to `""` (drops trailing comment; binding/name survive). */
 export function blankKvIds(toml: string, env: string): string {
-  const re = new RegExp(
-    `(\\[\\[env\\.${escapeRe(env)}\\.kv_namespaces\\]\\]\\s*\\n\\s*binding = "[^"]*"\\s*\\n\\s*id = )[^\\n]*`,
-    'g',
-  );
-  return toml.replace(re, '$1""');
+  return blankArrayField(toml, env, 'kv_namespaces', 'id');
+}
+
+/** The database_id written for `[[env.<env>.d1_databases]]` binding, or null if absent/empty. */
+export function getD1Id(toml: string, env: string, binding: string): string | null {
+  const block = envRecord(toml, env);
+  const rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+  for (const row of rows) {
+    if (isRecord(row) && row.binding === binding && typeof row.database_id === 'string') return row.database_id || null;
+  }
+  return null;
+}
+
+/** The `database_name` for `[[env.<env>.d1_databases]]` binding, or null. Source of truth for which DB to create/reuse. */
+export function getD1Name(toml: string, env: string, binding: string): string | null {
+  const block = envRecord(toml, env);
+  const rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+  for (const row of rows) {
+    if (isRecord(row) && row.binding === binding && typeof row.database_name === 'string') return row.database_name || null;
+  }
+  return null;
+}
+
+/** Rewrite the `database_id = ...` line (value + trailing comment) of the d1 table whose binding matches; the name line is untouched. Throws if absent. */
+export function setD1Id(toml: string, env: string, binding: string, id: string, name: string): string {
+  const kv = arrayTableKv(toml, env, 'd1_databases', binding, 'database_id');
+  if (!kv) throw new Error(`d1_databases binding "${binding}" not found under [env.${env}]`);
+  return splice(toml, kv.value.range[0], endOfLine(toml, kv.value.range[1]), `${JSON.stringify(id)} # ${name}`);
+}
+
+/** Blank every d1 `database_id` under the env to `""` (drops trailing comment; binding/name survive). */
+export function blankD1Ids(toml: string, env: string): string {
+  return blankArrayField(toml, env, 'd1_databases', 'database_id');
+}
+
+/** Blank one field across every `[[env.<env>.<arrayKey>]]` table (value..EOL -> `""`). */
+function blankArrayField(toml: string, env: string, arrayKey: string, field: string): string {
+  const edits = tables(toml)
+    .filter((t) => t.kind === 'array' && t.resolvedKey[0] === 'env' && t.resolvedKey[1] === env && t.resolvedKey[2] === arrayKey)
+    .map((t) => kvIn(toml, t, field))
+    .flatMap((kv) => (kv ? [{ start: kv.value.range[0], end: endOfLine(toml, kv.value.range[1]) }] : []));
+  return applyBlanks(toml, edits);
+}
+
+/** Apply `""` at each range, descending so earlier offsets stay valid. */
+function applyBlanks(toml: string, edits: { start: number; end: number }[]): string {
+  let out = toml;
+  for (const e of [...edits].sort((a, b) => b.start - a.start)) out = splice(out, e.start, e.end, '""');
+  return out;
 }
 
 /** Parse-guard: throws if `toml` no longer parses, so a bad edit can't be written to disk. */
 export function assertToml(toml: string): void {
-  parse(toml);
+  parseTOML(toml);
 }
 
 /** Persist a toml string after confirming it still parses. */
@@ -143,18 +217,13 @@ export function saveToml(path: string, toml: string): void {
   writeFileSync(path, toml);
 }
 
-function envRecord(toml: string, env: string): Record<string, unknown> | null {
-  const parsed = parse(toml);
-  const envs = isRecord(parsed) && isRecord(parsed.env) ? parsed.env : {};
-  const block = envs[env];
-  return isRecord(block) ? block : null;
-}
-
 // ── manifest: what the worker needs, split into vars vs secrets ──────────────
 
 export interface Manifest {
   /** KV binding names declared under `[[env.<env>.kv_namespaces]]` (resources to provision). */
   kvBindings: string[];
+  /** D1 binding names declared under `[[env.<env>.d1_databases]]` (resources to provision). */
+  d1Bindings: string[];
   /** Public var names declared in `[env.<env>.vars]` (committed config). */
   vars: string[];
   /** Secret names declared in `.dev.vars.example` (values live on the worker, never in the repo). */
@@ -185,9 +254,11 @@ export function readManifest(root: string, env: string): Manifest {
   const vars = Object.keys(varsRec);
   const kvRows = isRecord(block) && Array.isArray(block.kv_namespaces) ? block.kv_namespaces : [];
   const kvBindings = kvRows.flatMap((row) => (isRecord(row) && typeof row.binding === 'string' ? [row.binding] : []));
+  const d1Rows = isRecord(block) && Array.isArray(block.d1_databases) ? block.d1_databases : [];
+  const d1Bindings = d1Rows.flatMap((row) => (isRecord(row) && typeof row.binding === 'string' ? [row.binding] : []));
   const examplePath = join(root, '.dev.vars.example');
   const secrets = existsSync(examplePath) ? parseDevVarsExample(readFileSync(examplePath, 'utf8')) : [];
-  return { kvBindings, vars, secrets };
+  return { kvBindings, d1Bindings, vars, secrets };
 }
 
 // ── PEM (a standard, reusable) ───────────────────────────────────────────────
@@ -270,6 +341,51 @@ async function reList(logical: string, cwd: string): Promise<string | null> {
   return (await listNamespaces(cwd)).find((n) => n.title === logical)?.id ?? null;
 }
 
+export interface D1Database {
+  uuid: string;
+  name: string;
+}
+
+function asD1Databases(json: unknown): D1Database[] {
+  if (!Array.isArray(json)) return [];
+  const out: D1Database[] = [];
+  for (const row of json) {
+    if (isRecord(row) && typeof row.uuid === 'string' && typeof row.name === 'string') {
+      out.push({ uuid: row.uuid, name: row.name });
+    }
+  }
+  return out;
+}
+
+/** Live D1 databases on the account (`d1 list --json`); `[]` when offline/unauthenticated. */
+export async function listD1Databases(cwd: string): Promise<D1Database[]> {
+  try {
+    return asD1Databases(await $`bunx wrangler d1 list --json`.cwd(cwd).quiet().json());
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Reuse the D1 database whose name matches, else create it. The uuid comes from
+ * the structured `list` JSON (create prints freeform text), so we re-list rather
+ * than scrape. Returns the uuid, or null on failure.
+ */
+export async function ensureD1Database(name: string, existing: D1Database[], cwd: string): Promise<string | null> {
+  const match = existing.find((d) => d.name === name);
+  if (match) return match.uuid;
+  try {
+    await $`bunx wrangler d1 create ${name}`.cwd(cwd).quiet();
+  } catch (err) {
+    return errText(err).includes('already') ? reListD1(name, cwd) : null;
+  }
+  return reListD1(name, cwd);
+}
+
+async function reListD1(name: string, cwd: string): Promise<string | null> {
+  return (await listD1Databases(cwd)).find((d) => d.name === name)?.uuid ?? null;
+}
+
 /** Current secret names on the worker for `env`; `[]` when none/unreachable (Cloudflare allows setting pre-deploy). */
 export async function listSecretNames(env: string, cwd: string): Promise<string[]> {
   try {