@mikro-orm/core 7.2.2-dev.20 → 7.2.2-dev.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.2-dev.20",
+  "version": "7.2.2-dev.22",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/unit-of-work/ChangeSetPersister.js

@@ -207,7 +207,7 @@ export class ChangeSetPersister {
         const keys = meta.getOwnConcurrencyCheckKeys();
         for (const key of keys) {
             cond[key] = changeSet.originalEntity[key];
-            if (changeSet.payload[key]) {
+            if (Object.hasOwn(changeSet.payload, key)) {
                 tmp.push(key);
             }
         }
@@ -322,17 +322,19 @@ export class ChangeSetPersister {
         }
         // skip entity references as they don't have version values loaded
         changeSets = changeSets.filter(cs => helper(cs.entity).__initialized);
-        const primaryKeys = meta.primaryKeys.concat(...concurrencyCheckKeys);
+        const fields = meta.primaryKeys.concat(...concurrencyCheckKeys);
         const $or = changeSets.map(cs => {
-            const cond = Utils.getPrimaryKeyCond(cs.originalEntity, primaryKeys);
+            const cond = Utils.getPrimaryKeyCond(cs.originalEntity, meta.primaryKeys);
+            for (const key of concurrencyCheckKeys) {
+                cond[key] = cs.originalEntity[key];
+            }
             if (meta.ownsVersionProperty()) {
-                // @ts-ignore
                 cond[meta.versionProperty] = this.#platform.convertVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
             }
             return cond;
         });
         options = this.prepareOptions(meta, options, {
-            fields: primaryKeys,
+            fields,
             orderBy: meta.primaryKeys.reduce((o, pk) => {
                 o[pk] = 'asc';
                 return o;
@@ -344,8 +346,8 @@ export class ChangeSetPersister {
         if (res.length !== changeSets.length) {
             // a FK pointing to a composite PK is an array, so the values need to be compared deeply
             const compare = (a, b, keys) => keys.every(k => equals(a[k], b[k]));
-            const entity = changeSets.find(cs => {
-                return !res.some(row => compare(Utils.getPrimaryKeyCond(cs.entity, primaryKeys), row, primaryKeys));
+            const entity = changeSets.find((_, index) => {
+                return !res.some(row => compare($or[index], row, meta.primaryKeys));
             }).entity;
             throw OptimisticLockError.lockFailed(entity);
         }

package/utils/TransactionContext.d.ts

@@ -1,6 +1,7 @@
 import type { EntityManager } from '../EntityManager.js';
 /** Uses `AsyncLocalStorage` to maintain a transaction-scoped EntityManager context across async operations. */
 export declare class TransactionContext {
+    #private;
     readonly em: EntityManager;
     private static storage;
     readonly id: number;

package/utils/TransactionContext.js

@@ -1,8 +1,10 @@
+var _a;
 import { createAsyncContext } from './AsyncContext.js';
 /** Uses `AsyncLocalStorage` to maintain a transaction-scoped EntityManager context across async operations. */
 export class TransactionContext {
     em;
     static storage = createAsyncContext();
+    #parent = _a.currentTransactionContext();
     id;
     constructor(em) {
         this.em = em;
@@ -12,7 +14,7 @@ export class TransactionContext {
      * Creates new TransactionContext instance and runs the code inside its domain.
      */
     static create(em, next) {
-        const context = new TransactionContext(em);
+        const context = new _a(em);
         return this.storage.run(context, next);
     }
     /**
@@ -25,7 +27,11 @@ export class TransactionContext {
      * Returns current EntityManager (if available).
      */
     static getEntityManager(name = 'default') {
-        const context = TransactionContext.currentTransactionContext();
-        return context?.em.name === name ? context.em : undefined;
+        let context = _a.currentTransactionContext();
+        while (context && context.em.name !== name) {
+            context = context.#parent;
+        }
+        return context?.em;
     }
 }
+_a = TransactionContext;

package/utils/TransactionManager.js

@@ -81,10 +81,10 @@ export class TransactionManager {
      */
     async executeWithoutTransaction(em, cb, options) {
         const suspended = this.suspendTransaction(em);
-        const fork = this.createFork(em, { ...options, disableTransactions: true });
+        const fork = this.createFork(em, options);
         const propagateToUpperContext = this.shouldPropagateToUpperContext(em);
         try {
-            return await this.executeTransactionFlow(fork, cb, propagateToUpperContext, em);
+            return await TransactionContext.create(fork, () => this.executeTransactionFlow(fork, cb, propagateToUpperContext, em));
         }
         finally {
             this.resumeTransaction(em, suspended);

package/utils/Utils.js

@@ -153,7 +153,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.2.2-dev.20';
+    static #ORM_VERSION = '7.2.2-dev.22';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;