@forklaunch/better-auth-mikro-orm-fork 0.4.102 → 0.4.104

package/lib/adapter.cjs

@@ -33,7 +33,7 @@ var import_core = require("@mikro-orm/core");
 var import_dset = require("dset");
 
 // src/utils/createAdapterError.ts
-var import_better_auth = require("better-auth");
+var import_better_auth = require("@forklaunch/better-auth");
 function createAdapterError(message) {
   throw new import_better_auth.BetterAuthError(`[Mikro ORM Adapter] ${message}`);
 }
@@ -114,6 +114,12 @@ function createAdapterUtils(orm) {
       `Cannot normalize "${fieldName}" field name into path for "${metadata2.className}" entity.`
     );
   };
+  const normalizePropertyValue = (property, value) => {
+    if (!property.targetMeta || property.kind === import_core.ReferenceKind.SCALAR || property.kind === import_core.ReferenceKind.EMBEDDED) {
+      return value;
+    }
+    return orm.em.getReference(property.targetMeta.class, value);
+  };
   const normalizeInput = (metadata2, input) => {
     const fields = {};
     Object.entries(input).forEach(([key, value]) => {
@@ -126,7 +132,7 @@ function createAdapterUtils(orm) {
     });
     return fields;
   };
-  const normalizeOutput = (metadata2, output, select) => {
+  const normalizeOutput = (metadata2, output) => {
     output = (0, import_core.serialize)(output);
     const result = {};
     Object.entries(output).map(([key, value]) => ({
@@ -135,7 +141,7 @@ function createAdapterUtils(orm) {
         getPropertyMetadata(metadata2, key)
       ),
       value
-    })).filter(({ path }) => select ? select.includes(path) : true).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 = {}) {
@@ -291,13 +297,11 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
       },
       async updateMany({ model, where, update }) {
         const metadata = getEntityMetadata(model);
-        const affected = await orm.em.nativeUpdate(
+        return orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
-        orm.em.clear();
-        return affected;
       },
       async delete({ model, where }) {
         const metadata = getEntityMetadata(model);
@@ -314,15 +318,10 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
       },
       async deleteMany({ model, where }) {
         const metadata = getEntityMetadata(model);
-        const [rows, count] = await orm.em.findAndCount(
+        return orm.em.nativeDelete(
           metadata.class,
-          normalizeWhereClauses(metadata, where),
-          {
-            fields: ["id"]
-          }
+          normalizeWhereClauses(metadata, where)
         );
-        await orm.em.removeAndFlush(rows);
-        return count;
       }
     };
   }

package/lib/adapter.js

@@ -7,7 +7,7 @@ import { ReferenceKind, serialize } from "@mikro-orm/core";
 import { dset } from "dset";
 
 // src/utils/createAdapterError.ts
-import { BetterAuthError } from "better-auth";
+import { BetterAuthError } from "@forklaunch/better-auth";
 function createAdapterError(message) {
   throw new BetterAuthError(`[Mikro ORM Adapter] ${message}`);
 }
@@ -88,6 +88,12 @@ function createAdapterUtils(orm) {
       `Cannot normalize "${fieldName}" field name into path for "${metadata2.className}" entity.`
     );
   };
+  const normalizePropertyValue = (property, value) => {
+    if (!property.targetMeta || property.kind === ReferenceKind.SCALAR || property.kind === ReferenceKind.EMBEDDED) {
+      return value;
+    }
+    return orm.em.getReference(property.targetMeta.class, value);
+  };
   const normalizeInput = (metadata2, input) => {
     const fields = {};
     Object.entries(input).forEach(([key, value]) => {
@@ -100,7 +106,7 @@ function createAdapterUtils(orm) {
     });
     return fields;
   };
-  const normalizeOutput = (metadata2, output, select) => {
+  const normalizeOutput = (metadata2, output) => {
     output = serialize(output);
     const result = {};
     Object.entries(output).map(([key, value]) => ({
@@ -109,7 +115,7 @@ function createAdapterUtils(orm) {
         getPropertyMetadata(metadata2, key)
       ),
       value
-    })).filter(({ path }) => select ? select.includes(path) : true).forEach(({ path, value }) => dset(result, path, value));
+    })).forEach(({ path, value }) => dset(result, path, value));
     return result;
   };
   function createWhereClause(path, value, op, target = {}) {
@@ -265,13 +271,11 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
       },
       async updateMany({ model, where, update }) {
         const metadata = getEntityMetadata(model);
-        const affected = await orm.em.nativeUpdate(
+        return orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
-        orm.em.clear();
-        return affected;
       },
       async delete({ model, where }) {
         const metadata = getEntityMetadata(model);
@@ -288,15 +292,10 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
       },
       async deleteMany({ model, where }) {
         const metadata = getEntityMetadata(model);
-        const [rows, count] = await orm.em.findAndCount(
+        return orm.em.nativeDelete(
           metadata.class,
-          normalizeWhereClauses(metadata, where),
-          {
-            fields: ["id"]
-          }
+          normalizeWhereClauses(metadata, where)
         );
-        await orm.em.removeAndFlush(rows);
-        return count;
       }
     };
   }

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "type": "module",
   "name": "@forklaunch/better-auth-mikro-orm-fork",
-  "version": "0.4.102",
+  "version": "0.4.104",
   "description": "Mikro ORM Adapter for Better Auth",
   "keywords": [
     "auth",
@@ -61,6 +61,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",

package/readme.md

@@ -1,53 +1,64 @@
 # better-auth-mikro-orm
 
-[Mikro ORM](https://mikro-orm.io/) adapter for [Better Auth](https://www.better-auth.com/)
+[MikroORM](https://mikro-orm.io/) adapter for [Better Auth](https://www.better-auth.com/)
+
+[![CI](https://github.com/octet-stream/better-auth-mikro-orm/actions/workflows/ci.yaml/badge.svg)](https://github.com/octet-stream/better-auth-mikro-orm/actions/workflows/ci.yaml)
+[![codecov](https://codecov.io/gh/octet-stream/better-auth-mikro-orm/graph/badge.svg?token=xcVndkC8mL)](https://codecov.io/gh/octet-stream/better-auth-mikro-orm)
 
 ## Installation
 
-pnpm:
+Using npm:
 
 ```sh
-pnpm add better-auth-mikro-orm
+npm i better-auth-mikro-orm
 ```
 
-npm:
+Using yarn:
 
 ```sh
-npm i better-auth-mikro-orm
+yarn add better-auth-mikro-orm
+```
+
+Using pnpm:
+
+```sh
+pnpm add better-auth-mikro-orm
 ```
 
 ## Usage
 
-1. First you'll need to set up Mikro ORM and define the [core schema](https://www.better-auth.com/docs/concepts/database#core-schema) for Better Auth.
-If you use any plugin - don't forget to check if they have any additional database schema definitions, then define entities you'll need for each plugin.
-2. When you finished with the schema definition you can simply pass the result of `mikroOrmAdapter` call to the `database` option like this:
+1. First you'll need to set up MikroORM and define the [core schema](https://www.better-auth.com/docs/concepts/database#core-schema) for Better Auth.
+   If you use any plugin, don't forget to check if they have any additional database schema definitions, then define entities you'll need for each plugin.
+2. When you're finished with the schema definitions, you can simply pass the result of the `mikroOrmAdapter` call to the `database` option like this:
 
 ```ts
-import {mikroOrmAdapter} from "better-auth-mikro-orm"
-import {betterAuth} from "better-auth"
+import { mikroOrmAdapter } from "@forklaunch/better-auth-mikro-orm";
+import { betterAuth } from "@forklaunch/better-auth";
 
-import {orm} from "./orm.js" // Your Mikro ORM instance
+import { orm } from "./orm.js"; // Your Mikro ORM instance
 
 export const auth = betterAuth({
   database: mikroOrmAdapter(orm),
 
-  // Don't forget to disable ID generator if it already managed by Mikro ORM:
+  // Don't forget to disable the ID generator if it is already managed by MikroORM
   advanced: {
-    generateId: false
-  }
-})
+    database: {
+      generateId: false,
+    },
+  },
+});
 ```
 
 ## API
 
 ### `mikroOrmAdapter(orm: MikroORM): AdapterInstance`
 
-Creates Mikro ORM adapter instance. Note that this adapter **does not** manage database schema for you, so you can't use it with [`@better-auth/cli`](https://www.better-auth.com/docs/concepts/cli).
-This means you'll have to manage database schema on your own.
-Please refer to Better Auth and Mikro ORM documentation on the details.
+Creates the MikroORM adapter instance. Note that this adapter **does not** manage database schemas for you, so you can't use it with [`@better-auth/cli`](https://www.better-auth.com/docs/concepts/cli).
+This means you'll have to manage database schemas on your own.
+Please refer to the Better Auth and MikroORM documentations for details.
 
-Returns `AdapterInstance` function for Better Auth `database` option.
+Returns the `AdapterInstance` function for the Better Auth `database` option.
 
 This function expects a single argument:
 
-* `orm` - An instance of `MikroORM` returned from `MikroORM.init` or `MikroORM.initSync` methods.
+- `orm` - An instance of `MikroORM` returned from either `MikroORM.init` or `MikroORM.initSync`.