@mikro-orm/core 7.0.10-dev.5 → 7.0.10-dev.7

package/entity/EntityHelper.js

@@ -39,11 +39,6 @@ export class EntityHelper {
             // toJSON can be overridden
             Object.defineProperty(prototype, 'toJSON', {
                 value: function (...args) {
-                    // Guard against being called on the prototype itself (e.g. by serializers
-                    // walking the object graph and calling toJSON on prototype objects)
-                    if (this === prototype) {
-                        return {};
-                    }
                     return EntityTransformer.toObject(this, ...args);
                 },
                 writable: true,
@@ -51,6 +46,22 @@ export class EntityHelper {
                 enumerable: false,
             });
         }
+        // Walkers / serializers reaching the prototype directly invoke its methods and
+        // accessors with `this === prototype`. Wrap each so that case is a no-op rather
+        // than throwing (when a user `@Property({ persist: false })` getter dereferences
+        // unhydrated instance state) or installing state on the prototype itself (#7151).
+        for (const name of Object.getOwnPropertyNames(prototype)) {
+            const desc = Object.getOwnPropertyDescriptor(prototype, name);
+            const fn = desc.get ?? desc.value;
+            if (name === 'constructor' || typeof fn !== 'function' || fn.__guarded) {
+                continue;
+            }
+            const guarded = function (...args) {
+                return this === prototype ? undefined : fn.apply(this, args);
+            };
+            guarded.__guarded = true;
+            Object.defineProperty(prototype, name, desc.get ? { ...desc, get: guarded } : { ...desc, value: guarded });
+        }
     }
     /**
      * As a performance optimization, we create entity state methods lazily. We first add

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.10-dev.5",
+  "version": "7.0.10-dev.7",
   "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.5';
+    static #ORM_VERSION = '7.0.10-dev.7';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */

package/utils/fs-utils.js

@@ -14,10 +14,11 @@ export const fs = {
         if (tinyGlobby) {
             globSync = (patterns, options) => {
                 patterns = Utils.asArray(patterns).map(p => p.replace(/\\/g, '/'));
-                if (options?.cwd) {
-                    options = { ...options, cwd: options.cwd.replace(/\\/g, '/') };
-                }
-                return tinyGlobby.globSync(patterns, { ...options, expandDirectories: false });
+                // never forward `cwd: undefined` — tinyglobby >= 0.2.16 calls `path.resolve(undefined)` and throws
+                return tinyGlobby.globSync(patterns, {
+                    expandDirectories: false,
+                    ...(options?.cwd && { cwd: options.cwd.replace(/\\/g, '/') }),
+                });
             };
         }
     },