@mikro-orm/core 6.3.12-dev.7 → 6.3.13-dev.0

package/entity/EntityFactory.js

@@ -300,13 +300,14 @@ class EntityFactory {
             if (!meta.properties[k]) {
                 const tmp = { ...data };
                 for (const prop of meta.props) {
-                    if (options.convertCustomTypes && prop.customType && tmp[prop.name] != null) {
-                        if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(tmp[prop.name]) && !Utils_1.Utils.extractPK(tmp[prop.name], meta.properties[prop.name].targetMeta, true)) {
-                            tmp[prop.name] = Reference_1.Reference.wrapReference(this.create(meta.properties[prop.name].type, tmp[prop.name], options), prop);
-                        }
-                        else {
-                            tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.platform);
-                        }
+                    if (!options.convertCustomTypes || !prop.customType || tmp[prop.name] == null) {
+                        continue;
+                    }
+                    if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(tmp[prop.name]) && !Utils_1.Utils.extractPK(tmp[prop.name], meta.properties[prop.name].targetMeta, true)) {
+                        tmp[prop.name] = Reference_1.Reference.wrapReference(this.create(meta.properties[prop.name].type, tmp[prop.name], options), prop);
+                    }
+                    else if (prop.kind === enums_1.ReferenceKind.SCALAR) {
+                        tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.platform);
                     }
                 }
                 return tmp;

package/package.json

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

package/utils/Utils.js

@@ -49,9 +49,11 @@ function compareObjects(a, b) {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return a.sql === b.sql && compareArrays(a.params, b.params);
     }
+    if ((a instanceof Date && b instanceof Date)) {
+        return a.toISOString() === b.toISOString();
+    }
     if ((typeof a === 'function' && typeof b === 'function') ||
         (typeof a === 'object' && a.client && ['Ref', 'Raw'].includes(a.constructor.name) && typeof b === 'object' && b.client && ['Ref', 'Raw'].includes(b.constructor.name)) || // knex qb
-        (a instanceof Date && b instanceof Date) ||
         (a instanceof RegExp && b instanceof RegExp) ||
         (a instanceof String && b instanceof String) ||
         (a instanceof Number && b instanceof Number)) {