@mikro-orm/core 7.2.6-dev.41 → 7.2.6-dev.43

package/entity/EntityFactory.d.ts

@@ -38,6 +38,13 @@ export declare class EntityFactory {
     constructor(em: EntityManager);
     /** Creates a new entity instance or returns an existing one from the identity map, hydrating it with the provided data. */
     create<T extends object, P extends string = string>(entityName: EntityName<T>, data: EntityData<T>, options?: FactoryOptions): New<T, P>;
+    /**
+     * Whether merging `data` into an initialized entity would change nothing: every key is a scalar the entity already
+     * holds by identity, and keys `mergeData` always re-applies (formula, version, generated, discriminator) match the snapshot.
+     */
+    private isNoopMerge;
+    /** Whether hydrating `value` into `prop` would leave `current` as is, mirroring the hydrator's Date and boolean coercion. */
+    private holdsValue;
     /** Merges new data into an existing entity, preserving user-modified properties. */
     mergeData<T extends object>(meta: EntityMetadata<T>, entity: T, data: EntityData<T>, options?: FactoryOptions): void;
     /** Creates or retrieves an uninitialized entity reference by its primary key or alternate key. */

package/entity/EntityFactory.js

@@ -149,8 +149,45 @@ export class EntityFactory {
         wrapped.__processing = false;
         return entity;
     }
+    /**
+     * Whether merging `data` into an initialized entity would change nothing: every key is a scalar the entity already
+     * holds by identity, and keys `mergeData` always re-applies (formula, version, generated, discriminator) match the snapshot.
+     */
+    isNoopMerge(meta, entity, data, options) {
+        const wrapped = helper(entity);
+        if (!wrapped.__initialized || options.normalizeAccessors) {
+            return false;
+        }
+        for (const key of Utils.keys(data)) {
+            const prop = meta.properties[key];
+            const value = data[key];
+            // custom types are left to the full merge, as their JS and database values can differ
+            if (!prop || prop.customType || value === undefined || !this.holdsValue(prop, entity[key], value)) {
+                return false;
+            }
+            const reapplied = prop.formula || prop.version || prop.generated || key === meta.root.discriminatorColumn;
+            if (reapplied && (wrapped.__originalEntityData?.[key] !== value || !wrapped.__loadedProperties.has(key))) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /** Whether hydrating `value` into `prop` would leave `current` as is, mirroring the hydrator's Date and boolean coercion. */
+    holdsValue(prop, current, value) {
+        if (current instanceof Date && value instanceof Date) {
+            return current.getTime() === value.getTime();
+        }
+        if (prop.runtimeType === 'boolean' && value != null) {
+            return current === !!value;
+        }
+        return current === value;
+    }
     /** Merges new data into an existing entity, preserving user-modified properties. */
     mergeData(meta, entity, data, options = {}) {
+        // joined rows often repeat exactly what the entity already holds, skip the snapshot and diffing then
+        if (this.isNoopMerge(meta, entity, data, options)) {
+            return;
+        }
         // merge unchanged properties automatically
         data = QueryHelper.processParams(data);
         const existsData = this.#comparator.prepareEntity(entity);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.6-dev.41",
+  "version": "7.2.6-dev.43",
   "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/utils/Utils.js

@@ -153,7 +153,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.2.6-dev.41';
+    static #ORM_VERSION = '7.2.6-dev.43';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;