@mikro-orm/core 6.5.10-dev.18 → 6.5.10-dev.19

package/naming-strategy/AbstractNamingStrategy.d.ts

@@ -13,6 +13,10 @@ export declare abstract class AbstractNamingStrategy implements NamingStrategy {
      * @inheritDoc
      */
     getEnumClassName(columnName: string, tableName: string, schemaName?: string): string;
+    /**
+     * @inheritDoc
+     */
+    getEnumTypeName(columnName: string, tableName: string, schemaName?: string): string;
     /**
      * @inheritDoc
      */

package/naming-strategy/AbstractNamingStrategy.js

@@ -53,6 +53,12 @@ class AbstractNamingStrategy {
     getEnumClassName(columnName, tableName, schemaName) {
         return this.getEntityName(`${tableName}_${columnName}`, schemaName);
     }
+    /**
+     * @inheritDoc
+     */
+    getEnumTypeName(columnName, tableName, schemaName) {
+        return 'T' + this.getEnumClassName(columnName, tableName, schemaName);
+    }
     /**
      * @inheritDoc
      */

package/naming-strategy/NamingStrategy.d.ts

@@ -26,6 +26,16 @@ export interface NamingStrategy {
      * @return A new class name that will be used for the enum.
      */
     getEnumClassName(columnName: string, tableName: string, schemaName?: string): string;
+    /**
+     * Get an enum type name. Used with `enumType: 'dictionary'` and `enumType: 'union-type'` entity generator option.
+     *
+     * @param columnName The column name which has the enum.
+     * @param tableName The table name of the column.
+     * @param schemaName The schema name of the column.
+     *
+     * @return A new type name that will be used for the enum.
+     */
+    getEnumTypeName(columnName: string, tableName: string, schemaName?: string): string;
     /**
      * Get an enum option name for a given enum value.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "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",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.3.2",
     "globby": "11.1.0",
-    "mikro-orm": "6.5.10-dev.18",
+    "mikro-orm": "6.5.10-dev.19",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -577,9 +577,9 @@ export interface GenerateOptions {
     undefinedDefaults?: boolean;
     bidirectionalRelations?: boolean;
     identifiedReferences?: boolean;
-    entitySchema?: boolean;
-    defineEntity?: boolean;
+    entityDefinition?: 'decorators' | 'defineEntity' | 'entitySchema';
     inferEntityType?: boolean;
+    enumMode?: 'ts-enum' | 'union-type' | 'dictionary';
     esmImport?: boolean;
     scalarTypeInDecorator?: boolean;
     scalarPropertiesForRelations?: 'always' | 'never' | 'smart';
@@ -594,6 +594,8 @@ export interface GenerateOptions {
     coreImportsPrefix?: string;
     onInitialMetadata?: MetadataProcessor;
     onProcessedMetadata?: MetadataProcessor;
+    /** @deprecated use `entityDefinition: 'entitySchema'` instead */
+    entitySchema?: boolean;
 }
 export interface IEntityGenerator {
     generate(options?: GenerateOptions): Promise<string[]>;

package/utils/Configuration.d.ts

@@ -118,6 +118,8 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             identifiedReferences: false;
             scalarTypeInDecorator: false;
             scalarPropertiesForRelations: "never";
+            entityDefinition: "decorators";
+            enumMode: "ts-enum";
             fileName: (className: string) => string;
             onlyPurePivotTables: false;
             outputPurePivotTables: false;

package/utils/Configuration.js

@@ -112,6 +112,8 @@ class Configuration {
             identifiedReferences: false,
             scalarTypeInDecorator: false,
             scalarPropertiesForRelations: 'never',
+            entityDefinition: 'decorators',
+            enumMode: 'ts-enum',
             fileName: (className) => className,
             onlyPurePivotTables: false,
             outputPurePivotTables: false,
@@ -354,6 +356,9 @@ class Configuration {
     sync() {
         process.env.MIKRO_ORM_COLORS = '' + this.options.colors;
         this.options.tsNode = this.options.preferTs;
+        if (this.options.entityGenerator.entitySchema) {
+            this.options.entityGenerator.entityDefinition = 'entitySchema';
+        }
         this.logger.setDebugMode(this.options.debug);
     }
     /**