@mikro-orm/core 6.4.8-dev.5 → 6.4.8-dev.7

package/EntityManager.js

@@ -142,7 +142,7 @@ 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 [];
@@ -540,6 +540,7 @@ 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) {

package/drivers/IDatabaseDriver.d.ts

@@ -146,6 +146,8 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
     hintComments?: string | string[];
     loggerContext?: LogContext;
     logging?: LoggingOptions;
+    /** @internal used to apply filters to the auto-joined relations */
+    em?: EntityManager;
 }
 export interface FindByCursorOptions<T extends object, P extends string = never, F extends string = '*', E extends string = never> extends Omit<FindOptions<T, P, F, E>, 'limit' | 'offset'> {
 }

package/entity/Collection.js

@@ -222,9 +222,13 @@ class Collection extends ArrayCollection_1.ArrayCollection {
         const em = this.getEntityManager();
         if (options.dataloader ?? [enums_1.DataloaderType.ALL, enums_1.DataloaderType.COLLECTION].includes(utils_1.DataloaderUtils.getDataloaderType(em.config.get('dataloader')))) {
             const order = [...this.items]; // copy order of references
-            const customOrder = !!options.orderBy;
+            const orderBy = this.createOrderBy(options.orderBy);
+            const customOrder = orderBy.length > 0;
             // eslint-disable-next-line dot-notation
-            const items = await em['colLoader'].load([this, options]);
+            const items = await em['colLoader'].load([
+                this,
+                { ...options, orderBy },
+            ]);
             if (!customOrder) {
                 this.reorderItems(items, order);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.8-dev.5",
+  "version": "6.4.8-dev.7",
   "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.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.8-dev.5",
+    "mikro-orm": "6.4.8-dev.7",
     "reflect-metadata": "0.2.2"
   }
 }