@mikro-orm/core 6.4.7-dev.1 → 7.0.0-dev.0

package/EntityManager.js

@@ -6,7 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntityManager = void 0;
 const node_util_1 = require("node:util");
 const dataloader_1 = __importDefault(require("dataloader"));
-const utils_1 = require("./utils");
+const upsert_utils_1 = require("./utils/upsert-utils");
+const Utils_1 = require("./utils/Utils");
+const Cursor_1 = require("./utils/Cursor");
+const DataloaderUtils_1 = require("./utils/DataloaderUtils");
+const QueryHelper_1 = require("./utils/QueryHelper");
+const TransactionContext_1 = require("./utils/TransactionContext");
+const RawQueryFragment_1 = require("./utils/RawQueryFragment");
 const entity_1 = require("./entity");
 const unit_of_work_1 = require("./unit-of-work");
 const enums_1 = require("./enums");
@@ -27,8 +33,8 @@ class EntityManager {
     _id = EntityManager.counter++;
     global = false;
     name;
-    refLoader = new dataloader_1.default(utils_1.DataloaderUtils.getRefBatchLoadFn(this));
-    colLoader = new dataloader_1.default(utils_1.DataloaderUtils.getColBatchLoadFn(this));
+    refLoader = new dataloader_1.default(DataloaderUtils_1.DataloaderUtils.getRefBatchLoadFn(this));
+    colLoader = new dataloader_1.default(DataloaderUtils_1.DataloaderUtils.getColBatchLoadFn(this));
     validator;
     repositoryMap = {};
     entityLoader;
@@ -84,7 +90,7 @@ class EntityManager {
      * Gets repository for given entity. You can pass either string name or entity class reference.
      */
     getRepository(entityName) {
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         if (!this.repositoryMap[entityName]) {
             const meta = this.metadata.get(entityName);
             const RepositoryClass = this.config.getRepositoryClass(meta.repository);
@@ -118,7 +124,7 @@ class EntityManager {
         const em = this.getContext();
         em.prepareOptions(options);
         await em.tryFlush(entityName, options);
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         where = await em.processWhere(entityName, where, options, 'read');
         em.validator.validateParams(where);
         options.orderBy = options.orderBy || {};
@@ -157,7 +163,7 @@ class EntityManager {
             });
             ret.push(entity);
         }
-        const unique = utils_1.Utils.unique(ret);
+        const unique = Utils_1.Utils.unique(ret);
         await em.entityLoader.populate(entityName, unique, populate, {
             ...options,
             ...em.getPopulateWhere(where, options),
@@ -199,7 +205,7 @@ class EntityManager {
     addFilter(name, cond, entityName, enabled = true) {
         const options = { name, cond, default: enabled };
         if (entityName) {
-            options.entity = utils_1.Utils.asArray(entityName).map(n => utils_1.Utils.className(n));
+            options.entity = Utils_1.Utils.asArray(entityName).map(n => Utils_1.Utils.className(n));
         }
         this.getContext(false).filters[name] = options;
     }
@@ -234,7 +240,7 @@ class EntityManager {
         this.getContext(false).flushMode = flushMode;
     }
     async processWhere(entityName, where, options, type) {
-        where = utils_1.QueryHelper.processWhere({
+        where = QueryHelper_1.QueryHelper.processWhere({
             where,
             entityName,
             metadata: this.metadata,
@@ -269,10 +275,10 @@ class EntityManager {
         const ret = {};
         const populateWhere = options.populateWhere ?? this.config.get('populateWhere');
         if (populateWhere === enums_1.PopulateHint.INFER) {
-            utils_1.Utils.merge(ret, cond);
+            Utils_1.Utils.merge(ret, cond);
         }
         else if (typeof populateWhere === 'object') {
-            utils_1.Utils.merge(ret, populateWhere);
+            Utils_1.Utils.merge(ret, populateWhere);
         }
         return ret;
     }
@@ -288,12 +294,12 @@ class EntityManager {
                 }
                 const where = await this.applyFilters(prop.type, {}, options.filters ?? {}, 'read', { ...options, populate: hint.children });
                 const where2 = await this.getJoinedFilters(prop.targetMeta, {}, { ...options, populate: hint.children, populateWhere: enums_1.PopulateHint.ALL });
-                if (utils_1.Utils.hasObjectKeys(where)) {
+                if (Utils_1.Utils.hasObjectKeys(where)) {
                     ret[field] = ret[field] ? { $and: [where, ret[field]] } : where;
                 }
-                if (utils_1.Utils.hasObjectKeys(where2)) {
+                if (Utils_1.Utils.hasObjectKeys(where2)) {
                     if (ret[field]) {
-                        utils_1.Utils.merge(ret[field], where2);
+                        Utils_1.Utils.merge(ret[field], where2);
                     }
                     else {
                         ret[field] = where2;
@@ -317,7 +323,7 @@ class EntityManager {
         const ret = options.populate;
         for (const prop of props) {
             const cond = await this.applyFilters(prop.type, {}, options.filters ?? {}, 'read', options);
-            if (!utils_1.Utils.isEmpty(cond)) {
+            if (!Utils_1.Utils.isEmpty(cond)) {
                 const populated = options.populate.filter(({ field }) => field.split(':')[0] === prop.name);
                 if (populated.length > 0) {
                     populated.forEach(hint => hint.filter = true);
@@ -340,7 +346,7 @@ class EntityManager {
         }
         const active = new Set();
         const push = (source) => {
-            const activeFilters = utils_1.QueryHelper
+            const activeFilters = QueryHelper_1.QueryHelper
                 .getActiveFilters(entityName, options, source)
                 .filter(f => !active.has(f.name));
             filters.push(...activeFilters);
@@ -356,7 +362,7 @@ class EntityManager {
             let cond;
             if (filter.cond instanceof Function) {
                 // @ts-ignore
-                const args = utils_1.Utils.isPlainObject(options[filter.name]) ? options[filter.name] : this.getContext().filterParams[filter.name];
+                const args = Utils_1.Utils.isPlainObject(options[filter.name]) ? options[filter.name] : this.getContext().filterParams[filter.name];
                 if (!args && filter.cond.length > 0 && filter.args !== false) {
                     throw new Error(`No arguments provided for filter '${filter.name}'`);
                 }
@@ -365,7 +371,7 @@ class EntityManager {
             else {
                 cond = filter.cond;
             }
-            ret.push(utils_1.QueryHelper.processWhere({
+            ret.push(QueryHelper_1.QueryHelper.processWhere({
                 where: cond,
                 entityName,
                 metadata: this.metadata,
@@ -373,7 +379,7 @@ class EntityManager {
                 aliased: type === 'read',
             }));
         }
-        const conds = [...ret, where].filter(c => utils_1.Utils.hasObjectKeys(c));
+        const conds = [...ret, where].filter(c => Utils_1.Utils.hasObjectKeys(c));
         return conds.length > 1 ? { $and: conds } : conds[0];
     }
     /**
@@ -384,7 +390,7 @@ class EntityManager {
         const em = this.getContext(false);
         await em.tryFlush(entityName, options);
         options.flushMode = 'commit'; // do not try to auto flush again
-        return utils_1.RawQueryFragment.run(async () => {
+        return RawQueryFragment_1.RawQueryFragment.run(async () => {
             return Promise.all([
                 em.find(entityName, where, options),
                 em.count(entityName, where, options),
@@ -445,13 +451,13 @@ class EntityManager {
      */
     async findByCursor(entityName, where, options) {
         const em = this.getContext(false);
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         options.overfetch ??= true;
-        if (utils_1.Utils.isEmpty(options.orderBy)) {
+        if (Utils_1.Utils.isEmpty(options.orderBy)) {
             throw new Error('Explicit `orderBy` option required');
         }
         const [entities, count] = await em.findAndCount(entityName, where, options);
-        return new utils_1.Cursor(entities, count, options, this.metadata.get(entityName));
+        return new Cursor_1.Cursor(entities, count, options, this.metadata.get(entityName));
     }
     /**
      * Refreshes the persistent state of an entity from the database, overriding any local changes that have not yet been
@@ -501,7 +507,7 @@ class EntityManager {
             return ret;
         }
         const em = this.getContext();
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         em.prepareOptions(options);
         let entity = em.unitOfWork.tryGetById(entityName, where, options.schema);
         // query for a not managed entity which is already in the identity map as it
@@ -515,7 +521,7 @@ class EntityManager {
         where = await em.processWhere(entityName, where, options, 'read');
         em.validator.validateEmptyWhere(where);
         em.checkLockRequirements(options.lockMode, meta);
-        const isOptimisticLocking = !utils_1.Utils.isDefined(options.lockMode) || options.lockMode === enums_1.LockMode.OPTIMISTIC;
+        const isOptimisticLocking = !Utils_1.Utils.isDefined(options.lockMode) || options.lockMode === enums_1.LockMode.OPTIMISTIC;
         if (entity && !em.shouldRefresh(meta, entity, options) && isOptimisticLocking) {
             return em.lockAndPopulate(meta, entity, where, options);
         }
@@ -577,9 +583,9 @@ class EntityManager {
         if (!entity || isStrictViolation) {
             const key = options.strict ? 'findExactlyOneOrFailHandler' : 'findOneOrFailHandler';
             options.failHandler ??= this.config.get(key);
-            entityName = utils_1.Utils.className(entityName);
+            entityName = Utils_1.Utils.className(entityName);
             /* istanbul ignore next */
-            where = utils_1.Utils.isEntity(where) ? (0, entity_1.helper)(where).getPrimaryKey() : where;
+            where = Utils_1.Utils.isEntity(where) ? (0, entity_1.helper)(where).getPrimaryKey() : where;
             throw options.failHandler(entityName, where);
         }
         return entity;
@@ -624,11 +630,11 @@ class EntityManager {
             data = entityNameOrEntity;
         }
         else {
-            entityName = utils_1.Utils.className(entityNameOrEntity);
+            entityName = Utils_1.Utils.className(entityNameOrEntity);
         }
         const meta = this.metadata.get(entityName);
-        const convertCustomTypes = !utils_1.Utils.isEntity(data);
-        if (utils_1.Utils.isEntity(data)) {
+        const convertCustomTypes = !Utils_1.Utils.isEntity(data);
+        if (Utils_1.Utils.isEntity(data)) {
             entity = data;
             if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em && !this.config.get('upsertManaged')) {
                 em.entityFactory.mergeData(meta, entity, data, { initialized: true });
@@ -638,8 +644,8 @@ class EntityManager {
             data = em.comparator.prepareEntity(entity);
         }
         else {
-            data = utils_1.Utils.copy(utils_1.QueryHelper.processParams(data));
-            where = utils_1.Utils.extractPK(data, meta);
+            data = Utils_1.Utils.copy(QueryHelper_1.QueryHelper.processParams(data));
+            where = Utils_1.Utils.extractPK(data, meta);
             if (where && !this.config.get('upsertManaged')) {
                 const exists = em.unitOfWork.getById(entityName, where, options.schema);
                 if (exists) {
@@ -648,15 +654,15 @@ class EntityManager {
             }
         }
         const unique = options.onConflictFields ?? meta.props.filter(p => p.unique).map(p => p.name);
-        const propIndex = !utils_1.Utils.isRawSql(unique) && unique.findIndex(p => data[p] != null);
+        const propIndex = !(0, RawQueryFragment_1.isRaw)(unique) && unique.findIndex(p => data[p] != null);
         if (options.onConflictFields || where == null) {
             if (propIndex !== false && propIndex >= 0) {
                 where = { [unique[propIndex]]: data[unique[propIndex]] };
             }
             else if (meta.uniques.length > 0) {
                 for (const u of meta.uniques) {
-                    if (utils_1.Utils.asArray(u.properties).every(p => data[p] != null)) {
-                        where = utils_1.Utils.asArray(u.properties).reduce((o, key) => {
+                    if (Utils_1.Utils.asArray(u.properties).every(p => data[p] != null)) {
+                        where = Utils_1.Utils.asArray(u.properties).reduce((o, key) => {
                             o[key] = data[key];
                             return o;
                         }, {});
@@ -665,7 +671,7 @@ class EntityManager {
                 }
             }
         }
-        data = utils_1.QueryHelper.processObjectParams(data);
+        data = QueryHelper_1.QueryHelper.processObjectParams(data);
         em.validator.validateParams(data, 'insert data');
         if (em.eventManager.hasListeners(enums_1.EventType.beforeUpsert, meta)) {
             await em.eventManager.dispatchEvent(enums_1.EventType.beforeUpsert, { entity: data, em, meta }, meta);
@@ -682,8 +688,8 @@ class EntityManager {
             initialized: true,
             schema: options.schema,
         });
-        const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
-        const returning = (0, utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
+        const uniqueFields = options.onConflictFields ?? (Utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
+        const returning = (0, upsert_utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
         if (options.onConflictAction === 'ignore' || !(0, entity_1.helper)(entity).hasPrimaryKey() || (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
             const where = {};
             if (Array.isArray(uniqueFields)) {
@@ -696,6 +702,14 @@ class EntityManager {
                     }
                 }
             }
+            else {
+                Object.keys(data).forEach(prop => {
+                    where[prop] = data[prop];
+                });
+                if (meta.simplePK && ret.insertId != null) {
+                    where[meta.primaryKeys[0]] = ret.insertId;
+                }
+            }
             const data2 = await this.driver.findOne(meta.className, where, {
                 fields: returning,
                 ctx: em.transactionContext,
@@ -754,7 +768,7 @@ class EntityManager {
             data = entityNameOrEntity;
         }
         else {
-            entityName = utils_1.Utils.className(entityNameOrEntity);
+            entityName = Utils_1.Utils.className(entityNameOrEntity);
         }
         const batchSize = options.batchSize ?? this.config.get('batchSize');
         if (data.length > batchSize) {
@@ -766,7 +780,7 @@ class EntityManager {
             return ret;
         }
         const meta = this.metadata.get(entityName);
-        const convertCustomTypes = !utils_1.Utils.isEntity(data[0]);
+        const convertCustomTypes = !Utils_1.Utils.isEntity(data[0]);
         const allData = [];
         const allWhere = [];
         const entities = new Map();
@@ -774,7 +788,7 @@ class EntityManager {
         for (let i = 0; i < data.length; i++) {
             let row = data[i];
             let where;
-            if (utils_1.Utils.isEntity(row)) {
+            if (Utils_1.Utils.isEntity(row)) {
                 const entity = row;
                 if ((0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__em === em && !this.config.get('upsertManaged')) {
                     em.entityFactory.mergeData(meta, entity, row, { initialized: true });
@@ -786,8 +800,8 @@ class EntityManager {
                 row = em.comparator.prepareEntity(entity);
             }
             else {
-                row = data[i] = utils_1.Utils.copy(utils_1.QueryHelper.processParams(row));
-                where = utils_1.Utils.extractPK(row, meta);
+                row = data[i] = Utils_1.Utils.copy(QueryHelper_1.QueryHelper.processParams(row));
+                where = Utils_1.Utils.extractPK(row, meta);
                 if (where && !this.config.get('upsertManaged')) {
                     const exists = em.unitOfWork.getById(entityName, where, options.schema);
                     if (exists) {
@@ -806,8 +820,8 @@ class EntityManager {
                 }
                 else if (meta.uniques.length > 0) {
                     for (const u of meta.uniques) {
-                        if (utils_1.Utils.asArray(u.properties).every(p => row[p] != null)) {
-                            where = utils_1.Utils.asArray(u.properties).reduce((o, key) => {
+                        if (Utils_1.Utils.asArray(u.properties).every(p => row[p] != null)) {
+                            where = Utils_1.Utils.asArray(u.properties).reduce((o, key) => {
                                 o[key] = row[key];
                                 return o;
                             }, {});
@@ -816,8 +830,8 @@ class EntityManager {
                     }
                 }
             }
-            row = utils_1.QueryHelper.processObjectParams(row);
-            where = utils_1.QueryHelper.processWhere({
+            row = QueryHelper_1.QueryHelper.processObjectParams(row);
+            where = QueryHelper_1.QueryHelper.processWhere({
                 where,
                 entityName,
                 metadata: this.metadata,
@@ -846,8 +860,8 @@ class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
-            em.unitOfWork.getChangeSetPersister().mapReturnedValues(utils_1.Utils.isEntity(data[i]) ? data[i] : null, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
-            const entity = utils_1.Utils.isEntity(data[i]) ? data[i] : em.entityFactory.create(entityName, row, {
+            em.unitOfWork.getChangeSetPersister().mapReturnedValues(Utils_1.Utils.isEntity(data[i]) ? data[i] : null, Utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
+            const entity = Utils_1.Utils.isEntity(data[i]) ? data[i] : em.entityFactory.create(entityName, row, {
                 refresh: true,
                 initialized: true,
                 schema: options.schema,
@@ -859,24 +873,23 @@ class EntityManager {
             entitiesByData.set(row, entity);
         });
         // skip if we got the PKs via returning statement (`rows`)
-        const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(allWhere[0]) ? Object.keys(allWhere[0]).flatMap(key => utils_1.Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
-        const returning = (0, utils_1.getOnConflictReturningFields)(meta, data[0], uniqueFields, options);
+        const uniqueFields = options.onConflictFields ?? (Utils_1.Utils.isPlainObject(allWhere[0]) ? Object.keys(allWhere[0]).flatMap(key => Utils_1.Utils.splitPrimaryKeys(key)) : meta.primaryKeys);
+        const returning = (0, upsert_utils_1.getOnConflictReturningFields)(meta, data[0], uniqueFields, options);
         const reloadFields = returning.length > 0 && !(this.getPlatform().usesReturningStatement() && res.rows?.length);
         if (options.onConflictAction === 'ignore' || (!res.rows?.length && loadPK.size > 0) || reloadFields) {
             const unique = meta.hydrateProps.filter(p => !p.lazy).map(p => p.name);
             const add = new Set(propIndex >= 0 ? [unique[propIndex]] : []);
             for (const cond of loadPK.values()) {
-                utils_1.Utils.keys(cond).forEach(key => add.add(key));
+                Utils_1.Utils.keys(cond).forEach(key => add.add(key));
             }
             const where = { $or: [] };
-            if (Array.isArray(uniqueFields)) {
-                data.forEach((item, idx) => {
-                    where.$or[idx] = {};
-                    uniqueFields.forEach(prop => {
-                        where.$or[idx][prop] = item[prop];
-                    });
+            data.forEach((item, idx) => {
+                where.$or[idx] = {};
+                const props = Array.isArray(uniqueFields) ? uniqueFields : Object.keys(item);
+                props.forEach(prop => {
+                    where.$or[idx][prop] = item[prop];
                 });
-            }
+            });
             const data2 = await this.driver.find(meta.className, where, {
                 fields: returning.concat(...add).concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
                 ctx: em.transactionContext,
@@ -953,7 +966,7 @@ class EntityManager {
         });
         options.ctx ??= em.transactionContext;
         const propagateToUpperContext = !em.global || this.config.get('allowGlobalContext');
-        return utils_1.TransactionContext.create(fork, async () => {
+        return TransactionContext_1.TransactionContext.create(fork, async () => {
             return fork.getConnection().transactional(async (trx) => {
                 fork.transactionContext = trx;
                 if (propagateToUpperContext) {
@@ -975,7 +988,7 @@ class EntityManager {
                     }
                 }
                 return ret;
-            }, { ...options, eventBroadcaster: new events_1.TransactionEventBroadcaster(fork, undefined, { topLevelTransaction: !options.ctx }) });
+            }, { ...options, eventBroadcaster: new events_1.TransactionEventBroadcaster(fork, { topLevelTransaction: !options.ctx }) });
         });
     }
     /**
@@ -988,7 +1001,7 @@ class EntityManager {
         const em = this.getContext(false);
         em.transactionContext = await em.getConnection('write').begin({
             ...options,
-            eventBroadcaster: new events_1.TransactionEventBroadcaster(em, undefined, { topLevelTransaction: !options.ctx }),
+            eventBroadcaster: new events_1.TransactionEventBroadcaster(em, { topLevelTransaction: !options.ctx }),
         });
     }
     /**
@@ -1026,7 +1039,7 @@ class EntityManager {
      * Runs your callback wrapped inside a database transaction.
      */
     async lock(entity, lockMode, options = {}) {
-        options = utils_1.Utils.isPlainObject(options) ? options : { lockVersion: options };
+        options = Utils_1.Utils.isPlainObject(options) ? options : { lockVersion: options };
         await this.getUnitOfWork().lock(entity, { lockMode, ...options });
     }
     /**
@@ -1041,9 +1054,9 @@ class EntityManager {
             data = entityNameOrEntity;
         }
         else {
-            entityName = utils_1.Utils.className(entityNameOrEntity);
+            entityName = Utils_1.Utils.className(entityNameOrEntity);
         }
-        if (utils_1.Utils.isEntity(data)) {
+        if (Utils_1.Utils.isEntity(data)) {
             if (options.schema && (0, entity_1.helper)(data).getSchema() == null) {
                 (0, entity_1.helper)(data).setSchema(options.schema);
             }
@@ -1059,7 +1072,7 @@ class EntityManager {
             await em.unitOfWork.getChangeSetPersister().executeInserts([cs], { ctx: em.transactionContext, ...options });
             return cs.getPrimaryKey();
         }
-        data = utils_1.QueryHelper.processObjectParams(data);
+        data = QueryHelper_1.QueryHelper.processObjectParams(data);
         em.validator.validateParams(data, 'insert data');
         const res = await em.driver.nativeInsert(entityName, data, { ctx: em.transactionContext, ...options });
         return res.insertId;
@@ -1076,12 +1089,12 @@ class EntityManager {
             data = entityNameOrEntities;
         }
         else {
-            entityName = utils_1.Utils.className(entityNameOrEntities);
+            entityName = Utils_1.Utils.className(entityNameOrEntities);
         }
         if (data.length === 0) {
             return [];
         }
-        if (utils_1.Utils.isEntity(data[0])) {
+        if (Utils_1.Utils.isEntity(data[0])) {
             const meta = (0, entity_1.helper)(data[0]).__meta;
             const css = data.map(row => {
                 if (options.schema && (0, entity_1.helper)(row).getSchema() == null) {
@@ -1099,7 +1112,7 @@ class EntityManager {
             await em.unitOfWork.getChangeSetPersister().executeInserts(css, { ctx: em.transactionContext, ...options });
             return css.map(cs => cs.getPrimaryKey());
         }
-        data = data.map(row => utils_1.QueryHelper.processObjectParams(row));
+        data = data.map(row => QueryHelper_1.QueryHelper.processObjectParams(row));
         data.forEach(row => em.validator.validateParams(row, 'insert data'));
         const res = await em.driver.nativeInsertMany(entityName, data, { ctx: em.transactionContext, ...options });
         if (res.insertedIds) {
@@ -1113,8 +1126,8 @@ class EntityManager {
     async nativeUpdate(entityName, where, data, options = {}) {
         const em = this.getContext(false);
         em.prepareOptions(options);
-        entityName = utils_1.Utils.className(entityName);
-        data = utils_1.QueryHelper.processObjectParams(data);
+        entityName = Utils_1.Utils.className(entityName);
+        data = QueryHelper_1.QueryHelper.processObjectParams(data);
         where = await em.processWhere(entityName, where, { ...options, convertCustomTypes: false }, 'update');
         em.validator.validateParams(data, 'update data');
         em.validator.validateParams(where, 'update condition');
@@ -1127,7 +1140,7 @@ class EntityManager {
     async nativeDelete(entityName, where, options = {}) {
         const em = this.getContext(false);
         em.prepareOptions(options);
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         where = await em.processWhere(entityName, where, options, 'delete');
         em.validator.validateParams(where, 'delete condition');
         const res = await em.driver.nativeDelete(entityName, where, { ctx: em.transactionContext, ...options });
@@ -1137,7 +1150,7 @@ class EntityManager {
      * Maps raw database result to an entity and merges it to this EntityManager.
      */
     map(entityName, result, options = {}) {
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         const meta = this.metadata.get(entityName);
         const data = this.driver.mapResult(result, meta);
         Object.keys(data).forEach(k => {
@@ -1157,11 +1170,11 @@ class EntityManager {
      */
     merge(entityName, data, options = {}) {
         const em = this.getContext();
-        if (utils_1.Utils.isEntity(entityName)) {
+        if (Utils_1.Utils.isEntity(entityName)) {
             return em.merge(entityName.constructor.name, entityName, data);
         }
         options.schema ??= em._schema;
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
         let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && (0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__initialized && !options.refresh) {
@@ -1169,7 +1182,7 @@ class EntityManager {
         }
         const meta = em.metadata.find(entityName);
         const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
-        entity = utils_1.Utils.isEntity(data) ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
+        entity = Utils_1.Utils.isEntity(data) ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
         em.validator.validate(entity, data, childMeta ?? meta);
         em.unitOfWork.merge(entity);
         return entity;
@@ -1215,8 +1228,8 @@ class EntityManager {
     getReference(entityName, id, options = {}) {
         options.schema ??= this.schema;
         options.convertCustomTypes ??= false;
-        const meta = this.metadata.get(utils_1.Utils.className(entityName));
-        if (utils_1.Utils.isPrimaryKey(id)) {
+        const meta = this.metadata.get(Utils_1.Utils.className(entityName));
+        if (Utils_1.Utils.isPrimaryKey(id)) {
             if (meta.compositePK) {
                 throw errors_1.ValidationError.invalidCompositeIdentifier(meta);
             }
@@ -1238,7 +1251,7 @@ class EntityManager {
             schema: em._schema,
             ...options,
         };
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         await em.tryFlush(entityName, options);
         where = await em.processWhere(entityName, where, options, 'read');
         options.populate = await em.preparePopulate(entityName, options);
@@ -1265,14 +1278,14 @@ class EntityManager {
      */
     persist(entity) {
         const em = this.getContext();
-        if (utils_1.Utils.isEntity(entity)) {
+        if (Utils_1.Utils.isEntity(entity)) {
             // do not cascade just yet, cascading of entities in persist stack is done when flushing
             em.unitOfWork.persist(entity, undefined, { cascade: false });
             return em;
         }
-        const entities = utils_1.Utils.asArray(entity);
+        const entities = Utils_1.Utils.asArray(entity);
         for (const ent of entities) {
-            if (!utils_1.Utils.isEntity(ent, true)) {
+            if (!Utils_1.Utils.isEntity(ent, true)) {
                 /* istanbul ignore next */
                 const meta = typeof ent === 'object' ? em.metadata.find(ent.constructor.name) : undefined;
                 throw errors_1.ValidationError.notDiscoveredEntity(ent, meta);
@@ -1297,14 +1310,14 @@ class EntityManager {
      */
     remove(entity) {
         const em = this.getContext();
-        if (utils_1.Utils.isEntity(entity)) {
+        if (Utils_1.Utils.isEntity(entity)) {
             // do not cascade just yet, cascading of entities in persist stack is done when flushing
             em.unitOfWork.remove(entity, undefined, { cascade: false });
             return em;
         }
-        const entities = utils_1.Utils.asArray(entity, true);
+        const entities = Utils_1.Utils.asArray(entity, true);
         for (const ent of entities) {
-            if (!utils_1.Utils.isEntity(ent, true)) {
+            if (!Utils_1.Utils.isEntity(ent, true)) {
                 throw new Error(`You need to pass entity instance or reference to 'em.remove()'. To remove entities by condition, use 'em.nativeDelete()'.`);
             }
             // do not cascade just yet, cascading of entities in remove stack is done when flushing
@@ -1332,7 +1345,7 @@ class EntityManager {
     async tryFlush(entityName, options) {
         const em = this.getContext();
         const flushMode = options.flushMode ?? em.flushMode ?? em.config.get('flushMode');
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         const meta = em.metadata.get(entityName);
         if (flushMode === enums_1.FlushMode.COMMIT) {
             return;
@@ -1351,7 +1364,7 @@ class EntityManager {
      * Checks whether given property can be populated on the entity.
      */
     canPopulate(entityName, property) {
-        entityName = utils_1.Utils.className(entityName);
+        entityName = Utils_1.Utils.className(entityName);
         // eslint-disable-next-line prefer-const
         let [p, ...parts] = property.split('.');
         const meta = this.metadata.find(entityName);
@@ -1374,7 +1387,7 @@ class EntityManager {
      * Loads specified relations in batch. This will execute one query for each relation, that will populate it on all the specified entities.
      */
     async populate(entities, populate, options = {}) {
-        const arr = utils_1.Utils.asArray(entities);
+        const arr = Utils_1.Utils.asArray(entities);
         if (arr.length === 0) {
             return entities;
         }
@@ -1410,8 +1423,8 @@ class EntityManager {
             fork.transactionContext = em.transactionContext;
         }
         fork.filters = { ...em.filters };
-        fork.filterParams = utils_1.Utils.copy(em.filterParams);
-        fork.loggerContext = utils_1.Utils.merge({}, em.loggerContext, options.loggerContext);
+        fork.filterParams = Utils_1.Utils.copy(em.filterParams);
+        fork.loggerContext = Utils_1.Utils.merge({}, em.loggerContext, options.loggerContext);
         fork._schema = options.schema ?? em._schema;
         if (!options.clear) {
             for (const entity of em.unitOfWork.getIdentityMap()) {
@@ -1452,7 +1465,7 @@ class EntityManager {
         if (!this.useContext) {
             return this;
         }
-        let em = utils_1.TransactionContext.getEntityManager(this.name); // prefer the tx context
+        let em = TransactionContext_1.TransactionContext.getEntityManager(this.name); // prefer the tx context
         if (em) {
             return em;
         }
@@ -1482,7 +1495,12 @@ class EntityManager {
      * Sets the transaction context.
      */
     setTransactionContext(ctx) {
-        this.getContext(false).transactionContext = ctx;
+        if (!ctx) {
+            this.resetTransactionContext();
+        }
+        else {
+            this.getContext(false).transactionContext = ctx;
+        }
     }
     /**
      * Resets the transaction context.
@@ -1495,7 +1513,7 @@ class EntityManager {
      */
     getMetadata(entityName) {
         if (entityName) {
-            entityName = utils_1.Utils.className(entityName);
+            entityName = Utils_1.Utils.className(entityName);
             return this.metadata.get(entityName);
         }
         return this.metadata;
@@ -1537,8 +1555,8 @@ class EntityManager {
     }
     buildFields(fields) {
         return fields.reduce((ret, f) => {
-            if (utils_1.Utils.isPlainObject(f)) {
-                utils_1.Utils.keys(f).forEach(ff => ret.push(...this.buildFields(f[ff]).map(field => `${ff}.${field}`)));
+            if (Utils_1.Utils.isPlainObject(f)) {
+                Utils_1.Utils.keys(f).forEach(ff => ret.push(...this.buildFields(f[ff]).map(field => `${ff}.${field}`)));
             }
             else {
                 ret.push(f);
@@ -1581,7 +1599,7 @@ class EntityManager {
                         ret.push(...inner.map(c => `${key}.${c}`));
                     }
                 }
-                return utils_1.Utils.unique(ret);
+                return Utils_1.Utils.unique(ret);
             };
             options.populate = pruneToOneRelations(meta, this.buildFields(options.fields));
         }
@@ -1591,7 +1609,7 @@ class EntityManager {
             return populate;
         }
         if (typeof options.populate !== 'boolean') {
-            options.populate = utils_1.Utils.asArray(options.populate).map(field => {
+            options.populate = Utils_1.Utils.asArray(options.populate).map(field => {
                 /* istanbul ignore next */
                 if (typeof field === 'boolean' || field === enums_1.PopulatePath.ALL) {
                     return [{ field: meta.primaryKeys[0], strategy: options.strategy, all: !!field }]; //
@@ -1602,7 +1620,7 @@ class EntityManager {
                     options.flags.push(enums_1.QueryFlag.INFER_POPULATE);
                     return [];
                 }
-                if (utils_1.Utils.isString(field)) {
+                if (Utils_1.Utils.isString(field)) {
                     return [{ field, strategy: options.strategy }];
                 }
                 return [field];
@@ -1648,11 +1666,11 @@ class EntityManager {
         return !!options.populate;
     }
     prepareOptions(options) {
-        if (!utils_1.Utils.isEmpty(options.fields) && !utils_1.Utils.isEmpty(options.exclude)) {
+        if (!Utils_1.Utils.isEmpty(options.fields) && !Utils_1.Utils.isEmpty(options.exclude)) {
             throw new errors_1.ValidationError(`Cannot combine 'fields' and 'exclude' option.`);
         }
         options.schema ??= this._schema;
-        options.logging = utils_1.Utils.merge({ id: this.id }, this.loggerContext, options.loggerContext, options.logging);
+        options.logging = Utils_1.Utils.merge({ id: this.id }, this.loggerContext, options.loggerContext, options.logging);
     }
     /**
      * @internal
@@ -1686,7 +1704,7 @@ class EntityManager {
                     recomputeSnapshot: true,
                 }));
             }
-            else if (utils_1.Utils.isObject(cached) && merge) {
+            else if (Utils_1.Utils.isObject(cached) && merge) {
                 data = em.entityFactory.create(entityName, cached, {
                     merge: true,
                     convertCustomTypes: true,
@@ -1709,7 +1727,7 @@ class EntityManager {
         config ??= this.config.get('resultCache').global;
         if (config) {
             const em = this.getContext();
-            const expiration = Array.isArray(config) ? config[1] : (utils_1.Utils.isNumber(config) ? config : undefined);
+            const expiration = Array.isArray(config) ? config[1] : (Utils_1.Utils.isNumber(config) ? config : undefined);
             await em.resultCache.set(key.key, data instanceof Function ? data() : data, '', expiration);
         }
     }