test(adapter): Run adapter against better-auth test suite and remove select

Author: octet-stream

package.json

@@ -70,6 +70,7 @@
     "@vitest/ui": "3.1.1",
     "better-auth": "1.2.9",
     "del-cli": "6.0.0",
+    "es-toolkit": "1.39.7",
     "husky": "9.1.7",
     "is-in-ci": "1.0.0",
     "tsup": "8.4.0",

pnpm-lock.yaml

@@ -246,8 +246,7 @@ export function createAdapterUtils(orm: MikroORM): AdapterUtils {
 
   const normalizeOutput: AdapterUtils["normalizeOutput"] = (
     metadata,
-    output,
-    select
+    output
   ) => {
     output = serialize(output)
 
@@ -260,7 +259,6 @@ export function createAdapterUtils(orm: MikroORM): AdapterUtils {
         ),
         value
       }))
-      .filter(({path}) => (select ? select.includes(path) : true))
       .forEach(({path, value}) => dset(result, path, value))
 
     return result

src/utils/adapterUtils.ts

@@ -0,0 +1,3 @@
+export {Sessions} from "./better-auth-test-suite/Session.js"
+export {Address} from "./better-auth-test-suite/Address.js"
+export {User} from "./better-auth-test-suite/User.js"

tests/fixtures/entities/better-auth-test-suite.ts

@@ -0,0 +1,10 @@
+import {Embeddable, Property} from "@mikro-orm/core"
+
+@Embeddable()
+export class Address {
+  @Property({type: "string"})
+  street!: string
+
+  @Property({type: "string"})
+  city!: string
+}

tests/fixtures/entities/better-auth-test-suite/Address.ts

@@ -0,0 +1,24 @@
+import {Entity, ManyToOne, Property, Unique} from "@mikro-orm/core"
+import type {Session as DatabaseSession} from "better-auth"
+
+import {Base} from "../shared/Base.js"
+import {User} from "./User.js"
+
+@Entity()
+export class Sessions extends Base implements Omit<DatabaseSession, "userId"> {
+  @Property({type: "string"})
+  @Unique()
+  token!: string
+
+  @Property({type: Date})
+  expiresAt!: Date
+
+  @Property({type: "string", nullable: true, default: null})
+  ipAddress?: string | null | undefined
+
+  @Property({type: "string", nullable: true, default: null})
+  userAgent?: string | null | undefined
+
+  @ManyToOne(() => User)
+  user!: User
+}

tests/fixtures/entities/better-auth-test-suite/Session.ts

@@ -0,0 +1,35 @@
+import {
+  Collection,
+  Embedded,
+  Entity,
+  OneToMany,
+  type Opt,
+  Property,
+  Unique
+} from "@mikro-orm/core"
+
+import {Base} from "../shared/Base.js"
+import {Address} from "./Address.js"
+import {Sessions} from "./Session.js"
+
+@Entity()
+export class User extends Base {
+  @Property({type: "string"})
+  @Unique()
+  email_address!: string
+
+  @Property({type: "boolean"})
+  emailVerified: Opt<boolean> = false
+
+  @Property({type: "string", nullable: true})
+  test?: string
+
+  @Property({type: "string"})
+  name!: string
+
+  @OneToMany(() => Sessions, "user")
+  sessions = new Collection<Sessions, this>(this)
+
+  @Embedded(() => Address, {object: true, nullable: true})
+  address?: Address
+}

tests/fixtures/entities/better-auth-test-suite/User.ts

@@ -11,14 +11,18 @@ import {v7} from "uuid"
 import {afterAll, beforeAll, beforeEach} from "vitest"
 
 interface CreateOrmParams {
+  refreshOnEachTest?: boolean
   entities: Array<
     | EntityClass<Partial<any>>
     | EntityClassGroup<Partial<any>>
     | EntitySchema<Partial<any>>
   >
 }
 
-export function createOrm({entities}: CreateOrmParams): MikroORM {
+export function createOrm({
+  entities,
+  refreshOnEachTest = true
+}: CreateOrmParams): MikroORM {
   const dbName = join(import.meta.dirname, `${v7()}.sqlite`)
 
   const orm = MikroORM.initSync({
@@ -30,7 +34,11 @@ export function createOrm({entities}: CreateOrmParams): MikroORM {
 
   beforeAll(async () => await orm.connect())
 
-  beforeEach(async () => await orm.getSchemaGenerator().refreshDatabase())
+  if (refreshOnEachTest) {
+    beforeEach(async () => await orm.getSchemaGenerator().refreshDatabase())
+  } else {
+    beforeAll(async () => await orm.getSchemaGenerator().refreshDatabase())
+  }
 
   afterAll(async () => {
     await orm.close()

tests/fixtures/orm.ts

@@ -0,0 +1,45 @@
+import type {BetterAuthOptions} from "better-auth"
+import {runAdapterTest} from "better-auth/adapters/test"
+import {toMerged} from "es-toolkit"
+import {suite} from "vitest"
+
+import * as entities from "../fixtures/entities/better-auth-test-suite.js"
+
+import {mikroOrmAdapter} from "../../src/adapter.js"
+import {createOrm} from "../fixtures/orm.js"
+
+const orm = createOrm({
+  entities: Object.values(entities),
+  refreshOnEachTest: false
+})
+
+suite("better-auth tests", async () => {
+  const baseOptions: BetterAuthOptions = {
+    user: {
+      fields: {
+        email: "email_address"
+      },
+      additionalFields: {
+        test: {
+          type: "string",
+          defaultValue: "test"
+        }
+      }
+    },
+    session: {
+      modelName: "sessions"
+    }
+  }
+
+  await runAdapterTest({
+    async getAdapter(customOptions = {}) {
+      const adapter = mikroOrmAdapter(orm, {
+        debugLogs: {
+          isRunningAdapterTests: true
+        }
+      })
+
+      return adapter(toMerged(baseOptions, customOptions))
+    }
+  })
+})