chore: update drizzle stack

packages/db/credentials.ts

@@ -0,0 +1,23 @@
+import { env } from '@formbase/env';
+
+type DatabaseCredentials = {
+  url: string;
+  authToken?: string;
+};
+
+export const getDatabaseCredentials = (): DatabaseCredentials => {
+  const databaseUrl = env.DATABASE_URL;
+
+  if (!databaseUrl.startsWith('libsql://')) {
+    return { url: databaseUrl };
+  }
+
+  if (!env.TURSO_AUTH_TOKEN) {
+    throw new Error('TURSO_AUTH_TOKEN is required for libsql:// URLs');
+  }
+
+  return {
+    url: databaseUrl,
+    authToken: env.TURSO_AUTH_TOKEN,
+  };
+};

packages/db/drizzle.config.ts

@@ -1,14 +1,10 @@
-import type { Config } from 'drizzle-kit';
+import { defineConfig } from 'drizzle-kit';
 
-import { env } from '@formbase/env';
+import { getDatabaseCredentials } from './credentials';
 
-export default {
-  dialect: 'sqlite',
-  driver: 'turso',
+export default defineConfig({
+  dialect: 'turso',
   schema: './schema/index.ts',
   out: './drizzle',
-  dbCredentials: {
-    url: env.DATABASE_URL,
-    ...(env.TURSO_AUTH_TOKEN ? { authToken: env.TURSO_AUTH_TOKEN } : {}),
-  },
-} satisfies Config;
+  dbCredentials: getDatabaseCredentials(),
+});

packages/db/index.ts

@@ -14,23 +14,10 @@ import {
 } from 'drizzle-orm';
 import { drizzle } from 'drizzle-orm/libsql';
 
-import { env } from '@formbase/env';
-
+import { getDatabaseCredentials } from './credentials';
 import * as schema from './schema';
 
-const databaseUrl = env.DATABASE_URL;
-const authToken = databaseUrl.startsWith('libsql://')
-  ? env.TURSO_AUTH_TOKEN
-  : undefined;
-
-if (databaseUrl.startsWith('libsql://') && !authToken) {
-  throw new Error('TURSO_AUTH_TOKEN is required for libsql:// URLs');
-}
-
-export const queryClient = createClient({
-  url: databaseUrl,
-  ...(authToken ? { authToken } : {}),
-});
+export const queryClient = createClient(getDatabaseCredentials());
 
 export const db = drizzle(queryClient, {
   schema: schema,

packages/db/package.json

@@ -13,21 +13,21 @@
     "db:studio": "dotenv -e ../../apps/web/.env.local drizzle-kit studio",
     "db:up": "dotenv -e ../../apps/web/.env.local drizzle-kit up",
     "lint": "eslint . --cache --max-warnings 0",
-    "typecheck": "tsc --noEmit --tsBuildInfoFile .tsbuildinfo"
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "@formbase/env": "workspace:*",
     "@libsql/client": "^0.14.0",
-    "drizzle-orm": "^0.30.10",
-    "drizzle-zod": "^0.5.1",
+    "drizzle-orm": "^0.45.2",
+    "drizzle-zod": "^0.7.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@formbase/tsconfig": "workspace:*",
     "@types/node": "^20.19.39",
     "dotenv": "^16.4.5",
     "dotenv-cli": "^7.4.2",
-    "drizzle-kit": "^0.21.4",
+    "drizzle-kit": "^0.31.10",
     "eslint-config-formbase": "workspace:*",
     "tsx": "^4.15.5"
   }

packages/db/schema/accounts.ts

@@ -37,11 +37,11 @@ export const accounts = sqliteTable(
       .$onUpdate(() => new Date())
       .notNull(),
   },
-  (table) => ({
-    userIdx: index('account_userId_idx').on(table.userId),
-    providerAccountIdx: uniqueIndex('account_provider_account_idx').on(
+  (table) => [
+    index('account_userId_idx').on(table.userId),
+    uniqueIndex('account_provider_account_idx').on(
       table.providerId,
       table.accountId,
     ),
-  }),
+  ],
 );

packages/db/schema/api-audit-logs.ts

@@ -23,11 +23,11 @@ export const apiAuditLogs = sqliteTable(
       .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
       .notNull(),
   },
-  (t) => ({
-    apiKeyIdx: index('audit_api_key_idx').on(t.apiKeyId),
-    userIdx: index('audit_user_idx').on(t.userId),
-    createdAtIdx: index('audit_created_at_idx').on(t.createdAt),
-  }),
+  (t) => [
+    index('audit_api_key_idx').on(t.apiKeyId),
+    index('audit_user_idx').on(t.userId),
+    index('audit_created_at_idx').on(t.createdAt),
+  ],
 );
 
 export const ZSelectApiAuditLogSchema = createSelectSchema(apiAuditLogs);

packages/db/schema/api-keys.ts

@@ -20,10 +20,10 @@ export const apiKeys = sqliteTable(
       .default(sql`(cast(unixepoch('subsecond') * 1000 as integer))`)
       .notNull(),
   },
-  (t) => ({
-    userIdx: index('api_key_user_idx').on(t.userId),
-    keyHashIdx: index('api_key_hash_idx').on(t.keyHash),
-  }),
+  (t) => [
+    index('api_key_user_idx').on(t.userId),
+    index('api_key_hash_idx').on(t.keyHash),
+  ],
 );
 
 export const ZSelectApiKeySchema = createSelectSchema(apiKeys);

packages/db/schema/form-data.ts

@@ -22,10 +22,10 @@ export const formDatas = sqliteTable(
       .default(false)
       .notNull(),
   },
-  (t) => ({
-    formIdx: index('form_idx').on(t.formId),
-    createdAtIdx: index('form_data_created_at_idx').on(t.createdAt),
-  }),
+  (t) => [
+    index('form_idx').on(t.formId),
+    index('form_data_created_at_idx').on(t.createdAt),
+  ],
 );
 
 export const ZSelectFormDataSchema = createSelectSchema(formDatas);

packages/db/schema/forms.ts

@@ -39,10 +39,10 @@ export const forms = sqliteTable(
     defaultSubmissionEmail: text('default_submission_email'),
     honeypotField: text('honeypot_field').default('_gotcha').notNull(),
   },
-  (t) => ({
-    userIdx: index('form_user_idx').on(t.userId),
-    createdAtIdx: index('form_created_at_idx').on(t.createdAt),
-  }),
+  (t) => [
+    index('form_user_idx').on(t.userId),
+    index('form_created_at_idx').on(t.createdAt),
+  ],
 );
 
 export const ZSelectFormSchema = createSelectSchema(forms);

packages/db/schema/sessions.ts

@@ -22,7 +22,5 @@ export const sessions = sqliteTable(
       .notNull()
       .references(() => users.id, { onDelete: 'cascade' }),
   },
-  (table) => ({
-    userIdx: index('session_userId_idx').on(table.userId),
-  }),
+  (table) => [index('session_userId_idx').on(table.userId)],
 );

packages/db/schema/users.ts

@@ -20,9 +20,7 @@ export const users = sqliteTable(
       .$onUpdate(() => new Date())
       .notNull(),
   },
-  (t) => ({
-    emailIdx: index('user_email_idx').on(t.email),
-  }),
+  (t) => [index('user_email_idx').on(t.email)],
 );
 
 export const ZSelectUserSchema = createSelectSchema(users);

packages/db/schema/verification.ts

@@ -16,7 +16,5 @@ export const verifications = sqliteTable(
       .$onUpdate(() => new Date())
       .notNull(),
   },
-  (table) => ({
-    identifierIdx: index('verification_identifier_idx').on(table.identifier),
-  }),
+  (table) => [index('verification_identifier_idx').on(table.identifier)],
 );

packages/db/tsconfig.json

@@ -1,4 +1,8 @@
 {
   "extends": ["@formbase/tsconfig/base.json"],
+  "compilerOptions": {
+    "types": ["node"],
+    "tsBuildInfoFile": ".cache/.tsbuildinfo"
+  },
   "include": ["**/*.ts", "**/*.mjs"]
 }

tests/package.json

@@ -20,7 +20,7 @@
     "@playwright/test": "^1.59.1",
     "@types/node": "^20.19.39",
     "@vitest/coverage-v8": "^2.1.8",
-    "drizzle-orm": "^0.30.10",
+    "drizzle-orm": "^0.45.2",
     "typescript": "6.0.3",
     "vitest": "^2.1.8"
   }