@mikro-orm/core 7.1.8-dev.1 → 7.1.8-dev.10

package/EntityManager.js

@@ -1432,7 +1432,7 @@ export class EntityManager {
         options.validate ??= true;
         options.cascade ??= true;
         validatePrimaryKey(data, em.metadata.get(entityName));
-        let entity = em.#unitOfWork.tryGetById(entityName, data, options.schema, false);
+        let entity = em.#unitOfWork.tryGetById(entityName, data, options.schema, false, options.convertCustomTypes);
         if (entity && helper(entity).__managed && helper(entity).__initialized && !options.refresh) {
             return entity;
         }

package/entity/EntityAssigner.js

@@ -187,7 +187,9 @@ export class EntityAssigner {
             if (options.updateNestedEntities && options.updateByPrimaryKey && Utils.isPlainObject(item)) {
                 const pk = Utils.extractPK(item, prop.targetMeta);
                 if (pk && EntityAssigner.validateEM(em)) {
-                    const ref = em.getUnitOfWork().getById(prop.targetMeta.class, pk, options.schema);
+                    const ref = em
+                        .getUnitOfWork()
+                        .getById(prop.targetMeta.class, pk, options.schema, options.convertCustomTypes);
                     if (ref) {
                         return EntityAssigner.assign(ref, item, options);
                     }

package/entity/EntityFactory.js

@@ -421,7 +421,7 @@ export class EntityFactory {
             const value = data[k];
             if (prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && value) {
                 const pk = Reference.unwrapReference(value);
-                const entity = this.unitOfWork.getById(prop.targetMeta.class, pk, options.schema, true);
+                const entity = this.unitOfWork.getById(prop.targetMeta.class, pk, options.schema, options.convertCustomTypes);
                 if (entity) {
                     return entity;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.8-dev.1",
+  "version": "7.1.8-dev.10",
   "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/unit-of-work/UnitOfWork.d.ts

@@ -48,7 +48,7 @@ export declare class UnitOfWork {
      */
     storeByKey<T extends object>(entity: T, key: string, value: unknown, schema?: string, convertCustomTypes?: boolean): void;
     /** Attempts to extract a primary key from the where condition and look up the entity in the identity map. */
-    tryGetById<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>, schema?: string, strict?: boolean): T | null;
+    tryGetById<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>, schema?: string, strict?: boolean, convertCustomTypes?: boolean): T | null;
     /**
      * Returns map of all managed entities.
      */

package/unit-of-work/UnitOfWork.js

@@ -227,12 +227,12 @@ export class UnitOfWork {
         this.#identityMap.storeByKey(entity, key, '' + value, schema);
     }
     /** Attempts to extract a primary key from the where condition and look up the entity in the identity map. */
-    tryGetById(entityName, where, schema, strict = true) {
+    tryGetById(entityName, where, schema, strict = true, convertCustomTypes) {
         const pk = Utils.extractPK(where, this.#metadata.find(entityName), strict);
         if (!pk) {
             return null;
         }
-        return this.getById(entityName, pk, schema);
+        return this.getById(entityName, pk, schema, convertCustomTypes);
     }
     /**
      * Returns map of all managed entities.

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,7 +162,7 @@ export class TransactionManager {
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
             const wrapped = helper(entity);
             const meta = wrapped.__meta;
-            const parentEntity = parentUoW.getById(meta.class, wrapped.getPrimaryKey(), 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.1';
+    static #ORM_VERSION = '7.1.8-dev.10';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */