@mikro-orm/entity-generator 6.3.14-dev.35 → 6.3.14-dev.37

package/EntityGenerator.d.ts

@@ -15,7 +15,6 @@ export declare class EntityGenerator {
     generate(options?: GenerateOptions): Promise<string[]>;
     private getEntityMetadata;
     private matchName;
-    private isTableNameAllowed;
     private detectManyToManyRelations;
     private generateBidirectionalRelations;
     private generateIdentifiedReferences;

package/EntityGenerator.js

@@ -31,7 +31,7 @@ class EntityGenerator {
     }
     async generate(options = {}) {
         options = core_1.Utils.mergeConfig({}, this.config.get('entityGenerator'), options);
-        const schema = await knex_1.DatabaseSchema.create(this.connection, this.platform, this.config);
+        const schema = await knex_1.DatabaseSchema.create(this.connection, this.platform, this.config, undefined, undefined, options.takeTables, options.skipTables);
         const metadata = await this.getEntityMetadata(schema, options);
         const defaultPath = `${this.config.get('baseDir')}/generated-entities`;
         const baseDir = core_1.Utils.normalizePath(options.path ?? defaultPath);
@@ -59,9 +59,9 @@ class EntityGenerator {
         return this.sources.map(file => file.generate());
     }
     async getEntityMetadata(schema, options) {
-        let metadata = schema.getTables()
+        const metadata = schema.getTables()
             .filter(table => !options.schema || table.schema === options.schema)
-            .sort((a, b) => a.name.localeCompare(b.name))
+            .sort((a, b) => `${a.schema}.${a.name}`.localeCompare(`${b.schema}.${b.name}`))
             .map(table => {
             const skipColumns = options.skipColumns?.[table.getShortestName()];
             if (skipColumns) {
@@ -75,7 +75,7 @@ class EntityGenerator {
         });
         for (const meta of metadata) {
             for (const prop of meta.relations) {
-                if (!this.isTableNameAllowed(prop.referencedTableName, options)) {
+                if (!metadata.some(otherMeta => prop.referencedTableName === otherMeta.collection || prop.referencedTableName === `${otherMeta.schema ?? schema.name}.${otherMeta.collection}`)) {
                     prop.kind = core_1.ReferenceKind.SCALAR;
                     const mappedTypes = prop.columnTypes.map((t, i) => this.platform.getMappedType(t));
                     const runtimeTypes = mappedTypes.map(t => t.runtimeType);
@@ -84,7 +84,6 @@ class EntityGenerator {
                 }
             }
         }
-        metadata = metadata.filter(table => this.isTableNameAllowed(table.tableName, options));
         await options.onInitialMetadata?.(metadata, this.platform);
         // enforce schema usage in class names only on duplicates
         const duplicates = core_1.Utils.findDuplicates(metadata.map(meta => meta.className));
@@ -119,10 +118,6 @@ class EntityGenerator {
             ? name.toLocaleLowerCase() === nameToMatch.toLocaleLowerCase()
             : nameToMatch.test(name);
     }
-    isTableNameAllowed(tableName, { takeTables, skipTables }) {
-        return ((takeTables?.some(tableNameToMatch => this.matchName(tableName, tableNameToMatch)) ?? true) &&
-            !(skipTables?.some(tableNameToMatch => this.matchName(tableName, tableNameToMatch)) ?? false));
-    }
     detectManyToManyRelations(metadata, onlyPurePivotTables, readOnlyPivotTables, outputPurePivotTables) {
         for (const meta of metadata) {
             const isReferenced = metadata.some(m => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "6.3.14-dev.35",
+  "version": "6.3.14-dev.37",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -58,13 +58,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.3.14-dev.35",
+    "@mikro-orm/knex": "6.3.14-dev.37",
     "fs-extra": "11.2.0"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.3.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.3.14-dev.35"
+    "@mikro-orm/core": "6.3.14-dev.37"
   }
 }