@mikro-orm/core 6.4.12-dev.9 → 6.4.12

package/entity/EntityFactory.js

@@ -48,6 +48,7 @@ class EntityFactory {
         let wrapped = exists && (0, wrap_1.helper)(exists);
         if (wrapped && !options.refresh) {
             wrapped.__processing = true;
+            Utils_1.Utils.dropUndefinedProperties(data);
             this.mergeData(meta2, exists, data, options);
             wrapped.__processing = false;
             if (wrapped.isInitialized()) {

package/entity/EntityHelper.js

@@ -149,6 +149,9 @@ class EntityHelper {
             set(val) {
                 const entity = Reference_1.Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
                 const old = Reference_1.Reference.unwrapReference(wrapped.__data[prop.name]);
+                if (old && old !== entity && prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && prop.inversedBy && old[prop.inversedBy]) {
+                    old[prop.inversedBy].removeWithoutPropagation(this);
+                }
                 wrapped.__data[prop.name] = Reference_1.Reference.wrapReference(val, prop);
                 // when propagation from inside hydration, we set the FK to the entity data immediately
                 if (val && hydrator.isRunning() && wrapped.__originalEntityData && prop.owner) {

package/entity/EntityLoader.js

@@ -315,7 +315,14 @@ class EntityLoader {
             .map(orderBy => orderBy[prop.name]);
         const { refresh, filters, ignoreLazyScalarProperties, populateWhere, connectionType, logging, schema } = options;
         const exclude = Array.isArray(options.exclude) ? Utils_1.Utils.extractChildElements(options.exclude, prop.name) : options.exclude;
-        const filtered = Utils_1.Utils.unique(children.filter(e => !options.visited.has(e)));
+        const visited = options.visited;
+        for (const entity of entities) {
+            visited.delete(entity);
+        }
+        const filtered = Utils_1.Utils.unique(children.filter(e => !visited.has(e)));
+        for (const entity of entities) {
+            visited.add(entity);
+        }
         await this.populate(prop.type, filtered, populate.children ?? populate.all, {
             where: await this.extractChildCondition(options, prop, false),
             orderBy: innerOrderBy,

package/metadata/MetadataDiscovery.js

@@ -1124,7 +1124,7 @@ class MetadataDiscovery {
         }
         const mappedType = this.getMappedType(prop);
         if (prop.fieldNames?.length === 1 && !prop.customType) {
-            [types_1.BigIntType, types_1.DoubleType, types_1.DecimalType, types_1.IntervalType]
+            [types_1.BigIntType, types_1.DoubleType, types_1.DecimalType, types_1.IntervalType, types_1.DateType]
                 .filter(type => mappedType instanceof type)
                 .forEach(type => prop.customType = new type());
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.12-dev.9",
+  "version": "6.4.12",
   "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.3.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.4.12-dev.9",
+    "mikro-orm": "6.4.12",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -168,7 +168,7 @@ export interface IWrappedEntityInternal<Entity extends object> extends IWrappedE
     __touched: boolean;
     __originalEntityData?: EntityData<Entity>;
     __loadedProperties: Set<string>;
-    __identifier?: EntityIdentifier;
+    __identifier?: EntityIdentifier | EntityIdentifier[];
     __managed: boolean;
     __processing: boolean;
     __schema?: string;

package/typings.js

@@ -109,6 +109,9 @@ class EntityMetadata {
                         const hydrator = wrapped.hydrator;
                         const entity = entity_1.Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
                         const old = entity_1.Reference.unwrapReference(wrapped.__data[prop.name]);
+                        if (old && old !== entity && prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && prop.inversedBy && old[prop.inversedBy]) {
+                            old[prop.inversedBy].removeWithoutPropagation(this);
+                        }
                         wrapped.__data[prop.name] = entity_1.Reference.wrapReference(val, prop);
                         // when propagation from inside hydration, we set the FK to the entity data immediately
                         if (val && hydrator.isRunning() && wrapped.__originalEntityData && prop.owner) {

package/unit-of-work/ChangeSetPersister.js

@@ -211,7 +211,9 @@ class ChangeSetPersister {
         // of using the raw value from db, we convert it back to the db value explicitly
         value = prop.customType ? prop.customType.convertToDatabaseValue(insertId, this.platform, { mode: 'serialization' }) : value;
         changeSet.payload[wrapped.__meta.primaryKeys[0]] = value;
-        wrapped.__identifier?.setValue(value);
+        if (wrapped.__identifier && !Array.isArray(wrapped.__identifier)) {
+            wrapped.__identifier.setValue(value);
+        }
     }
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
@@ -339,6 +341,10 @@ class ChangeSetPersister {
             changeSet.payload[prop.name] = value.getValue();
             return;
         }
+        if (Array.isArray(value) && value.every(item => item instanceof entity_1.EntityIdentifier)) {
+            changeSet.payload[prop.name] = value.map(item => item.getValue());
+            return;
+        }
         if (prop.kind === enums_1.ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {
             changeSet.payload[prop.name] = value.map(val => val instanceof entity_1.EntityIdentifier ? val.getValue() : val);
             return;

package/unit-of-work/UnitOfWork.js

@@ -542,13 +542,22 @@ class UnitOfWork {
         if (!wrapped || wrapped.__identifier || wrapped.hasPrimaryKey()) {
             return;
         }
-        const pk = wrapped.__meta.getPrimaryProps()[0];
-        if (pk.kind === enums_1.ReferenceKind.SCALAR) {
-            wrapped.__identifier = new entity_1.EntityIdentifier();
+        const pks = wrapped.__meta.getPrimaryProps();
+        const idents = [];
+        for (const pk of pks) {
+            if (pk.kind === enums_1.ReferenceKind.SCALAR) {
+                idents.push(new entity_1.EntityIdentifier(entity[pk.name]));
+            }
+            else if (entity[pk.name]) {
+                this.initIdentifier(entity[pk.name]);
+                idents.push((0, entity_1.helper)(entity[pk.name])?.__identifier);
+            }
+        }
+        if (pks.length === 1) {
+            wrapped.__identifier = idents[0];
         }
-        else if (entity[pk.name]) {
-            this.initIdentifier(entity[pk.name]);
-            wrapped.__identifier = (0, entity_1.helper)(entity[pk.name])?.__identifier;
+        else {
+            wrapped.__identifier = idents;
         }
     }
     processReference(parent, prop, kind, visited, processed, idx) {
@@ -600,8 +609,15 @@ class UnitOfWork {
         const diff = this.comparator.diffEntities(changeSet.name, copy, current);
         Object.assign(changeSet.payload, diff);
         const wrapped = (0, entity_1.helper)(changeSet.entity);
-        if (wrapped.__identifier && diff[wrapped.__meta.primaryKeys[0]]) {
-            wrapped.__identifier.setValue(diff[wrapped.__meta.primaryKeys[0]]);
+        if (wrapped.__identifier) {
+            const idents = Utils_1.Utils.asArray(wrapped.__identifier);
+            let i = 0;
+            for (const pk of wrapped.__meta.primaryKeys) {
+                if (diff[pk]) {
+                    idents[i].setValue(diff[pk]);
+                }
+                i++;
+            }
         }
     }
     postCommitCleanup() {