@mikro-orm/entity-generator 7.0.0-dev.1 → 7.0.0-dev.100

package/SourceFile.js

@@ -1,21 +1,20 @@
-"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, inspect, } from '@mikro-orm/core';
+import { parse, relative } from 'node:path';
+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, 'unknown', 'object', 'any'];
+export class SourceFile {
     meta;
     namingStrategy;
     platform;
     options;
     coreImports = new Set();
+    decoratorImports = new Set();
     entityImports = new Set();
+    enumImports = new Map();
     constructor(meta, namingStrategy, platform, options) {
         this.meta = meta;
         this.namingStrategy = namingStrategy;
@@ -27,24 +26,24 @@ 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.referenceDecoratorImport('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.referenceDecoratorImport('Entity')}(${Utils.hasObjectKeys(options) ? this.serializeObject(options) : ''})\n`;
             }
         }
         for (const index of this.meta.indexes) {
             if (index.properties?.length === 1 && typeof this.meta.properties[index.properties[0]] !== 'undefined') {
                 continue;
             }
-            ret += `@${this.referenceCoreImport('Index')}(${this.serializeObject(this.getIndexOptions(index))})\n`;
+            ret += `@${this.referenceDecoratorImport('Index')}(${this.serializeObject(this.getIndexOptions(index))})\n`;
         }
         for (const index of this.meta.uniques) {
             if (index.properties?.length === 1 && typeof this.meta.properties[index.properties[0]] !== 'undefined') {
                 continue;
             }
-            ret += `@${this.referenceCoreImport('Unique')}(${this.serializeObject(this.getUniqueOptions(index))})\n`;
+            ret += `@${this.referenceDecoratorImport('Unique')}(${this.serializeObject(this.getUniqueOptions(index))})\n`;
         }
         let classHead = '';
         if (this.meta.className === this.options.customBaseEntityName) {
@@ -67,7 +66,10 @@ class SourceFile {
             classBody += definition;
             classBody += '\n';
             if (prop.enum) {
-                enumDefinitions.push(this.getEnumClassDefinition(prop, 2));
+                const def = this.getEnumClassDefinition(prop, 2);
+                if (def.length) {
+                    enumDefinitions.push(def);
+                }
             }
             if (prop.eager) {
                 eagerProperties.push(prop);
@@ -101,11 +103,14 @@ class SourceFile {
         if (typeof index.name === 'string') {
             indexOpt.name = this.quote(index.name);
         }
-        if (index.expression) {
+        if (typeof index.expression === 'string') {
             indexOpt.expression = this.quote(index.expression);
         }
+        else if (typeof index.expression === 'function') {
+            indexOpt.expression = `${index.expression}`.replace(')=>`', ') => `');
+        }
         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;
     }
@@ -114,11 +119,14 @@ class SourceFile {
         if (typeof index.name === 'string') {
             uniqueOpt.name = this.quote(index.name);
         }
-        if (index.expression) {
+        if (typeof index.expression === 'string') {
             uniqueOpt.expression = this.quote(index.expression);
         }
+        else if (typeof index.expression === 'function') {
+            uniqueOpt.expression = `${index.expression}`.replace(')=>`', ') => `');
+        }
         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 +137,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}`;
@@ -137,37 +145,61 @@ class SourceFile {
                 return ret;
             }).join(', '))} } from '@mikro-orm/core';`);
         }
+        if (this.decoratorImports.size > 0) {
+            const type = this.options.decorators;
+            imports.add(`import { ${([...this.decoratorImports].sort().map(t => {
+                let ret = t;
+                if (this.options.coreImportsPrefix) {
+                    const resolvedIdentifier = `${this.options.coreImportsPrefix}${t}`;
+                    ret += ` as ${resolvedIdentifier}`;
+                }
+                return ret;
+            }).join(', '))} } from '@mikro-orm/decorators/${type}';`);
+        }
         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 => {
+        const importMap = new Map();
+        for (const entity of entityImports) {
             const file = this.options.onImport?.(entity, basePath, extension, base) ?? {
                 path: `${basePath}/${this.options.fileName(entity)}${extension}`,
                 name: entity,
             };
             if (file.path === '') {
                 if (file.name === '') {
-                    return;
+                    continue;
                 }
-                imports.add(`import ${this.quote(file.name)};`);
-                return;
+                importMap.set(file.path, `import ${this.quote(file.name)};`);
+                continue;
             }
             if (file.name === '') {
-                imports.add(`import * as ${entity} from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import * as ${entity} from ${this.quote(file.path)};`);
+                continue;
             }
             if (file.name === 'default') {
-                imports.add(`import ${entity} from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import ${entity} from ${this.quote(file.path)};`);
+                continue;
             }
             if (file.name === entity) {
-                imports.add(`import { ${entity} } from ${this.quote(file.path)};`);
-                return;
+                importMap.set(file.path, `import { ${entity} } from ${this.quote(file.path)};`);
+                continue;
             }
-            imports.add(`import { ${exports.identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
-        });
+            importMap.set(file.path, `import { ${identifierRegex.test(file.name) ? file.name : this.quote(file.name)} as ${entity} } from ${this.quote(file.path)};`);
+        }
+        if (this.enumImports.size) {
+            for (const [name, exports] of this.enumImports.entries()) {
+                const file = this.options.onImport?.(name, basePath, extension, base) ?? {
+                    path: `${basePath}/${this.options.fileName(name)}${extension}`,
+                    name,
+                };
+                importMap.set(file.path, `import { ${exports.join(', ')} } from ${this.quote(file.path)};`);
+            }
+        }
+        for (const key of [...importMap.keys()].sort()) {
+            imports.add(importMap.get(key));
+        }
         return Array.from(imports.values()).join('\n');
     }
     getEntityClass(classBody) {
@@ -191,20 +223,21 @@ 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);
+        const enumMode = this.options.enumMode;
         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
             ? (() => {
@@ -214,7 +247,11 @@ class SourceFile {
             : (() => {
                 if (isScalar) {
                     if (prop.enum) {
-                        return prop.runtimeType;
+                        const method = enumMode === 'ts-enum' ? 'getEnumClassName' : 'getEnumTypeName';
+                        if (prop.nativeEnumName) {
+                            return this.namingStrategy[method](prop.nativeEnumName, undefined, this.meta.schema);
+                        }
+                        return this.namingStrategy[method](prop.fieldNames[0], this.meta.collection, this.meta.schema);
                     }
                     breakdownOfIType = this.breakdownOfIType(prop);
                     if (typeof breakdownOfIType !== 'undefined') {
@@ -231,7 +268,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' : ''}>`
@@ -249,8 +286,14 @@ class SourceFile {
             return `${padding}${ret};\n`;
         }
         if (prop.enum && typeof prop.default === 'string') {
+            if (enumMode === 'union-type') {
+                return `${padding}${ret} = ${this.quote(prop.default)};\n`;
+            }
+            const enumClassName = prop.nativeEnumName
+                ? this.namingStrategy.getEnumClassName(prop.nativeEnumName, undefined, this.meta.schema)
+                : this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
             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} = ${enumClassName}${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.
@@ -266,19 +309,55 @@ class SourceFile {
         return `${padding}${ret} = ${prop.ref ? this.referenceCoreImport('ref') : this.referenceCoreImport('rel')}(${propType}, ${defaultVal});\n`;
     }
     getEnumClassDefinition(prop, padLeft) {
+        const enumMode = this.options.enumMode;
+        if (prop.nativeEnumName) {
+            const imports = [];
+            if (enumMode !== 'union-type') {
+                imports.push(prop.runtimeType);
+            }
+            if (!this.options.inferEntityType && enumMode !== 'ts-enum') {
+                const enumTypeName = this.namingStrategy.getEnumTypeName(prop.nativeEnumName, undefined, this.meta.schema);
+                imports.push(enumTypeName);
+            }
+            this.enumImports.set(prop.runtimeType, imports);
+            return '';
+        }
         const enumClassName = this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
+        const enumTypeName = this.namingStrategy.getEnumTypeName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
         const padding = ' '.repeat(padLeft);
-        let ret = `export enum ${enumClassName} {\n`;
         const enumValues = prop.items;
+        if (enumMode === 'union-type') {
+            return `export type ${enumTypeName} = ${enumValues.map(item => this.quote(item)).join(' | ')};\n`;
+        }
+        let ret = '';
+        if (enumMode === 'dictionary') {
+            ret += `export const ${enumClassName} = {\n`;
+        }
+        else {
+            ret += `export enum ${enumClassName} {\n`;
+        }
         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`;
+            if (enumMode === 'dictionary') {
+                ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)}: ${this.quote(enumValue)},\n`;
+            }
+            else {
+                ret += `${padding}${identifierRegex.test(enumName) ? enumName : this.quote(enumName)} = ${this.quote(enumValue)},\n`;
+            }
+        }
+        if (enumMode === 'dictionary') {
+            ret += '} as const;\n';
+        }
+        else {
+            ret += '}\n';
+        }
+        if (enumMode === 'dictionary') {
+            ret += `\nexport type ${enumTypeName} = (typeof ${enumClassName})[keyof typeof ${enumClassName}];\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 +371,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))}` : ' '}}`;
     }
@@ -314,7 +393,7 @@ class SourceFile {
             options.expression = this.quote(this.meta.expression);
         }
         else if (typeof this.meta.expression === 'function') {
-            options.expression = `${this.meta.expression}`;
+            options.expression = this.meta.expression.toString();
         }
         if (this.meta.repositoryClass) {
             this.entityImports.add(this.meta.repositoryClass);
@@ -354,17 +433,17 @@ class SourceFile {
     getPropertyDecorator(prop, padLeft) {
         const padding = ' '.repeat(padLeft);
         const options = {};
-        let decorator = `@${this.referenceCoreImport(this.getDecoratorType(prop))}`;
-        if (prop.kind === core_1.ReferenceKind.MANY_TO_MANY) {
+        let decorator = `@${this.referenceDecoratorImport(this.getDecoratorType(prop))}`;
+        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 {
@@ -375,9 +454,9 @@ class SourceFile {
         decorator = [...indexes.sort(), decorator].map(d => padding + d).join('\n');
         const decoratorArgs = [];
         if (prop.formula) {
-            decoratorArgs.push(`${prop.formula}`);
+            decoratorArgs.push(prop.formula.toString());
         }
-        if (core_1.Utils.hasObjectKeys(options)) {
+        if (Utils.hasObjectKeys(options)) {
             decoratorArgs.push(`${this.serializeObject(options)}`);
         }
         return `${decorator}(${decoratorArgs.join(', ')})\n`;
@@ -392,7 +471,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];
@@ -404,26 +483,26 @@ class SourceFile {
         let propIndexIsNonTrivialIndex = false;
         const nonTrivialIndexes = this.meta.indexes.filter(i => i.properties?.length === 1 && i.properties[0] === prop.name);
         for (const i of nonTrivialIndexes) {
-            ret.push(`@${this.referenceCoreImport('Index')}(${this.serializeObject(this.getIndexOptions(i, false))})`);
+            ret.push(`@${this.referenceDecoratorImport('Index')}(${this.serializeObject(this.getIndexOptions(i, false))})`);
             if (prop.index === i.name) {
                 propIndexIsNonTrivialIndex = true;
                 delete options.index;
             }
         }
         if (prop.index && !options.index && !propIndexIsNonTrivialIndex) {
-            ret.push(`@${this.referenceCoreImport('Index')}(${typeof prop.index === 'string' ? `{ name: ${this.quote(prop.index)} }` : ''})`);
+            ret.push(`@${this.referenceDecoratorImport('Index')}(${typeof prop.index === 'string' ? `{ name: ${this.quote(prop.index)} }` : ''})`);
         }
         let propIndexIsNonTrivialUnique = false;
         const nonTrivialUnique = this.meta.uniques.filter(i => i.properties?.length === 1 && i.properties[0] === prop.name);
         for (const i of nonTrivialUnique) {
-            ret.push(`@${this.referenceCoreImport('Unique')}(${this.serializeObject(this.getUniqueOptions(i, false))})`);
+            ret.push(`@${this.referenceDecoratorImport('Unique')}(${this.serializeObject(this.getUniqueOptions(i, false))})`);
             if (prop.unique === i.name) {
                 propIndexIsNonTrivialUnique = true;
                 delete options.unique;
             }
         }
         if (prop.unique && !options.unique && !propIndexIsNonTrivialUnique) {
-            ret.push(`@${this.referenceCoreImport('Unique')}(${typeof prop.unique === 'string' ? `{ name: ${this.quote(prop.unique)} }` : ''})`);
+            ret.push(`@${this.referenceDecoratorImport('Unique')}(${typeof prop.unique === 'string' ? `{ name: ${this.quote(prop.unique)} }` : ''})`);
         }
         return ret;
     }
@@ -431,10 +510,10 @@ 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']
+        ['persist', 'hydrate']
             .filter(key => prop[key] === false)
             .forEach(key => options[key] = false);
         ['onCreate', 'onUpdate', 'serializer']
@@ -449,7 +528,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 +540,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 +561,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;
@@ -533,12 +612,23 @@ class SourceFile {
         this.propTypeBreakdowns.set(prop, r);
         return r;
     }
-    getScalarPropertyDecoratorOptions(options, prop) {
+    getScalarPropertyDecoratorOptions(options, prop, quote = true) {
         if (prop.fieldNames[0] !== this.namingStrategy.propertyToColumnName(prop.name)) {
             options.fieldName = this.quote(prop.fieldNames[0]);
         }
         if (prop.enum) {
-            options.items = `() => ${prop.runtimeType}`;
+            if (this.options.enumMode === 'union-type') {
+                options.items = `[${prop.items.map(item => this.quote(item)).join(', ')}]`;
+            }
+            else if (prop.nativeEnumName) {
+                const enumClassName = this.namingStrategy.getEnumClassName(prop.nativeEnumName, undefined, this.meta.schema);
+                options.items = `() => ${enumClassName}`;
+                options.nativeEnumName = this.quote(prop.nativeEnumName);
+            }
+            else {
+                const enumClassName = this.namingStrategy.getEnumClassName(prop.fieldNames[0], this.meta.collection, this.meta.schema);
+                options.items = `() => ${enumClassName}`;
+            }
         }
         // For enum properties, we don't need a column type
         // or the property length or other information in the decorator.
@@ -551,7 +641,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;
@@ -567,14 +657,14 @@ class SourceFile {
                     return ((useDefault && !hasUsableNullDefault) || (prop.optional && !prop.nullable));
                 })() // also when there is the "| Opt" type modifier (because reflect-metadata can't extract the base)
             ) {
-                options.type = this.quote(prop.type);
+                options.type = quote ? this.quote(prop.type) : prop.type;
             }
         }
         const columnTypeFromMappedRuntimeType = mappedRuntimeType.getColumnType({ ...prop, autoincrement: false }, this.platform);
         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 +684,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 */
+        if (mappedColumnType instanceof DecimalType && !options.columnType) {
             assign('precision');
             assign('scale');
         }
@@ -621,6 +711,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 +748,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);
@@ -662,7 +758,7 @@ class SourceFile {
         if (prop.array) {
             options.array = true;
         }
-        if (prop.object) {
+        if (prop.object && !prop.array) {
             options.object = true;
         }
         if (prop.prefix === false || typeof prop.prefix === 'string') {
@@ -713,19 +809,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) {
@@ -745,5 +841,10 @@ class SourceFile {
             ? `${this.options.coreImportsPrefix}${identifier}`
             : identifier;
     }
+    referenceDecoratorImport(identifier) {
+        this.decoratorImports.add(identifier);
+        return this.options.coreImportsPrefix
+            ? `${this.options.coreImportsPrefix}${identifier}`
+            : 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.1",
+  "type": "module",
+  "version": "7.0.0-dev.100",
   "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",
@@ -46,10 +38,10 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 22.11.0"
+    "node": ">= 22.17.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.1",
-    "fs-extra": "11.3.0"
+    "@mikro-orm/sql": "7.0.0-dev.100"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.5"
+    "@mikro-orm/core": "^6.6.2"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.1"
+    "@mikro-orm/core": "7.0.0-dev.100"
   }
 }

package/index.mjs

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