chore(release): bump package version(s) [skip ci]

* fix(adapters): use built-in `is()` to identify db type

* remove unused .then

* fix imports

packages/adapter-drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auth/drizzle-adapter",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Drizzle adapter for Auth.js.",
   "homepage": "https://authjs.dev",
   "repository": "https://github.com/nextauthjs/next-auth",

packages/adapter-drizzle/src/index.ts

@@ -16,19 +16,14 @@
  * @module @auth/drizzle-adapter
  */
 
-import { MySqlTableFn } from "drizzle-orm/mysql-core/index.js"
+import { MySqlDatabase, MySqlTableFn } from "drizzle-orm/mysql-core"
-import { PgTableFn } from "drizzle-orm/pg-core/index.js"
+import { PgDatabase, PgTableFn } from "drizzle-orm/pg-core"
-import { SQLiteTableFn } from "drizzle-orm/sqlite-core/index.js"
+import { BaseSQLiteDatabase, SQLiteTableFn } from "drizzle-orm/sqlite-core"
 import { mySqlDrizzleAdapter } from "./lib/mysql.js"
 import { pgDrizzleAdapter } from "./lib/pg.js"
 import { SQLiteDrizzleAdapter } from "./lib/sqlite.js"
-import {
+import { SqlFlavorOptions, TableFn } from "./lib/utils.js"
-  isMySqlDatabase,
+import { is } from "drizzle-orm"
-  isPgDatabase,
-  isSQLiteDatabase,
-  SqlFlavorOptions,
-  TableFn,
-} from "./lib/utils.js"
 
 import type { Adapter } from "@auth/core/adapters"
 
@@ -260,18 +255,15 @@ export function DrizzleAdapter<SqlFlavor extends SqlFlavorOptions>(
   db: SqlFlavor,
   table?: TableFn<SqlFlavor>
 ): Adapter {
-  if (isMySqlDatabase(db)) {
+  if (is(db, MySqlDatabase)) {
-    // We need to cast to unknown since the type overlaps (PScale is MySQL based)
     return mySqlDrizzleAdapter(db, table as MySqlTableFn)
-  }
+  } else if (is(db, PgDatabase)) {
-
-  if (isPgDatabase(db)) {
     return pgDrizzleAdapter(db, table as PgTableFn)
-  }
+  } else if (is(db, BaseSQLiteDatabase)) {
-
-  if (isSQLiteDatabase(db)) {
     return SQLiteDrizzleAdapter(db, table as SQLiteTableFn)
   }
 
-  throw new Error("Unsupported database type in Auth.js Drizzle adapter.")
+  throw new Error(
+    `Unsupported database type (${typeof db}) in Auth.js Drizzle adapter.`
+  )
 }

packages/adapter-drizzle/src/lib/mysql.ts

@@ -6,10 +6,10 @@ import {
   primaryKey,
   varchar,
   MySqlTableFn,
+  MySqlDatabase,
 } from "drizzle-orm/mysql-core"
 
 import type { Adapter, AdapterAccount } from "@auth/core/adapters"
-import type { MySql2Database } from "drizzle-orm/mysql2"
 
 export function createTables(mySqlTable: MySqlTableFn) {
   const users = mySqlTable("user", {
@@ -77,7 +77,7 @@ export function createTables(mySqlTable: MySqlTableFn) {
 export type DefaultSchema = ReturnType<typeof createTables>
 
 export function mySqlDrizzleAdapter(
-  client: MySql2Database<Record<string, never>>,
+  client: InstanceType<typeof MySqlDatabase>,
   tableFn = defaultMySqlTableFn
 ): Adapter {
   const { users, accounts, sessions, verificationTokens } =
@@ -164,10 +164,7 @@ export function mySqlDrizzleAdapter(
         .then((res) => res[0])
     },
     async linkAccount(rawAccount) {
-      await client
+      await client.insert(accounts).values(rawAccount)
-        .insert(accounts)
-        .values(rawAccount)
-        .then((res) => res[0])
     },
     async getUserByAccount(account) {
       const dbAccount =

packages/adapter-drizzle/src/lib/pg.ts

@@ -6,9 +6,9 @@ import {
   primaryKey,
   integer,
   PgTableFn,
+  PgDatabase,
 } from "drizzle-orm/pg-core"
 
-import type { PostgresJsDatabase } from "drizzle-orm/postgres-js"
 import type { Adapter, AdapterAccount } from "@auth/core/adapters"
 
 export function createTables(pgTable: PgTableFn) {
@@ -68,7 +68,7 @@ export function createTables(pgTable: PgTableFn) {
 export type DefaultSchema = ReturnType<typeof createTables>
 
 export function pgDrizzleAdapter(
-  client: PostgresJsDatabase<Record<string, never>>,
+  client: InstanceType<typeof PgDatabase>,
   tableFn = defaultPgTableFn
 ): Adapter {
   const { users, accounts, sessions, verificationTokens } =

packages/adapter-drizzle/src/lib/sqlite.ts

@@ -67,7 +67,7 @@ export function createTables(sqliteTable: SQLiteTableFn) {
 export type DefaultSchema = ReturnType<typeof createTables>
 
 export function SQLiteDrizzleAdapter(
-  client: BaseSQLiteDatabase<any, any>,
+  client: InstanceType<typeof BaseSQLiteDatabase>,
   tableFn = defaultSqliteTableFn
 ): Adapter {
   const { users, accounts, sessions, verificationTokens } =

packages/adapter-drizzle/src/lib/utils.ts

@@ -39,17 +39,3 @@ export type TableFn<Flavor> = Flavor extends AnyMySqlDatabase
   : Flavor extends AnySQLiteDatabase
   ? SQLiteTableFn
   : AnySQLiteTable
-
-export function isMySqlDatabase(
-  db: any
-): db is MySqlDatabase<any, any, any, any> {
-  return db instanceof MySqlDatabase
-}
-
-export function isPgDatabase(db: any): db is PgDatabase<any, any, any> {
-  return db instanceof PgDatabase
-}
-
-export function isSQLiteDatabase(db: any): db is AnySQLiteDatabase {
-  return db instanceof BaseSQLiteDatabase
-}