@mikro-orm/core 7.1.0-dev.44 → 7.1.0-dev.46

package/entity/EntityLoader.js

@@ -369,8 +369,11 @@ export class EntityLoader {
         }
         const fields = this.buildFields(options.fields, prop, ref);
         /* eslint-disable prefer-const */
-        let { refresh, filters, convertCustomTypes, lockMode, strategy, populateWhere = 'infer', connectionType, logging, } = options;
+        let { refresh, filters, convertCustomTypes, lockMode, strategy, populateWhere, connectionType, logging } = options;
         /* eslint-enable prefer-const */
+        // `populateWhere` is typed as required via `Required<EntityLoaderOptions>`, but `em.populate(...)`
+        // forwards user-supplied options without filling it in — keep the runtime default.
+        populateWhere ??= 'infer';
         if (typeof populateWhere === 'object') {
             populateWhere = await this.extractChildCondition({ where: populateWhere }, prop);
         }

package/entity/defineEntity.d.ts

@@ -615,7 +615,7 @@ export type PropertyBuilders = {
 /** Own keys + base entity keys (when TBase is not `never`). Guards against `keyof never = string | number | symbol`. */
 type AllKeys<TProperties, TBase> = keyof TProperties | (IsNever<TBase> extends true ? never : keyof TBase);
 /** Metadata descriptor for `defineEntity()`, combining entity options with property definitions. */
-export interface EntityMetadataWithProperties<TName extends string, TTableName extends string, TProperties extends Record<string, any>, TPK extends (keyof TProperties)[] | undefined = undefined, TBase = never, TRepository = never, TForceObject extends boolean = false, TDiscriminatorColumn extends string | undefined = undefined, TDiscriminatorValue extends string | number | undefined = undefined, TBaseDiscriminatorColumn extends string | undefined = undefined> extends Omit<Partial<EntityMetadata<InferEntityFromProperties<TProperties, TPK, TBase, TRepository>>>, 'properties' | 'extends' | 'primaryKeys' | 'hooks' | 'discriminatorColumn' | 'discriminatorValue' | 'versionProperty' | 'concurrencyCheckKeys' | 'serializedPrimaryKey' | 'indexes' | 'uniques' | 'triggers' | 'repository' | 'filters' | 'orderBy'> {
+export interface EntityMetadataWithProperties<TName extends string, TTableName extends string, TProperties extends Record<string, any>, TPK extends (keyof TProperties)[] | undefined = undefined, TBase = never, TRepository = never, TForceObject extends boolean = false, TDiscriminatorColumn extends string | undefined = undefined, TDiscriminatorValue extends string | number | undefined = undefined, TBaseDiscriminatorColumn extends string | undefined = undefined> extends Omit<Partial<EntityMetadata<InferEntityFromProperties<TProperties, TPK, TBase, TRepository>>>, 'properties' | 'extends' | 'primaryKeys' | 'hooks' | 'discriminator' | 'discriminatorColumn' | 'discriminatorValue' | 'versionProperty' | 'concurrencyCheckKeys' | 'serializedPrimaryKey' | 'indexes' | 'uniques' | 'triggers' | 'repository' | 'filters' | 'orderBy'> {
     name: TName;
     tableName?: TTableName;
     extends?: {
@@ -643,6 +643,8 @@ export interface EntityMetadataWithProperties<TName extends string, TTableName e
     } | {
         [K in Extract<AllKeys<TProperties, TBase>, string>]?: QueryOrderKeysFlat;
     }[];
+    discriminator?: TDiscriminatorColumn;
+    /** Alias for `discriminator`. */
     discriminatorColumn?: TDiscriminatorColumn;
     discriminatorValue?: TDiscriminatorValue;
     versionProperty?: AllKeys<TProperties, TBase>;

package/metadata/EntitySchema.js

@@ -254,6 +254,21 @@ export class EntitySchema {
             return this;
         }
         this.setClass(this._meta.class);
+        // `discriminator` is the property name on the entity / embeddable; `discriminatorColumn` is an
+        // optional column-name override on that property. For backward compat, when only
+        // `discriminatorColumn` is given (legacy), it is treated as the property name. Once normalized,
+        // `meta.discriminatorColumn` always holds the property name (so existing readers keep working),
+        // and `meta.discriminatorFieldName` carries the explicit column override (if any).
+        if (this._meta.discriminator &&
+            this._meta.discriminatorColumn &&
+            this._meta.discriminator !== this._meta.discriminatorColumn) {
+            this._meta.discriminatorFieldName = this._meta.discriminatorColumn;
+            this._meta.discriminatorColumn = this._meta.discriminator;
+        }
+        else {
+            this._meta.discriminatorColumn ??= this._meta.discriminator;
+            this._meta.discriminator ??= this._meta.discriminatorColumn;
+        }
         // Abstract TPT entities keep their name because they have their own table
         const isTPT = this._meta.inheritance === 'tpt' || this.isPartOfTPTHierarchy();
         if (this._meta.abstract && !this._meta.discriminatorColumn && !isTPT) {

package/metadata/MetadataDiscovery.js

@@ -1582,13 +1582,18 @@ export class MetadataDiscovery {
         });
     }
     createDiscriminatorProperty(meta) {
-        meta.addProperty({
+        const prop = {
             name: meta.discriminatorColumn,
             type: 'string',
             enum: true,
             kind: ReferenceKind.SCALAR,
             userDefined: false,
-        });
+        };
+        // honor the column-name override set via `discriminatorColumn` when `discriminator` is also given
+        if (meta.discriminatorFieldName) {
+            prop.fieldName = meta.discriminatorFieldName;
+        }
+        meta.addProperty(prop);
     }
     initAutoincrement(meta) {
         const pks = meta.getPrimaryProps();

package/metadata/types.d.ts

@@ -65,8 +65,10 @@ export type EntityOptions<T, E = T extends EntityClass<infer P> ? P : T> = {
      * 3. Entity-level `@Entity({ orderBy })`
      */
     orderBy?: QueryOrderMap<E> | QueryOrderMap<E>[];
-    /** For {@doclink inheritance-mapping#single-table-inheritance | Single Table Inheritance}. */
-    discriminatorColumn?: (T extends EntityClass<infer P> ? keyof P : string) | AnyString;
+    /** For {@doclink inheritance-mapping#single-table-inheritance | Single Table Inheritance}. Property name on the entity that stores the discriminator value. */
+    discriminator?: (T extends EntityClass<infer P> ? keyof P : string) | AnyString;
+    /** For {@doclink inheritance-mapping#single-table-inheritance | Single Table Inheritance}. Override the discriminator column name (the property is named via `discriminator`; defaults to the naming-strategy-derived column). */
+    discriminatorColumn?: string;
     /** For {@doclink inheritance-mapping#single-table-inheritance | Single Table Inheritance}. */
     discriminatorMap?: Dictionary<string>;
     /** For {@doclink inheritance-mapping#single-table-inheritance | Single Table Inheritance}. */
@@ -553,10 +555,10 @@ export interface EmbeddedOptions<Owner, Target> extends PropertyOptions<Owner> {
 export interface EmbeddableOptions<Owner> {
     /** Specify constructor parameters to be used in `em.create` or when `forceConstructor` is enabled. Those should be names of declared entity properties in the same order as your constructor uses them. The ORM tries to infer those automatically, use this option in case the inference fails. */
     constructorParams?: (Owner extends EntityClass<infer P> ? keyof P : string)[];
-    /** For polymorphic embeddables. Specify the property name that stores the discriminator value. Alias for `discriminatorColumn`. */
+    /** For polymorphic embeddables. Property name on the embeddable class that stores the discriminator value. */
     discriminator?: (Owner extends EntityClass<infer P> ? keyof P : string) | AnyString;
-    /** For polymorphic embeddables. @deprecated Use `discriminator` instead. */
-    discriminatorColumn?: (Owner extends EntityClass<infer P> ? keyof P : string) | AnyString;
+    /** For polymorphic embeddables. Override the discriminator column name (the property is named via `discriminator`; defaults to the naming-strategy-derived column). */
+    discriminatorColumn?: string;
     discriminatorMap?: Dictionary<string>;
     discriminatorValue?: number | string;
     abstract?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.0-dev.44",
+  "version": "7.1.0-dev.46",
   "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/typings.d.ts

@@ -1091,7 +1091,12 @@ export interface EntityMetadata<Entity = any, Class extends EntityCtor<Entity> =
     /** PostgreSQL partitioning definition for this table. */
     partitionBy?: EntityPartitionBy<Entity>;
     expression?: string | ((em: any, where: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any>, stream?: boolean) => MaybePromise<Raw | object | string>);
+    /** Property name on the entity that stores the discriminator value. */
+    discriminator?: EntityKey<Entity> | AnyString;
+    /** Internally holds the discriminator property name (legacy) or a column-name override (when different from `discriminator`); normalized in `EntitySchema.init()`. */
     discriminatorColumn?: EntityKey<Entity> | AnyString;
+    /** Explicit column-name override for the auto-managed discriminator property. Set when both `discriminator` and `discriminatorColumn` are provided and differ. */
+    discriminatorFieldName?: string;
     discriminatorValue?: number | string;
     discriminatorMap?: Dictionary<EntityClass>;
     embeddable: boolean;

package/unit-of-work/UnitOfWork.js

@@ -388,6 +388,23 @@ export class UnitOfWork {
                 }
                 continue;
             }
+            // inlined pivot M:N: scrub the deleted entity from each owning-side document's array;
+            // the owner's collection update rides along inside its UPDATE changeset in the same flush
+            if (prop.kind === ReferenceKind.MANY_TO_MANY &&
+                prop.mappedBy &&
+                !this.#platform.usesPivotTable() &&
+                Utils.isCollection(relation)) {
+                if (!relation.isInitialized(true)) {
+                    throw ValidationError.cannotModifyInverseCollection(entity, prop);
+                }
+                for (const owner of relation.getItems(false)) {
+                    const ownerColl = owner[inverseProp];
+                    if (Utils.isCollection(ownerColl)) {
+                        ownerColl.removeWithoutPropagation(entity);
+                    }
+                }
+                continue;
+            }
             const target = relation?.[inverseProp];
             if (relation && Utils.isCollection(target)) {
                 target.removeWithoutPropagation(entity);

package/utils/Utils.js

@@ -141,7 +141,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.1.0-dev.44';
+    static #ORM_VERSION = '7.1.0-dev.46';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */