@mikro-orm/core 6.3.14-dev.18 → 6.3.14-dev.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.18",
+  "version": "6.3.14-dev.19",
   "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.14-dev.18",
+    "mikro-orm": "6.3.14-dev.19",
     "reflect-metadata": "0.2.2"
   }
 }

package/utils/DataloaderUtils.d.ts

@@ -23,7 +23,7 @@ export declare class DataloaderUtils {
     static groupInversedOrMappedKeysByEntityAndOpts(collsWithOpts: readonly [Collection<any>, Omit<InitCollectionOptions<any, any>, 'dataloader'>?][]): Map<string, Map<string, Set<Primary<any>>>>;
     /**
      * Turn the entity+options map into actual queries.
-     * The keys are the entity names + a strigified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
+     * The keys are the entity names + a stringified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
      * We must populate the inverse side of the relationship in order to be able to later retrieve the PK(s) from its item(s).
      * Together with the query the promises will also return the key which can be used to narrow down the results pertaining to a certain set of options.
      */
@@ -33,7 +33,7 @@ export declare class DataloaderUtils {
      * First checks if the Entity type matches, then retrieves the inverse side of the relationship
      * where the filtering will be done in order to match the target collection.
      */
-    static getColFilter<T, S extends T>(collection: Collection<any, object>): (result: T) => result is S;
+    static getColFilter<T, S extends T>(collection: Collection<any>): (result: T) => result is S;
     /**
      * Returns the collection dataloader batchLoadFn, which aggregates collections by entity,
      * makes one query per entity and maps each input collection to the corresponding result.

package/utils/DataloaderUtils.js

@@ -4,6 +4,7 @@ exports.DataloaderUtils = void 0;
 const Collection_1 = require("../entity/Collection");
 const wrap_1 = require("../entity/wrap");
 const enums_1 = require("../enums");
+const Reference_1 = require("../entity/Reference");
 class DataloaderUtils {
     /**
      * Groups identified references by entity and returns a Map with the
@@ -92,7 +93,7 @@ class DataloaderUtils {
     }
     /**
      * Turn the entity+options map into actual queries.
-     * The keys are the entity names + a strigified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
+     * The keys are the entity names + a stringified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
      * We must populate the inverse side of the relationship in order to be able to later retrieve the PK(s) from its item(s).
      * Together with the query the promises will also return the key which can be used to narrow down the results pertaining to a certain set of options.
      */
@@ -139,20 +140,21 @@ class DataloaderUtils {
             // There is no need to check if Entity matches because we already matched the key which is entity+options.
             // This is the inverse side of the relationship where the filtering will be done in order to match the target collection
             // Either inversedBy or mappedBy exist because we already checked in groupInversedOrMappedKeysByEntity
-            const refOrCol = result[(collection.property.inversedBy ?? collection.property.mappedBy)];
-            if (refOrCol instanceof Collection_1.Collection) {
-                // The inverse side is a Collection
-                // We keep the result if any of PKs of the inverse side matches the PK of the collection owner
-                for (const item of refOrCol.getItems()) {
-                    if ((0, wrap_1.helper)(item).getSerializedPrimaryKey() === (0, wrap_1.helper)(collection.owner).getSerializedPrimaryKey()) {
+            const inverseProp = collection.property.inversedBy ?? collection.property.mappedBy;
+            const target = Reference_1.Reference.unwrapReference(result[inverseProp]);
+            if (target instanceof Collection_1.Collection) {
+                for (const item of target) {
+                    if (item === collection.owner) {
                         return true;
                     }
                 }
             }
-            else if (refOrCol) {
-                // The inverse side is a Reference
-                // We keep the result if the PK of the inverse side matches the PK of the collection owner
-                return (0, wrap_1.helper)(refOrCol).getSerializedPrimaryKey() === (0, wrap_1.helper)(collection.owner).getSerializedPrimaryKey();
+            else if (target) {
+                return target === collection.owner;
+            }
+            // FIXME https://github.com/mikro-orm/mikro-orm/issues/6031
+            if (!target && collection.property.kind === enums_1.ReferenceKind.MANY_TO_MANY) {
+                throw new Error(`Inverse side is required for M:N relations with dataloader: ${collection.owner.constructor.name}.${collection.property.name}`);
             }
             return false;
         };