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

package/EntityManager.js

@@ -1446,25 +1446,25 @@ class EntityManager {
      * Checks whether this EntityManager is currently operating inside a database transaction.
      */
     isInTransaction() {
-        return !!this.transactionContext;
+        return !!this.getContext(false).transactionContext;
     }
     /**
      * Gets the transaction context (driver dependent object used to make sure queries are executed on same connection).
      */
     getTransactionContext() {
-        return this.transactionContext;
+        return this.getContext(false).transactionContext;
     }
     /**
      * Sets the transaction context.
      */
     setTransactionContext(ctx) {
-        this.transactionContext = ctx;
+        this.getContext(false).transactionContext = ctx;
     }
     /**
      * Resets the transaction context.
      */
     resetTransactionContext() {
-        delete this.transactionContext;
+        delete this.getContext(false).transactionContext;
     }
     /**
      * Gets the `MetadataStorage` (without parameters) or `EntityMetadata` instance when provided with the `entityName` parameter.

package/entity/EntityFactory.js

@@ -190,14 +190,13 @@ class EntityFactory {
             if (!meta.class) {
                 throw new Error(`Cannot create entity ${meta.className}, class prototype is unknown`);
             }
-            options.initialized = options.newEntity || options.initialized;
             const params = this.extractConstructorParams(meta, data, options);
             const Entity = meta.class;
             // creates new instance via constructor as this is the new entity
             const entity = new Entity(...params);
             // creating managed entity instance when `forceEntityConstructor` is enabled,
             // we need to wipe all the values as they would cause update queries on next flush
-            if (!options.initialized && this.config.get('forceEntityConstructor')) {
+            if (!options.newEntity && (meta.forceConstructor || this.config.get('forceEntityConstructor'))) {
                 meta.props
                     .filter(prop => prop.persist !== false && !prop.primary && data[prop.name] === undefined)
                     .forEach(prop => delete entity[prop.name]);
@@ -302,7 +301,12 @@ class EntityFactory {
                 const tmp = { ...data };
                 for (const prop of meta.props) {
                     if (options.convertCustomTypes && prop.customType && tmp[prop.name] != null) {
-                        tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.platform);
+                        if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(tmp[prop.name]) && !Utils_1.Utils.extractPK(tmp[prop.name], meta.properties[prop.name].targetMeta, true)) {
+                            tmp[prop.name] = Reference_1.Reference.wrapReference(this.create(meta.properties[prop.name].type, tmp[prop.name], options), prop);
+                        }
+                        else {
+                            tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.platform);
+                        }
                     }
                 }
                 return tmp;

package/metadata/MetadataDiscovery.js

@@ -446,7 +446,7 @@ class MetadataDiscovery {
         if (pks.length === 1 && pks[0].kind !== enums_1.ReferenceKind.SCALAR) {
             pks[0].deleteRule ??= 'cascade';
         }
-        meta.forceConstructor = this.shouldForceConstructorUsage(meta);
+        meta.forceConstructor ??= this.shouldForceConstructorUsage(meta);
         this.validator.validateEntityDefinition(this.metadata, meta.className, this.config.get('discovery'));
         for (const prop of Object.values(meta.properties)) {
             this.initNullability(prop);
@@ -1264,7 +1264,7 @@ class MetadataDiscovery {
         if (Array.isArray(forceConstructor)) {
             return forceConstructor.some(cls => Utils_1.Utils.className(cls) === meta.className);
         }
-        return meta.forceConstructor = forceConstructor;
+        return forceConstructor;
     }
 }
 exports.MetadataDiscovery = MetadataDiscovery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.7-dev.2",
+  "version": "6.3.7-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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.7-dev.2",
+    "mikro-orm": "6.3.7-dev.4",
     "reflect-metadata": "0.2.2"
   }
 }