@forklaunch/better-auth-mikro-orm-fork 0.4.106 → 0.5.0

package/lib/adapter.cjs

@@ -25,7 +25,6 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/adapter.ts
-var import_core2 = require("@mikro-orm/core");
 var import_adapters = require("better-auth/adapters");
 var import_dset2 = require("dset");
 
@@ -51,12 +50,15 @@ function createAdapterUtils(orm) {
   const normalizeEntityName = (name) => naming.getEntityName(naming.classToTableName(name));
   const getEntityMetadata = (entityName) => {
     entityName = normalizeEntityName(entityName);
-    if (!metadata.has(entityName)) {
-      createAdapterError(
-        `Cannot find metadata for "${entityName}" entity. Make sure it defined and listed in your Mikro ORM config.`
-      );
+    const allMetadata = metadata.getAll();
+    for (const meta of allMetadata.values()) {
+      if (meta.className === entityName) {
+        return meta;
+      }
     }
-    return metadata.get(entityName);
+    createAdapterError(
+      `Cannot find metadata for "${entityName}" entity. Make sure it defined and listed in your Mikro ORM config.`
+    );
   };
   function getPropertyMetadata(metadata2, fieldName) {
     const prop = metadata2.props.find((prop2) => {
@@ -124,7 +126,7 @@ function createAdapterUtils(orm) {
   const normalizeInput = (metadata2, input) => {
     const fields = {};
     Object.entries(input).forEach(([key, value]) => {
-      if (typeof value === "object" && value.$in) {
+      if (typeof value === "object" && value !== null && value.$in) {
         const property = getPropertyMetadata(metadata2, key);
         (0, import_dset.dset)(fields, [property.name], value.$in);
       } else {
@@ -144,7 +146,9 @@ function createAdapterUtils(orm) {
         getPropertyMetadata(metadata2, key)
       ),
       value
-    })).forEach(({ path, value }) => (0, import_dset.dset)(result, path, value));
+    })).forEach(({ path, value }) => {
+      (0, import_dset.dset)(result, path, value);
+    });
     return result;
   };
   function createWhereClause(path, value, op, target = {}) {
@@ -195,13 +199,14 @@ function createAdapterUtils(orm) {
     where.filter(({ connector }) => !connector || connector === "AND").forEach(({ field, operator, value }, index) => {
       const path = ["$and", index].concat(getFieldPath(metadata2, field, true));
       if (operator === "in") {
-        return createWhereInClause(field, path, value, result);
+        createWhereInClause(field, path, value, result);
+      } else {
+        createWhereClause(path, value, "eq", result);
       }
-      return createWhereClause(path, value, "eq", result);
     });
     where.filter(({ connector }) => connector === "OR").forEach(({ field, value }, index) => {
       const path = ["$or", index].concat(getFieldPath(metadata2, field, true));
-      return createWhereClause(path, value, "eq", result);
+      createWhereClause(path, value, "eq", result);
     });
     return result;
   };
@@ -228,14 +233,14 @@ var adapter = (orm) => ({ options }) => {
     async create({ model, data, select }) {
       const metadata = getEntityMetadata(model);
       const input = normalizeInput(metadata, data);
-      if (options.advanced?.generateId === false && !options.advanced?.database || options.advanced?.database?.generateId === false) {
+      if (options.advanced?.database?.generateId === false) {
         Reflect.deleteProperty(input, "id");
       }
       const entity = orm.em.create(metadata.class, input);
       try {
-        await orm.em.persistAndFlush(entity);
+        await orm.em.persist(entity).flush();
       } catch (error) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
         throw error;
       }
       return normalizeOutput(metadata, entity, select);
@@ -288,7 +293,7 @@ var adapter = (orm) => ({ options }) => {
       try {
         await orm.em.flush();
       } catch (error) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
         throw error;
       }
       return normalizeOutput(metadata, entity);
@@ -311,7 +316,7 @@ var adapter = (orm) => ({ options }) => {
         }
       );
       if (entity) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
       }
     },
     async deleteMany({ model, where }) {

package/lib/adapter.d.cts

@@ -1,5 +1,4 @@
 import * as better_auth_adapters from 'better-auth/adapters';
-import { AdapterDebugLogs } from 'better-auth/adapters';
 import { MikroORM } from '@mikro-orm/core';
 import { BetterAuthOptions } from 'better-auth/types';
 
@@ -9,7 +8,11 @@ interface MikroOrmAdapterConfig {
      *
      * @default false
      */
-    debugLogs?: AdapterDebugLogs;
+    debugLogs?: boolean | {
+        isRunningAdapterTests: boolean;
+    } | {
+        logCondition?: () => boolean;
+    };
     /**
      * Indicates whether or not JSON is supported by target database.
      *
@@ -34,9 +37,9 @@ interface MikroOrmAdapterConfig {
  *   * No complex primary key support
  *   * No schema generation
  *
- * @param orm - Instance of Mikro ORM returned from `MikroORM.init` or `MikroORM.initSync` methods
+ * @param orm - Instance of Mikro ORM returned from `MikroORM.init` or `new MikroORM` constructor
  * @param config - Additional configuration for Mikro ORM adapter
  */
-declare const mikroOrmAdapter: (orm: MikroORM, { debugLogs, supportsJSON, options }?: MikroOrmAdapterConfig) => better_auth_adapters.AdapterFactory;
+declare const mikroOrmAdapter: (orm: MikroORM, { debugLogs, supportsJSON, options }?: MikroOrmAdapterConfig) => better_auth_adapters.AdapterFactory<BetterAuthOptions>;
 
 export { type MikroOrmAdapterConfig, mikroOrmAdapter };

package/lib/adapter.d.ts

@@ -1,5 +1,4 @@
 import * as better_auth_adapters from 'better-auth/adapters';
-import { AdapterDebugLogs } from 'better-auth/adapters';
 import { MikroORM } from '@mikro-orm/core';
 import { BetterAuthOptions } from 'better-auth/types';
 
@@ -9,7 +8,11 @@ interface MikroOrmAdapterConfig {
      *
      * @default false
      */
-    debugLogs?: AdapterDebugLogs;
+    debugLogs?: boolean | {
+        isRunningAdapterTests: boolean;
+    } | {
+        logCondition?: () => boolean;
+    };
     /**
      * Indicates whether or not JSON is supported by target database.
      *
@@ -34,9 +37,9 @@ interface MikroOrmAdapterConfig {
  *   * No complex primary key support
  *   * No schema generation
  *
- * @param orm - Instance of Mikro ORM returned from `MikroORM.init` or `MikroORM.initSync` methods
+ * @param orm - Instance of Mikro ORM returned from `MikroORM.init` or `new MikroORM` constructor
  * @param config - Additional configuration for Mikro ORM adapter
  */
-declare const mikroOrmAdapter: (orm: MikroORM, { debugLogs, supportsJSON, options }?: MikroOrmAdapterConfig) => better_auth_adapters.AdapterFactory;
+declare const mikroOrmAdapter: (orm: MikroORM, { debugLogs, supportsJSON, options }?: MikroOrmAdapterConfig) => better_auth_adapters.AdapterFactory<BetterAuthOptions>;
 
 export { type MikroOrmAdapterConfig, mikroOrmAdapter };

package/lib/adapter.js

@@ -1,5 +1,4 @@
 // src/adapter.ts
-import "@mikro-orm/core";
 import {
   createAdapterFactory
 } from "better-auth/adapters";
@@ -27,12 +26,15 @@ function createAdapterUtils(orm) {
   const normalizeEntityName = (name) => naming.getEntityName(naming.classToTableName(name));
   const getEntityMetadata = (entityName) => {
     entityName = normalizeEntityName(entityName);
-    if (!metadata.has(entityName)) {
-      createAdapterError(
-        `Cannot find metadata for "${entityName}" entity. Make sure it defined and listed in your Mikro ORM config.`
-      );
+    const allMetadata = metadata.getAll();
+    for (const meta of allMetadata.values()) {
+      if (meta.className === entityName) {
+        return meta;
+      }
     }
-    return metadata.get(entityName);
+    createAdapterError(
+      `Cannot find metadata for "${entityName}" entity. Make sure it defined and listed in your Mikro ORM config.`
+    );
   };
   function getPropertyMetadata(metadata2, fieldName) {
     const prop = metadata2.props.find((prop2) => {
@@ -100,7 +102,7 @@ function createAdapterUtils(orm) {
   const normalizeInput = (metadata2, input) => {
     const fields = {};
     Object.entries(input).forEach(([key, value]) => {
-      if (typeof value === "object" && value.$in) {
+      if (typeof value === "object" && value !== null && value.$in) {
         const property = getPropertyMetadata(metadata2, key);
         dset(fields, [property.name], value.$in);
       } else {
@@ -120,7 +122,9 @@ function createAdapterUtils(orm) {
         getPropertyMetadata(metadata2, key)
       ),
       value
-    })).forEach(({ path, value }) => dset(result, path, value));
+    })).forEach(({ path, value }) => {
+      dset(result, path, value);
+    });
     return result;
   };
   function createWhereClause(path, value, op, target = {}) {
@@ -171,13 +175,14 @@ function createAdapterUtils(orm) {
     where.filter(({ connector }) => !connector || connector === "AND").forEach(({ field, operator, value }, index) => {
       const path = ["$and", index].concat(getFieldPath(metadata2, field, true));
       if (operator === "in") {
-        return createWhereInClause(field, path, value, result);
+        createWhereInClause(field, path, value, result);
+      } else {
+        createWhereClause(path, value, "eq", result);
       }
-      return createWhereClause(path, value, "eq", result);
     });
     where.filter(({ connector }) => connector === "OR").forEach(({ field, value }, index) => {
       const path = ["$or", index].concat(getFieldPath(metadata2, field, true));
-      return createWhereClause(path, value, "eq", result);
+      createWhereClause(path, value, "eq", result);
     });
     return result;
   };
@@ -204,14 +209,14 @@ var adapter = (orm) => ({ options }) => {
     async create({ model, data, select }) {
       const metadata = getEntityMetadata(model);
       const input = normalizeInput(metadata, data);
-      if (options.advanced?.generateId === false && !options.advanced?.database || options.advanced?.database?.generateId === false) {
+      if (options.advanced?.database?.generateId === false) {
         Reflect.deleteProperty(input, "id");
       }
       const entity = orm.em.create(metadata.class, input);
       try {
-        await orm.em.persistAndFlush(entity);
+        await orm.em.persist(entity).flush();
       } catch (error) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
         throw error;
       }
       return normalizeOutput(metadata, entity, select);
@@ -264,7 +269,7 @@ var adapter = (orm) => ({ options }) => {
       try {
         await orm.em.flush();
       } catch (error) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
         throw error;
       }
       return normalizeOutput(metadata, entity);
@@ -287,7 +292,7 @@ var adapter = (orm) => ({ options }) => {
         }
       );
       if (entity) {
-        await orm.em.removeAndFlush(entity);
+        await orm.em.remove(entity).flush();
       }
     },
     async deleteMany({ model, where }) {

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "type": "module",
   "name": "@forklaunch/better-auth-mikro-orm-fork",
-  "version": "0.4.106",
+  "version": "0.5.0",
   "description": "Mikro ORM Adapter for Better Auth",
   "keywords": [
     "auth",
@@ -20,7 +20,7 @@
     "url": "git+ssh://git@github.com/octet-stream/better-auth-mikro-orm.git"
   },
   "engines": {
-    "node": ">= 18"
+    "node": ">= 22.17"
   },
   "types": "./lib/adapter.d.cts",
   "main": "./lib/adapter.cjs",
@@ -46,34 +46,35 @@
     "lib"
   ],
   "devDependencies": {
-    "@biomejs/biome": "1.9.4",
-    "@changesets/changelog-github": "0.5.1",
-    "@changesets/cli": "2.29.2",
-    "@commitlint/cli": "19.8.0",
-    "@commitlint/config-conventional": "19.8.0",
-    "@commitlint/types": "19.8.0",
-    "@faker-js/faker": "9.7.0",
-    "@mikro-orm/better-sqlite": "6.4.13",
-    "@mikro-orm/core": "6.4.13",
-    "@types/node": "22.14.1",
-    "@types/uuid": "10.0.0",
-    "@vitest/coverage-v8": "3.1.1",
-    "@vitest/ui": "3.1.1",
-    "better-auth": "1.3.11",
-    "del-cli": "6.0.0",
-    "es-toolkit": "1.39.7",
+    "@better-auth/test-utils": "1.5.5",
+    "@biomejs/biome": "2.4.7",
+    "@changesets/changelog-github": "0.6.0",
+    "@changesets/cli": "2.30.0",
+    "@commitlint/cli": "20.5.0",
+    "@commitlint/config-conventional": "20.5.0",
+    "@commitlint/types": "20.5.0",
+    "@faker-js/faker": "10.3.0",
+    "@mikro-orm/core": "7.0.2",
+    "@mikro-orm/sqlite": "7.0.2",
+    "@types/node": "25.5.0",
+    "@types/uuid": "11.0.0",
+    "@vitest/coverage-v8": "4.1.0",
+    "@vitest/ui": "4.1.0",
+    "better-auth": "1.5.5",
+    "del-cli": "7.0.0",
+    "es-toolkit": "1.45.1",
     "husky": "9.1.7",
-    "is-in-ci": "1.0.0",
-    "tsup": "8.4.0",
-    "typescript": "5.8.3",
-    "uuid": "11.1.0",
-    "vitest": "3.1.1"
+    "is-in-ci": "2.0.0",
+    "tsup": "8.5.1",
+    "typescript": "5.9.3",
+    "uuid": "13.0.0",
+    "vitest": "4.1.0"
   },
   "dependencies": {
     "dset": "3.1.4"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "^6.0.0",
+    "@mikro-orm/core": "^7.0.0",
     "better-auth": "^1.0.0"
   },
   "scripts": {