@mikro-orm/core 7.0.10-dev.6 → 7.0.10-dev.8

package/entity/EntityHelper.js

@@ -7,7 +7,12 @@ import { ReferenceKind } from '../enums.js';
 import { helper } from './wrap.js';
 import { inspect } from '../logging/inspect.js';
 import { getEnv } from '../utils/env-vars.js';
-const entitySymbol = Symbol('Entity');
+// Globally registered so the marker survives the CJS/ESM dual-package hazard
+// (#7515) — `tsx` registers both an ESM and a CJS hook for the CLI and ends up
+// loading `@mikro-orm/core` twice. JSON payloads still cannot forge the marker
+// because Symbol-keyed properties have no JSON representation, which is the
+// threat model the symbol-vs-string switch in f7e59a5ce was guarding against.
+const entitySymbol = Symbol.for('@mikro-orm/core/EntityHelper.entity');
 /**
  * @internal
  */

package/package.json

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

@@ -1188,20 +1188,21 @@ export class UnitOfWork {
     }
     getCommitOrder() {
         const calc = new CommitOrderCalculator();
-        const set = new Set();
+        // keyed by `_id` so we return the SAME instances as the change set groups (GH #7511)
+        const metaById = new Map();
         this.#changeSets.forEach(cs => {
             if (cs.meta.inheritanceType === 'tpt') {
-                set.add(cs.meta);
+                metaById.set(cs.meta._id, cs.meta);
                 for (const parentCs of cs.tptChangeSets ?? []) {
-                    set.add(parentCs.meta);
+                    metaById.set(parentCs.meta._id, parentCs.meta);
                 }
             }
             else {
-                set.add(cs.rootMeta);
+                metaById.set(cs.rootMeta._id, cs.rootMeta);
             }
         });
-        set.forEach(meta => calc.addNode(meta._id));
-        for (const meta of set) {
+        metaById.forEach(meta => calc.addNode(meta._id));
+        for (const meta of metaById.values()) {
             for (const prop of meta.relations) {
                 if (prop.polymorphTargets) {
                     for (const targetMeta of prop.polymorphTargets) {
@@ -1213,11 +1214,11 @@ export class UnitOfWork {
                 }
             }
             // For TPT, parent table must be inserted BEFORE child tables
-            if (meta.inheritanceType === 'tpt' && meta.tptParent && set.has(meta.tptParent)) {
+            if (meta.inheritanceType === 'tpt' && meta.tptParent && metaById.has(meta.tptParent._id)) {
                 calc.addDependency(meta.tptParent._id, meta._id, 1);
             }
         }
-        return calc.sort().map(id => this.#metadata.getById(id));
+        return calc.sort().map(id => metaById.get(id));
     }
     resetTransaction(oldTx) {
         if (oldTx) {

package/utils/Utils.js

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