@mikro-orm/core 7.0.11-dev.2 → 7.0.11-dev.4

package/entity/EntityFactory.js

@@ -139,12 +139,6 @@ export class EntityFactory {
         const existsData = this.#comparator.prepareEntity(entity);
         const originalEntityData = helper(entity).__originalEntityData ?? {};
         const diff = this.#comparator.diffEntities(meta.class, originalEntityData, existsData);
-        // version properties are not part of entity snapshots
-        if (meta.versionProperty &&
-            data[meta.versionProperty] &&
-            data[meta.versionProperty] !== originalEntityData[meta.versionProperty]) {
-            diff[meta.versionProperty] = data[meta.versionProperty];
-        }
         const diff2 = this.#comparator.diffEntities(meta.class, existsData, data, { includeInverseSides: true });
         // do not override values changed by user; for uninitialized entities,
         // the diff may include stale snapshot entries (value is undefined) — skip those
@@ -167,10 +161,11 @@ export class EntityFactory {
             return diff2[key] === undefined;
         })
             .forEach(key => delete diff2[key]);
-        // but always add collection properties, formulas, and generated columns if they are part of the `data`,
-        // as these are excluded from `comparableProps` and won't appear in the diff
+        // but always add collection properties, formulas, generated columns, and version properties if they
+        // are part of the `data`, as these are excluded from `comparableProps` and won't appear in the diff
         Utils.keys(data)
             .filter(key => meta.properties[key]?.formula ||
+            meta.properties[key]?.version ||
             (meta.properties[key]?.generated && !meta.properties[key]?.primary) ||
             [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
             .forEach(key => (diff2[key] = data[key]));

package/entity/EntityLoader.js

@@ -47,7 +47,12 @@ export class EntityLoader {
             throw ValidationError.invalidPropertyName(entityName, invalid.field);
         }
         this.setSerializationContext(entities, populate, options);
+        const addedToVisited = [];
         for (const entity of entities) {
+            if (visited.has(entity)) {
+                continue;
+            }
+            addedToVisited.push(entity);
             visited.add(entity);
         }
         for (const pop of populate) {
@@ -79,7 +84,7 @@ export class EntityLoader {
                 });
             }
         }
-        for (const entity of entities) {
+        for (const entity of addedToVisited) {
             visited.delete(entity);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.11-dev.2",
+  "version": "7.0.11-dev.4",
   "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.",
   "keywords": [
     "data-mapper",

package/unit-of-work/ChangeSetPersister.js

@@ -327,6 +327,10 @@ export class ChangeSetPersister {
         const primaryKeys = meta.primaryKeys.concat(...meta.concurrencyCheckKeys);
         options = this.prepareOptions(meta, options, {
             fields: primaryKeys,
+            orderBy: meta.primaryKeys.reduce((o, pk) => {
+                o[pk] = 'asc';
+                return o;
+            }, {}),
         });
         const res = await this.#driver.find(meta.root.class, { $or }, options);
         if (res.length !== changeSets.length) {

package/utils/Utils.js

@@ -141,7 +141,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.11-dev.2';
+    static #ORM_VERSION = '7.0.11-dev.4';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */