@mikro-orm/core 6.3.13-dev.9 → 6.3.14-dev.0

package/EntityManager.d.ts

@@ -115,7 +115,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     setFlushMode(flushMode?: FlushMode): void;
     protected processWhere<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entityName: string, where: FilterQuery<Entity>, options: FindOptions<Entity, Hint, Fields, Excludes> | FindOneOptions<Entity, Hint, Fields, Excludes>, type: 'read' | 'update' | 'delete'): Promise<FilterQuery<Entity>>;
     protected applyDiscriminatorCondition<Entity extends object>(entityName: string, where: FilterQuery<Entity>): FilterQuery<Entity>;
-    protected createPopulateWhere<Entity extends object>(cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any>): ObjectQuery<Entity>;
+    protected createPopulateWhere<Entity extends object>(cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any> | CountOptions<Entity, any>): ObjectQuery<Entity>;
     protected getJoinedFilters<Entity extends object>(meta: EntityMetadata<Entity>, cond: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any> | FindOneOptions<Entity, any, any, any>): Promise<ObjectQuery<Entity>>;
     /**
      * When filters are active on M:1 or 1:1 relations, we need to ref join them eagerly as they might affect the FK value.

package/EntityManager.js

@@ -1230,6 +1230,12 @@ class EntityManager {
         await em.tryFlush(entityName, options);
         where = await em.processWhere(entityName, where, options, 'read');
         options.populate = await em.preparePopulate(entityName, options);
+        options = { ...options };
+        // save the original hint value so we know it was infer/all
+        const meta = em.metadata.find(entityName);
+        options._populateWhere = options.populateWhere ?? this.config.get('populateWhere');
+        options.populateWhere = this.createPopulateWhere({ ...where }, options);
+        options.populateFilter = await this.getJoinedFilters(meta, { ...where }, options);
         em.validator.validateParams(where);
         delete options.orderBy;
         const cacheKey = em.cacheKey(entityName, options, 'em.count', where);

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/decorators/Property.d.ts

@@ -2,6 +2,7 @@ import { type Cascade, type LoadStrategy } from '../enums';
 import type { EntityName, Constructor, CheckCallback, GeneratedColumnCallback, AnyString, AnyEntity } from '../typings';
 import type { Type, types } from '../types';
 import type { EntityManager } from '../EntityManager';
+import type { SerializeOptions } from '../serialization/EntitySerializer';
 export declare function Property<T extends object>(options?: PropertyOptions<T>): (target: any, propertyName: string) => any;
 export interface PropertyOptions<Owner> {
     /**
@@ -188,7 +189,7 @@ export interface PropertyOptions<Owner> {
      *
      * @see https://mikro-orm.io/docs/serializing#property-serializers
      */
-    serializer?: (value: any) => any;
+    serializer?: (value: any, options?: SerializeOptions<any>) => any;
     /**
      * Specify name of key for the serialized value.
      */

package/drivers/IDatabaseDriver.d.ts

@@ -86,7 +86,7 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
      * Filter condition for populated relations. This is similar to `populateWhere`, but will produce a `left join`
      * when nesting the condition. This is used for implementation of joined filters.
      */
-    populateFilter?: ObjectQuery<Entity> | PopulateHint | `${PopulateHint}`;
+    populateFilter?: ObjectQuery<Entity>;
     /** Used for ordering of the populate queries. If not specified, the value of `options.orderBy` is used. */
     populateOrderBy?: OrderDefinition<Entity>;
     /** Ordering of the results.Can be an object or array of objects, keys are property names, values are ordering (asc/desc) */
@@ -182,6 +182,8 @@ export interface CountOptions<T extends object, P extends string = never> {
     having?: QBFilterQuery<T>;
     cache?: boolean | number | [string, number];
     populate?: Populate<T, P>;
+    populateWhere?: ObjectQuery<T> | PopulateHint | `${PopulateHint}`;
+    populateFilter?: ObjectQuery<T>;
     ctx?: Transaction;
     connectionType?: ConnectionType;
     flushMode?: FlushMode | `${FlushMode}`;

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-dev.9",
+  "version": "6.3.14-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.",
   "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-dev.9",
+    "mikro-orm": "6.3.14-dev.0",
     "reflect-metadata": "0.2.2"
   }
 }

package/serialization/EntitySerializer.js

@@ -118,7 +118,7 @@ class EntitySerializer {
         if (entity[prop] instanceof Function) {
             const returnValue = entity[prop]();
             if (!options.ignoreSerializers && serializer) {
-                return serializer(returnValue);
+                return serializer(returnValue, this.extractChildOptions(options, prop));
             }
             return returnValue;
         }

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>;
@@ -366,7 +368,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     referencedColumnNames: string[];
     referencedTableName: string;
     referencedPKs: EntityKey<Owner>[];
-    serializer?: (value: any) => any;
+    serializer?: (value: any, options?: SerializeOptions<any>) => any;
     serializedName?: string;
     comment?: string;
     /** mysql only */

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,