@mikro-orm/core 6.3.13-dev.12 → 6.3.13-dev.13

package/EntityManager.d.ts

@@ -115,7 +115,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     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>;
-    protected createPopulateWhere<Entity extends object>(cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any>): ObjectQuery<Entity>;
+    protected createPopulateWhere<Entity extends object>(cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any> | CountOptions<Entity, any>): ObjectQuery<Entity>;
     protected getJoinedFilters<Entity extends object>(meta: EntityMetadata<Entity>, cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any>): Promise<ObjectQuery<Entity>>;
     /**
      * When filters are active on M:1 or 1:1 relations, we need to ref join them eagerly as they might affect the FK value.

package/EntityManager.js

@@ -1230,6 +1230,12 @@ class EntityManager {
         await em.tryFlush(entityName, options);
         where = await em.processWhere(entityName, where, options, 'read');
         options.populate = await em.preparePopulate(entityName, options);
+        options = { ...options };
+        // save the original hint value so we know it was infer/all
+        const meta = em.metadata.find(entityName);
+        options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
+        options.populateWhere = this.createPopulateWhere({ ...where }, options);
+        options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
         em.validator.validateParams(where);
         delete options.orderBy;
         const cacheKey = em.cacheKey(entityName, options, 'em.count', where);

package/drivers/IDatabaseDriver.d.ts

@@ -86,7 +86,7 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
      * Filter condition for populated relations. This is similar to `populateWhere`, but will produce a `left join`
      * when nesting the condition. This is used for implementation of joined filters.
      */
-    populateFilter?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`;
+    populateFilter?: ObjectQuery<Entity>;
     /** Used for ordering of the populate queries. If not specified, the value of `options.orderBy` is used. */
     populateOrderBy?: OrderDefinition<Entity>;
     /** Ordering of the results.Can be an object or array of objects, keys are property names, values are ordering (asc/desc) */
@@ -182,6 +182,8 @@ export interface CountOptions<T extends object, P extends string = never> {
     having?: QBFilterQuery<T>;
     cache?: boolean | number | [string, number];
     populate?: Populate<T, P>;
+    populateWhere?: ObjectQuery<T> | PopulateHint | `${PopulateHint}`;
+    populateFilter?: ObjectQuery<T>;
     ctx?: Transaction;
     connectionType?: ConnectionType;
     flushMode?: FlushMode | `${FlushMode}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.13-dev.12",
+  "version": "6.3.13-dev.13",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.13-dev.12",
+    "mikro-orm": "6.3.13-dev.13",
     "reflect-metadata": "0.2.2"
   }
 }