@mikro-orm/core 7.0.0-dev.152 → 7.0.0-dev.153

package/metadata/EntitySchema.js

@@ -151,7 +151,8 @@ export class EntitySchema {
         this._meta.extends = base;
     }
     setClass(cls) {
-        const sameClass = this._meta.className === cls.name;
+        const oldClass = this._meta.class;
+        const sameClass = this._meta.class === cls;
         this._meta.class = cls;
         this._meta.prototype = cls.prototype;
         this._meta.className = this._meta.name ?? cls.name;
@@ -159,10 +160,18 @@ export class EntitySchema {
             this._meta.constructorParams = Utils.getConstructorParams(cls);
         }
         if (!this.internal) {
+            // Remove old class from registry if it's being replaced with a different class
+            if (oldClass && oldClass !== cls && EntitySchema.REGISTRY.get(oldClass) === this) {
+                EntitySchema.REGISTRY.delete(oldClass);
+            }
             EntitySchema.REGISTRY.set(cls, this);
         }
         const base = Object.getPrototypeOf(cls);
-        if (base !== BaseEntity) {
+        // Only set extends if the parent is NOT the auto-generated class for this same entity.
+        // When the user extends the auto-generated class (from defineEntity without a class option)
+        // and registers their custom class via setClass, we don't want to discover the
+        // auto-generated class as a separate parent entity.
+        if (base !== BaseEntity && base.name !== this._meta.className) {
             this._meta.extends ??= base.name ? base : undefined;
         }
     }

package/metadata/MetadataDiscovery.js

@@ -241,7 +241,8 @@ export class MetadataDiscovery {
                 continue;
             }
             parent = Object.getPrototypeOf(meta.class);
-            if (parent.name !== '' && !this.metadata.has(parent) && parent !== BaseEntity) {
+            // Skip if parent is the auto-generated base class for the same entity (from setClass usage)
+            if (parent.name !== '' && parent.name !== meta.className && !this.metadata.has(parent) && parent !== BaseEntity) {
                 this.discoverReferences([parent], false);
             }
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.152",
+  "version": "7.0.0-dev.153",
   "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.",
   "exports": {
     "./package.json": "./package.json",

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.152';
+    static #ORM_VERSION = '7.0.0-dev.153';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */