@mikro-orm/core 7.0.6-dev.9 → 7.0.7-dev.0

package/entity/defineEntity.d.ts

@@ -536,7 +536,7 @@ export type PropertyBuilders = {
     datetime: (length?: number) => UniversalPropertyOptionsBuilder<InferPropertyValueType<typeof types.datetime>, EmptyOptions, IncludeKeysForProperty>;
     time: (length?: number) => UniversalPropertyOptionsBuilder<InferPropertyValueType<typeof types.time>, EmptyOptions, IncludeKeysForProperty>;
     type: <T extends PropertyValueType>(type: T) => UniversalPropertyOptionsBuilder<InferPropertyValueType<T>, EmptyOptions, IncludeKeysForProperty>;
-    enum: <const T extends (number | string)[] | (() => Dictionary)>(items?: T) => UniversalPropertyOptionsBuilder<T extends () => Dictionary ? ValueOf<ReturnType<T>> : T extends (infer Value)[] ? Value : T, EmptyOptions, IncludeKeysForEnumOptions>;
+    enum: <const T extends readonly (number | string)[] | (() => Dictionary)>(items?: T) => UniversalPropertyOptionsBuilder<T extends () => Dictionary ? ValueOf<ReturnType<T>> : T extends readonly (infer Value)[] ? Value : T, EmptyOptions, IncludeKeysForEnumOptions>;
     embedded: <Target extends EntityTarget | EntityTarget[]>(target: Target) => PropertyChain<InferEntity<Target extends (infer T)[] ? T : Target>, EmptyOptions & {
         kind: 'embedded';
     }>;

package/metadata/MetadataProvider.d.ts

@@ -14,6 +14,11 @@ export declare class MetadataProvider {
     constructor(config: IConfiguration);
     /** Resolves entity references and type information for all properties in the given metadata. */
     loadEntityMetadata(meta: EntityMetadata): void;
+    /**
+     * Resolves the entity name for a given class or schema, respecting explicit names
+     * set via `defineEntity({ name })` + `setClass()`.
+     */
+    private resolveEntityName;
     /** Merges cached metadata into the given entity metadata, preserving function expressions. */
     loadFromCache(meta: EntityMetadata, cache: EntityMetadata): void;
     /** Whether this provider class uses metadata caching by default. */

package/metadata/MetadataProvider.js

@@ -17,10 +17,10 @@ export class MetadataProvider {
                 const tmp = prop.entity();
                 prop.type = Array.isArray(tmp)
                     ? tmp
-                        .map(t => Utils.className(t))
+                        .map(t => this.resolveEntityName(t))
                         .sort()
                         .join(' | ')
-                    : Utils.className(tmp);
+                    : this.resolveEntityName(tmp);
                 prop.target = EntitySchema.is(tmp) ? tmp.meta.class : tmp;
             }
             else if (!prop.type && !((prop.enum || prop.array) && (prop.items?.length ?? 0) > 0)) {
@@ -28,6 +28,20 @@ export class MetadataProvider {
             }
         }
     }
+    /**
+     * Resolves the entity name for a given class or schema, respecting explicit names
+     * set via `defineEntity({ name })` + `setClass()`.
+     */
+    resolveEntityName(entity) {
+        if (EntitySchema.is(entity)) {
+            return entity.meta.className;
+        }
+        const schema = EntitySchema.REGISTRY.get(entity);
+        if (schema) {
+            return schema.name;
+        }
+        return Utils.className(entity);
+    }
     /** Merges cached metadata into the given entity metadata, preserving function expressions. */
     loadFromCache(meta, cache) {
         Object.values(cache.properties).forEach(prop => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.6-dev.9",
+  "version": "7.0.7-dev.0",
   "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.",
   "keywords": [
     "data-mapper",

package/utils/Utils.js

@@ -132,7 +132,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.6-dev.9';
+    static #ORM_VERSION = '7.0.7-dev.0';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */