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

@@ -39,6 +39,7 @@ export default defineAddon({
 		if (!kit) unsupported('Requires SvelteKit');
 		if (!dependencyVersion('drizzle-orm')) dependsOn('drizzle');
 
+		runsAfter('sveltekitAdapter');
 		runsAfter('tailwindcss');
 	},
 	run: ({ sv, language, options, kit, dependencyVersion, files }) => {
@@ -49,6 +50,7 @@ export default defineAddon({
 		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 +69,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 +91,7 @@ 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'] });
+			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 +119,46 @@ 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`
+					const authConfig = {
+						baseURL: env.ORIGIN,
+						secret: env.BETTER_AUTH_SECRET,
+						emailAndPassword: {
+							enabled: true
+						},${githubProvider}
+						plugins: [
+							sveltekitCookies(getRequestEvent) // make sure this is the last plugin in the array
+						],
+					}${language === 'ts' ? ' satisfies Omit<Parameters<typeof betterAuth>[0], "database">' : ''};
+
+					export const createAuth = (d1${language === 'ts' ? ': D1Database' : ''}) => betterAuth({
+						...authConfig,
+						database: drizzleAdapter(getDb(d1), { provider: '${provider}' }),
+					});
+
+					/**
+					 * DO NOT USE!
+					 *
+					 * This instance is used by the \`better-auth\` CLI for schema generation ONLY.
+					 * To access \`auth\` at runtime, use \`event.locals.auth\`.
+					 */
+					export const auth = createAuth(${language === 'ts' ? 'null!' : 'null'});`;
+			} 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 +195,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: ['createAuth'], from: '$lib/server/auth' });
 			js.imports.addNamed(ast, {
 				imports: ['User', 'Session'],
 				from: 'better-auth/minimal',
@@ -178,25 +216,40 @@ 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 createAuth>', 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 d1HandleSetup = d1
+				? dedent`
+					if (!event.platform?.env?.DB) throw new Error('D1 binding "DB" not found — are you running with wrangler?');
+					event.locals.auth = createAuth(event.platform.env.DB);
+					const { auth } = event.locals;\n`
+				: '';
+
 			const handleContent = dedent`
-				async ({ event, resolve }) => {
+				async ({ event, resolve }) => {${d1HandleSetup}
 					// Fetch current session from Better Auth
 					const session = await auth.api.getSession({
 						headers: event.request.headers
@@ -237,9 +290,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 +316,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 +344,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 +369,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';" : ''}
 					${needsAPIError ? "import { APIError } from 'better-auth/api';" : ''}
 
 					export const load${ts(': PageServerLoad')} = async (event) => {
@@ -370,7 +425,9 @@ export default defineAddon({
 					: '';
 
 				const separator =
-					demoPassword && demoGithub ? `\n\n					<hr ${tailwind ? 'class="my-4"' : ''} />` : '';
+					demoPassword && demoGithub
+						? `\n\n\t\t\t\t\t<hr ${tailwind ? 'class="my-4"' : ''} />\n`
+						: '';
 
 				const githubForm = demoGithub
 					? `
@@ -400,11 +457,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 +472,7 @@ export default defineAddon({
 					};
 
 					export const actions${ts(': Actions')} = {
-						signOut: async (event) => {
+						signOut: async (event) => {${d1AuthLine}
 							await auth.api.signOut({
 								headers: event.request.headers
 							});