@forklaunch/better-auth-mikro-orm-fork 0.4.101 → 0.4.103

package/lib/adapter.cjs

@@ -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 = {}) {
@@ -222,28 +228,30 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
     } = createAdapterUtils(orm);
     return {
       async create({ model, data, select }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
         const input = normalizeInput(metadata, data);
-        if (options.advanced?.generateId === false && !options.advanced?.database) {
+        if (options.advanced?.generateId === false && !options.advanced?.database || options.advanced?.database?.generateId === false) {
           Reflect.deleteProperty(input, "id");
         }
-        const entity = em.create(metadata.class, input);
-        await em.persistAndFlush(entity);
+        const entity = orm.em.create(metadata.class, input);
+        try {
+          await orm.em.persistAndFlush(entity);
+        } catch (error) {
+          await orm.em.removeAndFlush(entity);
+          throw error;
+        }
         return normalizeOutput(metadata, entity, select);
       },
       async count({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        return em.count(
+        return orm.em.count(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
       },
       async findOne({ model, where, select }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
@@ -253,7 +261,6 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
         return normalizeOutput(metadata, entity, select);
       },
       async findMany({ model, where, limit, offset, sortBy }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
         const options2 = {
           limit,
@@ -263,7 +270,7 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
           const path = getFieldPath(metadata, sortBy.field);
           (0, import_dset2.dset)(options2, ["orderBy", ...path], sortBy.direction);
         }
-        const rows = await em.find(
+        const rows = await orm.em.find(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           options2
@@ -271,33 +278,34 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
         return rows.map((row) => normalizeOutput(metadata, row));
       },
       async update({ model, where, update }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
         if (!entity) {
           return null;
         }
-        em.assign(entity, normalizeInput(metadata, update));
-        await em.flush();
+        orm.em.assign(entity, normalizeInput(metadata, update));
+        try {
+          await orm.em.flush();
+        } catch (error) {
+          await orm.em.removeAndFlush(entity);
+          throw error;
+        }
         return normalizeOutput(metadata, entity);
       },
       async updateMany({ model, where, update }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const affected = await em.nativeUpdate(
+        return orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
-        return affected;
       },
       async delete({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           {
@@ -305,21 +313,15 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => (0, impo
           }
         );
         if (entity) {
-          await em.removeAndFlush(entity);
+          await orm.em.removeAndFlush(entity);
         }
       },
       async deleteMany({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const [rows, count] = await em.findAndCount(
+        return orm.em.nativeDelete(
           metadata.class,
-          normalizeWhereClauses(metadata, where),
-          {
-            fields: ["id"]
-          }
+          normalizeWhereClauses(metadata, where)
         );
-        await em.removeAndFlush(rows);
-        return count;
       }
     };
   }

package/lib/adapter.js

@@ -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 = {}) {
@@ -196,28 +202,30 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
     } = createAdapterUtils(orm);
     return {
       async create({ model, data, select }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
         const input = normalizeInput(metadata, data);
-        if (options.advanced?.generateId === false && !options.advanced?.database) {
+        if (options.advanced?.generateId === false && !options.advanced?.database || options.advanced?.database?.generateId === false) {
           Reflect.deleteProperty(input, "id");
         }
-        const entity = em.create(metadata.class, input);
-        await em.persistAndFlush(entity);
+        const entity = orm.em.create(metadata.class, input);
+        try {
+          await orm.em.persistAndFlush(entity);
+        } catch (error) {
+          await orm.em.removeAndFlush(entity);
+          throw error;
+        }
         return normalizeOutput(metadata, entity, select);
       },
       async count({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        return em.count(
+        return orm.em.count(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
       },
       async findOne({ model, where, select }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
@@ -227,7 +235,6 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
         return normalizeOutput(metadata, entity, select);
       },
       async findMany({ model, where, limit, offset, sortBy }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
         const options2 = {
           limit,
@@ -237,7 +244,7 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
           const path = getFieldPath(metadata, sortBy.field);
           dset2(options2, ["orderBy", ...path], sortBy.direction);
         }
-        const rows = await em.find(
+        const rows = await orm.em.find(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           options2
@@ -245,33 +252,34 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
         return rows.map((row) => normalizeOutput(metadata, row));
       },
       async update({ model, where, update }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where)
         );
         if (!entity) {
           return null;
         }
-        em.assign(entity, normalizeInput(metadata, update));
-        await em.flush();
+        orm.em.assign(entity, normalizeInput(metadata, update));
+        try {
+          await orm.em.flush();
+        } catch (error) {
+          await orm.em.removeAndFlush(entity);
+          throw error;
+        }
         return normalizeOutput(metadata, entity);
       },
       async updateMany({ model, where, update }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const affected = await em.nativeUpdate(
+        return orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
-        return affected;
       },
       async delete({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const entity = await em.findOne(
+        const entity = await orm.em.findOne(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           {
@@ -279,21 +287,15 @@ var mikroOrmAdapter = (orm, { debugLogs, supportsJSON = true } = {}) => createAd
           }
         );
         if (entity) {
-          await em.removeAndFlush(entity);
+          await orm.em.removeAndFlush(entity);
         }
       },
       async deleteMany({ model, where }) {
-        const em = orm.em.fork();
         const metadata = getEntityMetadata(model);
-        const [rows, count] = await em.findAndCount(
+        return orm.em.nativeDelete(
           metadata.class,
-          normalizeWhereClauses(metadata, where),
-          {
-            fields: ["id"]
-          }
+          normalizeWhereClauses(metadata, where)
         );
-        await 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.101",
+  "version": "0.4.103",
   "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

@@ -2,6 +2,10 @@
 
 [Mikro ORM](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: