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

package/lib/adapter.cjs

@@ -222,28 +222,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 +255,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 +264,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 +272,36 @@ 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(
+        const affected = await orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
+        orm.em.clear();
         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,20 +309,19 @@ 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(
+        const [rows, count] = await orm.em.findAndCount(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           {
             fields: ["id"]
           }
         );
-        await em.removeAndFlush(rows);
+        await orm.em.removeAndFlush(rows);
         return count;
       }
     };

package/lib/adapter.js

@@ -196,28 +196,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 +229,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 +238,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 +246,36 @@ 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(
+        const affected = await orm.em.nativeUpdate(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           normalizeInput(metadata, update)
         );
+        orm.em.clear();
         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,20 +283,19 @@ 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(
+        const [rows, count] = await orm.em.findAndCount(
           metadata.class,
           normalizeWhereClauses(metadata, where),
           {
             fields: ["id"]
           }
         );
-        await em.removeAndFlush(rows);
+        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.101",
+  "version": "0.4.102",
   "description": "Mikro ORM Adapter for Better Auth",
   "keywords": [
     "auth",