@auth/drizzle-adapter 1.0.0 → 1.1.0

package/src/lib/sqlite.ts

@@ -1,103 +1,113 @@
-import { eq, and } from "drizzle-orm"
+import { and, eq, getTableColumns } from "drizzle-orm"
 import {
+  BaseSQLiteDatabase,
+  SQLiteColumn,
+  SQLiteTableWithColumns,
   integer,
-  text,
   primaryKey,
-  BaseSQLiteDatabase,
   sqliteTable,
-  index,
-  TableConfig,
-  SQLiteTableWithColumns,
+  text,
 } from "drizzle-orm/sqlite-core"
 
 import type {
   Adapter,
   AdapterAccount,
-  AdapterUser,
+  AdapterAccountType,
   AdapterSession,
+  AdapterUser,
   VerificationToken,
 } from "@auth/core/adapters"
-import { randomUUID } from "crypto"
-
-export const sqliteUsersTable = sqliteTable("user" as string, {
-  id: text("id")
-    .primaryKey()
-    .$defaultFn(() => randomUUID()),
-  name: text("name"),
-  email: text("email").notNull().unique(),
-  emailVerified: integer("emailVerified", { mode: "timestamp_ms" }),
-  image: text("image"),
-})
-
-export const sqliteAccountsTable = sqliteTable(
-  "account" as string,
-  {
-    userId: text("userId")
-      .notNull()
-      .references(() => sqliteUsersTable.id, { onDelete: "cascade" }),
-    type: text("type").notNull(),
-    provider: text("provider").notNull(),
-    providerAccountId: text("providerAccountId").notNull(),
-    refresh_token: text("refresh_token"),
-    access_token: text("access_token"),
-    expires_at: integer("expires_at"),
-    token_type: text("token_type"),
-    scope: text("scope"),
-    id_token: text("id_token"),
-    session_state: text("session_state"),
-  },
-  (account) => ({
-    userIdIdx: index("Account_userId_index").on(account.userId),
-    compositePk: primaryKey({
-      columns: [account.provider, account.providerAccountId],
-    }),
-  })
-)
-
-export const sqliteSessionsTable = sqliteTable(
-  "session" as string,
-  {
-    id: text("id")
-      .primaryKey()
-      .$defaultFn(() => randomUUID()),
-    sessionToken: text("sessionToken").notNull().unique(),
-    userId: text("userId")
-      .notNull()
-      .references(() => sqliteUsersTable.id, { onDelete: "cascade" }),
-    expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
-  },
-  (table) => ({
-    userIdIdx: index("Session_userId_index").on(table.userId),
-  })
-)
-
-export const sqliteVerificationTokensTable = sqliteTable(
-  "verificationToken" as string,
-  {
-    identifier: text("identifier").notNull(),
-    token: text("token").notNull().unique(),
-    expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
-  },
-  (vt) => ({
-    compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
-  })
-)
+
+export function defineTables(
+  schema: Partial<DefaultSQLiteSchema> = {}
+): Required<DefaultSQLiteSchema> {
+  const usersTable =
+    schema.usersTable ??
+    (sqliteTable("user", {
+      id: text("id")
+        .primaryKey()
+        .$defaultFn(() => crypto.randomUUID()),
+      name: text("name"),
+      email: text("email").notNull(),
+      emailVerified: integer("emailVerified", { mode: "timestamp_ms" }),
+      image: text("image"),
+    }) satisfies DefaultSQLiteUsersTable)
+
+  const accountsTable =
+    schema.accountsTable ??
+    (sqliteTable(
+      "account",
+      {
+        userId: text("userId")
+          .notNull()
+          .references(() => usersTable.id, { onDelete: "cascade" }),
+        type: text("type").$type<AdapterAccountType>().notNull(),
+        provider: text("provider").notNull(),
+        providerAccountId: text("providerAccountId").notNull(),
+        refresh_token: text("refresh_token"),
+        access_token: text("access_token"),
+        expires_at: integer("expires_at"),
+        token_type: text("token_type"),
+        scope: text("scope"),
+        id_token: text("id_token"),
+        session_state: text("session_state"),
+      },
+      (account) => ({
+        compositePk: primaryKey({
+          columns: [account.provider, account.providerAccountId],
+        }),
+      })
+    ) satisfies DefaultSQLiteAccountsTable)
+
+  const sessionsTable =
+    schema.sessionsTable ??
+    (sqliteTable("session", {
+      sessionToken: text("sessionToken").primaryKey(),
+      userId: text("userId")
+        .notNull()
+        .references(() => usersTable.id, { onDelete: "cascade" }),
+      expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
+    }) satisfies DefaultSQLiteSessionsTable)
+
+  const verificationTokensTable =
+    schema.verificationTokensTable ??
+    (sqliteTable(
+      "verificationToken",
+      {
+        identifier: text("identifier").notNull(),
+        token: text("token").notNull(),
+        expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
+      },
+      (vt) => ({
+        compositePk: primaryKey({ columns: [vt.identifier, vt.token] }),
+      })
+    ) satisfies DefaultSQLiteVerificationTokenTable)
+
+  return {
+    usersTable,
+    accountsTable,
+    sessionsTable,
+    verificationTokensTable,
+  }
+}
 
 export function SQLiteDrizzleAdapter(
   client: BaseSQLiteDatabase<"sync" | "async", any, any>,
-  schema: DefaultSQLiteSchema = {
-    usersTable: sqliteUsersTable,
-    accountsTable: sqliteAccountsTable,
-    sessionsTable: sqliteSessionsTable,
-    verificationTokensTable: sqliteVerificationTokensTable,
-  }
+  schema?: DefaultSQLiteSchema
 ): Adapter {
   const { usersTable, accountsTable, sessionsTable, verificationTokensTable } =
-    schema
+    defineTables(schema)
 
   return {
-    async createUser(data: Omit<AdapterUser, "id">) {
-      return client.insert(usersTable).values(data).returning().get()
+    async createUser(data: AdapterUser) {
+      const { id, ...insertData } = data
+      const hasDefaultId = getTableColumns(usersTable)["id"]["hasDefault"]
+
+      return client
+        .insert(usersTable)
+        .values(hasDefaultId ? insertData : { ...insertData, id })
+        .returning()
+        .get()
     },
     async getUser(userId: string) {
       const result = await client
@@ -236,18 +246,192 @@ export function SQLiteDrizzleAdapter(
   }
 }
 
-export type SQLiteTableFn<T extends TableConfig> = SQLiteTableWithColumns<{
-  name: T["name"]
-  columns: T["columns"]
-  dialect: T["dialect"]
+type DefaultSQLiteColumn<
+  T extends {
+    data: string | number | Date
+    dataType: "string" | "number" | "date"
+    notNull: boolean
+    columnType: "SQLiteText" | "SQLiteTimestamp" | "SQLiteInteger"
+  },
+> = SQLiteColumn<{
+  name: string
+  columnType: T["columnType"]
+  data: T["data"]
+  driverParam: string | number
+  notNull: T["notNull"]
+  hasDefault: boolean
+  enumValues: any
+  dataType: T["dataType"]
+  tableName: string
+}>
+
+export type DefaultSQLiteUsersTable = SQLiteTableWithColumns<{
+  name: string
+  columns: {
+    id: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    name: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+      dataType: "string"
+    }>
+    email: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    emailVerified: DefaultSQLiteColumn<{
+      dataType: "date"
+      columnType: "SQLiteTimestamp"
+      data: Date
+      notNull: boolean
+    }>
+    image: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+  }
+  dialect: "sqlite"
+  schema: string | undefined
+}>
+
+export type DefaultSQLiteAccountsTable = SQLiteTableWithColumns<{
+  name: string
+  columns: {
+    userId: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    type: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    provider: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    providerAccountId: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+    }>
+    refresh_token: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+    access_token: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+    expires_at: DefaultSQLiteColumn<{
+      dataType: "number"
+      columnType: "SQLiteInteger"
+      data: number
+      notNull: boolean
+    }>
+    token_type: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+    scope: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+    id_token: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+    session_state: DefaultSQLiteColumn<{
+      dataType: "string"
+      columnType: "SQLiteText"
+      data: string
+      notNull: boolean
+    }>
+  }
+  dialect: "sqlite"
+  schema: string | undefined
+}>
+
+export type DefaultSQLiteSessionsTable = SQLiteTableWithColumns<{
+  name: string
+  columns: {
+    sessionToken: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    userId: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultSQLiteColumn<{
+      dataType: "date"
+      columnType: "SQLiteTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "sqlite"
+  schema: string | undefined
+}>
+
+export type DefaultSQLiteVerificationTokenTable = SQLiteTableWithColumns<{
+  name: string
+  columns: {
+    identifier: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    token: DefaultSQLiteColumn<{
+      columnType: "SQLiteText"
+      data: string
+      notNull: true
+      dataType: "string"
+    }>
+    expires: DefaultSQLiteColumn<{
+      dataType: "date"
+      columnType: "SQLiteTimestamp"
+      data: Date
+      notNull: true
+    }>
+  }
+  dialect: "sqlite"
   schema: string | undefined
 }>
 
 export type DefaultSQLiteSchema = {
-  usersTable: SQLiteTableFn<(typeof sqliteUsersTable)["_"]["config"]>
-  accountsTable: SQLiteTableFn<(typeof sqliteAccountsTable)["_"]["config"]>
-  sessionsTable: SQLiteTableFn<(typeof sqliteSessionsTable)["_"]["config"]>
-  verificationTokensTable: SQLiteTableFn<
-    (typeof sqliteVerificationTokensTable)["_"]["config"]
-  >
+  usersTable: DefaultSQLiteUsersTable
+  accountsTable: DefaultSQLiteAccountsTable
+  sessionsTable?: DefaultSQLiteSessionsTable
+  verificationTokensTable?: DefaultSQLiteVerificationTokenTable
 }

package/src/lib/utils.ts

@@ -1,14 +1,14 @@
-import { MySqlDatabase } from "drizzle-orm/mysql-core"
-import { PgDatabase } from "drizzle-orm/pg-core"
-import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core"
 import type {
   QueryResultHKT as MySQLQueryResultHKT,
   PreparedQueryHKTBase,
 } from "drizzle-orm/mysql-core"
+import { MySqlDatabase } from "drizzle-orm/mysql-core"
 import type { QueryResultHKT as PostgresQueryResultHKT } from "drizzle-orm/pg-core"
-import { DefaultSQLiteSchema } from "./sqlite"
-import { DefaultPostgresSchema } from "./pg"
-import { DefaultMySqlSchema } from "./mysql"
+import { PgDatabase } from "drizzle-orm/pg-core"
+import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core"
+import { DefaultMySqlSchema } from "./mysql.js"
+import { DefaultPostgresSchema } from "./pg.js"
+import { DefaultSQLiteSchema } from "./sqlite.js"
 
 type AnyPostgresDatabase = PgDatabase<PostgresQueryResultHKT, any>
 type AnyMySqlDatabase = MySqlDatabase<
@@ -23,10 +23,11 @@ export type SqlFlavorOptions =
   | AnyMySqlDatabase
   | AnySQLiteDatabase
 
-export type DefaultSchema<Flavor> = Flavor extends AnyMySqlDatabase
-  ? DefaultMySqlSchema
-  : Flavor extends AnyPostgresDatabase
-    ? DefaultPostgresSchema
-    : Flavor extends AnySQLiteDatabase
-      ? DefaultSQLiteSchema
-      : never
+export type DefaultSchema<Flavor extends SqlFlavorOptions> =
+  Flavor extends AnyMySqlDatabase
+    ? DefaultMySqlSchema
+    : Flavor extends AnyPostgresDatabase
+      ? DefaultPostgresSchema
+      : Flavor extends AnySQLiteDatabase
+        ? DefaultSQLiteSchema
+        : never