@mikro-orm/core 7.0.0-rc.3 → 7.0.1-dev.0

package/EntityManager.js

@@ -27,26 +27,27 @@ export class EntityManager {
     config;
     driver;
     metadata;
-    useContext;
     eventManager;
-    static counter = 1;
-    _id = EntityManager.counter++;
+    static #counter = 1;
+    /** @internal */
+    _id = EntityManager.#counter++;
     global = false;
     name;
-    loaders = {};
-    repositoryMap = new Map();
-    entityLoader;
-    comparator;
-    entityFactory;
-    unitOfWork;
-    resultCache;
-    filters = {};
-    filterParams = {};
+    #loaders = {};
+    #repositoryMap = new Map();
+    #entityLoader;
+    #comparator;
+    #entityFactory;
+    #unitOfWork;
+    #resultCache;
+    #filters = {};
+    #filterParams = {};
     loggerContext;
-    transactionContext;
-    disableTransactions;
-    flushMode;
-    _schema;
+    #transactionContext;
+    #disableTransactions;
+    #flushMode;
+    #schema;
+    #useContext;
     /**
      * @internal
      */
@@ -54,15 +55,15 @@ export class EntityManager {
         this.config = config;
         this.driver = driver;
         this.metadata = metadata;
-        this.useContext = useContext;
         this.eventManager = eventManager;
-        this.entityLoader = new EntityLoader(this);
+        this.#useContext = useContext;
+        this.#entityLoader = new EntityLoader(this);
         this.name = this.config.get('contextName');
-        this.comparator = this.config.getComparator(this.metadata);
-        this.resultCache = this.config.getResultCacheAdapter();
-        this.disableTransactions = this.config.get('disableTransactions');
-        this.entityFactory = new EntityFactory(this);
-        this.unitOfWork = new UnitOfWork(this);
+        this.#comparator = this.config.getComparator(this.metadata);
+        this.#resultCache = this.config.getResultCacheAdapter();
+        this.#disableTransactions = this.config.get('disableTransactions');
+        this.#entityFactory = new EntityFactory(this);
+        this.#unitOfWork = new UnitOfWork(this);
     }
     /**
      * Gets the Driver instance used by this EntityManager.
@@ -88,11 +89,11 @@ export class EntityManager {
      */
     getRepository(entityName) {
         const meta = this.metadata.get(entityName);
-        if (!this.repositoryMap.has(meta)) {
+        if (!this.#repositoryMap.has(meta)) {
             const RepositoryClass = this.config.getRepositoryClass(meta.repository);
-            this.repositoryMap.set(meta, new RepositoryClass(this, entityName));
+            this.#repositoryMap.set(meta, new RepositoryClass(this, entityName));
         }
-        return this.repositoryMap.get(meta);
+        return this.#repositoryMap.get(meta);
     }
     /**
      * Shortcut for `em.getRepository()`.
@@ -128,7 +129,7 @@ export class EntityManager {
         const cacheKey = em.cacheKey(entityName, options, 'em.find', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
         if (cached?.data) {
-            await em.entityLoader.populate(entityName, cached.data, populate, {
+            await em.#entityLoader.populate(entityName, cached.data, populate, {
                 ...options,
                 ...em.getPopulateWhere(where, options),
                 ignoreLazyScalarProperties: true,
@@ -142,14 +143,14 @@ export class EntityManager {
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, options);
         await em.processUnionWhere(entityName, options, 'read');
-        const results = await em.driver.find(entityName, where, { ctx: em.transactionContext, em, ...options });
+        const results = await em.driver.find(entityName, where, { ctx: em.#transactionContext, em, ...options });
         if (results.length === 0) {
             await em.storeCache(options.cache, cached, []);
             return [];
         }
         const ret = [];
         for (const data of results) {
-            const entity = em.entityFactory.create(entityName, data, {
+            const entity = em.#entityFactory.create(entityName, data, {
                 merge: true,
                 refresh: options.refresh,
                 schema: options.schema,
@@ -158,13 +159,13 @@ export class EntityManager {
             ret.push(entity);
         }
         const unique = Utils.unique(ret);
-        await em.entityLoader.populate(entityName, unique, populate, {
+        await em.#entityLoader.populate(entityName, unique, populate, {
             ...options,
             ...em.getPopulateWhere(where, options),
             ignoreLazyScalarProperties: true,
             lookup: false,
         });
-        await em.unitOfWork.dispatchOnLoadEvent();
+        await em.#unitOfWork.dispatchOnLoadEvent();
         if (meta.virtual) {
             await em.storeCache(options.cache, cached, () => ret);
         }
@@ -206,13 +207,13 @@ export class EntityManager {
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, options);
         const stream = em.driver.stream(entityName, where, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             mapResults: false,
             ...options,
         });
         for await (const data of stream) {
             const fork = em.fork();
-            const entity = fork.entityFactory.create(entityName, data, {
+            const entity = fork.#entityFactory.create(entityName, data, {
                 refresh: options.refresh,
                 schema: options.schema,
                 convertCustomTypes: true,
@@ -222,7 +223,7 @@ export class EntityManager {
                 fields: options.fields,
                 exclude: options.exclude,
             });
-            await fork.unitOfWork.dispatchOnLoadEvent();
+            await fork.#unitOfWork.dispatchOnLoadEvent();
             fork.clear();
             yield entity;
         }
@@ -254,20 +255,20 @@ export class EntityManager {
             options.entity = Utils.asArray(options.entity).map(n => Utils.className(n));
         }
         options.default ??= true;
-        this.getContext(false).filters[options.name] = options;
+        this.getContext(false).#filters[options.name] = options;
     }
     /**
      * Sets filter parameter values globally inside context defined by this entity manager.
      * If you want to set shared value for all contexts, be sure to use the root entity manager.
      */
     setFilterParams(name, args) {
-        this.getContext().filterParams[name] = args;
+        this.getContext().#filterParams[name] = args;
     }
     /**
      * Returns filter parameters for given filter set in this context.
      */
     getFilterParams(name) {
-        return this.getContext().filterParams[name];
+        return this.getContext().#filterParams[name];
     }
     /**
      * Sets logger context for this entity manager.
@@ -284,7 +285,7 @@ export class EntityManager {
         return em.loggerContext;
     }
     setFlushMode(flushMode) {
-        this.getContext(false).flushMode = flushMode;
+        this.getContext(false).#flushMode = flushMode;
     }
     async processWhere(entityName, where, options, type) {
         where = QueryHelper.processWhere({
@@ -442,7 +443,7 @@ export class EntityManager {
             activeFilters.forEach(f => active.add(f.name));
         };
         push(this.config.get('filters'));
-        push(this.filters);
+        push(this.#filters);
         push(meta.filters);
         if (filters.length === 0) {
             return where;
@@ -452,7 +453,7 @@ export class EntityManager {
             if (filter.cond instanceof Function) {
                 // @ts-ignore
                 // oxfmt-ignore
-                const args = Utils.isPlainObject(options?.[filter.name]) ? options[filter.name] : this.getContext().filterParams[filter.name];
+                const args = 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}'`);
                 }
@@ -587,17 +588,17 @@ export class EntityManager {
         });
         const em = this.getContext();
         if (!reloaded) {
-            em.unitOfWork.unsetIdentity(entity);
+            em.#unitOfWork.unsetIdentity(entity);
             return null;
         }
         let found = false;
-        for (const e of fork.unitOfWork.getIdentityMap()) {
+        for (const e of fork.#unitOfWork.getIdentityMap()) {
             const ref = em.getReference(e.constructor, helper(e).getPrimaryKey());
             const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: false });
             em.config
                 .getHydrator(this.metadata)
-                .hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, false);
-            Utils.merge(helper(ref).__originalEntityData, this.comparator.prepareEntity(e));
+                .hydrate(ref, helper(ref).__meta, data, em.#entityFactory, 'full', false, false);
+            Utils.merge(helper(ref).__originalEntityData, this.#comparator.prepareEntity(e));
             found ||= ref === entity;
         }
         if (!found) {
@@ -606,8 +607,10 @@ export class EntityManager {
                 includeHidden: true,
                 convertCustomTypes: true,
             });
-            em.config.getHydrator(this.metadata).hydrate(entity, wrapped.__meta, data, em.entityFactory, 'full', false, true);
-            Utils.merge(wrapped.__originalEntityData, this.comparator.prepareEntity(reloaded));
+            em.config
+                .getHydrator(this.metadata)
+                .hydrate(entity, wrapped.__meta, data, em.#entityFactory, 'full', false, true);
+            Utils.merge(wrapped.__originalEntityData, this.#comparator.prepareEntity(reloaded));
         }
         return entity;
     }
@@ -624,7 +627,7 @@ export class EntityManager {
         }
         const em = this.getContext();
         em.prepareOptions(options);
-        let entity = em.unitOfWork.tryGetById(entityName, where, options.schema);
+        let entity = em.#unitOfWork.tryGetById(entityName, where, options.schema);
         // query for a not managed entity which is already in the identity map as it
         // was provided with a PK this entity does not exist in the db, there can't
         // be any relations to it, so no need to deal with the populate hint
@@ -646,7 +649,7 @@ export class EntityManager {
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
         if (cached?.data !== undefined) {
             if (cached.data) {
-                await em.entityLoader.populate(entityName, [cached.data], options.populate, {
+                await em.#entityLoader.populate(entityName, [cached.data], options.populate, {
                     ...options,
                     ...em.getPopulateWhere(where, options),
                     ignoreLazyScalarProperties: true,
@@ -662,7 +665,7 @@ export class EntityManager {
         options.populateFilter = await this.getJoinedFilters(meta, options);
         await em.processUnionWhere(entityName, options, 'read');
         const data = await em.driver.findOne(entityName, where, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             em,
             ...options,
         });
@@ -670,14 +673,14 @@ export class EntityManager {
             await em.storeCache(options.cache, cached, null);
             return null;
         }
-        entity = em.entityFactory.create(entityName, data, {
+        entity = em.#entityFactory.create(entityName, data, {
             merge: true,
             refresh: options.refresh,
             schema: options.schema,
             convertCustomTypes: true,
         });
         await em.lockAndPopulate(meta, entity, where, options);
-        await em.unitOfWork.dispatchOnLoadEvent();
+        await em.#unitOfWork.dispatchOnLoadEvent();
         await em.storeCache(options.cache, cached, () => helper(entity).toPOJO());
         return entity;
     }
@@ -755,17 +758,17 @@ export class EntityManager {
         if (Utils.isEntity(data)) {
             entity = data;
             if (helper(entity).__managed && helper(entity).__em === em && !this.config.get('upsertManaged')) {
-                em.entityFactory.mergeData(meta, entity, data, { initialized: true });
+                em.#entityFactory.mergeData(meta, entity, data, { initialized: true });
                 return entity;
             }
             where = helper(entity).getPrimaryKey();
-            data = em.comparator.prepareEntity(entity);
+            data = em.#comparator.prepareEntity(entity);
         }
         else {
             data = Utils.copy(QueryHelper.processParams(data));
             where = Utils.extractPK(data, meta);
             if (where && !this.config.get('upsertManaged')) {
-                const exists = em.unitOfWork.getById(entityName, where, options.schema);
+                const exists = em.#unitOfWork.getById(entityName, where, options.schema);
                 if (exists) {
                     return em.assign(exists, data);
                 }
@@ -778,13 +781,13 @@ export class EntityManager {
             await em.eventManager.dispatchEvent(EventType.beforeUpsert, { entity: data, em, meta }, meta);
         }
         const ret = await em.driver.nativeUpdate(entityName, where, data, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             upsert: true,
             convertCustomTypes,
             ...options,
         });
-        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
-        entity ??= em.entityFactory.create(entityName, data, {
+        em.#unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
+        entity ??= em.#entityFactory.create(entityName, data, {
             refresh: true,
             initialized: true,
             schema: options.schema,
@@ -816,16 +819,16 @@ export class EntityManager {
             }
             const data2 = await this.driver.findOne(meta.class, where, {
                 fields: returning,
-                ctx: em.transactionContext,
+                ctx: em.#transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
                 schema: options.schema,
             });
-            em.getHydrator().hydrate(entity, meta, data2, em.entityFactory, 'full', false, true);
+            em.getHydrator().hydrate(entity, meta, data2, em.#entityFactory, 'full', false, true);
         }
         // recompute the data as there might be some values missing (e.g. those with db column defaults)
-        const snapshot = this.comparator.prepareEntity(entity);
-        em.unitOfWork.register(entity, snapshot, { refresh: true });
+        const snapshot = this.#comparator.prepareEntity(entity);
+        em.#unitOfWork.register(entity, snapshot, { refresh: true });
         if (em.eventManager.hasListeners(EventType.afterUpsert, meta)) {
             await em.eventManager.dispatchEvent(EventType.afterUpsert, { entity, em, meta }, meta);
         }
@@ -896,19 +899,19 @@ export class EntityManager {
             if (Utils.isEntity(row)) {
                 const entity = row;
                 if (helper(entity).__managed && helper(entity).__em === em && !this.config.get('upsertManaged')) {
-                    em.entityFactory.mergeData(meta, entity, row, { initialized: true });
+                    em.#entityFactory.mergeData(meta, entity, row, { initialized: true });
                     entities.set(entity, row);
                     entitiesByData.set(row, entity);
                     continue;
                 }
                 where = helper(entity).getPrimaryKey();
-                row = em.comparator.prepareEntity(entity);
+                row = em.#comparator.prepareEntity(entity);
             }
             else {
                 row = data[i] = Utils.copy(QueryHelper.processParams(row));
                 where = Utils.extractPK(row, meta);
                 if (where && !this.config.get('upsertManaged')) {
-                    const exists = em.unitOfWork.getById(entityName, where, options.schema);
+                    const exists = em.#unitOfWork.getById(entityName, where, options.schema);
                     if (exists) {
                         em.assign(exists, row);
                         entities.set(exists, row);
@@ -944,7 +947,7 @@ export class EntityManager {
             }
         }
         const res = await em.driver.nativeUpdateMany(entityName, allWhere, allData, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             upsert: true,
             convertCustomTypes,
             ...options,
@@ -953,12 +956,12 @@ export class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
-            em.unitOfWork
+            em.#unitOfWork
                 .getChangeSetPersister()
                 .mapReturnedValues(Utils.isEntity(data[i]) ? data[i] : null, Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
             const entity = Utils.isEntity(data[i])
                 ? data[i]
-                : em.entityFactory.create(entityName, row, {
+                : em.#entityFactory.create(entityName, row, {
                     refresh: true,
                     initialized: true,
                     schema: options.schema,
@@ -994,7 +997,7 @@ export class EntityManager {
                 fields: returning
                     .concat(...add)
                     .concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
-                ctx: em.transactionContext,
+                ctx: em.#transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
                 schema: options.schema,
@@ -1007,13 +1010,13 @@ export class EntityManager {
                             tmp[k] = row[k];
                         }
                     });
-                    return this.comparator.matching(entityName, cond, tmp);
+                    return this.#comparator.matching(entityName, cond, tmp);
                 });
                 /* v8 ignore next */
                 if (!row) {
                     throw new Error(`Cannot find matching entity for condition ${JSON.stringify(cond)}`);
                 }
-                em.getHydrator().hydrate(entity, meta, row, em.entityFactory, 'full', false, true);
+                em.getHydrator().hydrate(entity, meta, row, em.#entityFactory, 'full', false, true);
             }
             if (loadPK.size !== data2.length && Array.isArray(uniqueFields)) {
                 for (let i = 0; i < allData.length; i++) {
@@ -1030,20 +1033,20 @@ export class EntityManager {
                             a[b] = item[b];
                             return a;
                         }, {});
-                        return this.comparator.matching(entityName, cond, pk);
+                        return this.#comparator.matching(entityName, cond, pk);
                     });
                     /* v8 ignore next */
                     if (!row) {
                         throw new Error(`Cannot find matching entity for condition ${JSON.stringify(cond)}`);
                     }
-                    em.getHydrator().hydrate(entity, meta, row, em.entityFactory, 'full');
+                    em.getHydrator().hydrate(entity, meta, row, em.#entityFactory, 'full');
                 }
             }
         }
         for (const [entity] of entities) {
             // recompute the data as there might be some values missing (e.g. those with db column defaults)
-            const snapshot = this.comparator.prepareEntity(entity);
-            em.unitOfWork.register(entity, snapshot, { refresh: true });
+            const snapshot = this.#comparator.prepareEntity(entity);
+            em.#unitOfWork.register(entity, snapshot, { refresh: true });
         }
         if (em.eventManager.hasListeners(EventType.afterUpsert, meta)) {
             for (const [entity] of entities) {
@@ -1080,7 +1083,7 @@ export class EntityManager {
      */
     async transactional(cb, options = {}) {
         const em = this.getContext(false);
-        if (this.disableTransactions || em.disableTransactions) {
+        if (this.#disableTransactions || em.#disableTransactions) {
             return cb(em);
         }
         const manager = new TransactionManager(this);
@@ -1090,11 +1093,11 @@ export class EntityManager {
      * Starts new transaction bound to this EntityManager. Use `ctx` parameter to provide the parent when nesting transactions.
      */
     async begin(options = {}) {
-        if (this.disableTransactions) {
+        if (this.#disableTransactions) {
             return;
         }
         const em = this.getContext(false);
-        em.transactionContext = await em.getConnection('write').begin({
+        em.#transactionContext = await em.getConnection('write').begin({
             ...options,
             eventBroadcaster: new TransactionEventBroadcaster(em, { topLevelTransaction: !options.ctx }),
         });
@@ -1104,31 +1107,31 @@ export class EntityManager {
      */
     async commit() {
         const em = this.getContext(false);
-        if (this.disableTransactions) {
+        if (this.#disableTransactions) {
             await em.flush();
             return;
         }
-        if (!em.transactionContext) {
+        if (!em.#transactionContext) {
             throw ValidationError.transactionRequired();
         }
         await em.flush();
-        await em.getConnection('write').commit(em.transactionContext, new TransactionEventBroadcaster(em));
-        delete em.transactionContext;
+        await em.getConnection('write').commit(em.#transactionContext, new TransactionEventBroadcaster(em));
+        em.#transactionContext = undefined;
     }
     /**
      * Rollbacks the transaction bound to this EntityManager.
      */
     async rollback() {
-        if (this.disableTransactions) {
+        if (this.#disableTransactions) {
             return;
         }
         const em = this.getContext(false);
-        if (!em.transactionContext) {
+        if (!em.#transactionContext) {
             throw ValidationError.transactionRequired();
         }
-        await em.getConnection('write').rollback(em.transactionContext, new TransactionEventBroadcaster(em));
-        delete em.transactionContext;
-        em.unitOfWork.clearActionsQueue();
+        await em.getConnection('write').rollback(em.#transactionContext, new TransactionEventBroadcaster(em));
+        em.#transactionContext = undefined;
+        em.#unitOfWork.clearActionsQueue();
     }
     /**
      * Runs your callback wrapped inside a database transaction.
@@ -1157,20 +1160,20 @@ export class EntityManager {
             }
             if (!helper(data).__managed) {
                 // the entity might have been created via `em.create()`, which adds it to the persist stack automatically
-                em.unitOfWork.getPersistStack().delete(data);
+                em.#unitOfWork.getPersistStack().delete(data);
                 // it can be also in the identity map if it had a PK value already
-                em.unitOfWork.unsetIdentity(data);
+                em.#unitOfWork.unsetIdentity(data);
             }
             const meta = helper(data).__meta;
-            const payload = em.comparator.prepareEntity(data);
+            const payload = em.#comparator.prepareEntity(data);
             const cs = new ChangeSet(data, ChangeSetType.CREATE, payload, meta);
-            await em.unitOfWork.getChangeSetPersister().executeInserts([cs], { ctx: em.transactionContext, ...options });
+            await em.#unitOfWork.getChangeSetPersister().executeInserts([cs], { ctx: em.#transactionContext, ...options });
             return cs.getPrimaryKey();
         }
         data = QueryHelper.processObjectParams(data);
         validateParams(data, 'insert data');
         const res = await em.driver.nativeInsert(entityName, data, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             ...options,
         });
         return res.insertId;
@@ -1200,20 +1203,20 @@ export class EntityManager {
                 }
                 if (!helper(row).__managed) {
                     // the entity might have been created via `em.create()`, which adds it to the persist stack automatically
-                    em.unitOfWork.getPersistStack().delete(row);
+                    em.#unitOfWork.getPersistStack().delete(row);
                     // it can be also in the identity map if it had a PK value already
-                    em.unitOfWork.unsetIdentity(row);
+                    em.#unitOfWork.unsetIdentity(row);
                 }
-                const payload = em.comparator.prepareEntity(row);
+                const payload = em.#comparator.prepareEntity(row);
                 return new ChangeSet(row, ChangeSetType.CREATE, payload, meta);
             });
-            await em.unitOfWork.getChangeSetPersister().executeInserts(css, { ctx: em.transactionContext, ...options });
+            await em.#unitOfWork.getChangeSetPersister().executeInserts(css, { ctx: em.#transactionContext, ...options });
             return css.map(cs => cs.getPrimaryKey());
         }
         data = data.map(row => QueryHelper.processObjectParams(row));
         data.forEach(row => validateParams(row, 'insert data'));
         const res = await em.driver.nativeInsertMany(entityName, data, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             ...options,
         });
         if (res.insertedIds) {
@@ -1233,7 +1236,7 @@ export class EntityManager {
         validateParams(data, 'update data');
         validateParams(where, 'update condition');
         const res = await em.driver.nativeUpdate(entityName, where, data, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             em,
             ...options,
         });
@@ -1249,7 +1252,7 @@ export class EntityManager {
         where = (await em.processWhere(entityName, where, options, 'delete'));
         validateParams(where, 'delete condition');
         const res = await em.driver.nativeDelete(entityName, where, {
-            ctx: em.transactionContext,
+            ctx: em.#transactionContext,
             em,
             ...options,
         });
@@ -1286,20 +1289,20 @@ export class EntityManager {
             return this.merge(entityName.constructor, entityName, data);
         }
         const em = options.disableContextResolution ? this : this.getContext();
-        options.schema ??= em._schema;
+        options.schema ??= em.#schema;
         options.validate ??= true;
         options.cascade ??= true;
         validatePrimaryKey(data, em.metadata.get(entityName));
-        let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
+        let entity = em.#unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && helper(entity).__managed && helper(entity).__initialized && !options.refresh) {
             return entity;
         }
         const dataIsEntity = Utils.isEntity(data);
         entity = dataIsEntity
             ? data
-            : em.entityFactory.create(entityName, data, { merge: true, ...options });
+            : em.#entityFactory.create(entityName, data, { merge: true, ...options });
         const visited = options.cascade ? undefined : new Set([entity]);
-        em.unitOfWork.merge(entity, visited);
+        em.#unitOfWork.merge(entity, visited);
         return entity;
     }
     /**
@@ -1319,8 +1322,8 @@ export class EntityManager {
      */
     create(entityName, data, options = {}) {
         const em = this.getContext();
-        options.schema ??= em._schema;
-        const entity = em.entityFactory.create(entityName, data, {
+        options.schema ??= em.#schema;
+        const entity = em.#entityFactory.create(entityName, data, {
             ...options,
             newEntity: !options.managed,
             merge: options.managed,
@@ -1382,7 +1385,7 @@ export class EntityManager {
         if (cached?.data !== undefined) {
             return cached.data;
         }
-        const count = await em.driver.count(entityName, where, { ctx: em.transactionContext, em, ...options });
+        const count = await em.driver.count(entityName, where, { ctx: em.#transactionContext, em, ...options });
         await em.storeCache(options.cache, cached, () => +count);
         return +count;
     }
@@ -1394,7 +1397,7 @@ export class EntityManager {
         const em = this.getContext();
         if (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 });
+            em.#unitOfWork.persist(entity, undefined, { cascade: false });
             return em;
         }
         const entities = Utils.asArray(entity);
@@ -1405,7 +1408,7 @@ export class EntityManager {
                 throw ValidationError.notDiscoveredEntity(ent, meta);
             }
             // do not cascade just yet, cascading of entities in persist stack is done when flushing
-            em.unitOfWork.persist(Reference.unwrapReference(ent), undefined, { cascade: false });
+            em.#unitOfWork.persist(Reference.unwrapReference(ent), undefined, { cascade: false });
         }
         return this;
     }
@@ -1419,7 +1422,7 @@ export class EntityManager {
         const em = this.getContext();
         if (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 });
+            em.#unitOfWork.remove(entity, undefined, { cascade: false });
             return em;
         }
         const entities = Utils.asArray(entity, true);
@@ -1428,7 +1431,7 @@ export class EntityManager {
                 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
-            em.unitOfWork.remove(Reference.unwrapReference(ent), undefined, { cascade: false });
+            em.#unitOfWork.remove(Reference.unwrapReference(ent), undefined, { cascade: false });
         }
         return em;
     }
@@ -1444,7 +1447,7 @@ export class EntityManager {
      */
     async tryFlush(entityName, options) {
         const em = this.getContext();
-        const flushMode = options.flushMode ?? em.flushMode ?? em.config.get('flushMode');
+        const flushMode = options.flushMode ?? em.#flushMode ?? em.config.get('flushMode');
         const meta = em.metadata.get(entityName);
         if (flushMode === FlushMode.COMMIT) {
             return;
@@ -1457,7 +1460,7 @@ export class EntityManager {
      * Clears the EntityManager. All entities that are currently managed by this EntityManager become detached.
      */
     clear() {
-        this.getContext().unitOfWork.clear();
+        this.getContext().#unitOfWork.clear();
     }
     /**
      * Checks whether given property can be populated on the entity.
@@ -1492,7 +1495,7 @@ export class EntityManager {
         em.prepareOptions(options);
         const entityName = arr[0].constructor;
         const preparedPopulate = await em.preparePopulate(entityName, { populate: populate, filters: options.filters }, options.validate);
-        await em.entityLoader.populate(entityName, arr, preparedPopulate, options);
+        await em.#entityLoader.populate(entityName, arr, preparedPopulate, options);
         return entities;
     }
     /**
@@ -1513,26 +1516,26 @@ export class EntityManager {
         const allowGlobalContext = em.config.get('allowGlobalContext');
         em.config.set('allowGlobalContext', true);
         const fork = new em.constructor(em.config, em.driver, em.metadata, options.useContext, eventManager);
-        fork.setFlushMode(options.flushMode ?? em.flushMode);
-        fork.disableTransactions =
-            options.disableTransactions ?? this.disableTransactions ?? this.config.get('disableTransactions');
+        fork.setFlushMode(options.flushMode ?? em.#flushMode);
+        fork.#disableTransactions =
+            options.disableTransactions ?? this.#disableTransactions ?? this.config.get('disableTransactions');
         em.config.set('allowGlobalContext', allowGlobalContext);
         if (options.keepTransactionContext) {
-            fork.transactionContext = em.transactionContext;
+            fork.#transactionContext = em.#transactionContext;
         }
-        fork.filters = { ...em.filters };
-        fork.filterParams = Utils.copy(em.filterParams);
+        fork.#filters = { ...em.#filters };
+        fork.#filterParams = Utils.copy(em.#filterParams);
         fork.loggerContext = Utils.merge({}, em.loggerContext, options.loggerContext);
-        fork._schema = options.schema ?? em._schema;
+        fork.#schema = options.schema ?? em.#schema;
         if (!options.clear) {
-            for (const entity of em.unitOfWork.getIdentityMap()) {
-                fork.unitOfWork.register(entity);
+            for (const entity of em.#unitOfWork.getIdentityMap()) {
+                fork.#unitOfWork.register(entity);
             }
-            for (const entity of em.unitOfWork.getPersistStack()) {
-                fork.unitOfWork.persist(entity);
+            for (const entity of em.#unitOfWork.getPersistStack()) {
+                fork.#unitOfWork.persist(entity);
             }
-            for (const entity of em.unitOfWork.getOrphanRemoveStack()) {
-                fork.unitOfWork.getOrphanRemoveStack().add(entity);
+            for (const entity of em.#unitOfWork.getOrphanRemoveStack()) {
+                fork.#unitOfWork.getOrphanRemoveStack().add(entity);
             }
         }
         return fork;
@@ -1542,21 +1545,21 @@ export class EntityManager {
      */
     getUnitOfWork(useContext = true) {
         if (!useContext) {
-            return this.unitOfWork;
+            return this.#unitOfWork;
         }
-        return this.getContext().unitOfWork;
+        return this.getContext().#unitOfWork;
     }
     /**
      * Gets the EntityFactory used by the EntityManager.
      */
     getEntityFactory() {
-        return this.getContext().entityFactory;
+        return this.getContext().#entityFactory;
     }
     /**
      * @internal use `em.populate()` as the user facing API, this is exposed only for internal usage
      */
     getEntityLoader() {
-        return this.getContext().entityLoader;
+        return this.getContext().#entityLoader;
     }
     /**
      * Gets the Hydrator used by the EntityManager.
@@ -1569,7 +1572,7 @@ export class EntityManager {
      * @internal
      */
     getContext(validate = true) {
-        if (!this.useContext) {
+        if (!this.#useContext) {
             return this;
         }
         let em = TransactionContext.getEntityManager(this.name); // prefer the tx context
@@ -1590,13 +1593,13 @@ export class EntityManager {
      * Checks whether this EntityManager is currently operating inside a database transaction.
      */
     isInTransaction() {
-        return !!this.getContext(false).transactionContext;
+        return !!this.getContext(false).#transactionContext;
     }
     /**
      * Gets the transaction context (driver dependent object used to make sure queries are executed on same connection).
      */
     getTransactionContext() {
-        return this.getContext(false).transactionContext;
+        return this.getContext(false).#transactionContext;
     }
     /**
      * Sets the transaction context.
@@ -1606,14 +1609,14 @@ export class EntityManager {
             this.resetTransactionContext();
         }
         else {
-            this.getContext(false).transactionContext = ctx;
+            this.getContext(false).#transactionContext = ctx;
         }
     }
     /**
      * Resets the transaction context.
      */
     resetTransactionContext() {
-        delete this.getContext(false).transactionContext;
+        this.getContext(false).#transactionContext = undefined;
     }
     /**
      * Gets the `MetadataStorage` (without parameters) or `EntityMetadata` instance when provided with the `entityName` parameter.
@@ -1628,7 +1631,7 @@ export class EntityManager {
      * Gets the EntityComparator.
      */
     getComparator() {
-        return this.comparator;
+        return this.#comparator;
     }
     checkLockRequirements(mode, meta) {
         if (!mode) {
@@ -1649,7 +1652,7 @@ export class EntityManager {
             });
         }
         const preparedPopulate = await this.preparePopulate(meta.class, options);
-        await this.entityLoader.populate(meta.class, [entity], preparedPopulate, {
+        await this.#entityLoader.populate(meta.class, [entity], preparedPopulate, {
             ...options,
             ...this.getPopulateWhere(where, options),
             orderBy: options.populateOrderBy ?? options.orderBy,
@@ -1713,7 +1716,7 @@ export class EntityManager {
             options.populate = pruneToOneRelations(meta, this.buildFields(options.fields));
         }
         if (!options.populate) {
-            const populate = this.entityLoader.normalizePopulate(entityName, [], options.strategy, true, options.exclude);
+            const populate = this.#entityLoader.normalizePopulate(entityName, [], options.strategy, true, options.exclude);
             await this.autoJoinRefsForFilters(meta, { ...options, populate });
             return populate;
         }
@@ -1737,7 +1740,7 @@ export class EntityManager {
             })
                 .flat();
         }
-        const populate = this.entityLoader.normalizePopulate(entityName, options.populate, options.strategy, true, options.exclude);
+        const populate = this.#entityLoader.normalizePopulate(entityName, options.populate, options.strategy, true, options.exclude);
         const invalid = populate.find(({ field }) => !this.canPopulate(entityName, field));
         if (validate && invalid) {
             throw ValidationError.invalidPropertyName(entityName, invalid.field);
@@ -1783,7 +1786,7 @@ export class EntityManager {
         if (!Utils.isEmpty(options.fields) && !Utils.isEmpty(options.exclude)) {
             throw new ValidationError(`Cannot combine 'fields' and 'exclude' option.`);
         }
-        options.schema ??= this._schema;
+        options.schema ??= this.#schema;
         options.logging = options.loggerContext = Utils.merge({ id: this.id }, this.loggerContext, options.loggerContext, options.logging);
     }
     /**
@@ -1807,7 +1810,7 @@ export class EntityManager {
         }
         const em = this.getContext();
         const cacheKey = Array.isArray(config) ? config[0] : JSON.stringify(key);
-        const cached = await em.resultCache.get(cacheKey);
+        const cached = await em.#resultCache.get(cacheKey);
         if (!cached) {
             return { key: cacheKey, data: cached };
         }
@@ -1819,15 +1822,15 @@ export class EntityManager {
             recomputeSnapshot: true,
         };
         if (Array.isArray(cached) && merge) {
-            data = cached.map(item => em.entityFactory.create(entityName, item, createOptions));
+            data = cached.map(item => em.#entityFactory.create(entityName, item, createOptions));
         }
         else if (Utils.isObject(cached) && merge) {
-            data = em.entityFactory.create(entityName, cached, createOptions);
+            data = em.#entityFactory.create(entityName, cached, createOptions);
         }
         else {
             data = cached;
         }
-        await em.unitOfWork.dispatchOnLoadEvent();
+        await em.#unitOfWork.dispatchOnLoadEvent();
         return { key: cacheKey, data };
     }
     /**
@@ -1838,7 +1841,7 @@ export class EntityManager {
         if (config) {
             const em = this.getContext();
             const expiration = Array.isArray(config) ? config[1] : typeof config === 'number' ? config : undefined;
-            await em.resultCache.set(key.key, data instanceof Function ? data() : data, '', expiration);
+            await em.#resultCache.set(key.key, data instanceof Function ? data() : data, '', expiration);
         }
     }
     /**
@@ -1854,37 +1857,37 @@ export class EntityManager {
      * ```
      */
     async clearCache(cacheKey) {
-        await this.getContext().resultCache.remove(cacheKey);
+        await this.getContext().#resultCache.remove(cacheKey);
     }
     /**
      * Returns the default schema of this EntityManager. Respects the context, so global EM will give you the contextual schema
      * if executed inside request context handler.
      */
     get schema() {
-        return this.getContext(false)._schema;
+        return this.getContext(false).#schema;
     }
     /**
      * Sets the default schema of this EntityManager. Respects the context, so global EM will set the contextual schema
      * if executed inside request context handler.
      */
     set schema(schema) {
-        this.getContext(false)._schema = schema ?? undefined;
+        this.getContext(false).#schema = schema ?? undefined;
     }
     /** @internal */
     async getDataLoader(type) {
         const em = this.getContext();
-        if (em.loaders[type]) {
-            return em.loaders[type];
+        if (em.#loaders[type]) {
+            return em.#loaders[type];
         }
         const { DataloaderUtils } = await import('@mikro-orm/core/dataloader');
         const DataLoader = await DataloaderUtils.getDataLoader();
         switch (type) {
             case 'ref':
-                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getRefBatchLoadFn(em)));
+                return (em.#loaders[type] ??= new DataLoader(DataloaderUtils.getRefBatchLoadFn(em)));
             case '1:m':
-                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getColBatchLoadFn(em)));
+                return (em.#loaders[type] ??= new DataLoader(DataloaderUtils.getColBatchLoadFn(em)));
             case 'm:n':
-                return (em.loaders[type] ??= new DataLoader(DataloaderUtils.getManyToManyColBatchLoadFn(em)));
+                return (em.#loaders[type] ??= new DataLoader(DataloaderUtils.getManyToManyColBatchLoadFn(em)));
         }
     }
     /**