@mikro-orm/core 6.2.10-dev.7 → 6.2.10-dev.71

package/EntityManager.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { inspect } from 'util';
 import DataLoader from 'dataloader';
 import { type Configuration, Cursor } from './utils';
@@ -258,7 +257,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Runs your callback wrapped inside a database transaction.
      */
-    transactional<T>(cb: (em: this) => Promise<T>, options?: TransactionOptions): Promise<T>;
+    transactional<T>(cb: (em: this) => T | Promise<T>, options?: TransactionOptions): Promise<T>;
     /**
      * Starts new transaction bound to this EntityManager. Use `ctx` parameter to provide the parent when nesting transactions.
      */

package/EntityManager.js

@@ -467,7 +467,7 @@ class EntityManager {
      * in database, the method returns `null`.
      */
     async refresh(entity, options = {}) {
-        const fork = this.fork();
+        const fork = this.fork({ keepTransactionContext: true });
         const entityName = entity.constructor.name;
         const reloaded = await fork.findOne(entityName, entity, {
             schema: (0, entity_1.helper)(entity).__schema,
@@ -603,7 +603,7 @@ class EntityManager {
         em.prepareOptions(options);
         let entityName;
         let where;
-        let entity;
+        let entity = null;
         if (data === undefined) {
             entityName = entityNameOrEntity.constructor.name;
             data = entityNameOrEntity;
@@ -633,9 +633,9 @@ class EntityManager {
             }
         }
         const unique = options.onConflictFields ?? meta.props.filter(p => p.unique).map(p => p.name);
-        const propIndex = unique.findIndex(p => data[p] != null);
+        const propIndex = !utils_1.Utils.isRawSql(unique) && unique.findIndex(p => data[p] != null);
         if (options.onConflictFields || where == null) {
-            if (propIndex >= 0) {
+            if (propIndex !== false && propIndex >= 0) {
                 where = { [unique[propIndex]]: data[unique[propIndex]] };
             }
             else if (meta.uniques.length > 0) {
@@ -650,11 +650,6 @@ class EntityManager {
                 }
             }
         }
-        if (where == null) {
-            const compositeUniqueProps = meta.uniques.map(u => utils_1.Utils.asArray(u.properties).join(' + '));
-            const uniqueProps = meta.primaryKeys.concat(...unique).concat(compositeUniqueProps);
-            throw new Error(`Unique property value required for upsert, provide one of: ${uniqueProps.join(', ')}`);
-        }
         data = utils_1.QueryHelper.processObjectParams(data);
         em.validator.validateParams(data, 'insert data');
         if (em.eventManager.hasListeners(enums_1.EventType.beforeUpsert, meta)) {
@@ -666,18 +661,27 @@ class EntityManager {
             convertCustomTypes,
             ...options,
         });
+        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta, true);
         entity ??= em.entityFactory.create(entityName, data, {
             refresh: true,
             initialized: true,
             schema: options.schema,
             convertCustomTypes: true,
         });
-        em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, data, ret.row, meta);
         const uniqueFields = options.onConflictFields ?? (utils_1.Utils.isPlainObject(where) ? Object.keys(where) : meta.primaryKeys);
         const returning = (0, utils_1.getOnConflictReturningFields)(meta, data, uniqueFields, options);
         if (options.onConflictAction === 'ignore' || !(0, entity_1.helper)(entity).hasPrimaryKey() || (returning.length > 0 && !(this.getPlatform().usesReturningStatement() && ret.row))) {
             const where = {};
-            uniqueFields.forEach(prop => where[prop] = data[prop]);
+            if (Array.isArray(uniqueFields)) {
+                for (const prop of uniqueFields) {
+                    if (data[prop] != null) {
+                        where[prop] = data[prop];
+                    }
+                    else if (meta.primaryKeys.includes(prop) && ret.insertId != null) {
+                        where[prop] = ret.insertId;
+                    }
+                }
+            }
             const data2 = await this.driver.findOne(meta.className, where, {
                 fields: returning,
                 ctx: em.transactionContext,
@@ -791,11 +795,6 @@ class EntityManager {
                     }
                 }
             }
-            if (where == null) {
-                const compositeUniqueProps = meta.uniques.map(u => utils_1.Utils.asArray(u.properties).join(' + '));
-                const uniqueProps = meta.primaryKeys.concat(...unique).concat(compositeUniqueProps);
-                throw new Error(`Unique property value required for upsert, provide one of: ${uniqueProps.join(', ')}`);
-            }
             row = utils_1.QueryHelper.processObjectParams(row);
             where = utils_1.QueryHelper.processWhere({
                 where,
@@ -826,13 +825,13 @@ class EntityManager {
         entitiesByData.clear();
         const loadPK = new Map();
         allData.forEach((row, i) => {
+            em.unitOfWork.getChangeSetPersister().mapReturnedValues(utils_1.Utils.isEntity(data[i]) ? data[i] : null, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta, true);
             const entity = utils_1.Utils.isEntity(data[i]) ? data[i] : em.entityFactory.create(entityName, row, {
                 refresh: true,
                 initialized: true,
                 schema: options.schema,
                 convertCustomTypes: true,
             });
-            em.unitOfWork.getChangeSetPersister().mapReturnedValues(entity, utils_1.Utils.isEntity(data[i]) ? {} : data[i], res.rows?.[i], meta);
             if (!(0, entity_1.helper)(entity).hasPrimaryKey()) {
                 loadPK.set(entity, allWhere[i]);
             }
@@ -850,14 +849,16 @@ class EntityManager {
                 utils_1.Utils.keys(cond).forEach(key => add.add(key));
             }
             const where = { $or: [] };
-            data.forEach((item, idx) => {
-                where.$or[idx] = {};
-                uniqueFields.forEach(prop => {
-                    where.$or[idx][prop] = item[prop];
+            if (Array.isArray(uniqueFields)) {
+                data.forEach((item, idx) => {
+                    where.$or[idx] = {};
+                    uniqueFields.forEach(prop => {
+                        where.$or[idx][prop] = item[prop];
+                    });
                 });
-            });
+            }
             const data2 = await this.driver.find(meta.className, where, {
-                fields: returning.concat(...add).concat(...uniqueFields),
+                fields: returning.concat(...add).concat(...(Array.isArray(uniqueFields) ? uniqueFields : [])),
                 ctx: em.transactionContext,
                 convertCustomTypes: true,
                 connectionType: 'write',
@@ -878,7 +879,7 @@ class EntityManager {
                 }
                 em.getHydrator().hydrate(entity, meta, row, em.entityFactory, 'full');
             }
-            if (loadPK.size !== data2.length) {
+            if (loadPK.size !== data2.length && Array.isArray(uniqueFields)) {
                 for (let i = 0; i < allData.length; i++) {
                     const data = allData[i];
                     const cond = uniqueFields.reduce((a, b) => {
@@ -1497,6 +1498,7 @@ class EntityManager {
         await this.entityLoader.populate(meta.className, [entity], preparedPopulate, {
             ...options,
             ...this.getPopulateWhere(where, options),
+            orderBy: options.populateOrderBy ?? options.orderBy,
             convertCustomTypes: false,
             ignoreLazyScalarProperties: true,
             lookup: false,

package/decorators/Check.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Check = void 0;
+exports.Check = Check;
 const metadata_1 = require("../metadata");
 const Utils_1 = require("../utils/Utils");
 function Check(options) {
@@ -14,4 +14,3 @@ function Check(options) {
         return Utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.Check = Check;

package/decorators/CreateRequestContext.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EnsureRequestContext = exports.CreateRequestContext = void 0;
+exports.CreateRequestContext = CreateRequestContext;
+exports.EnsureRequestContext = EnsureRequestContext;
 const MikroORM_1 = require("../MikroORM");
 const RequestContext_1 = require("../utils/RequestContext");
 const EntityManager_1 = require("../EntityManager");
@@ -47,8 +48,6 @@ function CreateRequestContext(getContext, respectExistingContext = false) {
         return descriptor;
     };
 }
-exports.CreateRequestContext = CreateRequestContext;
 function EnsureRequestContext(getContext) {
     return CreateRequestContext(getContext, true);
 }
-exports.EnsureRequestContext = EnsureRequestContext;

package/decorators/Embeddable.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Embeddable = void 0;
+exports.Embeddable = Embeddable;
 const metadata_1 = require("../metadata");
 function Embeddable(options = {}) {
     return function (target) {
@@ -12,4 +12,3 @@ function Embeddable(options = {}) {
         return target;
     };
 }
-exports.Embeddable = Embeddable;

package/decorators/Embedded.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Embedded = void 0;
+exports.Embedded = Embedded;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
@@ -18,4 +18,3 @@ function Embedded(type = {}, options = {}) {
         return utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.Embedded = Embedded;

package/decorators/Entity.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Entity = void 0;
+exports.Entity = Entity;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 function Entity(options = {}) {
@@ -14,4 +14,3 @@ function Entity(options = {}) {
         return target;
     };
 }
-exports.Entity = Entity;

package/decorators/Enum.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Enum = void 0;
+exports.Enum = Enum;
 const metadata_1 = require("../metadata");
 const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
@@ -17,4 +17,3 @@ function Enum(options = {}) {
         return Utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.Enum = Enum;

package/decorators/Filter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Filter = void 0;
+exports.Filter = Filter;
 const metadata_1 = require("../metadata");
 function Filter(options) {
     return function (target) {
@@ -9,4 +9,3 @@ function Filter(options) {
         return target;
     };
 }
-exports.Filter = Filter;

package/decorators/Formula.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Formula = void 0;
+exports.Formula = Formula;
 const metadata_1 = require("../metadata");
 const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
@@ -16,4 +16,3 @@ function Formula(formula, options = {}) {
         return Utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.Formula = Formula;

package/decorators/Indexed.d.ts

@@ -1,7 +1,7 @@
-import type { Dictionary } from '../typings';
+import type { AnyEntity, Dictionary } from '../typings';
 import type { DeferMode } from '../enums';
-export declare function Index<T>(options?: IndexOptions<T>): (target: Partial<any>, propertyName?: string | undefined) => any;
-export declare function Unique<T>(options?: UniqueOptions<T>): (target: Partial<any>, propertyName?: string | undefined) => any;
+export declare function Index<T>(options?: IndexOptions<T>): (target: AnyEntity, propertyName?: string) => any;
+export declare function Unique<T>(options?: UniqueOptions<T>): (target: AnyEntity, propertyName?: string) => any;
 interface BaseOptions<T> {
     name?: string;
     properties?: keyof T | (keyof T)[];

package/decorators/Indexed.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Unique = exports.Index = void 0;
+exports.Index = Index;
+exports.Unique = Unique;
 const metadata_1 = require("../metadata");
 const Utils_1 = require("../utils/Utils");
 function createDecorator(options, unique) {
@@ -18,8 +19,6 @@ function createDecorator(options, unique) {
 function Index(options = {}) {
     return createDecorator(options, false);
 }
-exports.Index = Index;
 function Unique(options = {}) {
     return createDecorator(options, true);
 }
-exports.Unique = Unique;

package/decorators/ManyToMany.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManyToMany = void 0;
+exports.ManyToMany = ManyToMany;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
@@ -14,4 +14,3 @@ function ManyToMany(entity, mappedBy, options = {}) {
         return utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.ManyToMany = ManyToMany;

package/decorators/ManyToOne.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManyToOne = void 0;
+exports.ManyToOne = ManyToOne;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
@@ -14,4 +14,3 @@ function ManyToOne(entity = {}, options = {}) {
         return utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.ManyToOne = ManyToOne;

package/decorators/OneToMany.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OneToMany = exports.createOneToDecorator = void 0;
+exports.createOneToDecorator = createOneToDecorator;
+exports.OneToMany = OneToMany;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
@@ -14,8 +15,6 @@ function createOneToDecorator(entity, mappedBy, options, kind) {
         return utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.createOneToDecorator = createOneToDecorator;
 function OneToMany(entity, mappedBy, options = {}) {
     return createOneToDecorator(entity, mappedBy, options, enums_1.ReferenceKind.ONE_TO_MANY);
 }
-exports.OneToMany = OneToMany;

package/decorators/OneToOne.d.ts

@@ -1,7 +1,7 @@
 import { type DeferMode } from '../enums';
 import { type OneToManyOptions } from './OneToMany';
 import type { AnyString, EntityName } from '../typings';
-export declare function OneToOne<Target, Owner>(entity?: OneToOneOptions<Owner, Target> | string | ((e: Owner) => EntityName<Target>), mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target>>, options?: Partial<OneToOneOptions<Owner, Target>>): (target: Partial<any>, propertyName: string) => any;
+export declare function OneToOne<Target, Owner>(entity?: OneToOneOptions<Owner, Target> | string | ((e: Owner) => EntityName<Target>), mappedByOrOptions?: (string & keyof Target) | ((e: Target) => any) | Partial<OneToOneOptions<Owner, Target>>, options?: Partial<OneToOneOptions<Owner, Target>>): (target: import("../typings").AnyEntity, propertyName: string) => any;
 export interface OneToOneOptions<Owner, Target> extends Partial<Omit<OneToManyOptions<Owner, Target>, 'orderBy'>> {
     owner?: boolean;
     inversedBy?: (string & keyof Target) | ((e: Target) => any);

package/decorators/OneToOne.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OneToOne = void 0;
+exports.OneToOne = OneToOne;
 const enums_1 = require("../enums");
 const OneToMany_1 = require("./OneToMany");
 function OneToOne(entity, mappedByOrOptions, options = {}) {
@@ -8,4 +8,3 @@ function OneToOne(entity, mappedByOrOptions, options = {}) {
     options = typeof mappedByOrOptions === 'object' ? { ...mappedByOrOptions, ...options } : options;
     return (0, OneToMany_1.createOneToDecorator)(entity, mappedBy, options, enums_1.ReferenceKind.ONE_TO_ONE);
 }
-exports.OneToOne = OneToOne;

package/decorators/PrimaryKey.d.ts

@@ -1,6 +1,7 @@
 import type { PropertyOptions } from './Property';
-export declare function PrimaryKey<T extends object>(options?: PrimaryKeyOptions<T>): (target: Partial<any>, propertyName: string) => any;
-export declare function SerializedPrimaryKey<T extends object>(options?: SerializedPrimaryKeyOptions<T>): (target: Partial<any>, propertyName: string) => any;
+import type { AnyEntity } from '../typings';
+export declare function PrimaryKey<T extends object>(options?: PrimaryKeyOptions<T>): (target: AnyEntity, propertyName: string) => any;
+export declare function SerializedPrimaryKey<T extends object>(options?: SerializedPrimaryKeyOptions<T>): (target: AnyEntity, propertyName: string) => any;
 export interface PrimaryKeyOptions<T> extends PropertyOptions<T> {
 }
 export interface SerializedPrimaryKeyOptions<T> extends PropertyOptions<T> {

package/decorators/PrimaryKey.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SerializedPrimaryKey = exports.PrimaryKey = void 0;
+exports.PrimaryKey = PrimaryKey;
+exports.SerializedPrimaryKey = SerializedPrimaryKey;
 const metadata_1 = require("../metadata");
 const enums_1 = require("../enums");
 const Utils_1 = require("../utils/Utils");
@@ -17,8 +18,6 @@ function createDecorator(options, serialized) {
 function PrimaryKey(options = {}) {
     return createDecorator(options, false);
 }
-exports.PrimaryKey = PrimaryKey;
 function SerializedPrimaryKey(options = {}) {
     return createDecorator(options, true);
 }
-exports.SerializedPrimaryKey = SerializedPrimaryKey;

package/decorators/Property.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Property = void 0;
+exports.Property = Property;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
@@ -32,4 +32,3 @@ function Property(options = {}) {
         return utils_1.Utils.propertyDecoratorReturnValue();
     };
 }
-exports.Property = Property;

package/decorators/hooks.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AfterDelete = exports.BeforeDelete = exports.OnLoad = exports.OnInit = exports.AfterUpsert = exports.BeforeUpsert = exports.AfterUpdate = exports.BeforeUpdate = exports.AfterCreate = exports.BeforeCreate = void 0;
+exports.BeforeCreate = BeforeCreate;
+exports.AfterCreate = AfterCreate;
+exports.BeforeUpdate = BeforeUpdate;
+exports.AfterUpdate = AfterUpdate;
+exports.BeforeUpsert = BeforeUpsert;
+exports.AfterUpsert = AfterUpsert;
+exports.OnInit = OnInit;
+exports.OnLoad = OnLoad;
+exports.BeforeDelete = BeforeDelete;
+exports.AfterDelete = AfterDelete;
 const metadata_1 = require("../metadata");
 const enums_1 = require("../enums");
 function hook(type) {
@@ -15,46 +24,36 @@ function hook(type) {
 function BeforeCreate() {
     return hook(enums_1.EventType.beforeCreate);
 }
-exports.BeforeCreate = BeforeCreate;
 function AfterCreate() {
     return hook(enums_1.EventType.afterCreate);
 }
-exports.AfterCreate = AfterCreate;
 function BeforeUpdate() {
     return hook(enums_1.EventType.beforeUpdate);
 }
-exports.BeforeUpdate = BeforeUpdate;
 function AfterUpdate() {
     return hook(enums_1.EventType.afterUpdate);
 }
-exports.AfterUpdate = AfterUpdate;
 function BeforeUpsert() {
     return hook(enums_1.EventType.beforeUpsert);
 }
-exports.BeforeUpsert = BeforeUpsert;
 function AfterUpsert() {
     return hook(enums_1.EventType.afterUpsert);
 }
-exports.AfterUpsert = AfterUpsert;
 function OnInit() {
     return hook(enums_1.EventType.onInit);
 }
-exports.OnInit = OnInit;
 function OnLoad() {
     return hook(enums_1.EventType.onLoad);
 }
-exports.OnLoad = OnLoad;
 /**
  * Called before deleting entity, but only when providing initialized entity to EM#remove()
  */
 function BeforeDelete() {
     return hook(enums_1.EventType.beforeDelete);
 }
-exports.BeforeDelete = BeforeDelete;
 /**
  * Called after deleting entity, but only when providing initialized entity to EM#remove()
  */
 function AfterDelete() {
     return hook(enums_1.EventType.afterDelete);
 }
-exports.AfterDelete = AfterDelete;

package/drivers/DatabaseDriver.js

@@ -204,7 +204,7 @@ class DatabaseDriver {
                 const copy = data[k];
                 delete data[k];
                 if (prop.array) {
-                    data[prop.fieldNames[0]] = copy.map((item) => this.mapDataToFieldNames(item, stringifyJsonArrays, prop.embeddedProps, convertCustomTypes, true));
+                    data[prop.fieldNames[0]] = copy?.map((item) => this.mapDataToFieldNames(item, stringifyJsonArrays, prop.embeddedProps, convertCustomTypes, true));
                 }
                 else {
                     data[prop.fieldNames[0]] = this.mapDataToFieldNames(copy, stringifyJsonArrays, prop.embeddedProps, convertCustomTypes, true);

package/drivers/IDatabaseDriver.d.ts

@@ -8,6 +8,7 @@ import type { EntityManager } from '../EntityManager';
 import type { DriverException } from '../exceptions';
 import type { Configuration } from '../utils/Configuration';
 import type { LoggingOptions, LogContext } from '../logging';
+import type { RawQueryFragment } from '../utils/RawQueryFragment';
 export declare const EntityManagerType: unique symbol;
 export interface IDatabaseDriver<C extends Connection = Connection> {
     [EntityManagerType]: EntityManager<this>;
@@ -139,7 +140,7 @@ export interface NativeInsertUpdateManyOptions<T> extends NativeInsertUpdateOpti
     processCollections?: boolean;
 }
 export interface UpsertOptions<Entity> extends Omit<NativeInsertUpdateOptions<Entity>, 'upsert'> {
-    onConflictFields?: (keyof Entity)[];
+    onConflictFields?: (keyof Entity)[] | RawQueryFragment;
     onConflictAction?: 'ignore' | 'merge';
     onConflictMergeFields?: (keyof Entity)[];
     onConflictExcludeFields?: (keyof Entity)[];

package/entity/ArrayCollection.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { inspect } from 'util';
 import type { EntityDTO, EntityProperty, IPrimaryKey, Primary } from '../typings';
 import { Reference } from './Reference';

package/entity/EntityIdentifier.d.ts

@@ -4,7 +4,7 @@ import type { IPrimaryKey } from '../typings';
  */
 export declare class EntityIdentifier {
     private value?;
-    constructor(value?: import("../typings").IPrimaryKeyValue | undefined);
+    constructor(value?: IPrimaryKey | undefined);
     setValue(value: IPrimaryKey): void;
     getValue<T extends IPrimaryKey = IPrimaryKey>(): T;
 }

package/entity/EntityLoader.js

@@ -51,6 +51,9 @@ class EntityLoader {
         for (const pop of populate) {
             await this.populateField(entityName, entities, pop, options);
         }
+        for (const entity of entities) {
+            visited.delete(entity);
+        }
     }
     normalizePopulate(entityName, populate, strategy, lookup = true) {
         const meta = this.metadata.find(entityName);

package/entity/Reference.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { inspect } from 'util';
 import type { AddEager, Dictionary, EntityClass, EntityKey, EntityProperty, Loaded, LoadedReference, Primary, Ref } from '../typings';
 import type { FindOneOptions, FindOneOrFailOptions } from '../drivers/IDatabaseDriver';

package/entity/Reference.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Ref = exports.rel = exports.ref = exports.ScalarReference = exports.Reference = void 0;
+exports.Ref = exports.ScalarReference = exports.Reference = void 0;
+exports.ref = ref;
+exports.rel = rel;
 const util_1 = require("util");
 const enums_1 = require("../enums");
 const wrap_1 = require("./wrap");
@@ -77,11 +79,14 @@ class Reference {
      * the method returns `null`. Use `loadOrFail()` if you want an error to be thrown in such a case.
      */
     async load(options = {}) {
+        const wrapped = (0, wrap_1.helper)(this.entity);
+        if (!wrapped.__em) {
+            return this.entity;
+        }
+        if (this.isInitialized() && !options.refresh && options.populate) {
+            await wrapped.__em.populate(this.entity, options.populate, options);
+        }
         if (!this.isInitialized() || options.refresh) {
-            const wrapped = (0, wrap_1.helper)(this.entity);
-            if (!wrapped.__em) {
-                return this.entity;
-            }
             if (options.dataloader ?? [enums_1.DataloaderType.ALL, enums_1.DataloaderType.REFERENCE].includes(utils_1.DataloaderUtils.getDataloaderType(wrapped.__em.config.get('dataloader')))) {
                 // eslint-disable-next-line dot-notation
                 return wrapped.__em['refLoader'].load([this, options]);
@@ -229,7 +234,6 @@ function ref(entityOrType, pk) {
     }
     return Reference.createFromPK(entityOrType, pk);
 }
-exports.ref = ref;
 /**
  * shortcut for `Reference.createNakedFromPK(entityType, pk)`
  */
@@ -239,4 +243,3 @@ function rel(entityType, pk) {
     }
     return Reference.createNakedFromPK(entityType, pk);
 }
-exports.rel = rel;

package/entity/WrappedEntity.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { PopulatePath } from '../enums';
 import { inspect } from 'util';
 import type { EntityManager } from '../EntityManager';

package/entity/wrap.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.helper = exports.wrap = void 0;
+exports.wrap = wrap;
+exports.helper = helper;
 /**
  * wraps entity type with WrappedEntity internal properties and helpers like init/isInitialized/populated/toJSON
  * use `preferHelper = true` to have access to the internal `__` properties like `__meta` or `__em`
@@ -14,7 +15,6 @@ function wrap(entity, preferHelper = false) {
     }
     return entity.__helper ?? entity;
 }
-exports.wrap = wrap;
 /**
  * wraps entity type with WrappedEntity internal properties and helpers like init/isInitialized/populated/toJSON
  * use `preferHelper = true` to have access to the internal `__` properties like `__meta` or `__em`
@@ -23,4 +23,3 @@ exports.wrap = wrap;
 function helper(entity) {
     return entity.__helper;
 }
-exports.helper = helper;

package/events/TransactionEventBroadcaster.d.ts

@@ -6,11 +6,11 @@ export declare class TransactionEventBroadcaster {
     private readonly em;
     private readonly uow?;
     readonly context?: {
-        topLevelTransaction?: boolean | undefined;
+        topLevelTransaction?: boolean;
     } | undefined;
     private readonly eventManager;
     constructor(em: EntityManager, uow?: UnitOfWork | undefined, context?: {
-        topLevelTransaction?: boolean | undefined;
+        topLevelTransaction?: boolean;
     } | undefined);
     dispatchEvent(event: TransactionEventType, transaction?: Transaction): Promise<void>;
     isTopLevel(): boolean;

package/metadata/MetadataDiscovery.js

@@ -109,7 +109,7 @@ class MetadataDiscovery {
                 }
             }
         }
-        filtered.forEach(meta => Object.values(meta.properties).forEach(prop => this.initIndexes(prop)));
+        filtered.forEach(meta => Object.values(meta.properties).forEach(prop => this.initIndexes(meta, prop)));
         filtered.forEach(meta => this.autoWireBidirectionalProperties(meta));
         filtered.forEach(meta => this.findReferencingProperties(meta, filtered));
         for (const meta of filtered) {
@@ -1204,8 +1204,9 @@ class MetadataDiscovery {
         }
         prop.unsigned ??= (prop.primary || prop.unsigned) && this.isNumericProperty(prop) && this.platform.supportsUnsigned();
     }
-    initIndexes(prop) {
-        if (prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && this.platform.indexForeignKeys()) {
+    initIndexes(meta, prop) {
+        const hasIndex = meta.indexes.some(idx => idx.properties?.length === 1 && idx.properties[0] === prop.name);
+        if (prop.kind === enums_1.ReferenceKind.MANY_TO_ONE && this.platform.indexForeignKeys() && !hasIndex) {
             prop.index ??= true;
         }
     }