@mikro-orm/entity-generator 7.0.0-dev.0 → 7.0.0-dev.10

package/CoreImportsHelper.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.POSSIBLE_TYPE_IMPORTS = void 0;
-exports.POSSIBLE_TYPE_IMPORTS = [
+export const POSSIBLE_TYPE_IMPORTS = [
     'DefineConfig',
     'Hidden',
     'IType',

package/EntityGenerator.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityGenerator = void 0;
-const core_1 = require("@mikro-orm/core");
-const knex_1 = require("@mikro-orm/knex");
-const node_path_1 = require("node:path");
-const fs_extra_1 = require("fs-extra");
-const EntitySchemaSourceFile_1 = require("./EntitySchemaSourceFile");
-const SourceFile_1 = require("./SourceFile");
-class EntityGenerator {
+import { EntityMetadata, ReferenceKind, types, Utils, } from '@mikro-orm/core';
+import { DatabaseSchema, } from '@mikro-orm/knex';
+import { dirname, join } from 'node:path';
+import { writeFile } from 'node:fs/promises';
+import { EntitySchemaSourceFile } from './EntitySchemaSourceFile.js';
+import { SourceFile } from './SourceFile.js';
+export class EntityGenerator {
     em;
     config;
     driver;
@@ -30,30 +27,30 @@ class EntityGenerator {
         orm.config.registerExtension('@mikro-orm/entity-generator', () => new EntityGenerator(orm.em));
     }
     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, undefined, undefined, options.takeTables, options.skipTables);
+        options = Utils.mergeConfig({}, this.config.get('entityGenerator'), options);
+        const schema = await 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);
+        const baseDir = Utils.normalizePath(options.path ?? defaultPath);
         for (const meta of metadata) {
             if (!meta.pivotTable || options.outputPurePivotTables || this.referencedEntities.has(meta)) {
                 if (options.entitySchema) {
-                    this.sources.push(new EntitySchemaSourceFile_1.EntitySchemaSourceFile(meta, this.namingStrategy, this.platform, { ...options, scalarTypeInDecorator: true }));
+                    this.sources.push(new EntitySchemaSourceFile(meta, this.namingStrategy, this.platform, { ...options, scalarTypeInDecorator: true }));
                 }
                 else {
-                    this.sources.push(new SourceFile_1.SourceFile(meta, this.namingStrategy, this.platform, options));
+                    this.sources.push(new SourceFile(meta, this.namingStrategy, this.platform, options));
                 }
             }
         }
         if (options.save) {
-            await (0, fs_extra_1.ensureDir)(baseDir);
+            Utils.ensureDir(baseDir);
             await Promise.all(this.sources.map(async (file) => {
                 const fileName = file.getBaseName();
-                const fileDir = (0, node_path_1.dirname)(fileName);
+                const fileDir = dirname(fileName);
                 if (fileDir !== '.') {
-                    await (0, fs_extra_1.ensureDir)((0, node_path_1.join)(baseDir, fileDir));
+                    Utils.ensureDir(join(baseDir, fileDir));
                 }
-                return (0, fs_extra_1.writeFile)((0, node_path_1.join)(baseDir, fileName), file.generate(), { flush: true });
+                return writeFile(join(baseDir, fileName), file.generate(), { flush: true });
             }));
         }
         return this.sources.map(file => file.generate());
@@ -76,11 +73,11 @@ class EntityGenerator {
         for (const meta of metadata) {
             for (const prop of meta.relations) {
                 if (!metadata.some(otherMeta => prop.referencedTableName === otherMeta.collection || prop.referencedTableName === `${otherMeta.schema ?? schema.name}.${otherMeta.collection}`)) {
-                    prop.kind = core_1.ReferenceKind.SCALAR;
+                    prop.kind = ReferenceKind.SCALAR;
                     const mappedTypes = prop.columnTypes.map((t, i) => this.platform.getMappedType(t));
                     const runtimeTypes = mappedTypes.map(t => t.runtimeType);
                     prop.runtimeType = (runtimeTypes.length === 1 ? runtimeTypes[0] : `[${runtimeTypes.join(', ')}]`);
-                    prop.type = mappedTypes.length === 1 ? (core_1.Utils.entries(core_1.types).find(([k, v]) => Object.getPrototypeOf(mappedTypes[0]) === v.prototype)?.[0] ?? mappedTypes[0].name) : 'unknown';
+                    prop.type = mappedTypes.length === 1 ? (Utils.entries(types).find(([k, v]) => Object.getPrototypeOf(mappedTypes[0]) === v.prototype)?.[0] ?? mappedTypes[0].name) : 'unknown';
                 }
                 const meta2 = metadata.find(meta2 => meta2.className === prop.type);
                 const targetPrimaryColumns = meta2?.getPrimaryProps().flatMap(p => p.fieldNames);
@@ -93,7 +90,7 @@ class EntityGenerator {
         }
         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));
+        const duplicates = Utils.findDuplicates(metadata.map(meta => meta.className));
         for (const duplicate of duplicates) {
             for (const meta of metadata.filter(meta => meta.className === duplicate)) {
                 meta.className = this.namingStrategy.getEntityName(`${meta.schema ?? schema.name}_${meta.className}`);
@@ -131,7 +128,7 @@ class EntityGenerator {
         for (const meta of metadata) {
             const isReferenced = metadata.some(m => {
                 return m.tableName !== meta.tableName && m.relations.some(r => {
-                    return r.referencedTableName === meta.tableName && [core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(r.kind);
+                    return r.referencedTableName === meta.tableName && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(r.kind);
                 });
             });
             if (isReferenced) {
@@ -144,7 +141,7 @@ class EntityGenerator {
             // Entities where there are not exactly 2 PK relations that are both ManyToOne are never pivot tables. Skip.
             const pkRelations = meta.relations.filter(rel => rel.primary);
             if (pkRelations.length !== 2 ||
-                pkRelations.some(rel => rel.kind !== core_1.ReferenceKind.MANY_TO_ONE)) {
+                pkRelations.some(rel => rel.kind !== ReferenceKind.MANY_TO_ONE)) {
                 continue;
             }
             const pkRelationFields = new Set(pkRelations.flatMap(rel => rel.fieldNames));
@@ -196,7 +193,7 @@ class EntityGenerator {
             const name = this.namingStrategy.columnNameToProperty(meta.tableName.replace(new RegExp('^' + owner.tableName + '_'), ''));
             const ownerProp = {
                 name,
-                kind: core_1.ReferenceKind.MANY_TO_MANY,
+                kind: ReferenceKind.MANY_TO_MANY,
                 pivotTable: meta.tableName,
                 type: meta.relations[1].type,
                 joinColumns: meta.relations[0].fieldNames,
@@ -229,21 +226,21 @@ class EntityGenerator {
                     type: meta.className,
                     joinColumns: prop.fieldNames,
                     referencedTableName: meta.tableName,
-                    referencedColumnNames: core_1.Utils.flatten(targetMeta.getPrimaryProps().map(pk => pk.fieldNames)),
+                    referencedColumnNames: Utils.flatten(targetMeta.getPrimaryProps().map(pk => pk.fieldNames)),
                     mappedBy: prop.name,
                     persist: prop.persist,
                 };
-                if (prop.kind === core_1.ReferenceKind.MANY_TO_ONE) {
-                    newProp.kind = core_1.ReferenceKind.ONE_TO_MANY;
+                if (prop.kind === ReferenceKind.MANY_TO_ONE) {
+                    newProp.kind = ReferenceKind.ONE_TO_MANY;
                 }
-                else if (prop.kind === core_1.ReferenceKind.ONE_TO_ONE && !prop.mappedBy) {
-                    newProp.kind = core_1.ReferenceKind.ONE_TO_ONE;
+                else if (prop.kind === ReferenceKind.ONE_TO_ONE && !prop.mappedBy) {
+                    newProp.kind = ReferenceKind.ONE_TO_ONE;
                     newProp.nullable = true;
                     newProp.default = null;
                     newProp.defaultRaw = 'null';
                 }
-                else if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY && !prop.mappedBy) {
-                    newProp.kind = core_1.ReferenceKind.MANY_TO_MANY;
+                else if (prop.kind === ReferenceKind.MANY_TO_MANY && !prop.mappedBy) {
+                    newProp.kind = ReferenceKind.MANY_TO_MANY;
                 }
                 else {
                     continue;
@@ -260,7 +257,7 @@ class EntityGenerator {
     generateIdentifiedReferences(metadata) {
         for (const meta of metadata.filter(m => !m.pivotTable || this.referencedEntities.has(m))) {
             for (const prop of Object.values(meta.properties)) {
-                if ([core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) || prop.lazy) {
+                if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) || prop.lazy) {
                     prop.ref = true;
                 }
             }
@@ -276,7 +273,7 @@ class EntityGenerator {
             meta.extends ??= customBaseEntityName;
         }
         if (!baseClassExists) {
-            metadata.push(new core_1.EntityMetadata({
+            metadata.push(new EntityMetadata({
                 className: customBaseEntityName,
                 abstract: true,
                 relations: [],
@@ -294,4 +291,3 @@ class EntityGenerator {
         }
     }
 }
-exports.EntityGenerator = EntityGenerator;

package/EntitySchemaSourceFile.d.ts

@@ -1,5 +1,5 @@
 import { type Dictionary, type EntityProperty } from '@mikro-orm/core';
-import { SourceFile } from './SourceFile';
+import { SourceFile } from './SourceFile.js';
 export declare class EntitySchemaSourceFile extends SourceFile {
     generate(): string;
     private getPropertyOptions;

package/EntitySchemaSourceFile.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntitySchemaSourceFile = void 0;
-const core_1 = require("@mikro-orm/core");
-const SourceFile_1 = require("./SourceFile");
-class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
+import { Config, ReferenceKind, } from '@mikro-orm/core';
+import { SourceFile } from './SourceFile.js';
+export class EntitySchemaSourceFile extends SourceFile {
     generate() {
         let classBody = '';
         if (this.meta.className === this.options.customBaseEntityName) {
@@ -17,7 +14,7 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
         const props = [];
         for (const prop of Object.values(this.meta.properties)) {
             props.push(this.getPropertyDefinition(prop, 2));
-            if (prop.enum && (typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR)) {
+            if (prop.enum && (typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR)) {
                 enumDefinitions.push(this.getEnumClassDefinition(prop, 2));
             }
             if (prop.eager) {
@@ -60,8 +57,8 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
         }
         entitySchemaOptions.properties = Object.fromEntries(Object.entries(this.meta.properties).map(([name, prop]) => [name, this.getPropertyOptions(prop)]));
         // Force top level and properties to be indented, regardless of line length
-        entitySchemaOptions[core_1.Config] = true;
-        entitySchemaOptions.properties[core_1.Config] = true;
+        entitySchemaOptions[Config] = true;
+        entitySchemaOptions.properties[Config] = true;
         ret += this.serializeObject(entitySchemaOptions, declLine.length > 80 ? undefined : 80 - declLine.length, 0);
         ret += ');\n';
         ret = `${this.generateImports()}\n\n${ret}`;
@@ -72,19 +69,19 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
         if (prop.primary) {
             options.primary = true;
         }
-        if (typeof prop.kind !== 'undefined' && prop.kind !== core_1.ReferenceKind.SCALAR) {
+        if (typeof prop.kind !== 'undefined' && prop.kind !== ReferenceKind.SCALAR) {
             options.kind = this.quote(prop.kind);
         }
-        if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
+        if (prop.kind === ReferenceKind.MANY_TO_MANY) {
             this.getManyToManyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY) {
+        else if (prop.kind === ReferenceKind.ONE_TO_MANY) {
             this.getOneToManyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.SCALAR || typeof prop.kind === 'undefined') {
+        else if (prop.kind === ReferenceKind.SCALAR || typeof prop.kind === 'undefined') {
             this.getScalarPropertyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.EMBEDDED) {
+        else if (prop.kind === ReferenceKind.EMBEDDED) {
             this.getEmbeddedPropertyDeclarationOptions(options, prop);
         }
         else {
@@ -98,7 +95,7 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
         return options;
     }
     getPropertyIndexesOptions(prop, options) {
-        if (prop.kind === core_1.ReferenceKind.SCALAR) {
+        if (prop.kind === ReferenceKind.SCALAR) {
             if (prop.index) {
                 options.index = this.quote(prop.index);
             }
@@ -113,11 +110,11 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
                 return;
             }
             const defaultName = this.platform.getIndexName(this.meta.collection, prop.fieldNames, type);
-            /* istanbul ignore next */
+            /* v8 ignore next */
             options[type] = (propType === true || defaultName === propType) ? 'true' : this.quote(propType);
             const expected = {
                 index: this.platform.indexForeignKeys(),
-                unique: prop.kind === core_1.ReferenceKind.ONE_TO_ONE,
+                unique: prop.kind === ReferenceKind.ONE_TO_ONE,
             };
             if (expected[type] && options[type] === 'true') {
                 delete options[type];
@@ -137,4 +134,3 @@ class EntitySchemaSourceFile extends SourceFile_1.SourceFile {
         super.getScalarPropertyDecoratorOptions(options, prop);
     }
 }
-exports.EntitySchemaSourceFile = EntitySchemaSourceFile;

package/SourceFile.d.ts

@@ -12,8 +12,8 @@ export declare class SourceFile {
     protected readonly entityImports: Set<string>;
     constructor(meta: EntityMetadata, namingStrategy: NamingStrategy, platform: Platform, options: GenerateOptions);
     generate(): string;
-    protected getIndexOptions(index: EntityMetadata['indexes'][number], isAtEntityLevel?: boolean): IndexOptions<Dictionary>;
-    protected getUniqueOptions(index: EntityMetadata['uniques'][number], isAtEntityLevel?: boolean): UniqueOptions<Dictionary>;
+    protected getIndexOptions(index: EntityMetadata['indexes'][number], isAtEntityLevel?: boolean): IndexOptions<Dictionary, string>;
+    protected getUniqueOptions(index: EntityMetadata['uniques'][number], isAtEntityLevel?: boolean): UniqueOptions<Dictionary, string>;
     protected generateImports(): string;
     protected getEntityClass(classBody: string): string;
     getBaseName(extension?: string): string;
@@ -23,7 +23,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>;
-    protected getEmbeddableDeclOptions(): EmbeddableOptions;
+    protected getEmbeddableDeclOptions(): EmbeddableOptions<unknown>;
     private getCollectionDecl;
     private getPropertyDecorator;
     protected getPropertyIndexes(prop: EntityProperty, options: Dictionary): string[];

package/SourceFile.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SourceFile = exports.identifierRegex = void 0;
-const core_1 = require("@mikro-orm/core");
-const node_path_1 = require("node:path");
-const CoreImportsHelper_1 = require("./CoreImportsHelper");
+import { Cascade, Config, DecimalType, ReferenceKind, SCALAR_TYPES, UnknownType, Utils, } from '@mikro-orm/core';
+import { parse, relative } from 'node:path';
+import { inspect } from 'node:util';
+import { POSSIBLE_TYPE_IMPORTS } from './CoreImportsHelper.js';
 /**
  * @see https://github.com/tc39/proposal-regexp-unicode-property-escapes#other-examples
  */
-exports.identifierRegex = /^(?:[$_\p{ID_Start}])(?:[$\u200C\u200D\p{ID_Continue}])*$/u;
-const primitivesAndLibs = [...core_1.SCALAR_TYPES, 'bigint', 'Uint8Array', 'unknown', 'object', 'any'];
-class SourceFile {
+export const identifierRegex = /^(?:[$_\p{ID_Start}])(?:[$\u200C\u200D\p{ID_Continue}])*$/u;
+const primitivesAndLibs = [...SCALAR_TYPES, 'bigint', 'Uint8Array', 'unknown', 'object', 'any'];
+export class SourceFile {
     meta;
     namingStrategy;
     platform;
@@ -27,11 +25,11 @@ class SourceFile {
         if (this.meta.embeddable || this.meta.collection) {
             if (this.meta.embeddable) {
                 const options = this.getEmbeddableDeclOptions();
-                ret += `@${this.referenceCoreImport('Embeddable')}(${core_1.Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
+                ret += `@${this.referenceCoreImport('Embeddable')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
             }
             else {
                 const options = this.getEntityDeclOptions();
-                ret += `@${this.referenceCoreImport('Entity')}(${core_1.Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
+                ret += `@${this.referenceCoreImport('Entity')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
             }
         }
         for (const index of this.meta.indexes) {
@@ -105,7 +103,7 @@ class SourceFile {
             indexOpt.expression = this.quote(index.expression);
         }
         if (isAtEntityLevel && index.properties) {
-            indexOpt.properties = core_1.Utils.asArray(index.properties).map(prop => this.quote('' + prop));
+            indexOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
         return indexOpt;
     }
@@ -118,7 +116,7 @@ class SourceFile {
             uniqueOpt.expression = this.quote(index.expression);
         }
         if (isAtEntityLevel && index.properties) {
-            uniqueOpt.properties = core_1.Utils.asArray(index.properties).map(prop => this.quote('' + prop));
+            uniqueOpt.properties = Utils.asArray(index.properties).map(prop => this.quote('' + prop));
         }
         if (index.deferMode) {
             uniqueOpt.deferMode = `${this.referenceCoreImport('DeferMode')}.INITIALLY_${index.deferMode.toUpperCase()}`;
@@ -129,7 +127,7 @@ class SourceFile {
         const imports = new Set();
         if (this.coreImports.size > 0) {
             imports.add(`import { ${([...this.coreImports].sort().map(t => {
-                let ret = CoreImportsHelper_1.POSSIBLE_TYPE_IMPORTS.includes(t) ? `type ${t}` : t;
+                let ret = POSSIBLE_TYPE_IMPORTS.includes(t) ? `type ${t}` : t;
                 if (this.options.coreImportsPrefix) {
                     const resolvedIdentifier = `${this.options.coreImportsPrefix}${t}`;
                     ret += ` as ${resolvedIdentifier}`;
@@ -138,8 +136,8 @@ class SourceFile {
             }).join(', '))} } from '@mikro-orm/core';`);
         }
         const extension = this.options.esmImport ? '.js' : '';
-        const { dir, base } = (0, node_path_1.parse)(`${this.options.path ?? '.'}/${this.getBaseName()}`);
-        const basePath = (0, node_path_1.relative)(dir, this.options.path ?? '.') || '.';
+        const { dir, base } = parse(`${this.options.path ?? '.'}/${this.getBaseName()}`);
+        const basePath = relative(dir, this.options.path ?? '.') || '.';
         (this.options.extraImports?.(basePath, base) ?? []).forEach(v => this.entityImports.add(v));
         const entityImports = [...this.entityImports].filter(e => e !== this.meta.className);
         entityImports.sort().forEach(entity => {
@@ -166,7 +164,7 @@ class SourceFile {
                 imports.add(`import { ${entity} } from ${this.quote(file.path)};`);
                 return;
             }
-            imports.add(`import { ${exports.identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
+            imports.add(`import { ${identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
         });
         return Array.from(imports.values()).join('\n');
     }
@@ -191,20 +189,20 @@ class SourceFile {
     }
     quote(val) {
         const backtick = val.startsWith(`'`) || val.includes('\n');
-        /* istanbul ignore next */
+        /* v8 ignore next */
         return backtick ? `\`${val.replaceAll('`', '\\``')}\`` : `'${val.replaceAll(`'`, `\\'`)}'`;
     }
     getPropertyDefinition(prop, padLeft) {
         const padding = ' '.repeat(padLeft);
-        const propName = exports.identifierRegex.test(prop.name) ? prop.name : this.quote(prop.name);
+        const propName = identifierRegex.test(prop.name) ? prop.name : this.quote(prop.name);
         let hiddenType = '';
         if (prop.hidden) {
             hiddenType += ` & ${this.referenceCoreImport('Hidden')}`;
         }
-        if ([core_1.ReferenceKind.ONE_TO_MANY, core_1.ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
+        if ([ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
             return `${padding}${propName}${hiddenType ? `: ${this.referenceCoreImport('Collection')}<${prop.type}>${hiddenType}` : ''} = new ${this.referenceCoreImport('Collection')}<${prop.type}>(this);\n`;
         }
-        const isScalar = typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR;
+        const isScalar = typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR;
         let breakdownOfIType;
         const propType = prop.mapToPk
             ? (() => {
@@ -231,7 +229,7 @@ class SourceFile {
         const useDefault = hasUsableNullDefault || (!(typeof prop.default === 'undefined' || prop.default === null) && propType !== 'unknown' && typeof breakdownOfIType === 'undefined');
         const optional = (prop.nullable && (this.options.forceUndefined || prop.optional)) ? '?' : (useDefault ? '' : '!');
         let ret = `${propName}${optional}: `;
-        const isArray = prop.array && (prop.kind === core_1.ReferenceKind.EMBEDDED || prop.enum);
+        const isArray = prop.array && (prop.kind === ReferenceKind.EMBEDDED || prop.enum);
         const complexType = isArray ? `${propType}[]` : propType;
         let wrappedType = prop.ref
             ? `${this.referenceCoreImport('Ref')}<${complexType}${(isScalar && prop.nullable && !this.options.forceUndefined) ? ' | null' : ''}>`
@@ -250,7 +248,7 @@ class SourceFile {
         }
         if (prop.enum && typeof prop.default === 'string') {
             const enumVal = this.namingStrategy.enumValueToEnumProperty(prop.default, prop.fieldNames[0], this.meta.collection, this.meta.schema);
-            return `${padding}${ret} = ${propType}${exports.identifierRegex.test(enumVal) ? `.${enumVal}` : `[${this.quote(enumVal)}]`};\n`;
+            return `${padding}${ret} = ${propType}${identifierRegex.test(enumVal) ? `.${enumVal}` : `[${this.quote(enumVal)}]`};\n`;
         }
         if (prop.fieldNames?.length > 1) {
             // TODO: Composite FKs with default values require additions to default/defaultRaw that are not yet supported.
@@ -272,13 +270,13 @@ class SourceFile {
         const enumValues = prop.items;
         for (const enumValue of enumValues) {
             const enumName = this.namingStrategy.enumValueToEnumProperty(enumValue, prop.fieldNames[0], this.meta.collection, this.meta.schema);
-            ret += `${padding}${exports.identifierRegex.test(enumName) ? enumName : this.quote(enumName)} = ${this.quote(enumValue)},\n`;
+            ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)} = ${this.quote(enumValue)},\n`;
         }
         ret += '}\n';
         return ret;
     }
     serializeObject(options, wordwrap, spaces, level = 0) {
-        if (typeof wordwrap === 'number' && !Object.hasOwn(options, core_1.Config)) {
+        if (typeof wordwrap === 'number' && !Object.hasOwn(options, Config)) {
             const res = this.serializeObject(options, undefined, undefined, level);
             if (res.length <= wordwrap) {
                 return res;
@@ -292,7 +290,7 @@ class SourceFile {
         }
         const entries = Object.entries(options);
         return `{${doIndent ? `\n${' '.repeat(spaces)}` : ' '}${entries.map(([opt, val]) => {
-            const key = exports.identifierRegex.test(opt) ? opt : this.quote(opt);
+            const key = identifierRegex.test(opt) ? opt : this.quote(opt);
             return `${doIndent ? ' '.repeat((level * 2) + (spaces + 2)) : ''}${key}: ${this.serializeValue(val, typeof nextWordwrap === 'number' ? nextWordwrap - key.length - 2 /* ': '.length*/ : undefined, doIndent ? spaces : undefined, level + 1)}`;
         }).join(sep)}${doIndent ? `${entries.length > 0 ? ',\n' : ''}${' '.repeat(spaces + (level * 2))}` : ' '}}`;
     }
@@ -355,16 +353,16 @@ class SourceFile {
         const padding = ' '.repeat(padLeft);
         const options = {};
         let decorator = `@${this.referenceCoreImport(this.getDecoratorType(prop))}`;
-        if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
+        if (prop.kind === ReferenceKind.MANY_TO_MANY) {
             this.getManyToManyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY) {
+        else if (prop.kind === ReferenceKind.ONE_TO_MANY) {
             this.getOneToManyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.SCALAR || typeof prop.kind === 'undefined') {
+        else if (prop.kind === ReferenceKind.SCALAR || typeof prop.kind === 'undefined') {
             this.getScalarPropertyDecoratorOptions(options, prop);
         }
-        else if (prop.kind === core_1.ReferenceKind.EMBEDDED) {
+        else if (prop.kind === ReferenceKind.EMBEDDED) {
             this.getEmbeddedPropertyDeclarationOptions(options, prop);
         }
         else {
@@ -377,7 +375,7 @@ class SourceFile {
         if (prop.formula) {
             decoratorArgs.push(`${prop.formula}`);
         }
-        if (core_1.Utils.hasObjectKeys(options)) {
+        if (Utils.hasObjectKeys(options)) {
             decoratorArgs.push(`${this.serializeObject(options)}`);
         }
         return `${decorator}(${decoratorArgs.join(', ')})\n`;
@@ -392,7 +390,7 @@ class SourceFile {
             options[type] = (propType === true || defaultName === propType) ? 'true' : this.quote(propType);
             const expected = {
                 index: this.platform.indexForeignKeys(),
-                unique: prop.kind === core_1.ReferenceKind.ONE_TO_ONE,
+                unique: prop.kind === ReferenceKind.ONE_TO_ONE,
             };
             if (expected[type] && options[type] === 'true') {
                 delete options[type];
@@ -431,7 +429,7 @@ class SourceFile {
         if (!prop.mappedBy && (prop.nullable || prop.customTypes?.[0]?.prop?.nullable)) {
             options.nullable = true;
         }
-        if (prop.primary && (prop.enum || !(typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR))) {
+        if (prop.primary && (prop.enum || !(typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR))) {
             options.primary = true;
         }
         ['persist', 'hydrate', 'trackChanges']
@@ -449,7 +447,7 @@ class SourceFile {
         ['hidden', 'version', 'concurrencyCheck', 'eager', 'lazy', 'orphanRemoval']
             .filter(key => prop[key])
             .forEach(key => options[key] = true);
-        if (prop.cascade && (prop.cascade.length !== 1 || prop.cascade[0] !== core_1.Cascade.PERSIST)) {
+        if (prop.cascade && (prop.cascade.length !== 1 || prop.cascade[0] !== Cascade.PERSIST)) {
             options.cascade = `[${prop.cascade.map(value => `${this.referenceCoreImport('Cascade')}.${value.toUpperCase()}`).join(', ')}]`;
         }
         if (typeof prop.comment === 'string') {
@@ -461,7 +459,7 @@ class SourceFile {
                 prop.defaultRaw !== (typeof prop.default === 'string' ? this.quote(prop.default) : `${prop.default}`)) {
                 options.defaultRaw = `\`${prop.defaultRaw}\``;
             }
-            else if (!(typeof prop.default === 'undefined' || prop.default === null) && (prop.ref || (!prop.enum && (typeof prop.kind === 'undefined' || prop.kind === core_1.ReferenceKind.SCALAR) && (prop.type === 'unknown' || typeof this.breakdownOfIType(prop) !== 'undefined')))) {
+            else if (!(typeof prop.default === 'undefined' || prop.default === null) && (prop.ref || (!prop.enum && (typeof prop.kind === 'undefined' || prop.kind === ReferenceKind.SCALAR) && (prop.type === 'unknown' || typeof this.breakdownOfIType(prop) !== 'undefined')))) {
                 options.default = typeof prop.default === 'string' ? this.quote(prop.default) : prop.default;
             }
         }
@@ -482,7 +480,7 @@ class SourceFile {
             return this.propTypeBreakdowns.get(prop);
         }
         const mappedDeclaredType = this.platform.getMappedType(prop.type);
-        const mappedRawType = (prop.customTypes?.[0] ?? ((prop.type !== 'unknown' && mappedDeclaredType instanceof core_1.UnknownType)
+        const mappedRawType = (prop.customTypes?.[0] ?? ((prop.type !== 'unknown' && mappedDeclaredType instanceof UnknownType)
             ? this.platform.getMappedType(prop.columnTypes[0])
             : mappedDeclaredType));
         const rawType = mappedRawType.runtimeType;
@@ -551,7 +549,7 @@ class SourceFile {
             ? mappedColumnType
             : this.platform.getMappedType(prop.runtimeType);
         const mappedDeclaredType = this.platform.getMappedType(prop.type);
-        const isTypeStringMissingFromMap = prop.type !== 'unknown' && mappedDeclaredType instanceof core_1.UnknownType;
+        const isTypeStringMissingFromMap = prop.type !== 'unknown' && mappedDeclaredType instanceof UnknownType;
         if (isTypeStringMissingFromMap) {
             this.entityImports.add(prop.type);
             options.type = prop.type;
@@ -574,7 +572,7 @@ class SourceFile {
         const columnTypeFromMappedColumnType = mappedColumnType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const columnTypeFromMappedDeclaredType = mappedDeclaredType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         const needsExplicitColumnType = () => {
-            if (isTypeStringMissingFromMap || [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof core_1.UnknownType)) {
+            if (isTypeStringMissingFromMap || [mappedRuntimeType, mappedColumnType, columnTypeFromMappedDeclaredType].some(t => t instanceof UnknownType)) {
                 return true;
             }
             if (this.platform.normalizeColumnType(prop.columnTypes[0], prop) !== this.platform.normalizeColumnType(columnTypeFromMappedColumnType, prop)) {
@@ -594,8 +592,8 @@ class SourceFile {
             assign('length');
         }
         // those are already included in the `columnType` in most cases, and when that option is present, they would be ignored anyway
-        /* istanbul ignore next */
-        if (mappedColumnType instanceof core_1.DecimalType && !options.columnType) {
+        /* v8 ignore next 4 */
+        if (mappedColumnType instanceof DecimalType && !options.columnType) {
             assign('precision');
             assign('scale');
         }
@@ -621,6 +619,9 @@ class SourceFile {
     getManyToManyDecoratorOptions(options, prop) {
         this.entityImports.add(prop.type);
         options.entity = `() => ${prop.type}`;
+        if (prop.orderBy) {
+            options.orderBy = inspect(prop.orderBy);
+        }
         if (prop.mappedBy) {
             options.mappedBy = this.quote(prop.mappedBy);
             return;
@@ -655,6 +656,9 @@ class SourceFile {
         this.entityImports.add(prop.type);
         options.entity = `() => ${prop.type}`;
         options.mappedBy = this.quote(prop.mappedBy);
+        if (prop.orderBy) {
+            options.orderBy = inspect(prop.orderBy);
+        }
     }
     getEmbeddedPropertyDeclarationOptions(options, prop) {
         this.entityImports.add(prop.type);
@@ -713,19 +717,19 @@ class SourceFile {
         }
     }
     getDecoratorType(prop) {
-        if (prop.kind === core_1.ReferenceKind.ONE_TO_ONE) {
+        if (prop.kind === ReferenceKind.ONE_TO_ONE) {
             return 'OneToOne';
         }
-        if (prop.kind === core_1.ReferenceKind.MANY_TO_ONE) {
+        if (prop.kind === ReferenceKind.MANY_TO_ONE) {
             return 'ManyToOne';
         }
-        if (prop.kind === core_1.ReferenceKind.ONE_TO_MANY) {
+        if (prop.kind === ReferenceKind.ONE_TO_MANY) {
             return 'OneToMany';
         }
-        if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
+        if (prop.kind === ReferenceKind.MANY_TO_MANY) {
             return 'ManyToMany';
         }
-        if (prop.kind === core_1.ReferenceKind.EMBEDDED) {
+        if (prop.kind === ReferenceKind.EMBEDDED) {
             return 'Embedded';
         }
         if (prop.enum) {
@@ -746,4 +750,3 @@ class SourceFile {
             : identifier;
     }
 }
-exports.SourceFile = SourceFile;

package/index.d.ts

@@ -2,4 +2,4 @@
  * @packageDocumentation
  * @module entity-generator
  */
-export * from './EntityGenerator';
+export * from './EntityGenerator.js';

package/index.js

@@ -1,21 +1,5 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @packageDocumentation
  * @module entity-generator
  */
-__exportStar(require("./EntityGenerator"), exports);
+export * from './EntityGenerator.js';

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "7.0.0-dev.0",
+  "type": "module",
+  "version": "7.0.0-dev.10",
   "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",
-  "typings": "index.d.ts",
   "exports": {
     "./package.json": "./package.json",
-    ".": {
-      "import": {
-        "types": "./index.d.ts",
-        "default": "./index.mjs"
-      },
-      "require": "./index.js"
-    }
+    ".": "./index.js"
   },
   "repository": {
     "type": "git",
@@ -49,7 +41,7 @@
     "node": ">= 22.11.0"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
+    "build": "yarn clean && yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
@@ -58,13 +50,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.0",
-    "fs-extra": "11.3.0"
+    "@mikro-orm/knex": "7.0.0-dev.10"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.4.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.0"
+    "@mikro-orm/core": "7.0.0-dev.10"
   }
 }

package/index.mjs

@@ -1,4 +0,0 @@
-import mod from "./index.js";
-
-export default mod;
-export const EntityGenerator = mod.EntityGenerator;