feat(drizzle): add cloudflare D1 database

.changeset/cloudflare-d1-drizzle.md

@@ -0,0 +1,5 @@
+---
+'sv': minor
+---
+
+feat(drizzle): add cloudflare `D1` database

packages/sv/src/addons/better-auth.ts

@@ -9,10 +9,14 @@ import {
 	json,
 	parse,
 	resolveCommand,
-	createPrinter
+	createPrinter,
+	sanitizeName
 } from '@sveltejs/sv-utils';
 import crypto from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { defineAddon, defineAddonOptions } from '../core/config.ts';
+import { fileExists } from '../core/files.ts';
 import { addToDemoPage } from './common.ts';
 
 type Dialect = 'mysql' | 'postgresql' | 'sqlite' | 'turso';
@@ -39,16 +43,19 @@ export default defineAddon({
 		if (!kit) unsupported('Requires SvelteKit');
 		if (!dependencyVersion('drizzle-orm')) dependsOn('drizzle');
 
+		// some sort of wrangler / d1 / sveltekit adapter check
+		runsAfter('sveltekitAdapter');
 		runsAfter('tailwindcss');
 	},
-	run: ({ sv, language, options, kit, dependencyVersion, files }) => {
+	run: ({ sv, language, options, kit, dependencyVersion, files, cwd }) => {
 		if (!kit) throw new Error('SvelteKit is required');
 
 		const demoPassword = options.demo.includes('password');
 		const demoGithub = options.demo.includes('github');
 		const hasDemo = demoPassword || demoGithub;
 
 		let drizzleDialect: Dialect;
+		let d1 = false;
 
 		sv.devDependency('better-auth', '~1.4.21');
 		sv.devDependency('@better-auth/cli', '~1.4.21');
@@ -67,6 +74,13 @@ export default defineAddon({
 					) {
 						drizzleDialect = node.value.value as Dialect;
 					}
+					if (
+						isProp('driver', node) &&
+						node.value.type === 'Literal' &&
+						node.value.value === 'd1-http'
+					) {
+						d1 = true;
+					}
 				}
 			});
 
@@ -82,7 +96,13 @@ export default defineAddon({
 		sv.file(`${kit?.libDirectory}/server/auth.${language}`, (content) => {
 			const { ast, generateCode, comments } = parse.script(content);
 
-			js.imports.addNamed(ast, { from: '$lib/server/db', imports: ['db'] });
+			if (d1)
+				js.imports.addNamed(ast, {
+					from: 'drizzle-orm/d1',
+					imports: ['DrizzleD1Database'],
+					isType: true
+				});
+			js.imports.addNamed(ast, { from: '$lib/server/db', imports: [d1 ? 'getDb' : 'db'] });
 			js.imports.addNamed(ast, { from: '$app/server', imports: ['getRequestEvent'] });
 			js.imports.addNamed(ast, { from: '$env/dynamic/private', imports: ['env'] });
 			js.imports.addNamed(ast, { from: 'better-auth/svelte-kit', imports: ['sveltekitCookies'] });
@@ -110,18 +130,34 @@ export default defineAddon({
 				},`
 				: '';
 
-			const authConfig = dedent`
-				export const auth = betterAuth({
-					baseURL: env.ORIGIN,
-					secret: env.BETTER_AUTH_SECRET,
-					database: drizzleAdapter(db, {
-						provider: '${provider}'
-					}),
-					emailAndPassword: {
-						enabled: true
-					},${githubProvider}
-					plugins: [sveltekitCookies(getRequestEvent)], // make sure this is the last plugin in the array
-				});`;
+			let authConfig = '';
+			if (d1) {
+				authConfig = dedent`
+					export const createAuth = (d1${language === 'ts' ? ': DrizzleD1Database' : ''}) => betterAuth({
+						baseURL: env.ORIGIN,
+						secret: env.BETTER_AUTH_SECRET,
+						database: drizzleAdapter(getDb(d1), {
+							provider: '${provider}'
+						}),
+						emailAndPassword: {
+							enabled: true
+						},${githubProvider}
+						plugins: [sveltekitCookies(getRequestEvent)], // make sure this is the last plugin in the array
+					});`;
+			} else {
+				authConfig = dedent`
+					export const auth = betterAuth({
+						baseURL: env.ORIGIN,
+						secret: env.BETTER_AUTH_SECRET,
+						database: drizzleAdapter(db, {
+							provider: '${provider}'
+						}),
+						emailAndPassword: {
+							enabled: true
+						},${githubProvider}
+						plugins: [sveltekitCookies(getRequestEvent)], // make sure this is the last plugin in the array
+					});`;
+			}
 			js.common.appendFromString(ast, { code: authConfig, comments });
 
 			return generateCode();
@@ -158,6 +194,7 @@ export default defineAddon({
 		sv.file('src/app.d.ts', (content) => {
 			const { ast, comments, generateCode } = parse.script(content);
 
+			if (d1) js.imports.addNamed(ast, { imports: ['getAuth'], from: '$lib/server/auth' });
 			js.imports.addNamed(ast, {
 				imports: ['User', 'Session'],
 				from: 'better-auth/minimal',
@@ -178,25 +215,39 @@ export default defineAddon({
 			const session = locals.body.body.find((prop) =>
 				js.common.hasTypeProperty(prop, { name: 'session' })
 			);
+			const auth = locals.body.body.find((prop) =>
+				js.common.hasTypeProperty(prop, { name: 'auth' })
+			);
 
 			if (!user) {
 				locals.body.body.push(js.common.createTypeProperty('user', 'User', true));
 			}
 			if (!session) {
 				locals.body.body.push(js.common.createTypeProperty('session', 'Session', true));
 			}
+			if (d1 && !auth) {
+				locals.body.body.push(
+					js.common.createTypeProperty('auth', 'ReturnType<typeof getAuth>', false)
+				);
+			}
 			return generateCode();
 		});
 
 		sv.file(`src/hooks.server.${language}`, (content) => {
 			const { ast, generateCode, comments } = parse.script(content);
 
 			js.imports.addNamed(ast, { imports: ['svelteKitHandler'], from: 'better-auth/svelte-kit' });
-			js.imports.addNamed(ast, { imports: ['auth'], from: '$lib/server/auth' });
+			js.imports.addNamed(ast, { imports: [d1 ? 'createAuth' : 'auth'], from: '$lib/server/auth' });
 			js.imports.addNamed(ast, { imports: ['building'], from: '$app/environment' });
 
 			const handleContent = dedent`
 				async ({ event, resolve }) => {
+          ${
+						d1
+							? `event.locals.auth = createAuth(event.platform.env.DB);
+								const { auth } = event.locals`
+							: '' /* same thing, creates new line */
+					}
 					// Fetch current session from Better Auth
 					const session = await auth.api.getSession({
 						headers: event.request.headers
@@ -221,6 +272,29 @@ export default defineAddon({
 			return generateCode();
 		});
 
+		if (d1) {
+			const ext = fileExists(cwd, 'wrangler.toml') ? 'toml' : 'jsonc';
+			const pkg = parse.json(readFileSync(join(cwd, 'package.json'), 'utf-8'));
+			const dbName = sanitizeName(pkg.data.name, 'package') + '-db';
+
+			sv.file(`wrangler.${ext}`, (content) => {
+				const { data, generateCode } = ext === 'jsonc' ? parse.json(content) : parse.toml(content);
+
+				data.d1_databases ??= [
+					{
+						binding: 'DB',
+						database_name: dbName,
+						// is optional with auto-provisoning
+						database_id: '<YOUR_DATABASE_ID>',
+						// i cannot find a reference to remote
+						remote: true
+					}
+				];
+
+				return generateCode();
+			});
+		}
+
 		if (hasDemo) {
 			sv.file(`${kit?.routesDirectory}/demo/+page.svelte`, (content) => {
 				return addToDemoPage(content, 'better-auth', language);
@@ -237,9 +311,11 @@ export default defineAddon({
 
 					const [ts] = createPrinter(language === 'ts');
 
+					const d1AuthLine = d1 ? '\n\t\t\t\t\t\t\tconst { auth } = event.locals;\n' : '';
+
 					const signInEmailAction = demoPassword
 						? `
-						signInEmail: async (event) => {
+						signInEmail: async (event) => {${d1AuthLine}
 							const formData = await event.request.formData();
 							const email = formData.get('email')?.toString() ?? '';
 							const password = formData.get('password')?.toString() ?? '';
@@ -261,7 +337,7 @@ export default defineAddon({
 
 							return redirect(302, '/demo/better-auth');
 						},
-						signUpEmail: async (event) => {
+						signUpEmail: async (event) => {${d1AuthLine}
 							const formData = await event.request.formData();
 							const email = formData.get('email')?.toString() ?? '';
 							const password = formData.get('password')?.toString() ?? '';
@@ -289,7 +365,7 @@ export default defineAddon({
 
 					const signInSocialAction = demoGithub
 						? `
-						signInSocial: async (event) => {
+						signInSocial: async (event) => {${d1AuthLine}
 							const formData = await event.request.formData();
 							const provider = formData.get('provider')?.toString() ?? 'github';
 							const callbackURL = formData.get('callbackURL')?.toString() ?? '/demo/better-auth';
@@ -314,7 +390,7 @@ export default defineAddon({
 					import { fail, redirect } from '@sveltejs/kit';
 					${ts("import type { Actions } from './$types';")}
 					${ts("import type { PageServerLoad } from './$types';")}
-					import { auth } from '$lib/server/auth';
+					${!d1 ? "import { auth } from '$lib/server/auth';" : '' /* this creates a new line */}
 					${needsAPIError ? "import { APIError } from 'better-auth/api';" : ''}
 
 					export const load${ts(': PageServerLoad')} = async (event) => {
@@ -400,11 +476,12 @@ export default defineAddon({
 				}
 
 				const [ts] = createPrinter(language === 'ts');
+				const d1AuthLine = d1 ? '\n\t\t\t\t\t\t\tconst { auth } = event.locals;\n' : '';
 				return dedent`
 					import { redirect } from '@sveltejs/kit';
 					${ts("import type { Actions } from './$types';")}
 					${ts("import type { PageServerLoad } from './$types';")}
-					import { auth } from '$lib/server/auth';
+					${!d1 ? "import { auth } from '$lib/server/auth';" : ''}
 
 					export const load${ts(': PageServerLoad')} = async (event) => {
 						if (!event.locals.user) {
@@ -414,7 +491,7 @@ export default defineAddon({
 					};
 
 					export const actions${ts(': Actions')} = {
-						signOut: async (event) => {
+						signOut: async (event) => {${d1AuthLine}
 							await auth.api.signOut({
 								headers: event.request.headers
 							});