@mikro-orm/entity-generator 6.5.10-dev.18 → 6.5.10-dev.19

package/EntityGenerator.js

@@ -36,31 +36,40 @@ class EntityGenerator {
         const metadata = await this.getEntityMetadata(schema, options);
         const defaultPath = `${this.config.get('baseDir')}/generated-entities`;
         const baseDir = core_1.Utils.normalizePath(options.path ?? defaultPath);
+        this.sources.length = 0;
+        if (options.entitySchema) {
+            options.entityDefinition = 'entitySchema';
+        }
+        const map = {
+            defineEntity: DefineEntitySourceFile_1.DefineEntitySourceFile,
+            entitySchema: EntitySchemaSourceFile_1.EntitySchemaSourceFile,
+            decorators: SourceFile_1.SourceFile,
+        };
+        if (options.entityDefinition !== 'decorators') {
+            options.scalarTypeInDecorator = true;
+        }
         for (const meta of metadata) {
-            if (!meta.pivotTable || options.outputPurePivotTables || this.referencedEntities.has(meta)) {
-                if (options.defineEntity) {
-                    this.sources.push(new DefineEntitySourceFile_1.DefineEntitySourceFile(meta, this.namingStrategy, this.platform, { ...options, scalarTypeInDecorator: true }));
-                }
-                else if (options.entitySchema) {
-                    this.sources.push(new EntitySchemaSourceFile_1.EntitySchemaSourceFile(meta, this.namingStrategy, this.platform, { ...options, scalarTypeInDecorator: true }));
-                }
-                else {
-                    this.sources.push(new SourceFile_1.SourceFile(meta, this.namingStrategy, this.platform, options));
-                }
+            if (meta.pivotTable && !options.outputPurePivotTables && !this.referencedEntities.has(meta)) {
+                continue;
             }
+            this.sources.push(new map[options.entityDefinition](meta, this.namingStrategy, this.platform, options));
         }
+        const files = this.sources.map(file => [file.getBaseName(), file.generate()]);
         if (options.save) {
             await (0, fs_extra_1.ensureDir)(baseDir);
-            await Promise.all(this.sources.map(async (file) => {
-                const fileName = file.getBaseName();
-                const fileDir = (0, node_path_1.dirname)(fileName);
-                if (fileDir !== '.') {
-                    await (0, fs_extra_1.ensureDir)((0, node_path_1.join)(baseDir, fileDir));
-                }
-                return (0, fs_extra_1.writeFile)((0, node_path_1.join)(baseDir, fileName), file.generate(), { flush: true });
-            }));
+            const promises = [];
+            for (const [fileName, data] of files) {
+                promises.push((async () => {
+                    const fileDir = (0, node_path_1.dirname)(fileName);
+                    if (fileDir !== '.') {
+                        await (0, fs_extra_1.ensureDir)((0, node_path_1.join)(baseDir, fileDir));
+                    }
+                    await (0, fs_extra_1.writeFile)((0, node_path_1.join)(baseDir, fileName), data, { flush: true });
+                })());
+            }
+            await Promise.all(promises);
         }
-        return this.sources.map(file => file.generate());
+        return files.map(([, data]) => data);
     }
     async getEntityMetadata(schema, options) {
         const metadata = schema.getTables()

package/SourceFile.js

@@ -204,6 +204,7 @@ class SourceFile {
     getPropertyDefinition(prop, padLeft) {
         const padding = ' '.repeat(padLeft);
         const propName = exports.identifierRegex.test(prop.name) ? prop.name : this.quote(prop.name);
+        const enumMode = this.options.enumMode;
         let hiddenType = '';
         if (prop.hidden) {
             hiddenType += ` & ${this.referenceCoreImport('Hidden')}`;
@@ -221,7 +222,8 @@ class SourceFile {
             : (() => {
                 if (isScalar) {
                     if (prop.enum) {
-                        return prop.runtimeType;
+                        const method = enumMode === 'ts-enum' ? 'getEnumClassName' : 'getEnumTypeName';
+                        return this.namingStrategy[method](prop.fieldNames[0], this.meta.collection, this.meta.schema);
                     }
                     breakdownOfIType = this.breakdownOfIType(prop);
                     if (typeof breakdownOfIType !== 'undefined') {
@@ -256,8 +258,13 @@ class SourceFile {
             return `${padding}${ret};\n`;
         }
         if (prop.enum && typeof prop.default === 'string') {
+            const method = enumMode === 'union-type' ? 'getEnumTypeName' : 'getEnumClassName';
+            const enumClassName = this.namingStrategy[method](prop.fieldNames[0], this.meta.collection, this.meta.schema);
+            if (enumMode === 'union-type') {
+                return `${padding}${ret} = ${this.quote(prop.default)};\n`;
+            }
             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}${exports.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.
@@ -274,14 +281,38 @@ class SourceFile {
     }
     getEnumClassDefinition(prop, padLeft) {
         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 enumMode = this.options.enumMode;
         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}${exports.identifierRegex.test(enumName) ? enumName : this.quote(enumName)}: ${this.quote(enumValue)},\n`;
+            }
+            else {
+                ret += `${padding}${exports.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) {
@@ -545,7 +576,13 @@ class SourceFile {
             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 {
+                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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/entity-generator",
-  "version": "6.5.10-dev.18",
+  "version": "6.5.10-dev.19",
   "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.5.10-dev.18",
+    "@mikro-orm/knex": "6.5.10-dev.19",
     "fs-extra": "11.3.2"
   },
   "devDependencies": {
     "@mikro-orm/core": "^6.5.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.5.10-dev.18"
+    "@mikro-orm/core": "6.5.10-dev.19"
   }
 }