@mikro-orm/core 6.5.7-dev.9 → 6.5.8-dev.0

package/EntityManager.d.ts

@@ -579,6 +579,8 @@ export interface MergeOptions {
     schema?: string;
     disableContextResolution?: boolean;
     keepIdentity?: boolean;
+    validate?: boolean;
+    cascade?: boolean; /** @default true */
 }
 export interface ForkOptions {
     /** do we want a clear identity map? defaults to true */

package/EntityManager.js

@@ -1186,8 +1186,12 @@ class EntityManager {
         }
         const em = options.disableContextResolution ? this : this.getContext();
         options.schema ??= em._schema;
+        options.validate ??= true;
+        options.cascade ??= true;
         entityName = utils_1.Utils.className(entityName);
-        em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        if (options.validate) {
+            em.validator.validatePrimaryKey(data, em.metadata.get(entityName));
+        }
         let entity = em.unitOfWork.tryGetById(entityName, data, options.schema, false);
         if (entity && (0, entity_1.helper)(entity).__managed && (0, entity_1.helper)(entity).__initialized && !options.refresh) {
             return entity;
@@ -1196,12 +1200,16 @@ class EntityManager {
         const childMeta = em.metadata.getByDiscriminatorColumn(meta, data);
         const dataIsEntity = utils_1.Utils.isEntity(data);
         if (options.keepIdentity && entity && dataIsEntity && entity !== data) {
-            em.entityFactory.mergeData(meta, entity, (0, entity_1.helper)(data).__originalEntityData, { initialized: true, merge: true, ...options });
+            (0, entity_1.helper)(entity).__data = (0, entity_1.helper)(data).__data;
+            (0, entity_1.helper)(entity).__originalEntityData = (0, entity_1.helper)(data).__originalEntityData;
             return entity;
         }
         entity = dataIsEntity ? data : em.entityFactory.create(entityName, data, { merge: true, ...options });
-        em.validator.validate(entity, data, childMeta ?? meta);
-        em.unitOfWork.merge(entity);
+        if (options.validate) {
+            em.validator.validate(entity, data, childMeta ?? meta);
+        }
+        const visited = options.cascade ? undefined : new Set([entity]);
+        em.unitOfWork.merge(entity, visited);
         return entity;
     }
     /**

package/entity/EntityValidator.js

@@ -14,7 +14,7 @@ class EntityValidator {
     }
     validate(entity, payload, meta) {
         meta.props.forEach(prop => {
-            if (prop.inherited) {
+            if (prop.inherited || (prop.persist === false && prop.userDefined !== false)) {
                 return;
             }
             if ([enums_1.ReferenceKind.ONE_TO_MANY, enums_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {

package/entity/defineEntity.d.ts

@@ -73,7 +73,7 @@ export declare class PropertyOptionsBuilder<Value> {
     /**
      * Explicitly specify the auto increment of the primary key.
      */
-    autoincrement(autoincrement?: boolean): PropertyOptionsBuilder<Value>;
+    autoincrement<T extends boolean = true>(autoincrement?: T): PropertyOptionsBuilder<T extends true ? Opt<Value> : Value>;
     /**
      * Add the property to the `returning` statement.
      */

package/hydration/ObjectHydrator.js

@@ -73,7 +73,14 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                 ret.push(`  const oldValue_${idx} = entity${entityKey};`);
             }
             ret.push(`  if (data${dataKey} === null) {`);
-            ret.push(`    entity${entityKey} = ${nullVal};`);
+            if (prop.ref) {
+                ret.push(`    entity${entityKey} = new ScalarReference();`);
+                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.set(${nullVal});`);
+            }
+            else {
+                ret.push(`    entity${entityKey} = ${nullVal};`);
+            }
             ret.push(`  } else if (typeof data${dataKey} !== 'undefined') {`);
             if (prop.customType) {
                 registerCustomType(prop, convertorKey, 'convertToJSValue', context);

package/package.json

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

package/utils/TransactionManager.js

@@ -6,6 +6,7 @@ const events_1 = require("../events");
 const TransactionContext_1 = require("../utils/TransactionContext");
 const unit_of_work_1 = require("../unit-of-work");
 const errors_1 = require("../errors");
+const wrap_1 = require("../entity/wrap");
 /**
  * Manages transaction lifecycle and propagation for EntityManager.
  */
@@ -152,8 +153,28 @@ class TransactionManager {
      * Merges entities from fork to parent EntityManager.
      */
     mergeEntitiesToParent(fork, parent) {
+        const parentUoW = parent.getUnitOfWork(false);
+        // perf: if parent is empty, we can just move all entities from the fork to skip the `em.merge` overhead
+        if (parentUoW.getIdentityMap().keys().length === 0) {
+            for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
+                parentUoW.getIdentityMap().store(entity);
+                (0, wrap_1.helper)(entity).__em = parent;
+            }
+            return;
+        }
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
-            parent.merge(entity, { disableContextResolution: true, keepIdentity: true, refresh: true });
+            const wrapped = (0, wrap_1.helper)(entity);
+            const meta = wrapped.__meta;
+            // eslint-disable-next-line dot-notation
+            const parentEntity = parentUoW.getById(meta.className, wrapped.getPrimaryKey(), parent['_schema'], true);
+            if (parentEntity && parentEntity !== entity) {
+                const parentWrapped = (0, wrap_1.helper)(parentEntity);
+                parentWrapped.__data = (0, wrap_1.helper)(entity).__data;
+                parentWrapped.__originalEntityData = (0, wrap_1.helper)(entity).__originalEntityData;
+            }
+            else {
+                parentUoW.merge(entity, new Set([entity]));
+            }
         }
     }
     /**