@mikro-orm/entity-generator 7.1.0-dev.45 → 7.1.0-dev.46

package/SourceFile.d.ts

@@ -30,6 +30,7 @@ export declare class SourceFile {
     protected serializeObject(options: {}, wordwrap?: number, spaces?: number, level?: number): string;
     protected serializeValue(val: unknown, wordwrap?: number, spaces?: number, level?: number): unknown;
     protected getEntityDeclOptions(): EntityOptions<unknown>;
+    private isDiscriminatorPropertyUserDefined;
     protected getPartitionByDecl(partitionBy: EntityPartitionBy): Dictionary;
     protected getEmbeddableDeclOptions(): EmbeddableOptions<unknown>;
     private getCollectionDecl;

package/SourceFile.js

@@ -493,7 +493,15 @@ export class SourceFile {
         if (this.meta.virtual) {
             options.virtual = this.meta.virtual;
         }
-        return this.getCollectionDecl(options);
+        // when the discriminator references an explicitly defined property, emit the property-oriented
+        // `discriminator` name; fall back to `discriminatorColumn` when the discriminator property is
+        // auto-managed by the ORM and not part of the entity definition.
+        const key = this.isDiscriminatorPropertyUserDefined() ? 'discriminator' : 'discriminatorColumn';
+        return this.getCollectionDecl(options, key);
+    }
+    isDiscriminatorPropertyUserDefined() {
+        const name = this.meta.discriminatorColumn;
+        return !!name && this.meta.properties[name]?.userDefined !== false;
     }
     getPartitionByDecl(partitionBy) {
         const result = { type: this.quote(partitionBy.type) };
@@ -531,14 +539,9 @@ export class SourceFile {
     }
     getEmbeddableDeclOptions() {
         const options = {};
-        const result = this.getCollectionDecl(options);
-        if (result.discriminatorColumn) {
-            result.discriminator = result.discriminatorColumn;
-            delete result.discriminatorColumn;
-        }
-        return result;
+        return this.getCollectionDecl(options, 'discriminator');
     }
-    getCollectionDecl(options) {
+    getCollectionDecl(options, discriminatorKey) {
         if (this.meta.abstract) {
             options.abstract = true;
         }
@@ -549,7 +552,7 @@ export class SourceFile {
                     : this.meta.discriminatorValue;
         }
         if (this.meta.discriminatorColumn) {
-            options.discriminatorColumn = this.quote(this.meta.discriminatorColumn);
+            options[discriminatorKey] = this.quote(this.meta.discriminatorColumn);
         }
         if (this.meta.discriminatorMap) {
             options.discriminatorMap = Object.fromEntries(Object.entries(this.meta.discriminatorMap).map(([discriminatorValue, cls]) => [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "7.1.0-dev.45",
+  "version": "7.1.0-dev.46",
   "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",
@@ -47,13 +47,13 @@
     "copy": "node ../../scripts/copy.mjs"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.1.0-dev.45"
+    "@mikro-orm/sql": "7.1.0-dev.46"
   },
   "devDependencies": {
     "@mikro-orm/core": "^7.0.17"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.0-dev.45"
+    "@mikro-orm/core": "7.1.0-dev.46"
   },
   "engines": {
     "node": ">= 22.17.0"