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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.9-dev.2",
+  "version": "7.0.9-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.d.ts

@@ -24,6 +24,12 @@ export declare class ChangeSetPersister {
     private checkConcurrencyKeys;
     private persistManagedEntitiesBatch;
     private mapPrimaryKey;
+    /**
+     * After INSERT + hydration, sync all EntityIdentifier placeholders in composite PK arrays
+     * with the real values now present on the entity. This is needed because `mapPrimaryKey`
+     * only handles the first PK column, but any scalar PK in a composite key may be auto-generated.
+     */
+    private syncCompositeIdentifiers;
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
      */

package/unit-of-work/ChangeSetPersister.js

@@ -132,6 +132,7 @@ export class ChangeSetPersister {
             this.mapPrimaryKey(meta, res.insertId ?? res.row?.[meta.primaryKeys[0]], changeSet);
         }
         this.mapReturnedValues(changeSet.entity, changeSet.payload, res.row, meta);
+        this.syncCompositeIdentifiers(changeSet);
         this.markAsPopulated(changeSet, meta);
         wrapped.__initialized = true;
         wrapped.__managed = true;
@@ -178,6 +179,7 @@ export class ChangeSetPersister {
             if (res.rows) {
                 this.mapReturnedValues(changeSet.entity, changeSet.payload, res.rows[i], meta);
             }
+            this.syncCompositeIdentifiers(changeSet);
             this.markAsPopulated(changeSet, meta);
             wrapped.__initialized = true;
             wrapped.__managed = true;
@@ -255,6 +257,24 @@ export class ChangeSetPersister {
             wrapped.__identifier.setValue(value);
         }
     }
+    /**
+     * After INSERT + hydration, sync all EntityIdentifier placeholders in composite PK arrays
+     * with the real values now present on the entity. This is needed because `mapPrimaryKey`
+     * only handles the first PK column, but any scalar PK in a composite key may be auto-generated.
+     */
+    syncCompositeIdentifiers(changeSet) {
+        const wrapped = helper(changeSet.entity);
+        if (!Array.isArray(wrapped.__identifier)) {
+            return;
+        }
+        const pks = changeSet.meta.getPrimaryProps();
+        for (let i = 0; i < pks.length; i++) {
+            const ident = wrapped.__identifier[i];
+            if (ident instanceof EntityIdentifier && pks[i].kind === ReferenceKind.SCALAR) {
+                ident.setValue(changeSet.entity[pks[i].name]);
+            }
+        }
+    }
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
      */
@@ -413,8 +433,8 @@ export class ChangeSetPersister {
             }
             return;
         }
-        if (Array.isArray(value) && value.every(item => item instanceof EntityIdentifier)) {
-            changeSet.payload[prop.name] = value.map(item => item.getValue());
+        if (Array.isArray(value) && value.some(item => item instanceof EntityIdentifier)) {
+            changeSet.payload[prop.name] = value.map(item => (item instanceof EntityIdentifier ? item.getValue() : item));
             return;
         }
         if (prop.kind === ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {

package/utils/Utils.js

@@ -132,7 +132,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.9-dev.2';
+    static #ORM_VERSION = '7.0.9-dev.4';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */