@auth/drizzle-adapter 0.0.0-manual.ffc00566 → 0.1.0

package/src/lib/mysql.ts

@@ -6,10 +6,10 @@ import {
   primaryKey,
   varchar,
 } from "drizzle-orm/mysql-core"
+
 import type { Adapter, AdapterAccount } from "@auth/core/adapters"
-import { MySql2Database } from "drizzle-orm/mysql2"
+import type { MySql2Database } from "drizzle-orm/mysql2"
 
-/** @internal */
 export const users = mysqlTable("users", {
   id: varchar("id", { length: 255 }).notNull().primaryKey(),
   name: varchar("name", { length: 255 }),
@@ -21,7 +21,6 @@ export const users = mysqlTable("users", {
   image: varchar("image", { length: 255 }),
 })
 
-/** @internal */
 export const accounts = mysqlTable(
   "accounts",
   {
@@ -46,7 +45,6 @@ export const accounts = mysqlTable(
   })
 )
 
-/** @internal */
 export const sessions = mysqlTable("sessions", {
   sessionToken: varchar("sessionToken", { length: 255 }).notNull().primaryKey(),
   userId: varchar("userId", { length: 255 })
@@ -55,7 +53,6 @@ export const sessions = mysqlTable("sessions", {
   expires: timestamp("expires", { mode: "date" }).notNull(),
 })
 
-/** @internal */
 export const verificationTokens = mysqlTable(
   "verificationToken",
   {
@@ -68,16 +65,14 @@ export const verificationTokens = mysqlTable(
   })
 )
 
-/** @internal */
 export const schema = { users, accounts, sessions, verificationTokens }
 export type DefaultSchema = typeof schema
 
-/** @internal */
 export function mySqlDrizzleAdapter(
   client: MySql2Database<Record<string, never>>
 ): Adapter {
   return {
-    createUser: async (data) => {
+    async createUser(data) {
       const id = crypto.randomUUID()
 
       await client.insert(users).values({ ...data, id })
@@ -88,7 +83,7 @@ export function mySqlDrizzleAdapter(
         .where(eq(users.id, id))
         .then((res) => res[0])
     },
-    getUser: async (data) => {
+    async getUser(data) {
       const thing =
         (await client
           .select()
@@ -98,7 +93,7 @@ export function mySqlDrizzleAdapter(
 
       return thing
     },
-    getUserByEmail: async (data) => {
+    async getUserByEmail(data) {
       const user =
         (await client
           .select()
@@ -108,7 +103,7 @@ export function mySqlDrizzleAdapter(
 
       return user
     },
-    createSession: async (data) => {
+    async createSession(data) {
       await client.insert(sessions).values(data)
 
       return await client
@@ -117,7 +112,7 @@ export function mySqlDrizzleAdapter(
         .where(eq(sessions.sessionToken, data.sessionToken))
         .then((res) => res[0])
     },
-    getSessionAndUser: async (data) => {
+    async getSessionAndUser(data) {
       const sessionAndUser =
         (await client
           .select({
@@ -131,7 +126,7 @@ export function mySqlDrizzleAdapter(
 
       return sessionAndUser
     },
-    updateUser: async (data) => {
+    async updateUser(data) {
       if (!data.id) {
         throw new Error("No user id.")
       }
@@ -144,7 +139,7 @@ export function mySqlDrizzleAdapter(
         .where(eq(users.id, data.id))
         .then((res) => res[0])
     },
-    updateSession: async (data) => {
+    async updateSession(data) {
       await client
         .update(sessions)
         .set(data)
@@ -156,13 +151,13 @@ export function mySqlDrizzleAdapter(
         .where(eq(sessions.sessionToken, data.sessionToken))
         .then((res) => res[0])
     },
-    linkAccount: async (rawAccount) => {
+    async linkAccount(rawAccount) {
       await client
         .insert(accounts)
         .values(rawAccount)
         .then((res) => res[0])
     },
-    getUserByAccount: async (account) => {
+    async getUserByAccount(account) {
       const dbAccount =
         (await client
           .select()
@@ -182,7 +177,7 @@ export function mySqlDrizzleAdapter(
 
       return dbAccount.users
     },
-    deleteSession: async (sessionToken) => {
+    async deleteSession(sessionToken) {
       const session =
         (await client
           .select()
@@ -196,7 +191,7 @@ export function mySqlDrizzleAdapter(
 
       return session
     },
-    createVerificationToken: async (token) => {
+    async createVerificationToken(token) {
       await client.insert(verificationTokens).values(token)
 
       return await client
@@ -205,7 +200,7 @@ export function mySqlDrizzleAdapter(
         .where(eq(verificationTokens.identifier, token.identifier))
         .then((res) => res[0])
     },
-    useVerificationToken: async (token) => {
+    async useVerificationToken(token) {
       try {
         const deletedToken =
           (await client
@@ -233,7 +228,7 @@ export function mySqlDrizzleAdapter(
         throw new Error("No verification token found.")
       }
     },
-    deleteUser: async (id) => {
+    async deleteUser(id) {
       const user = await client
         .select()
         .from(users)
@@ -244,7 +239,7 @@ export function mySqlDrizzleAdapter(
 
       return user
     },
-    unlinkAccount: async (account) => {
+    async unlinkAccount(account) {
       await client
         .delete(accounts)
         .where(

package/src/lib/pg.ts

@@ -1,3 +1,4 @@
+import { and, eq } from "drizzle-orm"
 import {
   timestamp,
   pgTable,
@@ -5,11 +6,10 @@ import {
   primaryKey,
   integer,
 } from "drizzle-orm/pg-core"
-import { PostgresJsDatabase } from "drizzle-orm/postgres-js"
-import { Adapter, AdapterAccount } from "@auth/core/adapters"
-import { and, eq } from "drizzle-orm"
 
-/** @internal */
+import type { PostgresJsDatabase } from "drizzle-orm/postgres-js"
+import type { Adapter, AdapterAccount } from "@auth/core/adapters"
+
 export const users = pgTable("users", {
   id: text("id").notNull().primaryKey(),
   name: text("name"),
@@ -18,7 +18,6 @@ export const users = pgTable("users", {
   image: text("image"),
 })
 
-/** @internal */
 export const accounts = pgTable(
   "accounts",
   {
@@ -41,7 +40,6 @@ export const accounts = pgTable(
   })
 )
 
-/** @internal */
 export const sessions = pgTable("sessions", {
   sessionToken: text("sessionToken").notNull().primaryKey(),
   userId: text("userId")
@@ -50,7 +48,6 @@ export const sessions = pgTable("sessions", {
   expires: timestamp("expires", { mode: "date" }).notNull(),
 })
 
-/** @internal */
 export const verificationTokens = pgTable(
   "verificationToken",
   {
@@ -63,44 +60,42 @@ export const verificationTokens = pgTable(
   })
 )
 
-/** @internal */
 export const schema = { users, accounts, sessions, verificationTokens }
 export type DefaultSchema = typeof schema
 
-/** @internal */
 export function pgDrizzleAdapter(
   client: PostgresJsDatabase<Record<string, never>>
 ): Adapter {
   return {
-    createUser: async (data) => {
+    async createUser(data) {
       return await client
         .insert(users)
         .values({ ...data, id: crypto.randomUUID() })
         .returning()
         .then((res) => res[0] ?? null)
     },
-    getUser: async (data) => {
+    async getUser(data) {
       return await client
         .select()
         .from(users)
         .where(eq(users.id, data))
         .then((res) => res[0] ?? null)
     },
-    getUserByEmail: async (data) => {
+    async getUserByEmail(data) {
       return await client
         .select()
         .from(users)
         .where(eq(users.email, data))
         .then((res) => res[0] ?? null)
     },
-    createSession: async (data) => {
+    async createSession(data) {
       return await client
         .insert(sessions)
         .values(data)
         .returning()
         .then((res) => res[0])
     },
-    getSessionAndUser: async (data) => {
+    async getSessionAndUser(data) {
       return await client
         .select({
           session: sessions,
@@ -111,7 +106,7 @@ export function pgDrizzleAdapter(
         .innerJoin(users, eq(users.id, sessions.userId))
         .then((res) => res[0] ?? null)
     },
-    updateUser: async (data) => {
+    async updateUser(data) {
       if (!data.id) {
         throw new Error("No user id.")
       }
@@ -123,7 +118,7 @@ export function pgDrizzleAdapter(
         .returning()
         .then((res) => res[0])
     },
-    updateSession: async (data) => {
+    async updateSession(data) {
       return await client
         .update(sessions)
         .set(data)
@@ -131,7 +126,7 @@ export function pgDrizzleAdapter(
         .returning()
         .then((res) => res[0])
     },
-    linkAccount: async (rawAccount) => {
+    async linkAccount(rawAccount) {
       const updatedAccount = await client
         .insert(accounts)
         .values(rawAccount)
@@ -153,7 +148,7 @@ export function pgDrizzleAdapter(
 
       return account
     },
-    getUserByAccount: async (account) => {
+    async getUserByAccount(account) {
       const dbAccount =
         (await client
           .select()
@@ -173,7 +168,7 @@ export function pgDrizzleAdapter(
 
       return dbAccount.users
     },
-    deleteSession: async (sessionToken) => {
+    async deleteSession(sessionToken) {
       const session = await client
         .delete(sessions)
         .where(eq(sessions.sessionToken, sessionToken))
@@ -182,14 +177,14 @@ export function pgDrizzleAdapter(
 
       return session
     },
-    createVerificationToken: async (token) => {
+    async createVerificationToken(token) {
       return await client
         .insert(verificationTokens)
         .values(token)
         .returning()
         .then((res) => res[0])
     },
-    useVerificationToken: async (token) => {
+    async useVerificationToken(token) {
       try {
         return await client
           .delete(verificationTokens)
@@ -205,14 +200,14 @@ export function pgDrizzleAdapter(
         throw new Error("No verification token found.")
       }
     },
-    deleteUser: async (id) => {
+    async deleteUser(id) {
       await client
         .delete(users)
         .where(eq(users.id, id))
         .returning()
         .then((res) => res[0] ?? null)
     },
-    unlinkAccount: async (account) => {
+    async unlinkAccount(account) {
       const { type, provider, providerAccountId, userId } = await client
         .delete(accounts)
         .where(

package/src/lib/sqlite.ts

@@ -1,3 +1,4 @@
+import { eq, and } from "drizzle-orm"
 import {
   integer,
   sqliteTable,
@@ -5,10 +6,9 @@ import {
   primaryKey,
   BaseSQLiteDatabase,
 } from "drizzle-orm/sqlite-core"
-import { Adapter, AdapterAccount } from "@auth/core/adapters"
-import { eq, and } from "drizzle-orm"
 
-/** @internal */
+import type { Adapter, AdapterAccount } from "@auth/core/adapters"
+
 export const users = sqliteTable("users", {
   id: text("id").notNull().primaryKey(),
   name: text("name"),
@@ -17,7 +17,6 @@ export const users = sqliteTable("users", {
   image: text("image"),
 })
 
-/** @internal */
 export const accounts = sqliteTable(
   "accounts",
   {
@@ -40,7 +39,6 @@ export const accounts = sqliteTable(
   })
 )
 
-/** @internal */
 export const sessions = sqliteTable("sessions", {
   sessionToken: text("sessionToken").notNull().primaryKey(),
   userId: text("userId")
@@ -49,7 +47,6 @@ export const sessions = sqliteTable("sessions", {
   expires: integer("expires", { mode: "timestamp_ms" }).notNull(),
 })
 
-/** @internal */
 export const verificationTokens = sqliteTable(
   "verificationToken",
   {
@@ -62,34 +59,32 @@ export const verificationTokens = sqliteTable(
   })
 )
 
-/** @internal */
 export const schema = { users, accounts, sessions, verificationTokens }
 export type DefaultSchema = typeof schema
 
-/** @internal */
 export function SQLiteDrizzleAdapter(
   client: BaseSQLiteDatabase<any, any>
 ): Adapter {
   return {
-    createUser: (data) => {
+    createUser(data) {
       return client
         .insert(users)
         .values({ ...data, id: crypto.randomUUID() })
         .returning()
         .get()
     },
-    getUser: (data) => {
+    getUser(data) {
       return client.select().from(users).where(eq(users.id, data)).get() ?? null
     },
-    getUserByEmail: (data) => {
+    getUserByEmail(data) {
       return (
         client.select().from(users).where(eq(users.email, data)).get() ?? null
       )
     },
-    createSession: (data) => {
+    createSession(data) {
       return client.insert(sessions).values(data).returning().get()
     },
-    getSessionAndUser: (data) => {
+    getSessionAndUser(data) {
       return (
         client
           .select({
@@ -102,7 +97,7 @@ export function SQLiteDrizzleAdapter(
           .get() ?? null
       )
     },
-    updateUser: (data) => {
+    updateUser(data) {
       if (!data.id) {
         throw new Error("No user id.")
       }
@@ -114,7 +109,7 @@ export function SQLiteDrizzleAdapter(
         .returning()
         .get()
     },
-    updateSession: (data) => {
+    updateSession(data) {
       return client
         .update(sessions)
         .set(data)
@@ -122,7 +117,7 @@ export function SQLiteDrizzleAdapter(
         .returning()
         .get()
     },
-    linkAccount: (rawAccount) => {
+    linkAccount(rawAccount) {
       const updatedAccount = client
         .insert(accounts)
         .values(rawAccount)
@@ -143,7 +138,7 @@ export function SQLiteDrizzleAdapter(
 
       return account
     },
-    getUserByAccount: (account) => {
+    getUserByAccount(account) {
       const results = client
         .select()
         .from(accounts)
@@ -158,7 +153,7 @@ export function SQLiteDrizzleAdapter(
 
       return results?.users ?? null
     },
-    deleteSession: (sessionToken) => {
+    deleteSession(sessionToken) {
       return (
         client
           .delete(sessions)
@@ -167,10 +162,10 @@ export function SQLiteDrizzleAdapter(
           .get() ?? null
       )
     },
-    createVerificationToken: (token) => {
+    createVerificationToken(token) {
       return client.insert(verificationTokens).values(token).returning().get()
     },
-    useVerificationToken: (token) => {
+    useVerificationToken(token) {
       try {
         return (
           client
@@ -188,10 +183,10 @@ export function SQLiteDrizzleAdapter(
         throw new Error("No verification token found.")
       }
     },
-    deleteUser: (id) => {
+    deleteUser(id) {
       return client.delete(users).where(eq(users.id, id)).returning().get()
     },
-    unlinkAccount: (account) => {
+    unlinkAccount(account) {
       client
         .delete(accounts)
         .where(

package/src/lib/utils.ts

@@ -1,9 +1,13 @@
-import { AnyMySqlTable, MySqlDatabase } from "drizzle-orm/mysql-core"
-import { AnyPgTable, PgDatabase } from "drizzle-orm/pg-core"
-import { AnySQLiteTable, BaseSQLiteDatabase } from "drizzle-orm/sqlite-core"
-import { DefaultSchema as PgSchema } from "./pg"
-import { DefaultSchema as MySqlSchema } from "./mysql"
-import { DefaultSchema as SQLiteSchema } from "./sqlite"
+import { MySqlDatabase } from "drizzle-orm/mysql-core"
+import { PgDatabase } from "drizzle-orm/pg-core"
+import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core"
+
+import type { AnyMySqlTable } from "drizzle-orm/mysql-core"
+import type { AnyPgTable } from "drizzle-orm/pg-core"
+import type { AnySQLiteTable } from "drizzle-orm/sqlite-core"
+import type { DefaultSchema as PgSchema } from "./pg.js"
+import type { DefaultSchema as MySqlSchema } from "./mysql.js"
+import type { DefaultSchema as SQLiteSchema } from "./sqlite.js"
 
 export type AnyMySqlDatabase = MySqlDatabase<any, any>
 export type AnyPgDatabase = PgDatabase<any, any, any>