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

package/entity/EntityFactory.js

@@ -122,7 +122,11 @@ export class EntityFactory {
                 newEntity: options.newEntity,
                 loaded: options.initialized,
             });
-            if (options.recomputeSnapshot) {
+            // A reference seeded from a raw scalar PK with `convertCustomTypes: false` (e.g. `em.getReference()` or a to-one
+            // relation assigned a raw scalar in `em.create()`) keeps its snapshot in JS-form, while `prepareEntity()` derives
+            // DB-form — so for a custom type mapping between different shapes (e.g. ULID <-> UUID) they always diff, yielding a
+            // spurious PK update on every flush. Recompute the snapshot from the entity to keep it in DB-form (GH #7966).
+            if (options.recomputeSnapshot || (!options.convertCustomTypes && !options.initialized)) {
                 wrapped.__originalEntityData = this.#comparator.prepareEntity(entity);
             }
         }
@@ -189,8 +193,7 @@ export class EntityFactory {
                 [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE, ReferenceKind.SCALAR].includes(prop.kind) &&
                 prop.customType?.ensureComparable(meta, prop) &&
                 diff2[key] != null) {
-                const converted = prop.customType.convertToJSValue(diff2[key], this.#platform, { force: true });
-                diff2[key] = prop.customType.convertToDatabaseValue(converted, this.#platform, { fromQuery: true });
+                diff2[key] = prop.customType.convertToDatabaseValue(diff2[key], this.#platform, { fromQuery: true });
             }
             originalEntityData[key] = diff2[key] === null ? nullVal : diff2[key];
             helper(entity).__loadedProperties.add(key);

package/entity/defineEntity.d.ts

@@ -691,6 +691,9 @@ export interface EntityMetadataWithProperties<TName extends string, TTableName e
 }
 /** Defines an entity schema using property builders, with full type inference from the property definitions. */
 export declare function defineEntity<const TName extends string, const TTableName extends string, const TProperties extends Record<string, any>, const TPK extends (keyof TProperties)[] | undefined = undefined, const TBase = never, const TRepository = never, const TForceObject extends boolean = false, const TDiscriminatorColumn extends string | undefined = undefined, const TDiscriminatorValue extends string | number | undefined = undefined, const TBaseDiscriminatorColumn extends string | undefined = undefined>(meta: EntityMetadataWithProperties<TName, TTableName, TProperties, TPK, TBase, TRepository, TForceObject, TDiscriminatorColumn, TDiscriminatorValue, TBaseDiscriminatorColumn>): EntitySchemaWithMeta<TName, TTableName, InferEntityFromProperties<TProperties, TPK, TBase, TRepository, TForceObject, TBaseDiscriminatorColumn, TDiscriminatorValue>, TBase, TProperties, EntityCtor<InferEntityFromProperties<TProperties, TPK, TBase, TRepository, TForceObject, TBaseDiscriminatorColumn, TDiscriminatorValue>>, TDiscriminatorColumn>;
+export declare namespace defineEntity {
+    export { propertyBuilders as properties };
+}
 /** Defines an entity schema for an existing class, combining the class with property builders. */
 export declare function defineEntity<const TEntity = any, const TProperties extends Record<string, any> = Record<string, any>, const TClassName extends string = string, const TTableName extends string = string, const TBase = never, const TClass extends EntityCtor = EntityCtor<TEntity>>(meta: Omit<Partial<EntityMetadata<TEntity>>, 'properties' | 'extends' | 'className' | 'tableName' | 'hooks'> & {
     class: TClass;
@@ -700,9 +703,6 @@ export declare function defineEntity<const TEntity = any, const TProperties exte
     properties: TProperties | ((properties: PropertyBuilders) => TProperties);
     hooks?: DefineEntityHooks<TEntity>;
 }): EntitySchemaWithMeta<TClassName, TTableName, TEntity, TBase, TProperties, TClass>;
-export declare namespace defineEntity {
-    var properties: PropertyBuilders;
-}
 /** Shorthand alias for `defineEntity.properties` - the property builders for use in `defineEntity()`. */
 export { propertyBuilders as p };
 type EntityHookValue<T, K extends keyof EventSubscriber<T>> = (keyof T | NonNullable<EventSubscriber<T>[K]>)[];

package/metadata/MetadataProvider.js

@@ -44,6 +44,9 @@ export class MetadataProvider {
     }
     /** Merges cached metadata into the given entity metadata, preserving function expressions. */
     loadFromCache(meta, cache) {
+        // `_id` is a process-local runtime counter; a cached value comes from a different discovery
+        // run and can collide with ids assigned in the current process, collapsing distinct entities.
+        Reflect.deleteProperty(cache, '_id');
         Object.values(cache.properties).forEach(prop => {
             const metaProp = meta.properties[prop.name];
             /* v8 ignore next */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.6-dev.9",
+  "version": "7.1.6",
   "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/utils/Utils.js

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