@mikro-orm/core 7.0.0-dev.99 → 7.0.0-rc.1

package/utils/AbstractSchemaGenerator.js

@@ -40,7 +40,7 @@ export class AbstractSchemaGenerator {
     }
     async clear(options) {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
-            await this.driver.nativeDelete(meta.className, {}, options);
+            await this.driver.nativeDelete(meta.class, {}, options);
         }
         if (options?.clearIdentityMap ?? true) {
             this.clearIdentityMap();
@@ -90,21 +90,30 @@ export class AbstractSchemaGenerator {
         this.notImplemented();
     }
     getOrderedMetadata(schema) {
-        const metadata = Object.values(this.metadata.getAll()).filter(meta => {
-            const isRootEntity = meta.root.className === meta.className;
-            return isRootEntity && !meta.embeddable && !meta.virtual;
+        const metadata = [...this.metadata.getAll().values()].filter(meta => {
+            const isRootEntity = meta.root.class === meta.class;
+            const isTPTChild = meta.inheritanceType === 'tpt' && meta.tptParent;
+            return (isRootEntity || isTPTChild) && !meta.embeddable && !meta.virtual;
         });
         const calc = new CommitOrderCalculator();
-        metadata.forEach(meta => calc.addNode(meta.root.className));
+        metadata.forEach(meta => {
+            const nodeId = meta.inheritanceType === 'tpt' && meta.tptParent ? meta._id : meta.root._id;
+            calc.addNode(nodeId);
+        });
         let meta = metadata.pop();
         while (meta) {
-            for (const prop of meta.props) {
-                calc.discoverProperty(prop, meta.root.className);
+            const nodeId = meta.inheritanceType === 'tpt' && meta.tptParent ? meta._id : meta.root._id;
+            for (const prop of meta.relations) {
+                calc.discoverProperty(prop, nodeId);
+            }
+            if (meta.inheritanceType === 'tpt' && meta.tptParent) {
+                const parentId = meta.tptParent._id;
+                calc.addDependency(parentId, nodeId, 1);
             }
             meta = metadata.pop();
         }
         return calc.sort()
-            .map(cls => this.metadata.find(cls))
+            .map(cls => this.metadata.getById(cls))
             .filter(meta => {
             const targetSchema = meta.schema ?? this.config.get('schema', this.platform.getDefaultSchemaName());
             return schema ? [schema, '*'].includes(targetSchema) : meta.schema !== '*';

package/utils/AsyncContext.d.ts

@@ -0,0 +1,6 @@
+export interface AsyncContext<T> {
+    getStore(): T | undefined;
+    run<R>(store: T, callback: () => R): R;
+    enterWith(store: T): void;
+}
+export declare function createAsyncContext<T>(): AsyncContext<T>;

package/utils/AsyncContext.js

@@ -0,0 +1,42 @@
+function getNodeAsyncContext() {
+    const mod = globalThis.process?.getBuiltinModule?.('node:async_hooks');
+    /* v8 ignore next */
+    if (!mod?.AsyncLocalStorage) {
+        throw new Error('AsyncLocalStorage not available');
+    }
+    return new mod.AsyncLocalStorage();
+}
+/* v8 ignore next */
+function createFallbackAsyncContext() {
+    let store;
+    // eslint-disable-next-line no-console
+    console.warn('AsyncLocalStorage not available');
+    return {
+        getStore: () => store,
+        enterWith: value => store = value,
+        run: (value, cb) => {
+            const prev = store;
+            store = value;
+            try {
+                return cb();
+            }
+            finally {
+                store = prev;
+            }
+        },
+    };
+}
+export function createAsyncContext() {
+    /* v8 ignore next */
+    const ALS = globalThis.AsyncLocalStorage;
+    /* v8 ignore next */
+    if (typeof ALS === 'function' && ALS.prototype?.run) {
+        return new ALS();
+    }
+    /* v8 ignore else */
+    if (globalThis.process?.versions?.node) {
+        return getNodeAsyncContext();
+    }
+    /* v8 ignore next */
+    return createFallbackAsyncContext();
+}

package/utils/Configuration.d.ts

@@ -1,7 +1,7 @@
 import type { NamingStrategy } from '../naming-strategy/NamingStrategy.js';
 import { type CacheAdapter, type SyncCacheAdapter } from '../cache/CacheAdapter.js';
 import type { EntityRepository } from '../entity/EntityRepository.js';
-import type { AnyEntity, Constructor, Dictionary, EnsureDatabaseOptions, EntityClass, EntityMetadata, FilterDef, GenerateOptions, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, Migration, MigrationObject } from '../typings.js';
+import type { AnyEntity, CompiledFunctions, Constructor, Dictionary, EnsureDatabaseOptions, EntityClass, EntityMetadata, FilterDef, GenerateOptions, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, Migration, MigrationObject } from '../typings.js';
 import { ObjectHydrator } from '../hydration/ObjectHydrator.js';
 import { NullHighlighter } from '../utils/NullHighlighter.js';
 import { type Logger, type LoggerNamespace, type LoggerOptions } from '../logging/Logger.js';
@@ -35,7 +35,7 @@ declare const DEFAULTS: {
         readonly inferDefaultValues: true;
     };
     readonly validateRequired: true;
-    readonly context: (name: string) => EntityManager<IDatabaseDriver<import("@mikro-orm/sql").Connection>> | undefined;
+    readonly context: (name: string) => EntityManager<IDatabaseDriver<import("../index.js").Connection>> | undefined;
     readonly contextName: "default";
     readonly allowGlobalContext: false;
     readonly logger: (message?: any, ...optionalParams: any[]) => void;
@@ -69,6 +69,7 @@ declare const DEFAULTS: {
     readonly upsertManaged: true;
     readonly forceEntityConstructor: false;
     readonly forceUndefined: false;
+    readonly forceUtcTimezone: true;
     readonly processOnCreateHooksEarly: true;
     readonly ensureDatabase: true;
     readonly ensureIndexes: false;
@@ -82,7 +83,6 @@ declare const DEFAULTS: {
         readonly glob: "!(*.d).{js,ts,cjs}";
         readonly silent: false;
         readonly transactional: true;
-        readonly disableForeignKeys: false;
         readonly allOrNothing: true;
         readonly dropTables: true;
         readonly safe: false;
@@ -91,10 +91,10 @@ declare const DEFAULTS: {
         readonly fileName: (timestamp: string, name?: string) => string;
     };
     readonly schemaGenerator: {
-        readonly disableForeignKeys: false;
         readonly createForeignKeyConstraints: true;
         readonly ignoreSchema: readonly [];
         readonly skipTables: readonly [];
+        readonly skipViews: readonly [];
         readonly skipColumns: {};
     };
     readonly embeddables: {
@@ -256,6 +256,21 @@ export interface ConnectionOptions {
     driverOptions?: Dictionary;
     /** Callback to execute when a new connection is created. */
     onCreateConnection?: (connection: unknown) => Promise<void>;
+    /**
+     * SQLite/libSQL: databases to attach on connection.
+     * Each attached database acts as a schema, accessible via `schema.table` syntax.
+     * Entities can reference attached databases via `@Entity({ schema: 'db_name' })`.
+     * Note: Not supported for remote libSQL connections.
+     * @example
+     * attachDatabases: [
+     *   { name: 'users_db', path: './users.db' },
+     *   { name: 'logs_db', path: '/var/data/logs.db' },
+     * ]
+     */
+    attachDatabases?: {
+        name: string;
+        path: string;
+    }[];
 }
 /**
  * Configuration options for database migrations.
@@ -402,11 +417,6 @@ export interface MetadataDiscoveryOptions {
      * @default true
      */
     checkDuplicateFieldNames?: boolean;
-    /**
-     * Check for duplicate entities and throw an error if found.
-     * @default true
-     */
-    checkDuplicateEntities?: boolean;
     /**
      * Check for composite primary keys marked as `persist: false` and throw an error if found.
      * @default true
@@ -628,9 +638,9 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
     processOnCreateHooksEarly?: boolean;
     /**
      * Force `Date` values to be stored in UTC for datetime columns without timezone.
-     * Works for MySQL (`datetime` type) and PostgreSQL (`timestamp` type).
+     * Works for MySQL (`datetime` type), PostgreSQL (`timestamp` type), and MSSQL (`datetime`/`datetime2` types).
      * SQLite does this by default.
-     * @default false
+     * @default true
      */
     forceUtcTimezone?: boolean;
     /**
@@ -670,6 +680,12 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
      * @default ObjectHydrator
      */
     hydrator?: HydratorConstructor;
+    /**
+     * Pre-generated compiled functions for hydration and comparison.
+     * Use the `compile` CLI command to create these functions.
+     * Enables deployment to runtimes that prohibit `new Function`/eval (e.g. Cloudflare Workers).
+     */
+    compiledFunctions?: CompiledFunctions;
     /**
      * Default loading strategy for relations.
      * - `'joined'`: Use SQL JOINs (single query, may cause cartesian product)
@@ -741,6 +757,12 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
      * @default false
      */
     allowGlobalContext?: boolean;
+    /**
+     * When enabled, environment variables take precedence over explicitly provided config options.
+     * By default, explicit options win over env vars.
+     * @default false
+     */
+    preferEnvVars?: boolean;
     /**
      * Disable the identity map.
      * When disabled, each query returns new entity instances.
@@ -824,6 +846,10 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
          * @default false
          */
         disableForeignKeys?: boolean;
+        /**
+         * Try to disable foreign key checks during `schema.clear()`. Enabled by default for MySQL/MariaDB.
+         */
+        disableForeignKeysForClear?: boolean;
         /**
          * Generate foreign key constraints.
          * @default true
@@ -839,6 +865,11 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
          * @default []
          */
         skipTables?: (string | RegExp)[];
+        /**
+         * View names or patterns to skip during schema generation (e.g. PostGIS system views).
+         * @default []
+         */
+        skipViews?: (string | RegExp)[];
         /**
          * Column names or patterns to skip during schema generation, keyed by table name.
          * @default {}
@@ -848,6 +879,16 @@ export interface Options<Driver extends IDatabaseDriver = IDatabaseDriver, EM ex
          * Database name to use for management operations (e.g., creating/dropping databases).
          */
         managementDbName?: string;
+        /**
+         * Default ON UPDATE rule for foreign keys.
+         * When not set, no rule is emitted and the database uses its native default (NO ACTION/RESTRICT).
+         */
+        defaultUpdateRule?: 'cascade' | 'no action' | 'set null' | 'set default' | 'restrict';
+        /**
+         * Default ON DELETE rule for foreign keys.
+         * When not set, no rule is emitted and the database uses its native default (NO ACTION/RESTRICT).
+         */
+        defaultDeleteRule?: 'cascade' | 'no action' | 'set null' | 'set default' | 'restrict';
     };
     /**
      * Embeddable entity configuration options.

package/utils/Configuration.js

@@ -10,6 +10,7 @@ import { RequestContext } from './RequestContext.js';
 import { DataloaderType, FlushMode, LoadStrategy, PopulateHint } from '../enums.js';
 import { MemoryCacheAdapter } from '../cache/MemoryCacheAdapter.js';
 import { EntityComparator } from './EntityComparator.js';
+import { setEnv } from './env-vars.js';
 const DEFAULTS = {
     pool: {},
     entities: [],
@@ -34,7 +35,7 @@ const DEFAULTS = {
     colors: true,
     findOneOrFailHandler: (entityName, where) => NotFoundError.findOneFailed(entityName, where),
     findExactlyOneOrFailHandler: (entityName, where) => NotFoundError.findExactlyOneFailed(entityName, where),
-    baseDir: process.cwd(),
+    baseDir: globalThis.process?.cwd?.(),
     hydrator: ObjectHydrator,
     flushMode: FlushMode.AUTO,
     loadStrategy: LoadStrategy.BALANCED,
@@ -61,6 +62,7 @@ const DEFAULTS = {
     upsertManaged: true,
     forceEntityConstructor: false,
     forceUndefined: false,
+    forceUtcTimezone: true,
     processOnCreateHooksEarly: true,
     ensureDatabase: true,
     ensureIndexes: false,
@@ -74,7 +76,6 @@ const DEFAULTS = {
         glob: '!(*.d).{js,ts,cjs}',
         silent: false,
         transactional: true,
-        disableForeignKeys: false,
         allOrNothing: true,
         dropTables: true,
         safe: false,
@@ -83,10 +84,10 @@ const DEFAULTS = {
         fileName: (timestamp, name) => `Migration${timestamp}${name ? '_' + name : ''}`,
     },
     schemaGenerator: {
-        disableForeignKeys: false,
         createForeignKeyConstraints: true,
         ignoreSchema: [],
         skipTables: [],
+        skipViews: [],
         skipColumns: {},
     },
     embeddables: {
@@ -135,10 +136,9 @@ export class Configuration {
     extensions = new Map();
     constructor(options, validate = true) {
         if (options.dynamicImportProvider) {
-            Utils.dynamicImportProvider = options.dynamicImportProvider;
+            globalThis.dynamicImportProvider = options.dynamicImportProvider;
         }
         this.options = Utils.mergeConfig({}, DEFAULTS, options);
-        this.options.baseDir = Utils.absolutePath(this.options.baseDir);
         if (validate) {
             this.validateOptions();
         }
@@ -150,6 +150,10 @@ export class Configuration {
             highlighter: this.options.highlighter,
             writer: this.options.logger,
         });
+        const cf = this.options.compiledFunctions;
+        if (cf && cf.__version !== Utils.getORMVersion()) {
+            this.logger.warn('discovery', `Compiled functions were generated with MikroORM v${cf.__version ?? 'unknown'}, but the current version is v${Utils.getORMVersion()}. Please regenerate with \`npx mikro-orm compile\`.`);
+        }
         if (this.options.driver) {
             this.driver = new this.options.driver(this);
             this.platform = this.driver.getPlatform();
@@ -240,7 +244,7 @@ export class Configuration {
      * Gets instance of Comparator. (cached)
      */
     getComparator(metadata) {
-        return this.getCachedService(EntityComparator, metadata, this.platform);
+        return this.getCachedService(EntityComparator, metadata, this.platform, this);
     }
     /**
      * Gets instance of MetadataProvider. (cached)
@@ -293,7 +297,7 @@ export class Configuration {
         metadataCache.enabled ??= useCache;
         this.options.clientUrl ??= this.platform.getDefaultClientUrl();
         this.options.implicitTransactions ??= this.platform.usesImplicitTransactions();
-        if (metadataCache.enabled && !metadataCache.adapter) {
+        if (validate && metadataCache.enabled && !metadataCache.adapter) {
             throw new Error('No metadata cache adapter specified, please fill in `metadataCache.adapter` option or use the async MikroORM.init() method which can autoload it.');
         }
         try {
@@ -328,7 +332,7 @@ export class Configuration {
         }
     }
     sync() {
-        process.env.MIKRO_ORM_COLORS = '' + this.options.colors;
+        setEnv('MIKRO_ORM_COLORS', this.options.colors);
         this.logger.setDebugMode(this.options.debug);
     }
     validateOptions() {

package/utils/Cursor.js

@@ -2,7 +2,7 @@ import { Utils } from './Utils.js';
 import { ReferenceKind } from '../enums.js';
 import { Reference } from '../entity/Reference.js';
 import { helper } from '../entity/wrap.js';
-import { RawQueryFragment } from '../utils/RawQueryFragment.js';
+import { Raw } from '../utils/RawQueryFragment.js';
 import { CursorError } from '../errors.js';
 import { inspect } from '../logging/inspect.js';
 /**
@@ -95,15 +95,22 @@ export class Cursor {
     from(entity) {
         const processEntity = (entity, prop, direction, object = false) => {
             if (Utils.isPlainObject(direction)) {
+                const unwrapped = Reference.unwrapReference(entity[prop]);
+                // Check if the relation is loaded - for nested properties, undefined means not populated
+                if (Utils.isEntity(unwrapped) && !helper(unwrapped).isInitialized()) {
+                    throw CursorError.entityNotPopulated(entity, prop);
+                }
                 return Utils.keys(direction).reduce((o, key) => {
-                    Object.assign(o, processEntity(Reference.unwrapReference(entity[prop]), key, direction[key], true));
+                    Object.assign(o, processEntity(unwrapped, key, direction[key], true));
                     return o;
                 }, {});
             }
-            if (entity[prop] == null) {
-                throw CursorError.entityNotPopulated(entity, prop);
-            }
             let value = entity[prop];
+            // Allow null/undefined values in cursor - they will be handled in createCursorCondition
+            // undefined can occur with forceUndefined config option which converts null to undefined
+            if (value == null) {
+                return object ? { [prop]: null } : null;
+            }
             if (Utils.isEntity(value, true)) {
                 value = helper(value).getPrimaryKey();
             }
@@ -131,7 +138,13 @@ export class Cursor {
      */
     static for(meta, entity, orderBy) {
         const definition = this.getDefinition(meta, orderBy);
-        return Cursor.encode(definition.map(([key]) => entity[key]));
+        return Cursor.encode(definition.map(([key]) => {
+            const value = entity[key];
+            if (value === undefined) {
+                throw CursorError.missingValue(meta.className, key);
+            }
+            return value;
+        }));
     }
     static encode(value) {
         return Buffer.from(JSON.stringify(value)).toString('base64url');
@@ -147,8 +160,8 @@ export class Cursor {
     static getDefinition(meta, orderBy) {
         return Utils.asArray(orderBy).flatMap(order => {
             const ret = [];
-            for (const key of Utils.keys(order)) {
-                if (RawQueryFragment.isKnownFragment(key)) {
+            for (const key of Utils.getObjectQueryKeys(order)) {
+                if (Raw.isKnownFragmentSymbol(key)) {
                     ret.push([key, order[key]]);
                     continue;
                 }

package/utils/DataloaderUtils.js

@@ -11,7 +11,7 @@ export class DataloaderUtils {
     static groupPrimaryKeysByEntityAndOpts(refsWithOpts) {
         const map = new Map();
         for (const [ref, opts] of refsWithOpts) {
-            /* The key is a combination of the className and a stringified version if the load options because we want
+            /* The key is a combination of the uniqueName (a unique table name based identifier) and a stringified version if the load options because we want
                to map each combination of entities/options into separate find queries in order to return accurate results.
                This could be further optimized finding the "lowest common denominator" among the different options
                for each Entity and firing a single query for each Entity instead of Entity+options combination.
@@ -24,7 +24,7 @@ export class DataloaderUtils {
                Thus such approach should probably be configurable, if not opt-in.
                NOTE: meta + opts multi maps (https://github.com/martian17/ds-js) might be a more elegant way
                to implement this but not necessarily faster.  */
-            const key = `${helper(ref).__meta.className}|${JSON.stringify(opts ?? {})}`;
+            const key = `${helper(ref).__meta.uniqueName}|${JSON.stringify(opts ?? {})}`;
             let primaryKeysSet = map.get(key);
             if (primaryKeysSet == null) {
                 primaryKeysSet = new Set();
@@ -42,9 +42,10 @@ export class DataloaderUtils {
         return async (refsWithOpts) => {
             const groupedIdsMap = DataloaderUtils.groupPrimaryKeysByEntityAndOpts(refsWithOpts);
             const promises = Array.from(groupedIdsMap).map(([key, idsSet]) => {
-                const className = key.substring(0, key.indexOf('|'));
+                const uniqueName = key.substring(0, key.indexOf('|'));
                 const opts = JSON.parse(key.substring(key.indexOf('|') + 1));
-                return em.find(className, Array.from(idsSet), opts);
+                const meta = em.getMetadata().getByUniqueName(uniqueName);
+                return em.find(meta.class, Array.from(idsSet), opts);
             });
             await Promise.all(promises);
             /* Instead of assigning each find result to the original reference we use a shortcut
@@ -70,7 +71,7 @@ export class DataloaderUtils {
             The value is another Map which we can use to filter the find query to get results pertaining to the collections that have been dataloaded:
             its keys are the props we are going to filter to and its values are the corresponding PKs.
             */
-            const key = `${col.property.targetMeta.className}|${JSON.stringify(opts ?? {})}`;
+            const key = `${col.property.targetMeta.uniqueName}|${JSON.stringify(opts ?? {})}`;
             let filterMap = entitiesMap.get(key); // We are going to use this map to filter the entities pertaining to the collections that have been dataloaded.
             if (filterMap == null) {
                 filterMap = new Map();
@@ -97,9 +98,10 @@ export class DataloaderUtils {
      */
     static entitiesAndOptsMapToQueries(entitiesAndOptsMap, em) {
         return Array.from(entitiesAndOptsMap, async ([key, filterMap]) => {
-            const className = key.substring(0, key.indexOf('|'));
+            const uniqueName = key.substring(0, key.indexOf('|'));
             const opts = JSON.parse(key.substring(key.indexOf('|') + 1));
-            const res = await em.find(className, opts?.where != null && Object.keys(opts.where).length > 0 ?
+            const meta = em.getMetadata().getByUniqueName(uniqueName);
+            const res = await em.find(meta.class, opts?.where != null && Object.keys(opts.where).length > 0 ?
                 {
                     $and: [
                         {
@@ -121,7 +123,7 @@ export class DataloaderUtils {
                     ...(opts.populate === false ? [] : opts.populate ?? []),
                     ...Array.from(filterMap.keys()).filter(
                     // We need to do so only if the inverse side is a collection, because we can already retrieve the PK from a reference without having to load it
-                    prop => em.getMetadata(className).properties[prop]?.ref !== true),
+                    prop => meta.properties[prop]?.ref !== true),
                 ],
             });
             return [key, res];
@@ -164,7 +166,7 @@ export class DataloaderUtils {
             // We need to filter the results in order to map each input collection
             // to a subset of each query matching the collection items.
             return collsWithOpts.map(([col, opts]) => {
-                const key = `${col.property.targetMeta.className}|${JSON.stringify(opts ?? {})}`;
+                const key = `${col.property.targetMeta.uniqueName}|${JSON.stringify(opts ?? {})}`;
                 const entities = resultsMap.get(key);
                 if (entities == null) {
                     // Should never happen
@@ -183,7 +185,7 @@ export class DataloaderUtils {
         return async (collsWithOpts) => {
             const groups = new Map();
             for (const [col, opts] of collsWithOpts) {
-                const key = `${col.property.targetMeta.className}.${col.property.name}|${JSON.stringify(opts ?? {})}`;
+                const key = `${col.property.targetMeta.uniqueName}.${col.property.name}|${JSON.stringify(opts ?? {})}`;
                 const value = groups.get(key) ?? [];
                 value.push([col, opts ?? {}]);
                 groups.set(key, value);
@@ -198,7 +200,7 @@ export class DataloaderUtils {
                 const owners = group.map(c => c[0].owner);
                 const $or = [];
                 // a bit of a hack, but we need to prefix the key, since we have only a column name, not a property name
-                const alias = em.config.getNamingStrategy().aliasName(prop.pivotEntity, 0);
+                const alias = em.config.getNamingStrategy().aliasName(Utils.className(prop.pivotEntity), 0);
                 const fk = `${alias}.${Utils.getPrimaryKeyHash(prop.joinColumns)}`;
                 for (const c of group) {
                     $or.push({ $and: [c[1]?.where ?? {}, { [fk]: c[0].owner }] });

package/utils/EntityComparator.d.ts

@@ -1,5 +1,6 @@
 import type { EntityData, EntityDictionary, EntityMetadata, EntityName, EntityProperty, IMetadataStorage } from '../typings.js';
 import type { Platform } from '../platforms/Platform.js';
+import type { Configuration } from './Configuration.js';
 type Comparator<T> = (a: T, b: T, options?: {
     includeInverseSides?: boolean;
 }) => EntityData<T>;
@@ -9,6 +10,7 @@ type CompositeKeyPart = string | CompositeKeyPart[];
 export declare class EntityComparator {
     private readonly metadata;
     private readonly platform;
+    private readonly config?;
     private readonly comparators;
     private readonly mappers;
     private readonly snapshotGenerators;
@@ -16,23 +18,23 @@ export declare class EntityComparator {
     private readonly pkGettersConverted;
     private readonly pkSerializers;
     private tmpIndex;
-    constructor(metadata: IMetadataStorage, platform: Platform);
+    constructor(metadata: IMetadataStorage, platform: Platform, config?: Configuration | undefined);
     /**
      * Computes difference between two entities.
      */
-    diffEntities<T>(entityName: string, a: EntityData<T>, b: EntityData<T>, options?: {
+    diffEntities<T extends object>(entityName: EntityName<T>, a: EntityData<T>, b: EntityData<T>, options?: {
         includeInverseSides?: boolean;
     }): EntityData<T>;
-    matching<T>(entityName: string, a: EntityData<T>, b: EntityData<T>): boolean;
+    matching<T extends object>(entityName: EntityName<T>, a: EntityData<T>, b: EntityData<T>): boolean;
     /**
      * Removes ORM specific code from entities and prepares it for serializing. Used before change set computation.
      * References will be mapped to primary keys, collections to arrays of primary keys.
      */
-    prepareEntity<T>(entity: T): EntityData<T>;
+    prepareEntity<T extends object>(entity: T): EntityData<T>;
     /**
      * Maps database columns to properties.
      */
-    mapResult<T>(entityName: string, result: EntityDictionary<T>): EntityData<T>;
+    mapResult<T>(meta: EntityMetadata<T>, result: EntityDictionary<T>): EntityData<T>;
     /**
      * @internal Highly performance-sensitive method.
      */
@@ -64,7 +66,7 @@ export declare class EntityComparator {
     /**
      * @internal Highly performance-sensitive method.
      */
-    getResultMapper<T>(entityName: string): ResultMapper<T>;
+    getResultMapper<T>(meta: EntityMetadata<T>): ResultMapper<T>;
     private getPropertyCondition;
     private getEmbeddedArrayPropertySnapshot;
     /**
@@ -78,11 +80,16 @@ export declare class EntityComparator {
     /**
      * @internal Highly performance-sensitive method.
      */
-    getEntityComparator<T extends object>(entityName: string): Comparator<T>;
+    getEntityComparator<T extends object>(entityName: EntityName<T>): Comparator<T>;
     private getGenericComparator;
     private getPropertyComparator;
     private wrap;
     private safeKey;
+    /**
+     * Sets the toArray helper in the context if not already set.
+     * Used for converting composite PKs to arrays.
+     */
+    private setToArrayHelper;
     /**
      * perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison
      */