@mikro-orm/core 7.1.8-dev.7 → 7.1.8-dev.8

package/package.json

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

@@ -12,6 +12,11 @@ export declare class IdentityMap {
     storeByKey<T>(item: T, key: string, value: string, schema?: string): void;
     /** Removes an entity and its alternate key entries from the identity map. */
     delete<T>(item: T): void;
+    /**
+     * Retrieves the entity occupying the same slot as the given one, if any. Hashes the entity the same way `store()`
+     * does, so it matches regardless of the primary key shape — unlike hashing a primary key value obtained elsewhere.
+     */
+    getByEntity<T>(item: T): T | undefined;
     /** Retrieves an entity by its hash key from the identity map. */
     getByHash<T>(meta: EntityMetadata<T>, hash: string): T | undefined;
     /** Returns (or creates) the per-entity-class store within the identity map. */

package/unit-of-work/IdentityMap.js

@@ -40,6 +40,13 @@ export class IdentityMap {
             this.#alternateKeys.delete(item);
         }
     }
+    /**
+     * Retrieves the entity occupying the same slot as the given one, if any. Hashes the entity the same way `store()`
+     * does, so it matches regardless of the primary key shape — unlike hashing a primary key value obtained elsewhere.
+     */
+    getByEntity(item) {
+        return this.getStore(item.__meta.root).get(this.getPkHash(item));
+    }
     /** Retrieves an entity by its hash key from the identity map. */
     getByHash(meta, hash) {
         const store = this.getStore(meta);

package/utils/EntityComparator.js

@@ -172,6 +172,10 @@ export class EntityComparator {
                 if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
                     lines.push(`    (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey() : entity${this.wrap(pk)},`);
                 }
+                else if (meta.properties[pk].customType) {
+                    const convertorKey = this.registerCustomType(meta.properties[pk], context);
+                    lines.push(`    convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)}),`);
+                }
                 else {
                     lines.push(`    entity${this.wrap(pk)},`);
                 }

package/utils/TransactionManager.js

@@ -162,8 +162,7 @@ export class TransactionManager {
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
             const wrapped = helper(entity);
             const meta = wrapped.__meta;
-            // the identity map is keyed by the database form, so the lookup has to use it too
-            const parentEntity = parentUoW.getById(meta.class, wrapped.getPrimaryKey(true), parent.schema, true);
+            const parentEntity = parentUoW.getIdentityMap().getByEntity(entity);
             if (parentEntity && parentEntity !== entity) {
                 const parentWrapped = helper(parentEntity);
                 // Don't overwrite a fully-loaded entity with an uninitialized reference

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.1.8-dev.7';
+    static #ORM_VERSION = '7.1.8-dev.8';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */