@mikro-orm/entity-generator 7.0.0-dev.114 → 7.0.0-dev.116

package/EntityGenerator.js

@@ -1,4 +1,4 @@
-import { EntityMetadata, ReferenceKind, types, Utils, } from '@mikro-orm/core';
+import { EntitySchema, ReferenceKind, types, Utils, } from '@mikro-orm/core';
 import { DatabaseSchema, } from '@mikro-orm/sql';
 import { fs } from '@mikro-orm/core/fs-utils';
 import { dirname, join } from 'node:path';
@@ -215,7 +215,7 @@ export class EntityGenerator {
                 inverseJoinColumns: meta.relations[1].fieldNames,
             };
             if (outputPurePivotTables || this.referencedEntities.has(meta)) {
-                ownerProp.pivotEntity = meta.className;
+                ownerProp.pivotEntity = meta.class;
             }
             if (fixedOrderColumn) {
                 ownerProp.fixedOrder = true;
@@ -279,20 +279,16 @@ export class EntityGenerator {
         }
     }
     generateAndAttachCustomBaseEntity(metadata, customBaseEntityName) {
-        let baseClassExists = false;
+        let base = metadata.find(meta => meta.className === customBaseEntityName);
+        if (!base) {
+            const schema = new EntitySchema({ className: customBaseEntityName, abstract: true });
+            base = schema.init().meta;
+            metadata.push(base);
+        }
         for (const meta of metadata) {
-            if (meta.className === customBaseEntityName) {
-                baseClassExists = true;
-                continue;
+            if (meta.className !== customBaseEntityName) {
+                meta.extends ??= base.class;
             }
-            meta.extends ??= customBaseEntityName;
-        }
-        if (!baseClassExists) {
-            metadata.push(new EntityMetadata({
-                className: customBaseEntityName,
-                abstract: true,
-                relations: [],
-            }));
         }
     }
     castNullDefaultsToUndefined(metadata) {

package/SourceFile.js

@@ -209,8 +209,8 @@ export class SourceFile {
         }
         ret += `class ${this.meta.className}`;
         if (this.meta.extends) {
-            this.entityImports.add(this.meta.extends);
-            ret += ` extends ${this.meta.extends}`;
+            this.entityImports.add(Utils.className(this.meta.extends));
+            ret += ` extends ${Utils.className(this.meta.extends)}`;
         }
         else if (this.options.useCoreBaseEntity) {
             ret += ` extends ${this.referenceCoreImport('BaseEntity')}`;
@@ -426,7 +426,7 @@ export class SourceFile {
         }
         if (this.meta.discriminatorMap) {
             options.discriminatorMap = Object.fromEntries(Object.entries(this.meta.discriminatorMap)
-                .map(([discriminatorValue, className]) => [discriminatorValue, this.quote(className)]));
+                .map(([discriminatorValue, cls]) => [discriminatorValue, this.quote(Utils.className(cls))]));
         }
         return options;
     }
@@ -721,9 +721,9 @@ export class SourceFile {
         if (prop.pivotTable !== this.namingStrategy.joinTableName(this.meta.collection, prop.type, prop.name, this.meta.tableName)) {
             options.pivotTable = this.quote(prop.pivotTable);
         }
-        if (prop.pivotEntity && prop.pivotEntity !== prop.pivotTable) {
-            this.entityImports.add(prop.pivotEntity);
-            options.pivotEntity = `() => ${prop.pivotEntity}`;
+        if (prop.pivotEntity && Utils.className(prop.pivotEntity) !== prop.pivotTable) {
+            this.entityImports.add(Utils.className(prop.pivotEntity));
+            options.pivotEntity = `() => ${Utils.className(prop.pivotEntity)}`;
         }
         if (prop.joinColumns.length === 1) {
             options.joinColumn = this.quote(prop.joinColumns[0]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/entity-generator",
   "type": "module",
-  "version": "7.0.0-dev.114",
+  "version": "7.0.0-dev.116",
   "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",
@@ -50,12 +50,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/sql": "7.0.0-dev.114"
+    "@mikro-orm/sql": "7.0.0-dev.116"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.6.2"
+    "@mikro-orm/core": "^6.6.3"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.114"
+    "@mikro-orm/core": "7.0.0-dev.116"
   }
 }