@mikro-orm/core 6.3.13 → 6.3.14-dev.1

package/decorators/Embedded.d.ts

@@ -1,9 +1,12 @@
 import type { AnyEntity } from '../typings';
 export declare function Embedded<T extends object>(type?: EmbeddedOptions | (() => AnyEntity), options?: EmbeddedOptions): (target: AnyEntity, propertyName: string) => any;
+/** With `absolute` the prefix is set at the root of the entity (regardless of the nesting level) */
+export type EmbeddedPrefixMode = 'absolute' | 'relative';
 export type EmbeddedOptions = {
     entity?: string | (() => AnyEntity | AnyEntity[]);
     type?: string;
     prefix?: string | boolean;
+    prefixMode?: EmbeddedPrefixMode;
     nullable?: boolean;
     object?: boolean;
     array?: boolean;

package/metadata/MetadataDiscovery.d.ts

@@ -63,6 +63,7 @@ export declare class MetadataDiscovery {
     private initRelation;
     private initColumnType;
     private getMappedType;
+    private getPrefix;
     private initUnsigned;
     private initIndexes;
     private getEntityClassOrSchema;

package/metadata/MetadataDiscovery.js

@@ -797,11 +797,8 @@ class MetadataDiscovery {
         const parentProperty = meta.properties[embeddedProp.embedded?.[0] ?? ''];
         const object = isParentObject(embeddedProp);
         this.initFieldName(embeddedProp, rootProperty !== embeddedProp && object);
-        const prefix = embeddedProp.prefix === false
-            ? (parentProperty?.prefix || '')
-            : embeddedProp.prefix === true
-                ? embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_'
-                : embeddedProp.prefix;
+        // the prefix of the parent can not be a boolean; it already passed here
+        const prefix = this.getPrefix(embeddedProp, parentProperty);
         for (const prop of Object.values(embeddable.properties)) {
             const name = (embeddedProp.embeddedPath?.join('_') ?? embeddedProp.fieldNames[0] + '_') + prop.name;
             meta.properties[name] = Utils_1.Utils.copy(prop, false);
@@ -1231,6 +1228,18 @@ class MetadataDiscovery {
         }
         return this.platform.getMappedType(t);
     }
+    getPrefix(prop, parent) {
+        const { embeddedPath = [], fieldNames, prefix = true, prefixMode } = prop;
+        if (prefix === true) {
+            return (embeddedPath.length ? embeddedPath.join('_') : fieldNames[0]) + '_';
+        }
+        const prefixParent = parent ? this.getPrefix(parent, null) : '';
+        if (prefix === false) {
+            return prefixParent;
+        }
+        const mode = prefixMode ?? this.config.get('embeddables').prefixMode;
+        return mode === 'absolute' ? prefix : prefixParent + prefix;
+    }
     initUnsigned(prop) {
         if (prop.unsigned != null) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.13",
+  "version": "6.3.14-dev.1",
   "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.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.13",
+    "mikro-orm": "6.3.14-dev.1",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -7,6 +7,7 @@ import type { Type, types } from './types';
 import type { Platform } from './platforms';
 import type { Configuration } from './utils';
 import type { EntityManager } from './EntityManager';
+import type { EmbeddedPrefixMode } from './decorators/Embedded';
 import type { EventSubscriber } from './events';
 import type { FindOneOptions, FindOptions, LoadHint } from './drivers';
 export type Constructor<T = unknown> = new (...args: any[]) => T;
@@ -319,6 +320,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     defaultRaw?: string;
     formula?: (alias: string) => string;
     prefix?: string | boolean;
+    prefixMode?: EmbeddedPrefixMode;
     embedded?: [EntityKey<Owner>, EntityKey<Owner>];
     embeddedPath?: string[];
     embeddable: EntityClass<Owner>;

package/utils/Configuration.d.ts

@@ -1,7 +1,7 @@
 import type { NamingStrategy } from '../naming-strategy';
 import { FileCacheAdapter, type SyncCacheAdapter, type CacheAdapter } from '../cache';
 import type { EntityRepository } from '../entity/EntityRepository';
-import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions } from '../typings';
+import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } from '../typings';
 import { ObjectHydrator } from '../hydration';
 import { NullHighlighter } from '../utils/NullHighlighter';
 import { type Logger, type LoggerNamespace, type LoggerOptions } from '../logging';
@@ -11,6 +11,7 @@ import type { EntitySchema } from '../metadata/EntitySchema';
 import type { MetadataProvider } from '../metadata/MetadataProvider';
 import type { MetadataStorage } from '../metadata/MetadataStorage';
 import { ReflectMetadataProvider } from '../metadata/ReflectMetadataProvider';
+import type { EmbeddedPrefixMode } from '../decorators/Embedded';
 import type { EventSubscriber } from '../events';
 import type { AssignOptions } from '../entity/EntityAssigner';
 import type { EntityManagerType, IDatabaseDriver } from '../drivers/IDatabaseDriver';
@@ -97,6 +98,9 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             createForeignKeyConstraints: true;
             ignoreSchema: never[];
         };
+        embeddables: {
+            prefixMode: "absolute";
+        };
         entityGenerator: {
             bidirectionalRelations: false;
             identifiedReferences: false;
@@ -253,7 +257,7 @@ export type MigrationsOptions = {
     emit?: 'js' | 'ts' | 'cjs';
     generator?: Constructor<IMigrationGenerator>;
     fileName?: (timestamp: string, name?: string) => string;
-    migrationsList?: MigrationObject[];
+    migrationsList?: (MigrationObject | Constructor<Migration>)[];
 };
 export interface SeederOptions {
     path?: string;
@@ -367,6 +371,9 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
         ignoreSchema?: string[];
         managementDbName?: string;
     };
+    embeddables: {
+        prefixMode: EmbeddedPrefixMode;
+    };
     entityGenerator: GenerateOptions;
     metadataCache: {
         enabled?: boolean;

package/utils/Configuration.js

@@ -92,6 +92,9 @@ class Configuration {
             createForeignKeyConstraints: true,
             ignoreSchema: [],
         },
+        embeddables: {
+            prefixMode: 'absolute',
+        },
         entityGenerator: {
             bidirectionalRelations: false,
             identifiedReferences: false,