@mikro-orm/core 7.0.0-dev.3 → 7.0.0-dev.31

package/EntityManager.d.ts

@@ -6,7 +6,7 @@ import { EntityFactory } from './entity/EntityFactory.js';
 import { type AssignOptions } from './entity/EntityAssigner.js';
 import { EntityValidator } from './entity/EntityValidator.js';
 import { type EntityRepository } from './entity/EntityRepository.js';
-import { type EntityLoaderOptions } from './entity/EntityLoader.js';
+import { EntityLoader, type EntityLoaderOptions } from './entity/EntityLoader.js';
 import { Reference } from './entity/Reference.js';
 import { UnitOfWork } from './unit-of-work/UnitOfWork.js';
 import type { CountOptions, DeleteOptions, FindAllOptions, FindByCursorOptions, FindOneOptions, FindOneOrFailOptions, FindOptions, GetReferenceOptions, IDatabaseDriver, LockOptions, NativeInsertUpdateOptions, UpdateOptions, UpsertManyOptions, UpsertOptions } from './drivers/IDatabaseDriver.js';
@@ -33,6 +33,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     readonly name: string;
     protected readonly refLoader: DataLoader<[Reference<any>, (Omit<import("./entity/Reference.js").LoadReferenceOptions<any, any, "*", never>, "dataloader"> | undefined)?], any, [Reference<any>, (Omit<import("./entity/Reference.js").LoadReferenceOptions<any, any, "*", never>, "dataloader"> | undefined)?]>;
     protected readonly colLoader: DataLoader<[import("./index.js").Collection<any, object>, (Omit<import("./index.js").InitCollectionOptions<any, any, "*", never>, "dataloader"> | undefined)?], any, [import("./index.js").Collection<any, object>, (Omit<import("./index.js").InitCollectionOptions<any, any, "*", never>, "dataloader"> | undefined)?]>;
+    protected readonly colLoaderMtoN: DataLoader<[import("./index.js").Collection<any, object>, (Omit<import("./index.js").InitCollectionOptions<any, any, "*", never>, "dataloader"> | undefined)?], any, [import("./index.js").Collection<any, object>, (Omit<import("./index.js").InitCollectionOptions<any, any, "*", never>, "dataloader"> | undefined)?]>;
     private readonly validator;
     private readonly repositoryMap;
     private readonly entityLoader;
@@ -117,7 +118,9 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Gets logger context for this entity manager.
      */
-    getLoggerContext<T extends Dictionary = Dictionary>(): T;
+    getLoggerContext<T extends Dictionary = Dictionary>(options?: {
+        disableContextResolution?: boolean;
+    }): T;
     setFlushMode(flushMode?: FlushMode): void;
     protected processWhere<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entityName: string, where: FilterQuery<Entity>, options: FindOptions<Entity, Hint, Fields, Excludes> | FindOneOptions<Entity, Hint, Fields, Excludes>, type: 'read' | 'update' | 'delete'): Promise<FilterQuery<Entity>>;
     protected applyDiscriminatorCondition<Entity extends object>(entityName: string, where: FilterQuery<Entity>): FilterQuery<Entity>;
@@ -171,6 +174,10 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * });
      * ```
      *
+     * The options also support an `includeCount` (true by default) option. If set to false, the `totalCount` is not
+     * returned as part of the cursor. This is useful for performance reason, when you don't care about the total number
+     * of pages.
+     *
      * The `Cursor` object provides the following interface:
      *
      * ```ts
@@ -180,7 +187,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      *     User { ... },
      *     User { ... },
      *   ],
-     *   totalCount: 50,
+     *   totalCount: 50, // not included if `includeCount: false`
      *   startCursor: 'WzRd',
      *   endCursor: 'WzZd',
      *   hasPrevPage: true,
@@ -188,7 +195,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * }
      * ```
      */
-    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entityName: EntityName<Entity>, where: FilterQuery<NoInfer<Entity>>, options: FindByCursorOptions<Entity, Hint, Fields, Excludes>): Promise<Cursor<Entity, Hint, Fields, Excludes>>;
+    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never, IncludeCount extends boolean = true>(entityName: EntityName<Entity>, where: FilterQuery<NoInfer<Entity>>, options: FindByCursorOptions<Entity, Hint, Fields, Excludes, IncludeCount>): Promise<Cursor<Entity, Hint, Fields, Excludes, IncludeCount>>;
     /**
      * Refreshes the persistent state of an entity from the database, overriding any local changes that have not yet been
      * persisted. Returns the same entity instance (same object reference), but re-hydrated. If the entity is no longer
@@ -263,6 +270,29 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     upsertMany<Entity extends object, Fields extends string = any>(entityNameOrEntity: EntityName<Entity> | Entity[], data?: (EntityData<Entity> | NoInfer<Entity>)[], options?: UpsertManyOptions<Entity, Fields>): Promise<Entity[]>;
     /**
      * Runs your callback wrapped inside a database transaction.
+     *
+     * If a transaction is already active, a new savepoint (nested transaction) will be created by default. This behavior
+     * can be controlled via the `propagation` option. Use the provided EntityManager instance for all operations that
+     * should be part of the transaction. You can safely use a global EntityManager instance from a DI container, as this
+     * method automatically creates an async context for the transaction.
+     *
+     * **Concurrency note:** When running multiple transactions concurrently (e.g. in parallel requests or jobs), use the
+     * `clear: true` option. This ensures the callback runs in a clear fork of the EntityManager, providing full isolation
+     * between concurrent transactional handlers. Using `clear: true` is an alternative to forking explicitly and calling
+     * the method on the new fork – it already provides the necessary isolation for safe concurrent usage.
+     *
+     * **Propagation note:** Changes made within a transaction (whether top-level or nested) are always propagated to the
+     * parent context, unless the parent context is a global one. If you want to avoid that, fork the EntityManager first
+     * and then call this method on the fork.
+     *
+     * **Example:**
+     * ```ts
+     * await em.transactional(async (em) => {
+     *   const author = new Author('Jon');
+     *   em.persist(author);
+     *   // flush is called automatically at the end of the callback
+     * });
+     * ```
      */
     transactional<T>(cb: (em: this) => T | Promise<T>, options?: TransactionOptions): Promise<T>;
     /**
@@ -419,7 +449,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Loads specified relations in batch. This will execute one query for each relation, that will populate it on all the specified entities.
      */
-    populate<Entity extends object, Naked extends FromEntityType<UnboxArray<Entity>> = FromEntityType<UnboxArray<Entity>>, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entities: Entity, populate: AutoPath<Naked, Hint, PopulatePath.ALL>[] | false, options?: EntityLoaderOptions<Naked, Fields, Excludes>): Promise<Entity extends object[] ? MergeLoaded<ArrayElement<Entity>, Naked, Hint, Fields, Excludes>[] : MergeLoaded<Entity, Naked, Hint, Fields, Excludes>>;
+    populate<Entity extends object, Naked extends FromEntityType<UnboxArray<Entity>> = FromEntityType<UnboxArray<Entity>>, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entities: Entity, populate: readonly AutoPath<Naked, Hint, PopulatePath.ALL>[] | false, options?: EntityLoaderOptions<Naked, Fields, Excludes>): Promise<Entity extends object[] ? MergeLoaded<ArrayElement<Entity>, Naked, Hint, Fields, Excludes>[] : MergeLoaded<Entity, Naked, Hint, Fields, Excludes>>;
     /**
      * Returns new EntityManager instance with its own identity map
      */
@@ -432,6 +462,10 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * Gets the EntityFactory used by the EntityManager.
      */
     getEntityFactory(): EntityFactory;
+    /**
+     * @internal use `em.populate()` as the user facing API, this is exposed only for internal usage
+     */
+    getEntityLoader(): EntityLoader;
     /**
      * Gets the Hydrator used by the EntityManager.
      */
@@ -479,7 +513,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * some additional lazy properties, if so, we reload and merge the data from database
      */
     protected shouldRefresh<T extends object, P extends string = never, F extends string = '*', E extends string = never>(meta: EntityMetadata<T>, entity: T, options: FindOneOptions<T, P, F, E>): boolean;
-    protected prepareOptions(options: FindOptions<any, any, any, any> | FindOneOptions<any, any, any, any>): void;
+    protected prepareOptions(options: FindOptions<any, any, any, any> | FindOneOptions<any, any, any, any> | CountOptions<any, any>): void;
     /**
      * @internal
      */
@@ -488,7 +522,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * @internal
      */
     tryCache<T extends object, R>(entityName: string, config: boolean | number | [string, number] | undefined, key: unknown, refresh?: boolean, merge?: boolean): Promise<{
-        data?: R;
+        data?: R | null;
         key: string;
     } | undefined>;
     /**
@@ -539,11 +573,20 @@ export interface CreateOptions<Convert extends boolean> {
     partial?: boolean;
     /** convert raw database values based on mapped types (by default, already converted values are expected) */
     convertCustomTypes?: Convert;
+    /**
+     * Property `onCreate` hooks are normally executed during `flush` operation.
+     * With this option, they will be processed early inside `em.create()` method.
+     */
+    processOnCreateHooksEarly?: boolean;
 }
 export interface MergeOptions {
     refresh?: boolean;
     convertCustomTypes?: boolean;
     schema?: string;
+    disableContextResolution?: boolean;
+    keepIdentity?: boolean;
+    validate?: boolean;
+    cascade?: boolean; /** @default true */
 }
 export interface ForkOptions {
     /** do we want a clear identity map? defaults to true */

package/EntityManager.js

@@ -19,6 +19,8 @@ import { EventType, FlushMode, LoadStrategy, LockMode, PopulateHint, PopulatePat
 import { EventManager } from './events/EventManager.js';
 import { TransactionEventBroadcaster } from './events/TransactionEventBroadcaster.js';
 import { OptimisticLockError, ValidationError } from './errors.js';
+import { getLoadingStrategy } from './entity/utils.js';
+import { TransactionManager } from './utils/TransactionManager.js';
 /**
  * The EntityManager is the central access point to ORM functionality. It is a facade to all different ORM subsystems
  * such as UnitOfWork, Query Language, and Repository API.
@@ -36,6 +38,7 @@ export class EntityManager {
     name;
     refLoader = new DataLoader(DataloaderUtils.getRefBatchLoadFn(this));
     colLoader = new DataLoader(DataloaderUtils.getColBatchLoadFn(this));
+    colLoaderMtoN = new DataLoader(DataloaderUtils.getManyToManyColBatchLoadFn(this));
     validator;
     repositoryMap = {};
     entityLoader;
@@ -137,7 +140,6 @@ export class EntityManager {
             await em.entityLoader.populate(entityName, cached.data, populate, {
                 ...options,
                 ...em.getPopulateWhere(where, options),
-                convertCustomTypes: false,
                 ignoreLazyScalarProperties: true,
                 lookup: false,
             });
@@ -149,7 +151,7 @@ export class EntityManager {
         options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
         options.populateWhere = this.createPopulateWhere({ ...where }, options);
         options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
-        const results = await em.driver.find(entityName, where, { ctx: em.transactionContext, ...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 [];
@@ -168,7 +170,6 @@ export class EntityManager {
         await em.entityLoader.populate(entityName, unique, populate, {
             ...options,
             ...em.getPopulateWhere(where, options),
-            convertCustomTypes: false,
             ignoreLazyScalarProperties: true,
             lookup: false,
         });
@@ -232,8 +233,8 @@ export class EntityManager {
     /**
      * Gets logger context for this entity manager.
      */
-    getLoggerContext() {
-        const em = this.getContext();
+    getLoggerContext(options) {
+        const em = options?.disableContextResolution ? this : this.getContext();
         em.loggerContext ??= {};
         return em.loggerContext;
     }
@@ -289,7 +290,8 @@ export class EntityManager {
             for (const hint of options.populate) {
                 const field = hint.field.split(':')[0];
                 const prop = meta.properties[field];
-                const joined = (prop.strategy || options.strategy || hint.strategy || this.config.get('loadStrategy')) === LoadStrategy.JOINED && prop.kind !== ReferenceKind.SCALAR;
+                const strategy = getLoadingStrategy(prop.strategy || hint.strategy || options.strategy || this.config.get('loadStrategy'), prop.kind);
+                const joined = strategy === LoadStrategy.JOINED && prop.kind !== ReferenceKind.SCALAR;
                 if (!joined && !hint.filter) {
                     continue;
                 }
@@ -326,10 +328,19 @@ export class EntityManager {
             const cond = await this.applyFilters(prop.type, {}, options.filters ?? {}, 'read', options);
             if (!Utils.isEmpty(cond)) {
                 const populated = options.populate.filter(({ field }) => field.split(':')[0] === prop.name);
+                let found = false;
                 if (populated.length > 0) {
-                    populated.forEach(hint => hint.filter = true);
+                    for (const hint of populated) {
+                        if (!hint.all) {
+                            hint.filter = true;
+                            found = true;
+                        }
+                        else if (hint.field === `${prop.name}:ref`) {
+                            found = true;
+                        }
+                    }
                 }
-                else {
+                if (!found) {
                     ret.push({ field: `${prop.name}:ref`, strategy: LoadStrategy.JOINED, filter: true });
                 }
             }
@@ -367,7 +378,7 @@ export class EntityManager {
                 if (!args && filter.cond.length > 0 && filter.args !== false) {
                     throw new Error(`No arguments provided for filter '${filter.name}'`);
                 }
-                cond = await filter.cond(args, type, this, findOptions);
+                cond = await filter.cond(args, type, this, findOptions, entityName);
             }
             else {
                 cond = filter.cond;
@@ -433,6 +444,10 @@ export class EntityManager {
      * });
      * ```
      *
+     * The options also support an `includeCount` (true by default) option. If set to false, the `totalCount` is not
+     * returned as part of the cursor. This is useful for performance reason, when you don't care about the total number
+     * of pages.
+     *
      * The `Cursor` object provides the following interface:
      *
      * ```ts
@@ -442,7 +457,7 @@ export class EntityManager {
      *     User { ... },
      *     User { ... },
      *   ],
-     *   totalCount: 50,
+     *   totalCount: 50, // not included if `includeCount: false`
      *   startCursor: 'WzRd',
      *   endCursor: 'WzZd',
      *   hasPrevPage: true,
@@ -457,7 +472,9 @@ export class EntityManager {
         if (Utils.isEmpty(options.orderBy)) {
             throw new Error('Explicit `orderBy` option required');
         }
-        const [entities, count] = await em.findAndCount(entityName, where, options);
+        const [entities, count] = options.includeCount !== false
+            ? await em.findAndCount(entityName, where, options)
+            : [await em.find(entityName, where, options)];
         return new Cursor(entities, count, options, this.metadata.get(entityName));
     }
     /**
@@ -488,13 +505,25 @@ export class EntityManager {
             ...options,
             flushMode: FlushMode.COMMIT,
         });
-        if (reloaded) {
-            this.config.getHydrator(this.metadata).hydrate(entity, helper(entity).__meta, helper(reloaded).toPOJO(), this.getEntityFactory(), 'full');
+        const em = this.getContext();
+        if (!reloaded) {
+            em.unitOfWork.unsetIdentity(entity);
+            return null;
         }
-        else {
-            this.getUnitOfWork().unsetIdentity(entity);
+        let found = false;
+        for (const e of fork.unitOfWork.getIdentityMap()) {
+            const ref = em.getReference(e.constructor.name, helper(e).getPrimaryKey());
+            const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true });
+            em.config.getHydrator(this.metadata).hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, true);
+            helper(ref).__originalEntityData = this.comparator.prepareEntity(e);
+            found ||= ref === entity;
         }
-        return reloaded ? entity : reloaded;
+        if (!found) {
+            const data = helper(reloaded).serialize({ ignoreSerializers: true, includeHidden: true });
+            em.config.getHydrator(this.metadata).hydrate(entity, helper(entity).__meta, data, em.entityFactory, 'full', false, true);
+            helper(entity).__originalEntityData = this.comparator.prepareEntity(reloaded);
+        }
+        return entity;
     }
     /**
      * Finds first entity matching your `where` query.
@@ -530,14 +559,15 @@ export class EntityManager {
         options.populate = await em.preparePopulate(entityName, options);
         const cacheKey = em.cacheKey(entityName, options, 'em.findOne', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey, options.refresh, true);
-        if (cached?.data) {
-            await em.entityLoader.populate(entityName, [cached.data], options.populate, {
-                ...options,
-                ...em.getPopulateWhere(where, options),
-                convertCustomTypes: false,
-                ignoreLazyScalarProperties: true,
-                lookup: false,
-            });
+        if (cached?.data !== undefined) {
+            if (cached.data) {
+                await em.entityLoader.populate(entityName, [cached.data], options.populate, {
+                    ...options,
+                    ...em.getPopulateWhere(where, options),
+                    ignoreLazyScalarProperties: true,
+                    lookup: false,
+                });
+            }
             return cached.data;
         }
         options = { ...options };
@@ -547,6 +577,7 @@ export class EntityManager {
         options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
         const data = await em.driver.findOne(entityName, where, {
             ctx: em.transactionContext,
+            em,
             ...options,
         });
         if (!data) {
@@ -716,8 +747,9 @@ export class EntityManager {
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
+                schema: options.schema,
             });
-            em.getHydrator().hydrate(entity, meta, data2, em.entityFactory, 'full');
+            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);
@@ -896,6 +928,7 @@ export class EntityManager {
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
+                schema: options.schema,
             });
             for (const [entity, cond] of loadPK.entries()) {
                 const row = data2.find(row => {
@@ -911,7 +944,7 @@ export class EntityManager {
                 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', false, true);
             }
             if (loadPK.size !== data2.length && Array.isArray(uniqueFields)) {
                 for (let i = 0; i < allData.length; i++) {
@@ -952,45 +985,37 @@ export class EntityManager {
     }
     /**
      * Runs your callback wrapped inside a database transaction.
+     *
+     * If a transaction is already active, a new savepoint (nested transaction) will be created by default. This behavior
+     * can be controlled via the `propagation` option. Use the provided EntityManager instance for all operations that
+     * should be part of the transaction. You can safely use a global EntityManager instance from a DI container, as this
+     * method automatically creates an async context for the transaction.
+     *
+     * **Concurrency note:** When running multiple transactions concurrently (e.g. in parallel requests or jobs), use the
+     * `clear: true` option. This ensures the callback runs in a clear fork of the EntityManager, providing full isolation
+     * between concurrent transactional handlers. Using `clear: true` is an alternative to forking explicitly and calling
+     * the method on the new fork – it already provides the necessary isolation for safe concurrent usage.
+     *
+     * **Propagation note:** Changes made within a transaction (whether top-level or nested) are always propagated to the
+     * parent context, unless the parent context is a global one. If you want to avoid that, fork the EntityManager first
+     * and then call this method on the fork.
+     *
+     * **Example:**
+     * ```ts
+     * await em.transactional(async (em) => {
+     *   const author = new Author('Jon');
+     *   em.persist(author);
+     *   // flush is called automatically at the end of the callback
+     * });
+     * ```
      */
     async transactional(cb, options = {}) {
         const em = this.getContext(false);
         if (this.disableTransactions || em.disableTransactions) {
             return cb(em);
         }
-        const fork = em.fork({
-            clear: options.clear ?? false, // state will be merged once resolves
-            flushMode: options.flushMode,
-            cloneEventManager: true,
-            disableTransactions: options.ignoreNestedTransactions,
-            loggerContext: options.loggerContext,
-        });
-        options.ctx ??= em.transactionContext;
-        const propagateToUpperContext = !em.global || this.config.get('allowGlobalContext');
-        return TransactionContext.create(fork, async () => {
-            return fork.getConnection().transactional(async (trx) => {
-                fork.transactionContext = trx;
-                if (propagateToUpperContext) {
-                    fork.eventManager.registerSubscriber({
-                        afterFlush(args) {
-                            args.uow.getChangeSets()
-                                .filter(cs => [ChangeSetType.DELETE, ChangeSetType.DELETE_EARLY].includes(cs.type))
-                                .forEach(cs => em.unitOfWork.unsetIdentity(cs.entity));
-                        },
-                    });
-                }
-                const ret = await cb(fork);
-                await fork.flush();
-                if (propagateToUpperContext) {
-                    // ensure all entities from inner context are merged to the upper one
-                    for (const entity of fork.unitOfWork.getIdentityMap()) {
-                        em.unitOfWork.register(entity);
-                        entity.__helper.__em = em;
-                    }
-                }
-                return ret;
-            }, { ...options, eventBroadcaster: new TransactionEventBroadcaster(fork, { topLevelTransaction: !options.ctx }) });
-        });
+        const manager = new TransactionManager(this);
+        return manager.handle(cb, options);
     }
     /**
      * Starts new transaction bound to this EntityManager. Use `ctx` parameter to provide the parent when nesting transactions.
@@ -1170,22 +1195,35 @@ export class EntityManager {
      * via second parameter. By default, it will return already loaded entities without modifying them.
      */
     merge(entityName, data, options = {}) {
-        const em = this.getContext();
         if (Utils.isEntity(entityName)) {
-            return em.merge(entityName.constructor.name, entityName, data);
+            return this.merge(entityName.constructor.name, entityName, data);
         }
+        const em = options.disableContextResolution ? this : this.getContext();
         options.schema ??= em._schema;
+        options.validate ??= true;
+        options.cascade ??= true;
         entityName = Utils.className(entityName);
-        em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        if (options.validate) {
+            em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        }
         let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && helper(entity).__managed && helper(entity).__initialized && !options.refresh) {
             return entity;
         }
         const meta = em.metadata.find(entityName);
         const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
-        entity = Utils.isEntity(data) ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
-        em.validator.validate(entity, data, childMeta ?? meta);
-        em.unitOfWork.merge(entity);
+        const dataIsEntity = Utils.isEntity(data);
+        if (options.keepIdentity && entity && dataIsEntity && entity !== data) {
+            helper(entity).__data = helper(data).__data;
+            helper(entity).__originalEntityData = helper(data).__originalEntityData;
+            return entity;
+        }
+        entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
+        if (options.validate) {
+            em.validator.validate(entity, data, childMeta ?? meta);
+        }
+        const visited = options.cascade ? undefined : new Set([entity]);
+        em.unitOfWork.merge(entity, visited);
         return entity;
     }
     /**
@@ -1248,10 +1286,8 @@ export class EntityManager {
     async count(entityName, where = {}, options = {}) {
         const em = this.getContext(false);
         // Shallow copy options since the object will be modified when deleting orderBy
-        options = {
-            schema: em._schema,
-            ...options,
-        };
+        options = { ...options };
+        em.prepareOptions(options);
         entityName = Utils.className(entityName);
         await em.tryFlush(entityName, options);
         where = await em.processWhere(entityName, where, options, 'read');
@@ -1266,10 +1302,10 @@ export class EntityManager {
         delete options.orderBy;
         const cacheKey = em.cacheKey(entityName, options, 'em.count', where);
         const cached = await em.tryCache(entityName, options.cache, cacheKey);
-        if (cached?.data) {
+        if (cached?.data !== undefined) {
             return cached.data;
         }
-        const count = await em.driver.count(entityName, where, { ctx: em.transactionContext, ...options });
+        const count = await em.driver.count(entityName, where, { ctx: em.transactionContext, em, ...options });
         await em.storeCache(options.cache, cached, () => +count);
         return +count;
     }
@@ -1431,6 +1467,9 @@ export class EntityManager {
             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.getOrphanRemoveStack()) {
                 fork.unitOfWork.getOrphanRemoveStack().add(entity);
             }
@@ -1452,6 +1491,12 @@ export class EntityManager {
     getEntityFactory() {
         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;
+    }
     /**
      * Gets the Hydrator used by the EntityManager.
      */
@@ -1548,7 +1593,6 @@ export class EntityManager {
             ...options,
             ...this.getPopulateWhere(where, options),
             orderBy: options.populateOrderBy ?? options.orderBy,
-            convertCustomTypes: false,
             ignoreLazyScalarProperties: true,
             lookup: false,
         });
@@ -1671,7 +1715,7 @@ export class EntityManager {
             throw new ValidationError(`Cannot combine 'fields' and 'exclude' option.`);
         }
         options.schema ??= this._schema;
-        options.logging = Utils.merge({ id: this.id }, this.loggerContext, options.loggerContext, options.logging);
+        options.logging = options.loggerContext = Utils.merge({ id: this.id }, this.loggerContext, options.loggerContext, options.logging);
     }
     /**
      * @internal
@@ -1695,31 +1739,31 @@ export class EntityManager {
         const em = this.getContext();
         const cacheKey = Array.isArray(config) ? config[0] : JSON.stringify(key);
         const cached = await em.resultCache.get(cacheKey);
-        if (cached) {
-            let data;
-            if (Array.isArray(cached) && merge) {
-                data = cached.map(item => em.entityFactory.create(entityName, item, {
-                    merge: true,
-                    convertCustomTypes: true,
-                    refresh,
-                    recomputeSnapshot: true,
-                }));
-            }
-            else if (Utils.isObject(cached) && merge) {
-                data = em.entityFactory.create(entityName, cached, {
-                    merge: true,
-                    convertCustomTypes: true,
-                    refresh,
-                    recomputeSnapshot: true,
-                });
-            }
-            else {
-                data = cached;
-            }
-            await em.unitOfWork.dispatchOnLoadEvent();
-            return { key: cacheKey, data };
+        if (!cached) {
+            return { key: cacheKey, data: cached };
+        }
+        let data;
+        if (Array.isArray(cached) && merge) {
+            data = cached.map(item => em.entityFactory.create(entityName, item, {
+                merge: true,
+                convertCustomTypes: true,
+                refresh,
+                recomputeSnapshot: true,
+            }));
         }
-        return { key: cacheKey };
+        else if (Utils.isObject(cached) && merge) {
+            data = em.entityFactory.create(entityName, cached, {
+                merge: true,
+                convertCustomTypes: true,
+                refresh,
+                recomputeSnapshot: true,
+            });
+        }
+        else {
+            data = cached;
+        }
+        await em.unitOfWork.dispatchOnLoadEvent();
+        return { key: cacheKey, data };
     }
     /**
      * @internal

package/MikroORM.js

@@ -35,7 +35,6 @@ export class MikroORM {
             }
         }
         options = Utils.mergeConfig(options, env);
-        ConfigurationLoader.commonJSCompat(options);
         if ('DRIVER' in this && !options.driver) {
             options.driver = this.DRIVER;
         }

package/README.md

@@ -11,7 +11,6 @@ TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-or
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
 [![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
-[![Maintainability](https://api.codeclimate.com/v1/badges/27999651d3adc47cfa40/maintainability)](https://codeclimate.com/github/mikro-orm/mikro-orm/maintainability)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
 ## 🤔 Unit of What?
@@ -141,7 +140,7 @@ There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit m
 - [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
 - [Filters](https://mikro-orm.io/docs/filters)
 - [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Populating relations](https://mikro-orm.io/docs/populating-relations)
 - [Property Validation](https://mikro-orm.io/docs/property-validation)
 - [Lifecycle Hooks](https://mikro-orm.io/docs/events#hooks)
 - [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)

package/cache/FileCacheAdapter.d.ts

@@ -3,12 +3,13 @@ export declare class FileCacheAdapter implements SyncCacheAdapter {
     private readonly options;
     private readonly baseDir;
     private readonly pretty;
+    private readonly hashAlgorithm;
     private readonly VERSION;
     private cache;
     constructor(options: {
         cacheDir: string;
         combined?: boolean | string;
-    }, baseDir: string, pretty?: boolean);
+    }, baseDir: string, pretty?: boolean, hashAlgorithm?: 'md5' | 'sha256');
     /**
      * @inheritDoc
      */