@mikro-orm/core 6.3.13-dev.0 → 6.3.13-dev.2

package/entity/EntityLoader.js

@@ -481,6 +481,9 @@ class EntityLoader {
         }
         const [f, ...r] = field.split('.');
         if (wrapped.__loadedProperties.has(f) && wrapped.__meta.properties[f]?.targetMeta) {
+            if ([enums_1.ReferenceKind.ONE_TO_MANY, enums_1.ReferenceKind.MANY_TO_MANY].includes(wrapped.__meta.properties[f].kind)) {
+                return entity[f].getItems(false).every((item) => this.isPropertyLoaded(item, r.join('.')));
+            }
             return this.isPropertyLoaded(entity[f], r.join('.'));
         }
         /* istanbul ignore next */

package/errors.js

@@ -173,7 +173,7 @@ class MetadataError extends ValidationError {
         return new MetadataError('No entities were discovered');
     }
     static onlyAbstractEntitiesDiscovered() {
-        return new MetadataError('Only abstract entities were discovered, maybe you forgot to use @Entity() decorator?');
+        return new MetadataError('Only abstract entities were discovered, maybe you forgot to use @Entity() decorator? This can also happen when you have multiple `@mikro-orm/core` packages installed side by side.');
     }
     static duplicateEntityDiscovered(paths, subject = 'entity names') {
         return new MetadataError(`Duplicate ${subject} are not allowed: ${paths.join(', ')}`);

package/package.json

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

package/typings.d.ts

@@ -90,8 +90,8 @@ export type Scalar = boolean | number | string | bigint | symbol | Date | RegExp
 };
 export type ExpandScalar<T> = null | (T extends string ? T | RegExp : T extends Date ? Date | string : T extends bigint ? bigint | string | number : T);
 export type OperatorMap<T> = {
-    $and?: readonly ExpandQuery<T>[];
-    $or?: readonly ExpandQuery<T>[];
+    $and?: ExpandQuery<T>[];
+    $or?: ExpandQuery<T>[];
     $eq?: ExpandScalar<T> | readonly ExpandScalar<T>[];
     $ne?: ExpandScalar<T>;
     $in?: readonly ExpandScalar<T>[];

package/unit-of-work/ChangeSetPersister.js

@@ -180,14 +180,20 @@ class ChangeSetPersister {
             convertCustomTypes: false,
             processCollections: false,
         });
-        const cond = changeSets.map(cs => cs.getPrimaryKey(true));
-        changeSets.forEach((changeSet, idx) => {
-            this.checkConcurrencyKeys(meta, changeSet, cond[idx]);
-        });
-        const res = await this.driver.nativeUpdateMany(meta.className, cond, changeSets.map(cs => cs.payload), options);
+        const cond = [];
+        const payload = [];
+        for (const changeSet of changeSets) {
+            const where = changeSet.getPrimaryKey(true);
+            this.checkConcurrencyKeys(meta, changeSet, where);
+            cond.push(where);
+            payload.push(changeSet.payload);
+        }
+        const res = await this.driver.nativeUpdateMany(meta.className, cond, payload, options);
+        const map = new Map();
+        res.rows?.forEach(item => map.set(utils_1.Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
         for (const changeSet of changeSets) {
             if (res.rows) {
-                const row = res.rows.find(row => utils_1.Utils.equals(utils_1.Utils.extractPK(row, meta), changeSet.getPrimaryKey()));
+                const row = map.get((0, entity_1.helper)(changeSet.entity).getSerializedPrimaryKey());
                 this.mapReturnedValues(changeSet.entity, changeSet.payload, row, meta);
             }
             changeSet.persisted = true;