@mikro-orm/core 7.0.10-dev.15 → 7.0.10-dev.17

package/entity/Collection.js

@@ -5,7 +5,9 @@ import { Reference } from './Reference.js';
 import { helper, wrap } from './wrap.js';
 import { QueryHelper } from '../utils/QueryHelper.js';
 import { inspect } from '../logging/inspect.js';
-const collectionSymbol = Symbol('Collection');
+// Globally registered so the marker survives the CJS/ESM dual-package hazard
+// (see entitySymbol rationale in EntityHelper.ts and #7515/#7534).
+const collectionSymbol = Symbol.for('@mikro-orm/core/Collection');
 /** Represents a to-many relation (1:m or m:n) as an iterable, managed collection of entities. */
 export class Collection {
     owner;

package/entity/Reference.js

@@ -4,8 +4,10 @@ import { Utils } from '../utils/Utils.js';
 import { QueryHelper } from '../utils/QueryHelper.js';
 import { NotFoundError } from '../errors.js';
 import { inspect } from '../logging/inspect.js';
-const referenceSymbol = Symbol('Reference');
-const scalarReferenceSymbol = Symbol('ScalarReference');
+// Globally registered so the markers survive the CJS/ESM dual-package hazard
+// (see entitySymbol rationale in EntityHelper.ts and #7515/#7534).
+const referenceSymbol = Symbol.for('@mikro-orm/core/Reference');
+const scalarReferenceSymbol = Symbol.for('@mikro-orm/core/ScalarReference');
 /** Wrapper around an entity that provides lazy loading capabilities and identity-preserving reference semantics. */
 export class Reference {
     entity;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.10-dev.15",
+  "version": "7.0.10-dev.17",
   "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/TransactionManager.js

@@ -163,6 +163,10 @@ export class TransactionManager {
             const parentEntity = parentUoW.getById(meta.class, wrapped.getPrimaryKey(), parent.schema, true);
             if (parentEntity && parentEntity !== entity) {
                 const parentWrapped = helper(parentEntity);
+                // Don't overwrite a fully-loaded entity with an uninitialized reference
+                if (!wrapped.__initialized && parentWrapped.__initialized) {
+                    continue;
+                }
                 parentWrapped.__data = wrapped.__data;
                 parentWrapped.__originalEntityData = wrapped.__originalEntityData;
                 for (const prop of meta.hydrateProps) {

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