@mikro-orm/core 6.3.3-dev.11 → 6.3.3-dev.12

package/decorators/CreateRequestContext.js

@@ -6,6 +6,7 @@ const MikroORM_1 = require("../MikroORM");
 const RequestContext_1 = require("../utils/RequestContext");
 const EntityManager_1 = require("../EntityManager");
 const EntityRepository_1 = require("../entity/EntityRepository");
+const TransactionContext_1 = require("../utils/TransactionContext");
 function CreateRequestContext(getContext, respectExistingContext = false) {
     return function (target, propertyKey, descriptor) {
         const originalMethod = descriptor.value;
@@ -14,6 +15,10 @@ function CreateRequestContext(getContext, respectExistingContext = false) {
             if (respectExistingContext && RequestContext_1.RequestContext.currentRequestContext()) {
                 return originalMethod.apply(this, args);
             }
+            // If we are inside explicit transaction context, we need to create another tx context.
+            // Otherwise, the outer tx context would be preferred.
+            const txContext = TransactionContext_1.TransactionContext.currentTransactionContext();
+            const provider = txContext ? TransactionContext_1.TransactionContext : RequestContext_1.RequestContext;
             /* istanbul ignore next */
             let orm;
             let em;
@@ -29,23 +34,25 @@ function CreateRequestContext(getContext, respectExistingContext = false) {
                 orm = await this.orm;
                 em = await this.em;
             }
-            if (em instanceof EntityManager_1.EntityManager) {
-                return await RequestContext_1.RequestContext.create(em, () => {
+            const create = async (em) => {
+                if (txContext) {
+                    em = em.fork({ useContext: true });
+                }
+                return await provider.create(em, () => {
                     return originalMethod.apply(this, args);
                 });
+            };
+            if (em instanceof EntityManager_1.EntityManager) {
+                return await create(em);
             }
             if (orm instanceof EntityRepository_1.EntityRepository) {
-                return await RequestContext_1.RequestContext.create(orm.getEntityManager(), () => {
-                    return originalMethod.apply(this, args);
-                });
+                return await create(orm.getEntityManager());
             }
             if (!(orm instanceof MikroORM_1.MikroORM)) {
                 const name = respectExistingContext ? 'EnsureRequestContext' : 'CreateRequestContext';
                 throw new Error(`@${name}() decorator can only be applied to methods of classes with \`orm: MikroORM\` property, \`em: EntityManager\` property, or with a callback parameter like \`@${name}(() => orm)\` that returns one of those types. The parameter will contain a reference to current \`this\`. Returning an EntityRepository from it is also supported.`);
             }
-            return await RequestContext_1.RequestContext.create(orm.em, () => {
-                return originalMethod.apply(this, args);
-            });
+            return await create(orm.em);
         };
         return descriptor;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.3-dev.11",
+  "version": "6.3.3-dev.12",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.3-dev.11",
+    "mikro-orm": "6.3.3-dev.12",
     "reflect-metadata": "0.2.2"
   }
 }