@beignet/cli 0.0.8 → 0.0.10

package/src/templates/{db.ts → db/sqlite.ts}

@@ -5,9 +5,14 @@
 // To regenerate: scaffold a scratch app with `dbSchema` as
 // infra/db/schema/index.ts plus `drizzleConfig` as drizzle.config.ts, run
 // `drizzle-kit generate --name starter` with the drizzle-kit version pinned in
-// externalVersions, then paste drizzle/0000_starter.sql,
-// drizzle/meta/_journal.json, and drizzle/meta/0000_snapshot.json back here
-// verbatim.
+// externalVersions, paste drizzle/0000_starter.sql, drizzle/meta/_journal.json,
+// and drizzle/meta/0000_snapshot.json back here verbatim, then append the
+// output of createDrizzleSqliteIdempotencySetupStatements() from
+// @beignet/provider-db-drizzle/sqlite to the migration SQL, separated by
+// `--> statement-breakpoint`. The idempotency table is provider-owned and
+// lives outside the app schema, so `db generate` never diffs against it.
+
+import type { DbTemplateFiles } from "./index.js";
 
 const files = {
   drizzleConfig: `export default {
@@ -15,8 +20,8 @@ const files = {
 	out: "./drizzle",
 	dialect: "sqlite",
 	dbCredentials: {
-		url: process.env.TURSO_DB_URL ?? "file:local.db",
-		authToken: process.env.TURSO_DB_AUTH_TOKEN,
+		url: process.env.SQLITE_DB_URL ?? "file:local.db",
+		authToken: process.env.SQLITE_DB_AUTH_TOKEN,
 	},
 };
 `,
@@ -95,35 +100,10 @@ export const todos = sqliteTable(
 		userIdx: index("todos_user_idx").on(table.userId, table.createdAt),
 	}),
 );
-
-export const idempotencyRecords = sqliteTable(
-	"idempotency_records",
-	{
-		storageKey: text("storage_key").primaryKey(),
-		namespace: text("namespace").notNull(),
-		idempotencyKey: text("idempotency_key").notNull(),
-		scopeKey: text("scope_key").notNull(),
-		fingerprint: text("fingerprint").notNull(),
-		status: text("status", { enum: ["in-progress", "completed"] }).notNull(),
-		resultJson: text("result_json"),
-		reservedAt: text("reserved_at").notNull(),
-		completedAt: text("completed_at"),
-		expiresAt: text("expires_at"),
-		updatedAt: text("updated_at").notNull(),
-	},
-	(table) => ({
-		lookupIdx: index("idempotency_records_lookup_idx").on(
-			table.namespace,
-			table.scopeKey,
-			table.idempotencyKey,
-		),
-		expiresIdx: index("idempotency_records_expires_idx").on(table.expiresAt),
-	}),
-);
 `,
   drizzleTodoRepository: `import type { beignetServerOnly } from "@beignet/core/server-only";
 import { offsetPageResult } from "@beignet/core/pagination";
-import type { DrizzleTursoDatabase } from "@beignet/provider-drizzle-turso";
+import type { DrizzleSqliteDatabase } from "@beignet/provider-db-drizzle/sqlite";
 import { count, desc, eq } from "drizzle-orm";
 import type {
 	NewTodo,
@@ -146,7 +126,7 @@ function toTodo(row: TodoRow): Todo {
 }
 
 export function createDrizzleTodoRepository(
-	db: DrizzleTursoDatabase<typeof schema>,
+	db: DrizzleSqliteDatabase<typeof schema>,
 ): TodoRepository {
 	return {
 		async list(userId, page) {
@@ -208,13 +188,13 @@ export function createDrizzleTodoRepository(
 	};
 }
 `,
-  dbRepositories: `import type { DrizzleTursoDatabase } from "@beignet/provider-drizzle-turso";
+  dbRepositories: `import type { DrizzleSqliteDatabase } from "@beignet/provider-db-drizzle/sqlite";
 import { createDrizzleTodoRepository } from "@/infra/todos/drizzle-todo-repository";
 import type { AppTransactionPorts } from "@/ports";
 import * as schema from "./schema";
 
 export function createRepositories(
-	db: DrizzleTursoDatabase<typeof schema>,
+	db: DrizzleSqliteDatabase<typeof schema>,
 ): Omit<AppTransactionPorts, "idempotency"> {
 	return {
 		todos: createDrizzleTodoRepository(db),
@@ -265,10 +245,10 @@ async function prepare(client: Client): Promise<void> {
   dbProvider: `import type { beignetServerOnly } from "@beignet/core/server-only";
 import { createProvider } from "@beignet/core/providers";
 import {
-	createDrizzleTursoIdempotencyPort,
-	createDrizzleTursoUnitOfWork,
+	createDrizzleSqliteIdempotencyPort,
+	createDrizzleSqliteUnitOfWork,
 	type DbPort,
-} from "@beignet/provider-drizzle-turso";
+} from "@beignet/provider-db-drizzle/sqlite";
 import type { AppPorts } from "@/ports";
 import { ensureDatabaseReady } from "./database-ready";
 import { createRepositories } from "./repositories";
@@ -283,21 +263,21 @@ export const starterDatabaseProvider = createProvider<{
 		const dbPort = ports.db;
 		if (!dbPort) {
 			throw new Error(
-				"starterDatabaseProvider requires a db port. Register createDrizzleTursoProvider({ schema }) before it.",
+				"starterDatabaseProvider requires a db port. Register createDrizzleSqliteProvider({ schema }) before it.",
 			);
 		}
 
 		const repositories = createRepositories(dbPort.db);
-		const idempotency = createDrizzleTursoIdempotencyPort(dbPort.db);
+		const idempotency = createDrizzleSqliteIdempotencyPort(dbPort.db);
 
 		const providedPorts: Pick<AppPorts, "idempotency" | "todos" | "uow"> = {
 			...repositories,
 			idempotency,
-			uow: createDrizzleTursoUnitOfWork({
+			uow: createDrizzleSqliteUnitOfWork({
 				db: dbPort.db,
 				createTransactionPorts: (tx) => ({
 					...createRepositories(tx),
-					idempotency: createDrizzleTursoIdempotencyPort(tx),
+					idempotency: createDrizzleSqliteIdempotencyPort(tx),
 				}),
 			}),
 		};
@@ -317,7 +297,7 @@ import { migrate } from "drizzle-orm/libsql/migrator";
 import { env } from "@/lib/env";
 
 if (
-	!env.TURSO_DB_URL.startsWith("file:") &&
+	!env.SQLITE_DB_URL.startsWith("file:") &&
 	process.env.BEIGNET_ALLOW_DATABASE_RESET !== "true"
 ) {
 	throw new Error(
@@ -336,8 +316,8 @@ const tables = [
 ] as const;
 
 const client = createClient({
-	url: env.TURSO_DB_URL,
-	authToken: env.TURSO_DB_AUTH_TOKEN,
+	url: env.SQLITE_DB_URL,
+	authToken: env.SQLITE_DB_AUTH_TOKEN,
 });
 
 try {
@@ -393,7 +373,8 @@ export async function createTestDatabase(): Promise<TestDatabase> {
 	};
 }
 `,
-  // Generated by drizzle-kit generate --name starter against dbSchema above.
+  // Generated by drizzle-kit generate --name starter against dbSchema
+  // above, with the provider idempotency setup statements appended.
   starterMigrationSql: `CREATE TABLE \`account\` (
 	\`id\` text PRIMARY KEY NOT NULL,
 	\`account_id\` text NOT NULL,
@@ -411,22 +392,6 @@ export async function createTestDatabase(): Promise<TestDatabase> {
 	FOREIGN KEY (\`user_id\`) REFERENCES \`user\`(\`id\`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
-CREATE TABLE \`idempotency_records\` (
-	\`storage_key\` text PRIMARY KEY NOT NULL,
-	\`namespace\` text NOT NULL,
-	\`idempotency_key\` text NOT NULL,
-	\`scope_key\` text NOT NULL,
-	\`fingerprint\` text NOT NULL,
-	\`status\` text NOT NULL,
-	\`result_json\` text,
-	\`reserved_at\` text NOT NULL,
-	\`completed_at\` text,
-	\`expires_at\` text,
-	\`updated_at\` text NOT NULL
-);
---> statement-breakpoint
-CREATE INDEX \`idempotency_records_lookup_idx\` ON \`idempotency_records\` (\`namespace\`,\`scope_key\`,\`idempotency_key\`);--> statement-breakpoint
-CREATE INDEX \`idempotency_records_expires_idx\` ON \`idempotency_records\` (\`expires_at\`);--> statement-breakpoint
 CREATE TABLE \`session\` (
 	\`id\` text PRIMARY KEY NOT NULL,
 	\`expires_at\` integer NOT NULL,
@@ -469,6 +434,22 @@ CREATE TABLE \`verification\` (
 	\`created_at\` integer,
 	\`updated_at\` integer
 );
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "idempotency_records" (
+      storage_key text PRIMARY KEY NOT NULL,
+      namespace text NOT NULL,
+      idempotency_key text NOT NULL,
+      scope_key text NOT NULL,
+      fingerprint text NOT NULL,
+      status text NOT NULL,
+      result_json text,
+      reserved_at text NOT NULL,
+      completed_at text,
+      expires_at text,
+      updated_at text NOT NULL
+    );--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "idempotency_records_lookup_idx" ON "idempotency_records" (namespace, scope_key, idempotency_key);--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "idempotency_records_expires_idx" ON "idempotency_records" (expires_at);
 `,
   starterMigrationJournal: `{
   "version": "7",
@@ -477,7 +458,7 @@ CREATE TABLE \`verification\` (
     {
       "idx": 0,
       "version": "6",
-      "when": 1781185557868,
+      "when": 1781285554238,
       "tag": "0000_starter",
       "breakpoints": true
     }
@@ -486,7 +467,7 @@ CREATE TABLE \`verification\` (
   starterMigrationSnapshot: `{
   "version": "6",
   "dialect": "sqlite",
-  "id": "5131bbf1-cff0-42de-a5f4-298187fdafd1",
+  "id": "1fa6ba12-5a4d-4815-bda1-225734f18921",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "account": {
@@ -604,110 +585,6 @@ CREATE TABLE \`verification\` (
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
-    "idempotency_records": {
-      "name": "idempotency_records",
-      "columns": {
-        "storage_key": {
-          "name": "storage_key",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "namespace": {
-          "name": "namespace",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "idempotency_key": {
-          "name": "idempotency_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "scope_key": {
-          "name": "scope_key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "fingerprint": {
-          "name": "fingerprint",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "result_json": {
-          "name": "result_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "reserved_at": {
-          "name": "reserved_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "completed_at": {
-          "name": "completed_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "idempotency_records_lookup_idx": {
-          "name": "idempotency_records_lookup_idx",
-          "columns": [
-            "namespace",
-            "scope_key",
-            "idempotency_key"
-          ],
-          "isUnique": false
-        },
-        "idempotency_records_expires_idx": {
-          "name": "idempotency_records_expires_idx",
-          "columns": [
-            "expires_at"
-          ],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
     "session": {
       "name": "session",
       "columns": {
@@ -999,4 +876,6 @@ CREATE TABLE \`verification\` (
 }`,
 };
 
-export { files as dbFiles };
+export function sqliteDbFiles(): DbTemplateFiles {
+  return files;
+}

package/src/templates/index.ts

@@ -1,9 +1,10 @@
 export type {
+  DatabaseName,
   IntegrationName,
   PackageManager,
   TemplateName,
 } from "../choices.js";
-export { integrationChoices } from "../choices.js";
+export { databaseChoices, integrationChoices } from "../choices.js";
 export type { TemplateContext, TemplateFile } from "./shared.js";
 
 import {
@@ -13,10 +14,13 @@ import {
   packageJson,
   readme,
 } from "./base.js";
-import { dbFiles } from "./db.js";
+import { dbFiles } from "./db/index.js";
 import {
+  betterAuth,
+  env,
   infrastructurePorts,
   ports,
+  server,
   serverFiles,
   serverProviders,
 } from "./server.js";
@@ -29,11 +33,12 @@ import { todosFiles } from "./todos.js";
  * Render all template files for a new Beignet app.
  *
  * There is one starter: a full-stack app with a typed API, Better Auth,
- * Drizzle/libSQL persistence, pino logging, devtools, and a shadcn UI shell.
- * `ctx.api` swaps the UI shell for a minimal API landing page and a reduced
- * typed client.
+ * Drizzle persistence (SQLite, Postgres, or MySQL via `ctx.database`), pino
+ * logging, devtools, and a shadcn UI shell. `ctx.api` swaps the UI shell for
+ * a minimal API landing page and a reduced typed client.
  */
 export function getTemplateFiles(ctx: TemplateContext): TemplateFile[] {
+  const db = dbFiles(ctx);
   const templateFiles: TemplateFile[] = [
     { path: "package.json", content: packageJson(ctx) },
     { path: "README.md", content: readme(ctx) },
@@ -98,31 +103,31 @@ export function getTemplateFiles(ctx: TemplateContext): TemplateFile[] {
     { path: "ports/index.ts", content: ports(ctx) },
     { path: "ports/auth.ts", content: serverFiles.authPort },
     { path: "infra/app-ports.ts", content: infrastructurePorts(ctx) },
-    { path: "infra/db/database-ready.ts", content: dbFiles.databaseReady },
-    { path: "infra/db/provider.ts", content: dbFiles.dbProvider },
-    { path: "infra/db/repositories.ts", content: dbFiles.dbRepositories },
-    { path: "infra/db/reset.ts", content: dbFiles.dbReset },
-    { path: "infra/db/test-database.ts", content: dbFiles.dbTestDatabase },
-    { path: "infra/db/schema/index.ts", content: dbFiles.dbSchema },
+    { path: "infra/db/database-ready.ts", content: db.databaseReady },
+    { path: "infra/db/provider.ts", content: db.dbProvider },
+    { path: "infra/db/repositories.ts", content: db.dbRepositories },
+    { path: "infra/db/reset.ts", content: db.dbReset },
+    { path: "infra/db/test-database.ts", content: db.dbTestDatabase },
+    { path: "infra/db/schema/index.ts", content: db.dbSchema },
     {
       path: "infra/todos/drizzle-todo-repository.ts",
-      content: dbFiles.drizzleTodoRepository,
+      content: db.drizzleTodoRepository,
     },
-    { path: "drizzle.config.ts", content: dbFiles.drizzleConfig },
-    { path: "drizzle/0000_starter.sql", content: dbFiles.starterMigrationSql },
+    { path: "drizzle.config.ts", content: db.drizzleConfig },
+    { path: "drizzle/0000_starter.sql", content: db.starterMigrationSql },
     {
       path: "drizzle/meta/_journal.json",
-      content: dbFiles.starterMigrationJournal,
+      content: db.starterMigrationJournal,
     },
     {
       path: "drizzle/meta/0000_snapshot.json",
-      content: dbFiles.starterMigrationSnapshot,
+      content: db.starterMigrationSnapshot,
     },
-    { path: "lib/env.ts", content: serverFiles.env },
+    { path: "lib/env.ts", content: env(ctx) },
     { path: "lib/auth.ts", content: serverFiles.authHelpers },
-    { path: "lib/better-auth.ts", content: serverFiles.betterAuth },
+    { path: "lib/better-auth.ts", content: betterAuth(ctx) },
     { path: "lib/use-case.ts", content: serverFiles.useCaseBuilder },
-    { path: "server/index.ts", content: serverFiles.server },
+    { path: "server/index.ts", content: server(ctx) },
     { path: "server/context.ts", content: serverFiles.serverContext },
     { path: "server/routes.ts", content: serverFiles.serverRoutes },
     { path: "server/providers.ts", content: serverProviders(ctx) },