@mikro-orm/core 7.0.0-dev.8 → 7.0.0-dev.9

package/EntityManager.d.ts

@@ -171,6 +171,10 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * });
      * ```
      *
+     * The options also support an `includeCount` (true by default) option. If set to false, the `totalCount` is not
+     * returned as part of the cursor. This is useful for performance reason, when you don't care about the total number
+     * of pages.
+     *
      * The `Cursor` object provides the following interface:
      *
      * ```ts
@@ -180,7 +184,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      *     User { ... },
      *     User { ... },
      *   ],
-     *   totalCount: 50,
+     *   totalCount: 50, // not included if `includeCount: false`
      *   startCursor: 'WzRd',
      *   endCursor: 'WzZd',
      *   hasPrevPage: true,
@@ -188,7 +192,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * }
      * ```
      */
-    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entityName: EntityName<Entity>, where: FilterQuery<NoInfer<Entity>>, options: FindByCursorOptions<Entity, Hint, Fields, Excludes>): Promise<Cursor<Entity, Hint, Fields, Excludes>>;
+    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never, IncludeCount extends boolean = true>(entityName: EntityName<Entity>, where: FilterQuery<NoInfer<Entity>>, options: FindByCursorOptions<Entity, Hint, Fields, Excludes, IncludeCount>): Promise<Cursor<Entity, Hint, Fields, Excludes, IncludeCount>>;
     /**
      * Refreshes the persistent state of an entity from the database, overriding any local changes that have not yet been
      * persisted. Returns the same entity instance (same object reference), but re-hydrated. If the entity is no longer
@@ -419,7 +423,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Loads specified relations in batch. This will execute one query for each relation, that will populate it on all the specified entities.
      */
-    populate<Entity extends object, Naked extends FromEntityType<UnboxArray<Entity>> = FromEntityType<UnboxArray<Entity>>, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entities: Entity, populate: AutoPath<Naked, Hint, PopulatePath.ALL>[] | false, options?: EntityLoaderOptions<Naked, Fields, Excludes>): Promise<Entity extends object[] ? MergeLoaded<ArrayElement<Entity>, Naked, Hint, Fields, Excludes>[] : MergeLoaded<Entity, Naked, Hint, Fields, Excludes>>;
+    populate<Entity extends object, Naked extends FromEntityType<UnboxArray<Entity>> = FromEntityType<UnboxArray<Entity>>, Hint extends string = never, Fields extends string = '*', Excludes extends string = never>(entities: Entity, populate: readonly AutoPath<Naked, Hint, PopulatePath.ALL>[] | false, options?: EntityLoaderOptions<Naked, Fields, Excludes>): Promise<Entity extends object[] ? MergeLoaded<ArrayElement<Entity>, Naked, Hint, Fields, Excludes>[] : MergeLoaded<Entity, Naked, Hint, Fields, Excludes>>;
     /**
      * Returns new EntityManager instance with its own identity map
      */

package/EntityManager.js

@@ -433,6 +433,10 @@ export class EntityManager {
      * });
      * ```
      *
+     * The options also support an `includeCount` (true by default) option. If set to false, the `totalCount` is not
+     * returned as part of the cursor. This is useful for performance reason, when you don't care about the total number
+     * of pages.
+     *
      * The `Cursor` object provides the following interface:
      *
      * ```ts
@@ -442,7 +446,7 @@ export class EntityManager {
      *     User { ... },
      *     User { ... },
      *   ],
-     *   totalCount: 50,
+     *   totalCount: 50, // not included if `includeCount: false`
      *   startCursor: 'WzRd',
      *   endCursor: 'WzZd',
      *   hasPrevPage: true,
@@ -457,7 +461,9 @@ export class EntityManager {
         if (Utils.isEmpty(options.orderBy)) {
             throw new Error('Explicit `orderBy` option required');
         }
-        const [entities, count] = await em.findAndCount(entityName, where, options);
+        const [entities, count] = options.includeCount !== false
+            ? await em.findAndCount(entityName, where, options)
+            : [await em.find(entityName, where, options)];
         return new Cursor(entities, count, options, this.metadata.get(entityName));
     }
     /**

package/drivers/IDatabaseDriver.d.ts

@@ -149,7 +149,8 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
     /** @internal used to apply filters to the auto-joined relations */
     em?: EntityManager;
 }
-export interface FindByCursorOptions<T extends object, P extends string = never, F extends string = '*', E extends string = never> extends Omit<FindOptions<T, P, F, E>, 'limit' | 'offset'> {
+export interface FindByCursorOptions<T extends object, P extends string = never, F extends string = '*', E extends string = never, I extends boolean = true> extends Omit<FindOptions<T, P, F, E>, 'limit' | 'offset'> {
+    includeCount?: I;
 }
 export interface FindOneOptions<T extends object, P extends string = never, F extends string = '*', E extends string = never> extends Omit<FindOptions<T, P, F, E>, 'limit' | 'lockMode'> {
     lockMode?: LockMode;

package/entity/EntityFactory.js

@@ -45,6 +45,7 @@ export class EntityFactory {
         let wrapped = exists && helper(exists);
         if (wrapped && !options.refresh) {
             wrapped.__processing = true;
+            Utils.dropUndefinedProperties(data);
             this.mergeData(meta2, exists, data, options);
             wrapped.__processing = false;
             if (wrapped.isInitialized()) {

package/entity/EntityHelper.js

@@ -146,6 +146,9 @@ export class EntityHelper {
             set(val) {
                 const entity = Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
                 const old = Reference.unwrapReference(wrapped.__data[prop.name]);
+                if (old && old !== entity && prop.kind === ReferenceKind.MANY_TO_ONE && prop.inversedBy && old[prop.inversedBy]) {
+                    old[prop.inversedBy].removeWithoutPropagation(this);
+                }
                 wrapped.__data[prop.name] = Reference.wrapReference(val, prop);
                 // when propagation from inside hydration, we set the FK to the entity data immediately
                 if (val && hydrator.isRunning() && wrapped.__originalEntityData && prop.owner) {

package/entity/EntityLoader.js

@@ -314,9 +314,16 @@ export class EntityLoader {
         const innerOrderBy = Utils.asArray(options.orderBy)
             .filter(orderBy => Utils.isObject(orderBy[prop.name]))
             .map(orderBy => orderBy[prop.name]);
-        const { refresh, filters, ignoreLazyScalarProperties, populateWhere, connectionType, logging } = options;
+        const { refresh, filters, ignoreLazyScalarProperties, populateWhere, connectionType, logging, schema } = options;
         const exclude = Array.isArray(options.exclude) ? Utils.extractChildElements(options.exclude, prop.name) : options.exclude;
-        const filtered = Utils.unique(children.filter(e => !options.visited.has(e)));
+        const visited = options.visited;
+        for (const entity of entities) {
+            visited.delete(entity);
+        }
+        const filtered = Utils.unique(children.filter(e => !visited.has(e)));
+        for (const entity of entities) {
+            visited.add(entity);
+        }
         await this.populate(prop.type, filtered, populate.children ?? populate.all, {
             where: await this.extractChildCondition(options, prop, false),
             orderBy: innerOrderBy,
@@ -329,6 +336,7 @@ export class EntityLoader {
             populateWhere,
             connectionType,
             logging,
+            schema,
             // @ts-ignore not a public option, will be propagated to the populate call
             refresh: refresh && !filtered.every(item => options.visited.has(item)),
             // @ts-ignore not a public option, will be propagated to the populate call
@@ -518,7 +526,7 @@ export class EntityLoader {
         if (refresh) {
             return entities;
         }
-        return entities.filter(e => !e[field]?.__helper?.__initialized);
+        return entities.filter(e => e[field] !== null && !e[field]?.__helper?.__initialized);
     }
     lookupAllRelationships(entityName) {
         const ret = [];

package/entity/Reference.d.ts

@@ -1,5 +1,5 @@
 import { inspect } from 'node:util';
-import type { AddEager, Dictionary, EntityClass, EntityKey, EntityProperty, Loaded, LoadedReference, Primary, Ref } from '../typings.js';
+import type { AddEager, AddOptional, Dictionary, EntityClass, EntityKey, EntityProperty, Loaded, LoadedReference, Primary, Ref } from '../typings.js';
 import type { FindOneOptions, FindOneOrFailOptions } from '../drivers/IDatabaseDriver.js';
 export declare class Reference<T extends object> {
     private entity;
@@ -72,15 +72,11 @@ export interface LoadReferenceOrFailOptions<T extends object, P extends string =
 /**
  * shortcut for `wrap(entity).toReference()`
  */
-export declare function ref<T>(entity: T | Ref<T>): Ref<T> & LoadedReference<Loaded<T, AddEager<T>>>;
+export declare function ref<I extends unknown | Ref<unknown> | undefined | null, T extends I & {}>(entity: I): Ref<T> & LoadedReference<Loaded<T, AddEager<T>>> | AddOptional<typeof entity>;
 /**
  * shortcut for `Reference.createFromPK(entityType, pk)`
  */
-export declare function ref<T, PKV extends Primary<T> = Primary<T>>(entityType: EntityClass<T>, pk?: T | PKV): Ref<T>;
-/**
- * shortcut for `wrap(entity).toReference()`
- */
-export declare function ref<T>(value: T | Ref<T>): Ref<T> & LoadedReference<Loaded<T, AddEager<T>>>;
+export declare function ref<I extends unknown | undefined | null, T, PKV extends Primary<T> = Primary<T>>(entityType: EntityClass<T>, pk: I): Ref<T> | AddOptional<typeof pk>;
 /**
  * shortcut for `Reference.createNakedFromPK(entityType, pk)`
  */

package/hydration/ObjectHydrator.js

@@ -256,6 +256,7 @@ export class ObjectHydrator extends Hydrator {
                             ...prop2,
                             name: childProp.name,
                             embedded: childProp.embedded,
+                            embeddedProps: childProp.embeddedProps,
                         };
                         // eslint-disable-next-line @typescript-eslint/no-use-before-define
                         ret.push(...hydrateProperty(prop3, childProp.object, [...path, childProp.embedded[1]], childDataKey).map(l => '    ' + l));

package/metadata/MetadataDiscovery.js

@@ -7,7 +7,7 @@ import { MetadataStorage } from './MetadataStorage.js';
 import { EntitySchema } from './EntitySchema.js';
 import { Cascade, ReferenceKind } from '../enums.js';
 import { MetadataError } from '../errors.js';
-import { ArrayType, BigIntType, BlobType, DecimalType, DoubleType, EnumArrayType, IntervalType, JsonType, t, Type, Uint8ArrayType, UnknownType, } from '../types/index.js';
+import { ArrayType, BigIntType, BlobType, DateType, DecimalType, DoubleType, EnumArrayType, IntervalType, JsonType, t, Type, Uint8ArrayType, UnknownType, } from '../types/index.js';
 import { colors } from '../logging/colors.js';
 import { raw, RawQueryFragment } from '../utils/RawQueryFragment.js';
 export class MetadataDiscovery {
@@ -765,6 +765,7 @@ export class MetadataDiscovery {
                     delete prop.default;
                     if (properties[prop.name] && properties[prop.name].type !== prop.type) {
                         properties[prop.name].type = `${properties[prop.name].type} | ${prop.type}`;
+                        properties[prop.name].runtimeType = 'any';
                         return properties[prop.name];
                     }
                     return properties[prop.name] = prop;
@@ -924,7 +925,7 @@ export class MetadataDiscovery {
         }
         let i = 1;
         Object.values(meta.properties).forEach(prop => {
-            const newProp = Utils.copy(prop, false);
+            const newProp = { ...prop };
             if (meta.root.properties[prop.name] && meta.root.properties[prop.name].type !== prop.type) {
                 const name = newProp.name;
                 this.initFieldName(newProp, newProp.object);
@@ -1134,7 +1135,7 @@ export class MetadataDiscovery {
         }
         const mappedType = this.getMappedType(prop);
         if (prop.fieldNames?.length === 1 && !prop.customType) {
-            [BigIntType, DoubleType, DecimalType, IntervalType]
+            [BigIntType, DoubleType, DecimalType, IntervalType, DateType]
                 .filter(type => mappedType instanceof type)
                 .forEach(type => prop.customType = new type());
         }

package/metadata/MetadataValidator.js

@@ -100,14 +100,15 @@ export class MetadataValidator {
         if (!prop.type) {
             throw MetadataError.fromWrongTypeDefinition(meta, prop);
         }
+        const targetMeta = metadata.find(prop.type);
         // references do have type of known entity
-        if (!metadata.find(prop.type)) {
+        if (!targetMeta) {
             throw MetadataError.fromWrongTypeDefinition(meta, prop);
         }
-        if (metadata.find(prop.type).abstract && !metadata.find(prop.type).discriminatorColumn) {
+        if (targetMeta.abstract && !targetMeta.discriminatorColumn && !targetMeta.embeddable) {
             throw MetadataError.targetIsAbstract(meta, prop);
         }
-        if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && prop.persist === false && metadata.find(prop.type).compositePK && options.checkNonPersistentCompositeProps) {
+        if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && prop.persist === false && targetMeta.compositePK && options.checkNonPersistentCompositeProps) {
             throw MetadataError.nonPersistentCompositeProp(meta, prop);
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.8",
+  "version": "7.0.0-dev.9",
   "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.",
   "exports": {
     "./package.json": "./package.json",
@@ -52,10 +52,10 @@
   },
   "dependencies": {
     "dataloader": "2.2.3",
-    "dotenv": "16.4.7",
+    "dotenv": "16.5.0",
     "esprima": "4.0.1",
     "globby": "11.1.0",
-    "mikro-orm": "7.0.0-dev.8",
+    "mikro-orm": "7.0.0-dev.9",
     "reflect-metadata": "0.2.2"
   }
 }

package/typings.d.ts

@@ -177,7 +177,7 @@ export interface IWrappedEntityInternal<Entity extends object> extends IWrappedE
     __touched: boolean;
     __originalEntityData?: EntityData<Entity>;
     __loadedProperties: Set<string>;
-    __identifier?: EntityIdentifier;
+    __identifier?: EntityIdentifier | EntityIdentifier[];
     __managed: boolean;
     __processing: boolean;
     __schema?: string;
@@ -206,7 +206,7 @@ export type EntityName<T> = string | EntityClass<T> | EntitySchema<T, any> | {
 };
 export type GetRepository<Entity extends {
     [k: PropertyKey]: any;
-}, Fallback> = Entity[typeof EntityRepositoryType] extends EntityRepository<Entity> | undefined ? NonNullable<Entity[typeof EntityRepositoryType]> : Fallback;
+}, Fallback> = Entity[typeof EntityRepositoryType] extends EntityRepository<any> | undefined ? NonNullable<Entity[typeof EntityRepositoryType]> : Fallback;
 export type EntityDataPropValue<T> = T | Primary<T>;
 type ExpandEntityProp<T, C extends boolean = false> = T extends Record<string, any> ? {
     [K in keyof T as CleanKeys<T, K>]?: EntityDataProp<ExpandProperty<T[K]>, C> | EntityDataPropValue<ExpandProperty<T[K]>> | null;
@@ -283,7 +283,7 @@ type PrimaryOrObject<T, U, C extends TypeConfig> = PreferExplicitConfig<C, Extra
 } : Primary<U>;
 export type EntityDTOProp<E, T, C extends TypeConfig = never> = T extends Scalar ? T : T extends {
     __serialized?: infer U;
-} ? U : T extends LoadedReference<infer U> ? EntityDTO<U, C> : T extends Reference<infer U> ? PrimaryOrObject<E, U, C> : T extends ScalarReference<infer U> ? U : T extends LoadedCollection<infer U> ? EntityDTO<U, C>[] : T extends Collection<infer U> ? PrimaryOrObject<E, U, C>[] : T extends readonly (infer U)[] ? (T extends readonly any[] ? T : U[]) : T extends Relation<T> ? EntityDTO<T, C> : T;
+} ? (IsUnknown<U> extends false ? U : T) : T extends LoadedReference<infer U> ? EntityDTO<U, C> : T extends Reference<infer U> ? PrimaryOrObject<E, U, C> : T extends ScalarReference<infer U> ? U : T extends LoadedCollection<infer U> ? EntityDTO<U, C>[] : T extends Collection<infer U> ? PrimaryOrObject<E, U, C>[] : T extends readonly (infer U)[] ? (T extends readonly any[] ? T : U[]) : T extends Relation<T> ? EntityDTO<T, C> : T;
 type DTOProbablyOptionalProps<T> = NonNullable<NullableKeys<T, undefined>>;
 type DTOIsOptional<T, K extends keyof T> = T[K] extends LoadedCollection<any> ? false : K extends PrimaryProperty<T> ? false : K extends DTOProbablyOptionalProps<T> ? true : false;
 type DTORequiredKeys<T, K extends keyof T> = DTOIsOptional<T, K> extends false ? ExcludeHidden<T, K> & CleanKeys<T, K> : never;
@@ -729,7 +729,7 @@ export type MergeSelected<T, U, F extends string> = T extends Loaded<infer TT, i
 type MergeFields<F1 extends string, F2 extends string, P1, P2> = P1 | P2 extends '*' ? '*' : F1 | F2;
 type MergeExcludes<F extends string, E extends string> = F extends E ? never : Exclude<E, F>;
 export type MergeLoaded<T, U, P extends string, F extends string, E extends string, R extends boolean = false> = T extends Loaded<U, infer PP, infer FF, infer EE> ? string extends FF ? Loaded<T, P, F, AnyStringToNever<EE> | E> : string extends P ? Loaded<U, never, F | (FF & string), MergeExcludes<F | (FF & string), EE | E>> : Loaded<U, P | AnyStringToNever<PP>, MergeFields<F, AnyStringToNever<FF>, P, PP>, MergeExcludes<MergeFields<F, AnyStringToNever<FF>, P, PP>, (R extends true ? never : EE) | E>> : Loaded<T, P, F>;
-type AddOptional<T> = undefined | null extends T ? null | undefined : null extends T ? null : undefined extends T ? undefined : never;
+export type AddOptional<T> = undefined | null extends T ? null | undefined : null extends T ? null : undefined extends T ? undefined : never;
 type LoadedProp<T, L extends string = never, F extends string = '*', E extends string = never> = LoadedLoadable<T, Loaded<ExtractType<T>, L, F, E>>;
 export type AddEager<T> = ExtractEagerProps<T> & string;
 export type ExpandHint<T, L extends string> = L | AddEager<T>;

package/typings.js

@@ -123,6 +123,9 @@ export class EntityMetadata {
                         const hydrator = wrapped.hydrator;
                         const entity = Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
                         const old = Reference.unwrapReference(wrapped.__data[prop.name]);
+                        if (old && old !== entity && prop.kind === ReferenceKind.MANY_TO_ONE && prop.inversedBy && old[prop.inversedBy]) {
+                            old[prop.inversedBy].removeWithoutPropagation(this);
+                        }
                         wrapped.__data[prop.name] = Reference.wrapReference(val, prop);
                         // when propagation from inside hydration, we set the FK to the entity data immediately
                         if (val && hydrator.isRunning() && wrapped.__originalEntityData && prop.owner) {

package/unit-of-work/ChangeSetPersister.js

@@ -210,7 +210,9 @@ export class ChangeSetPersister {
         // of using the raw value from db, we convert it back to the db value explicitly
         value = prop.customType ? prop.customType.convertToDatabaseValue(insertId, this.platform, { mode: 'serialization' }) : value;
         changeSet.payload[wrapped.__meta.primaryKeys[0]] = value;
-        wrapped.__identifier?.setValue(value);
+        if (wrapped.__identifier && !Array.isArray(wrapped.__identifier)) {
+            wrapped.__identifier.setValue(value);
+        }
     }
     /**
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
@@ -338,6 +340,10 @@ export class ChangeSetPersister {
             changeSet.payload[prop.name] = value.getValue();
             return;
         }
+        if (Array.isArray(value) && value.every(item => item instanceof EntityIdentifier)) {
+            changeSet.payload[prop.name] = value.map(item => item.getValue());
+            return;
+        }
         if (prop.kind === ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {
             changeSet.payload[prop.name] = value.map(val => val instanceof EntityIdentifier ? val.getValue() : val);
             return;

package/unit-of-work/UnitOfWork.js

@@ -542,13 +542,22 @@ export class UnitOfWork {
         if (!wrapped || wrapped.__identifier || wrapped.hasPrimaryKey()) {
             return;
         }
-        const pk = wrapped.__meta.getPrimaryProps()[0];
-        if (pk.kind === ReferenceKind.SCALAR) {
-            wrapped.__identifier = new EntityIdentifier();
+        const pks = wrapped.__meta.getPrimaryProps();
+        const idents = [];
+        for (const pk of pks) {
+            if (pk.kind === ReferenceKind.SCALAR) {
+                idents.push(new EntityIdentifier(entity[pk.name]));
+            }
+            else if (entity[pk.name]) {
+                this.initIdentifier(entity[pk.name]);
+                idents.push(helper(entity[pk.name])?.__identifier);
+            }
+        }
+        if (pks.length === 1) {
+            wrapped.__identifier = idents[0];
         }
-        else if (entity[pk.name]) {
-            this.initIdentifier(entity[pk.name]);
-            wrapped.__identifier = helper(entity[pk.name])?.__identifier;
+        else {
+            wrapped.__identifier = idents;
         }
     }
     processReference(parent, prop, kind, visited, processed, idx) {
@@ -600,8 +609,15 @@ export class UnitOfWork {
         const diff = this.comparator.diffEntities(changeSet.name, copy, current);
         Object.assign(changeSet.payload, diff);
         const wrapped = helper(changeSet.entity);
-        if (wrapped.__identifier && diff[wrapped.__meta.primaryKeys[0]]) {
-            wrapped.__identifier.setValue(diff[wrapped.__meta.primaryKeys[0]]);
+        if (wrapped.__identifier) {
+            const idents = Utils.asArray(wrapped.__identifier);
+            let i = 0;
+            for (const pk of wrapped.__meta.primaryKeys) {
+                if (diff[pk]) {
+                    idents[i].setValue(diff[pk]);
+                }
+                i++;
+            }
         }
     }
     postCommitCleanup() {

package/utils/Cursor.d.ts

@@ -49,13 +49,13 @@ import { type QueryOrder } from '../enums.js';
  * }
  * ```
  */
-export declare class Cursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never> {
+export declare class Cursor<Entity extends object, Hint extends string = never, Fields extends string = '*', Excludes extends string = never, IncludeCount extends boolean = true> {
     readonly items: Loaded<Entity, Hint, Fields, Excludes>[];
-    readonly totalCount: number;
+    readonly totalCount: IncludeCount extends true ? number : undefined;
     readonly hasPrevPage: boolean;
     readonly hasNextPage: boolean;
     private readonly definition;
-    constructor(items: Loaded<Entity, Hint, Fields, Excludes>[], totalCount: number, options: FindByCursorOptions<Entity, Hint, Fields, Excludes>, meta: EntityMetadata<Entity>);
+    constructor(items: Loaded<Entity, Hint, Fields, Excludes>[], totalCount: IncludeCount extends true ? number : undefined, options: FindByCursorOptions<Entity, Hint, Fields, Excludes, IncludeCount>, meta: EntityMetadata<Entity>);
     get startCursor(): string | null;
     get endCursor(): string | null;
     /**

package/utils/EntityComparator.js

@@ -286,56 +286,72 @@ export class EntityComparator {
             lines.push(`${padding}    }`);
         };
         lines.push(`  const mapped = {};`);
-        meta.props.forEach(prop => {
-            if (!prop.fieldNames) {
-                return;
-            }
-            if (prop.targetMeta && prop.fieldNames.length > 1) {
-                lines.push(`  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`);
-                lines.push(`  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${this.createCompositeKeyArray(prop)};`);
-                lines.push(...prop.fieldNames.map(field => `    ${this.propName(field, 'mapped')} = true;`));
-                lines.push(`  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n    ret${this.wrap(prop.name)} = null;`);
-                lines.push(...prop.fieldNames.map(field => `    ${this.propName(field, 'mapped')} = true;`), '  }');
-                return;
-            }
-            if (prop.embedded && (meta.embeddable || meta.properties[prop.embedded[0]].object)) {
-                return;
-            }
-            if (prop.runtimeType === 'boolean') {
-                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : !!${this.propName(prop.fieldNames[0])};`);
-                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-                lines.push(`  }`);
-            }
-            else if (prop.runtimeType === 'Date' && !this.platform.isNumericProperty(prop)) {
-                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-                context.set('parseDate', (value) => this.platform.parseDate(value));
-                parseDate('ret' + this.wrap(prop.name), this.propName(prop.fieldNames[0]));
-                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-                lines.push(`  }`);
-            }
-            else if (prop.kind === ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
-                const idx = this.tmpIndex++;
-                context.set(`mapEmbeddedResult_${idx}`, (data) => {
-                    const item = parseJsonSafe(data);
-                    if (Array.isArray(item)) {
-                        return item.map(row => row == null ? row : this.getResultMapper(prop.type)(row));
-                    }
-                    return item == null ? item : this.getResultMapper(prop.type)(item);
-                });
-                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : mapEmbeddedResult_${idx}(${this.propName(prop.fieldNames[0])});`);
-                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-                lines.push(`  }`);
+        const mapEntityProperties = (meta, padding = '') => {
+            for (const prop of meta.props) {
+                if (!prop.fieldNames) {
+                    continue;
+                }
+                if (prop.targetMeta && prop.fieldNames.length > 1) {
+                    lines.push(`${padding}  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`);
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.createCompositeKeyArray(prop)};`);
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`));
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n    ret${this.wrap(prop.name)} = null;`);
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`), '  }');
+                    continue;
+                }
+                if (prop.embedded && (meta.embeddable || meta.properties[prop.embedded[0]].object)) {
+                    continue;
+                }
+                if (prop.runtimeType === 'boolean') {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : !!${this.propName(prop.fieldNames[0])};`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.runtimeType === 'Date' && !this.platform.isNumericProperty(prop)) {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    context.set('parseDate', (value) => this.platform.parseDate(value));
+                    parseDate('ret' + this.wrap(prop.name), this.propName(prop.fieldNames[0]), padding);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.kind === ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
+                    const idx = this.tmpIndex++;
+                    context.set(`mapEmbeddedResult_${idx}`, (data) => {
+                        const item = parseJsonSafe(data);
+                        if (Array.isArray(item)) {
+                            return item.map(row => row == null ? row : this.getResultMapper(prop.type)(row));
+                        }
+                        return item == null ? item : this.getResultMapper(prop.type)(item);
+                    });
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : mapEmbeddedResult_${idx}(${this.propName(prop.fieldNames[0])});`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.kind !== ReferenceKind.EMBEDDED) {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
             }
-            else if (prop.kind !== ReferenceKind.EMBEDDED) {
-                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
-                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+        };
+        if (meta.polymorphs && meta.discriminatorColumn) {
+            for (const polymorph of meta.polymorphs) {
+                const first = polymorph === meta.polymorphs[0];
+                lines.push(`  ${first ? '' : 'else '}if (${this.propName(meta.discriminatorColumn)} == '${polymorph.discriminatorValue}') {`);
+                mapEntityProperties(polymorph, '  ');
                 lines.push(`  }`);
             }
-        });
+            lines.push(`  else {`);
+            mapEntityProperties(meta, '  ');
+            lines.push(`  }`);
+        }
+        else {
+            mapEntityProperties(meta);
+        }
         lines.push(`  for (let k in result) { if (Object.hasOwn(result, k) && !mapped[k]) ret[k] = result[k]; }`);
         const code = `// compiled mapper for entity ${meta.className}\n`
             + `return function(result) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;

package/utils/Utils.js

@@ -625,8 +625,12 @@ export class Utils {
             || !!process.env.TS_JEST // check if ts-jest is used (works only with v27.0.4+)
             || !!process.env.VITEST // check if vitest is used
             || !!process.versions.bun // check if bun is used
-            || process.argv.slice(1).some(arg => arg.includes('ts-node')) // registering ts-node runner
-            || process.execArgv.some(arg => arg === 'ts-node/esm'); // check for ts-node/esm module loader
+            || process.argv.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) // executing `.ts` file
+            || process.execArgv.some(arg => {
+                return arg.includes('ts-node') // check for ts-node loader
+                    || arg.includes('@swc-node/register') // check for swc-node/register loader
+                    || arg.includes('node_modules/tsx/'); // check for tsx loader
+            });
     }
     /**
      * Uses some dark magic to get source path to caller where decorator is used.
@@ -644,7 +648,8 @@ export class Utils {
         // but those are also present in node, so we need to check this only if they weren't found.
         if (line === -1) {
             // here we handle bun which stack is different from nodejs so we search for reflect-metadata
-            const reflectLine = stack.findIndex(line => Utils.normalizePath(line).includes('node_modules/reflect-metadata/Reflect.js'));
+            // Different bun versions might have different stack traces. The "last index" works for both 1.2.6 and 1.2.7.
+            const reflectLine = stack.findLastIndex(line => Utils.normalizePath(line).includes('node_modules/reflect-metadata/Reflect.js'));
             if (reflectLine === -1 || reflectLine + 2 >= stack.length || !stack[reflectLine + 1].includes('bun:wrap')) {
                 return name;
             }