@beignet/cli 0.0.35 → 0.0.37

package/src/templates/server.ts

@@ -23,6 +23,7 @@ export function serverProviders(ctx: TemplateContext): string {
       ? 'import { createUpstashRateLimitProvider } from "@beignet/provider-rate-limit-upstash";'
       : undefined,
     'import * as schema from "@/infra/db/schema";',
+    'import { databaseClient } from "@/infra/db/client";',
     'import { starterDatabaseProvider } from "@/infra/db/provider";',
     'import { auth } from "@/lib/better-auth";',
     'import type { AuthSessionMetadata, AuthUser } from "@/ports/auth";',
@@ -45,7 +46,10 @@ export function serverProviders(ctx: TemplateContext): string {
 
   return `${imports.join("\n")}
 
-const ${db.providerInstance} = ${db.providerFactory}({ schema });
+const ${db.providerInstance} = ${db.providerFactory}({
+	schema,
+	client: databaseClient,
+});
 
 export const providers = [
 ${entries.join("\n")}
@@ -151,7 +155,8 @@ export function env(ctx: TemplateContext): string {
 \t\tSQLITE_DB_AUTH_TOKEN: z.string().optional(),`
       : `\t\t${databaseDescriptor(ctx).urlEnvVar}: z
 \t\t\t.string()
-\t\t\t.default("${databaseLocalUrl(ctx.database, ctx.name)}"),`;
+\t\t\t.default("${databaseLocalUrl(ctx.database, ctx.name)}"),
+\t\t${ctx.database === "postgres" ? "POSTGRES" : "MYSQL"}_DB_POOL_MAX: z.coerce.number().int().positive().default(5),`;
 
   return `import { createEnv } from "@beignet/core/config";
 import { z } from "zod";
@@ -202,54 +207,45 @@ export const isDevtoolsEnabled =
 
 export function betterAuth(ctx: TemplateContext): string {
   const connectionByDatabase = {
-    sqlite: `import { createClient } from "@libsql/client";
-import { betterAuth } from "better-auth";
+    sqlite: `import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { drizzle } from "drizzle-orm/libsql";
+import { databaseClient } from "@/infra/db/client";
 import { ensureDatabaseReady } from "@/infra/db/database-ready";
 import * as schema from "@/infra/db/schema";
 import { env } from "@/lib/env";
 
-const client = createClient({
-	url: env.SQLITE_DB_URL,
-	authToken: env.SQLITE_DB_AUTH_TOKEN,
-});
-
 // Auth routes can be the first thing to touch the database, before any
 // Beignet provider boots, so readiness is enforced here too.
-await ensureDatabaseReady(client);
+await ensureDatabaseReady(databaseClient);
 
-const db = drizzle(client, { schema });`,
+const db = drizzle(databaseClient, { schema });`,
     postgres: `import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { drizzle } from "drizzle-orm/node-postgres";
-import pg from "pg";
+import { databaseClient } from "@/infra/db/client";
 import { ensureDatabaseReady } from "@/infra/db/database-ready";
 import * as schema from "@/infra/db/schema";
 import { env } from "@/lib/env";
 
-const pool = new pg.Pool({ connectionString: env.POSTGRES_DB_URL });
-
 // Auth routes can be the first thing to touch the database, before any
 // Beignet provider boots, so readiness is enforced here too.
-await ensureDatabaseReady(pool);
+await ensureDatabaseReady(databaseClient);
 
-const db = drizzle(pool, { schema });`,
+const db = drizzle(databaseClient, { schema });`,
     mysql: `import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import { drizzle } from "drizzle-orm/mysql2";
-import mysql from "mysql2/promise";
+import { databaseClient } from "@/infra/db/client";
 import { ensureDatabaseReady } from "@/infra/db/database-ready";
 import * as schema from "@/infra/db/schema";
 import { env } from "@/lib/env";
 
-const pool = mysql.createPool({ uri: env.MYSQL_DB_URL });
-
 // Auth routes can be the first thing to touch the database, before any
 // Beignet provider boots, so readiness is enforced here too.
-await ensureDatabaseReady(pool);
+await ensureDatabaseReady(databaseClient);
 
-const db = drizzle(pool, { schema, mode: "default" });`,
+const db = drizzle(databaseClient, { schema, mode: "default" });`,
   } as const;
 
   return `${connectionByDatabase[ctx.database]}
@@ -285,18 +281,7 @@ export const auth = betterAuth({
 `;
 }
 
-export function server(ctx: TemplateContext): string {
-  const db = databaseDescriptor(ctx);
-  const providerConfigEntries =
-    ctx.database === "sqlite"
-      ? `\t\t"drizzle-sqlite": {
-\t\t\tDB_URL: env.SQLITE_DB_URL,
-\t\t\tDB_AUTH_TOKEN: env.SQLITE_DB_AUTH_TOKEN,
-\t\t},`
-      : `\t\t"${db.providerName}": {
-\t\t\tDB_URL: env.${db.urlEnvVar},
-\t\t},`;
-
+export function server(): string {
   return `import "@beignet/core/server-only";
 import { createNextServer, createNextServerLoader } from "@beignet/next";
 import {
@@ -306,6 +291,7 @@ import {
 } from "@beignet/core/server";
 import type { AppContext } from "@/app-context";
 import { appPorts } from "@/infra/app-ports";
+import { closeDatabaseClient } from "@/infra/db/client";
 import { env } from "@/lib/env";
 import { appContext } from "./context";
 import { routes } from "./routes";
@@ -313,12 +299,9 @@ import { routes } from "./routes";
 export const getServer = createNextServerLoader(async () => {
 	const { providers } = await import("./providers");
 
-	return createNextServer({
+	const server = await createNextServer({
 	ports: appPorts,
 	providers,
-	providerConfig: {
-${providerConfigEntries}
-	},
 	hooks: [
 		createSecurityHeadersHooks<AppContext>(),
 		createErrorReportingHooks<AppContext>(),
@@ -343,7 +326,38 @@ ${providerConfigEntries}
 		};
 	},
 	});
+	let stopPromise: Promise<void> | undefined;
+
+	return {
+		...server,
+		stop() {
+			stopPromise ??= stopServerAndDatabase(server);
+			return stopPromise;
+		},
+	};
 });
+
+async function stopServerAndDatabase(server: {
+	stop(): Promise<void>;
+}): Promise<void> {
+	const errors: unknown[] = [];
+	try {
+		await server.stop();
+	} catch (error) {
+		errors.push(error);
+	}
+
+	try {
+		await closeDatabaseClient();
+	} catch (error) {
+		errors.push(error);
+	}
+
+	if (errors.length === 1) throw errors[0];
+	if (errors.length > 1) {
+		throw new AggregateError(errors, "Server and database shutdown failed");
+	}
+}
 `;
 }
 

package/src/templates/shared.ts

@@ -32,7 +32,7 @@ export type TemplateContext = {
 
 export const externalVersions = {
   biome: "^2.4.14",
-  next: "^16.2.4",
+  next: "^16.2.10",
   react: "^19.2.5",
   reactDom: "^19.2.5",
   tsx: "^4.22.4",
@@ -48,7 +48,7 @@ export const externalVersions = {
   bullmq: "^5.0.0",
   drizzleKit: "^0.31.10",
   drizzleOrm: "^0.45.2",
-  inngest: "^3.0.0",
+  inngest: "^3.54.0",
   libsqlClient: "^0.14.0",
   vercelBlob: "^2.5.0",
   mysql2: "^3.12.0",
@@ -58,7 +58,7 @@ export const externalVersions = {
   resend: "^6.14.0",
   sentryNode: "^10.58.0",
   stripe: "^22.2.1",
-  nodemailer: "^8.0.5",
+  nodemailer: "^9.0.1",
   openFeatureServerSdk: "^1.22.0",
   typesPg: "^8.11.0",
   ioredis: "^5.0.0",