@mikro-orm/core 7.0.0-dev.5 → 7.0.0-dev.50

package/unit-of-work/UnitOfWork.d.ts

@@ -28,6 +28,12 @@ export declare class UnitOfWork {
     private working;
     constructor(em: EntityManager);
     merge<T extends object>(entity: T, visited?: Set<AnyEntity>): void;
+    /**
+     * Entity data can wary in its shape, e.g. we might get a deep relation graph with joined strategy, but for diffing,
+     * we need to normalize the shape, so relation values are only raw FKs. This method handles that.
+     * @internal
+     */
+    normalizeEntityData<T extends object>(meta: EntityMetadata<T>, data: EntityData<T>): void;
     /**
      * @internal
      */
@@ -39,7 +45,7 @@ export declare class UnitOfWork {
     /**
      * Returns entity from the identity map. For composite keys, you need to pass an array of PKs in the same order as they are defined in `meta.primaryKeys`.
      */
-    getById<T extends object>(entityName: string, id: Primary<T> | Primary<T>[], schema?: string): T | undefined;
+    getById<T extends object>(entityName: string, id: Primary<T> | Primary<T>[], schema?: string, convertCustomTypes?: boolean): T | undefined;
     tryGetById<T extends object>(entityName: string, where: FilterQuery<T>, schema?: string, strict?: boolean): T | null;
     /**
      * Returns map of all managed entities.
@@ -103,6 +109,7 @@ export declare class UnitOfWork {
     private commitDeleteChangeSets;
     private commitExtraUpdates;
     private commitCollectionUpdates;
+    private filterCollectionUpdates;
     /**
      * Orders change sets so FK constrains are maintained, ensures stable order (needed for node < 11)
      */

package/unit-of-work/UnitOfWork.js

@@ -43,7 +43,7 @@ export class UnitOfWork {
         this.eventManager = this.em.getEventManager();
         this.comparator = this.em.getComparator();
         this.changeSetComputer = new ChangeSetComputer(this.em.getValidator(), this.collectionUpdates, this.metadata, this.platform, this.em.config, this.em);
-        this.changeSetPersister = new ChangeSetPersister(this.em.getDriver(), this.metadata, this.em.config.getHydrator(this.metadata), this.em.getEntityFactory(), this.em.getValidator(), this.em.config);
+        this.changeSetPersister = new ChangeSetPersister(this.em.getDriver(), this.metadata, this.em.config.getHydrator(this.metadata), this.em.getEntityFactory(), this.em.getValidator(), this.em.config, this.em);
     }
     merge(entity, visited) {
         const wrapped = helper(entity);
@@ -61,10 +61,43 @@ export class UnitOfWork {
         // as there can be some entity with already changed state that is not yet flushed
         if (wrapped.__initialized && (!visited || !wrapped.__originalEntityData)) {
             wrapped.__originalEntityData = this.comparator.prepareEntity(entity);
-            wrapped.__touched = false;
         }
         this.cascade(entity, Cascade.MERGE, visited ?? new Set());
     }
+    /**
+     * Entity data can wary in its shape, e.g. we might get a deep relation graph with joined strategy, but for diffing,
+     * we need to normalize the shape, so relation values are only raw FKs. This method handles that.
+     * @internal
+     */
+    normalizeEntityData(meta, data) {
+        const forceUndefined = this.em.config.get('forceUndefined');
+        for (const key of Utils.keys(data)) {
+            const prop = meta.properties[key];
+            if (!prop) {
+                continue;
+            }
+            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(data[prop.name])) {
+                data[prop.name] = Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta, true);
+            }
+            else if (prop.kind === ReferenceKind.EMBEDDED && !prop.object && Utils.isPlainObject(data[prop.name])) {
+                for (const p of prop.targetMeta.props) {
+                    /* v8 ignore next */
+                    const prefix = prop.prefix === false ? '' : prop.prefix === true ? prop.name + '_' : prop.prefix;
+                    data[prefix + p.name] = data[prop.name][p.name];
+                }
+                data[prop.name] = Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta, true);
+            }
+            if (prop.hydrate === false && prop.customType?.ensureComparable(meta, prop)) {
+                const converted = prop.customType.convertToJSValue(data[key], this.platform, { key, mode: 'hydration', force: true });
+                data[key] = prop.customType.convertToDatabaseValue(converted, this.platform, { key, mode: 'hydration' });
+            }
+            if (forceUndefined) {
+                if (data[key] === null) {
+                    data[key] = undefined;
+                }
+            }
+        }
+    }
     /**
      * @internal
      */
@@ -82,31 +115,14 @@ export class UnitOfWork {
         wrapped.__em ??= this.em;
         wrapped.__managed = true;
         if (data && (options?.refresh || !wrapped.__originalEntityData)) {
+            this.normalizeEntityData(wrapped.__meta, data);
             for (const key of Utils.keys(data)) {
                 const prop = wrapped.__meta.properties[key];
-                if (!prop) {
-                    continue;
-                }
-                wrapped.__loadedProperties.add(key);
-                if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(data[prop.name])) {
-                    data[prop.name] = Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta.primaryKeys, true);
-                }
-                else if (prop.kind === ReferenceKind.EMBEDDED && !prop.object && Utils.isPlainObject(data[prop.name])) {
-                    for (const p of prop.targetMeta.props) {
-                        /* v8 ignore next */
-                        const prefix = prop.prefix === false ? '' : prop.prefix === true ? prop.name + '_' : prop.prefix;
-                        data[prefix + p.name] = data[prop.name][p.name];
-                    }
-                    data[prop.name] = Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta.primaryKeys, true);
-                }
-                if (forceUndefined) {
-                    if (data[key] === null) {
-                        data[key] = undefined;
-                    }
+                if (prop) {
+                    wrapped.__loadedProperties.add(key);
                 }
             }
             wrapped.__originalEntityData = data;
-            wrapped.__touched = false;
         }
         return entity;
     }
@@ -125,7 +141,7 @@ export class UnitOfWork {
     /**
      * Returns entity from the identity map. For composite keys, you need to pass an array of PKs in the same order as they are defined in `meta.primaryKeys`.
      */
-    getById(entityName, id, schema) {
+    getById(entityName, id, schema, convertCustomTypes) {
         if (id == null || (Array.isArray(id) && id.length === 0)) {
             return undefined;
         }
@@ -135,7 +151,16 @@ export class UnitOfWork {
             hash = '' + id;
         }
         else {
-            const keys = Array.isArray(id) ? Utils.flatten(id) : [id];
+            let keys = Array.isArray(id) ? Utils.flatten(id) : [id];
+            keys = meta.getPrimaryProps(true).map((p, i) => {
+                if (!convertCustomTypes && p.customType) {
+                    return p.customType.convertToDatabaseValue(keys[i], this.platform, {
+                        key: p.name,
+                        mode: 'hydration',
+                    });
+                }
+                return keys[i];
+            });
             hash = Utils.getPrimaryKeyHash(keys);
         }
         schema ??= meta.schema ?? this.em.config.getSchema();
@@ -185,10 +210,8 @@ export class UnitOfWork {
         if (this.queuedActions.has(meta.className) || this.queuedActions.has(meta.root.className)) {
             return true;
         }
-        for (const entity of this.identityMap.getStore(meta).values()) {
-            if (helper(entity).__initialized && helper(entity).isTouched()) {
-                return true;
-            }
+        if (meta.discriminatorMap && Object.values(meta.discriminatorMap).some(v => this.queuedActions.has(v))) {
+            return true;
         }
         return false;
     }
@@ -209,7 +232,6 @@ export class UnitOfWork {
         this.changeSets.set(entity, cs);
         this.persistStack.delete(entity);
         wrapped.__originalEntityData = this.comparator.prepareEntity(entity);
-        wrapped.__touched = false;
     }
     recomputeSingleChangeSet(entity) {
         const changeSet = this.changeSets.get(entity);
@@ -220,7 +242,6 @@ export class UnitOfWork {
         if (cs && !this.checkUniqueProps(cs)) {
             Object.assign(changeSet.payload, cs.payload);
             helper(entity).__originalEntityData = this.comparator.prepareEntity(entity);
-            helper(entity).__touched = false;
         }
     }
     persist(entity, visited, options = {}) {
@@ -303,6 +324,7 @@ export class UnitOfWork {
                 cs.entity.__helper.__processing = true;
             }
             await this.eventManager.dispatchEvent(EventType.onFlush, { em: this.em, uow: this });
+            this.filterCollectionUpdates();
             // nothing to do, do not start transaction
             if (this.changeSets.size === 0 && this.collectionUpdates.size === 0 && this.extraUpdates.size === 0) {
                 return void (await this.eventManager.dispatchEvent(EventType.afterFlush, { em: this.em, uow: this }));
@@ -311,9 +333,11 @@ export class UnitOfWork {
             const platform = this.em.getPlatform();
             const runInTransaction = !this.em.isInTransaction() && platform.supportsTransactions() && this.em.config.get('implicitTransactions');
             if (runInTransaction) {
+                const loggerContext = Utils.merge({ id: this.em._id }, this.em.getLoggerContext({ disableContextResolution: true }));
                 await this.em.getConnection('write').transactional(trx => this.persistToDatabase(groups, trx), {
                     ctx: oldTx,
                     eventBroadcaster: new TransactionEventBroadcaster(this.em),
+                    loggerContext,
                 });
             }
             else {
@@ -369,7 +393,6 @@ export class UnitOfWork {
         }
         delete wrapped.__identifier;
         delete wrapped.__originalEntityData;
-        wrapped.__touched = false;
         wrapped.__managed = false;
     }
     computeChangeSets() {
@@ -379,14 +402,14 @@ export class UnitOfWork {
             this.cascade(entity, Cascade.REMOVE, visited);
         }
         visited.clear();
-        for (const entity of this.persistStack) {
-            this.cascade(entity, Cascade.PERSIST, visited, { checkRemoveStack: true });
-        }
         for (const entity of this.identityMap) {
             if (!this.removeStack.has(entity) && !this.persistStack.has(entity) && !this.orphanRemoveStack.has(entity)) {
                 this.cascade(entity, Cascade.PERSIST, visited, { checkRemoveStack: true });
             }
         }
+        for (const entity of this.persistStack) {
+            this.cascade(entity, Cascade.PERSIST, visited, { checkRemoveStack: true });
+        }
         visited.clear();
         for (const entity of this.persistStack) {
             this.findNewEntities(entity, visited);
@@ -542,13 +565,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 +632,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() {
@@ -825,9 +864,16 @@ export class UnitOfWork {
         }
         await this.changeSetPersister.executeUpdates(changeSets, batched, { ctx });
         for (const changeSet of changeSets) {
-            helper(changeSet.entity).__originalEntityData = this.comparator.prepareEntity(changeSet.entity);
-            helper(changeSet.entity).__touched = false;
-            helper(changeSet.entity).__initialized = true;
+            const wrapped = helper(changeSet.entity);
+            wrapped.__originalEntityData = this.comparator.prepareEntity(changeSet.entity);
+            if (!wrapped.__initialized) {
+                for (const prop of changeSet.meta.relations) {
+                    if ([ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(prop.kind) && changeSet.entity[prop.name] == null) {
+                        changeSet.entity[prop.name] = Collection.create(changeSet.entity, prop.name, undefined, wrapped.isInitialized());
+                    }
+                }
+                wrapped.__initialized = true;
+            }
             await this.runHooks(EventType.afterUpdate, changeSet);
         }
     }
@@ -870,23 +916,34 @@ export class UnitOfWork {
         }
     }
     async commitCollectionUpdates(ctx) {
-        const collectionUpdates = [];
+        this.filterCollectionUpdates();
+        const loggerContext = Utils.merge({ id: this.em._id }, this.em.getLoggerContext({ disableContextResolution: true }));
+        await this.em.getDriver().syncCollections(this.collectionUpdates, {
+            ctx,
+            schema: this.em.schema,
+            loggerContext,
+        });
+        for (const coll of this.collectionUpdates) {
+            coll.takeSnapshot();
+        }
+    }
+    filterCollectionUpdates() {
         for (const coll of this.collectionUpdates) {
+            let skip = true;
             if (coll.property.owner || coll.getItems(false).filter(item => !item.__helper.__initialized).length > 0) {
                 if (this.platform.usesPivotTable()) {
-                    collectionUpdates.push(coll);
+                    skip = false;
                 }
             }
             else if (coll.property.kind === ReferenceKind.ONE_TO_MANY && coll.getSnapshot() === undefined) {
-                collectionUpdates.push(coll);
+                skip = false;
             }
             else if (coll.property.kind === ReferenceKind.MANY_TO_MANY && !coll.property.owner) {
-                collectionUpdates.push(coll);
+                skip = false;
+            }
+            if (skip) {
+                this.collectionUpdates.delete(coll);
             }
-        }
-        await this.em.getDriver().syncCollections(collectionUpdates, { ctx, schema: this.em.schema });
-        for (const coll of this.collectionUpdates) {
-            coll.takeSnapshot();
         }
     }
     /**

package/utils/AbstractSchemaGenerator.js

@@ -42,7 +42,9 @@ export class AbstractSchemaGenerator {
         for (const meta of this.getOrderedMetadata(options?.schema).reverse()) {
             await this.driver.nativeDelete(meta.className, {}, options);
         }
-        this.clearIdentityMap();
+        if (options?.clearIdentityMap ?? true) {
+            this.clearIdentityMap();
+        }
     }
     clearIdentityMap() {
         /* v8 ignore next 3 */

package/utils/Configuration.d.ts

@@ -2,7 +2,7 @@ import type { NamingStrategy } from '../naming-strategy/NamingStrategy.js';
 import { FileCacheAdapter } from '../cache/FileCacheAdapter.js';
 import { type SyncCacheAdapter, type CacheAdapter } from '../cache/CacheAdapter.js';
 import type { EntityRepository } from '../entity/EntityRepository.js';
-import type { AnyEntity, Constructor, Dictionary, EntityClass, EntityClassGroup, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } from '../typings.js';
+import type { AnyEntity, Constructor, Dictionary, EntityClass, FilterDef, Highlighter, HydratorConstructor, IHydrator, IMigrationGenerator, IPrimaryKey, MaybePromise, MigrationObject, EntityMetadata, EnsureDatabaseOptions, GenerateOptions, Migration } 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';
@@ -54,14 +54,14 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
         baseDir: string;
         hydrator: typeof ObjectHydrator;
         flushMode: FlushMode.AUTO;
-        loadStrategy: LoadStrategy.JOINED;
+        loadStrategy: LoadStrategy.BALANCED;
         dataloader: DataloaderType.NONE;
         populateWhere: PopulateHint.ALL;
-        connect: true;
         ignoreUndefinedInQuery: false;
         onQuery: (sql: string) => string;
         autoJoinOneToOneOwner: true;
         autoJoinRefsForFilters: true;
+        filtersOnRelations: true;
         propagationOnPrototype: true;
         populateAfterFlush: true;
         serialization: {
@@ -78,9 +78,11 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
         upsertManaged: true;
         forceEntityConstructor: false;
         forceUndefined: false;
+        processOnCreateHooksEarly: false;
         ensureDatabase: true;
         ensureIndexes: false;
         batchSize: number;
+        hashAlgorithm: "md5";
         debug: false;
         ignoreDeprecations: false;
         verbose: false;
@@ -103,17 +105,21 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
             disableForeignKeys: false;
             createForeignKeyConstraints: true;
             ignoreSchema: never[];
+            skipTables: never[];
+            skipColumns: {};
         };
         embeddables: {
-            prefixMode: "absolute";
+            prefixMode: "relative";
         };
         entityGenerator: {
             forceUndefined: true;
             undefinedDefaults: false;
-            bidirectionalRelations: false;
-            identifiedReferences: false;
             scalarTypeInDecorator: false;
+            bidirectionalRelations: true;
+            identifiedReferences: true;
             scalarPropertiesForRelations: "never";
+            entityDefinition: "defineEntity";
+            enumMode: "dictionary";
             fileName: (className: string) => string;
             onlyPurePivotTables: false;
             outputPurePivotTables: false;
@@ -170,10 +176,6 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
      */
     getLogger(): Logger;
     getDataloaderType(): DataloaderType;
-    /**
-     * Gets current client URL (connection string).
-     */
-    getClientUrl(hidePassword?: boolean): string;
     getSchema(skipDefaultSchema?: boolean): string | undefined;
     /**
      * Gets current database driver instance.
@@ -232,7 +234,7 @@ export declare class Configuration<D extends IDatabaseDriver = IDatabaseDriver,
 /**
  * Type helper to make it easier to use `mikro-orm.config.js`.
  */
-export declare function defineConfig<D extends IDatabaseDriver>(options: Options<D>): Options<D, D[typeof EntityManagerType] & EntityManager<IDatabaseDriver<import("../index.js").Connection>>>;
+export declare function defineConfig<D extends IDatabaseDriver = IDatabaseDriver, EM extends EntityManager<D> = EntityManager<D>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]>(options: Options<D, EM, Entities>): Options<D, EM, Entities>;
 export interface ConnectionOptions {
     dbName?: string;
     schema?: string;
@@ -294,10 +296,11 @@ export interface MetadataDiscoveryOptions {
     onMetadata?: (meta: EntityMetadata, platform: Platform) => MaybePromise<void>;
     afterDiscovered?: (storage: MetadataStorage, platform: Platform) => MaybePromise<void>;
     tsConfigPath?: string;
+    skipSyncDiscovery?: boolean;
 }
 export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM extends EntityManager = EntityManager> extends ConnectionOptions {
-    entities: (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[];
-    entitiesTs: (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema)[];
+    entities: (string | EntityClass<AnyEntity> | EntitySchema)[];
+    entitiesTs: (string | EntityClass<AnyEntity> | EntitySchema)[];
     extensions: {
         register: (orm: MikroORM) => void;
     }[];
@@ -314,12 +317,12 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     };
     implicitTransactions?: boolean;
     disableTransactions?: boolean;
-    connect: boolean;
     verbose: boolean;
     ignoreUndefinedInQuery?: boolean;
     onQuery: (sql: string, params: readonly unknown[]) => string;
     autoJoinOneToOneOwner: boolean;
     autoJoinRefsForFilters: boolean;
+    filtersOnRelations: boolean;
     propagationOnPrototype: boolean;
     populateAfterFlush: boolean;
     serialization: {
@@ -332,6 +335,11 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     upsertManaged: boolean;
     forceEntityConstructor: boolean | (Constructor<AnyEntity> | string)[];
     forceUndefined: boolean;
+    /**
+     * Property `onCreate` hooks are normally executed during `flush` operation.
+     * With this option, they will be processed early inside `em.create()` method.
+     */
+    processOnCreateHooksEarly: boolean;
     forceUtcTimezone?: boolean;
     timezone?: string;
     ensureDatabase: boolean | EnsureDatabaseOptions;
@@ -340,7 +348,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     useBatchUpdates?: boolean;
     batchSize: number;
     hydrator: HydratorConstructor;
-    loadStrategy: LoadStrategy | 'select-in' | 'joined';
+    loadStrategy: LoadStrategy | `${LoadStrategy}`;
     dataloader: DataloaderType | boolean;
     populateWhere?: PopulateHint | `${PopulateHint}`;
     flushMode: FlushMode | 'commit' | 'auto' | 'always';
@@ -374,6 +382,8 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
         disableForeignKeys?: boolean;
         createForeignKeyConstraints?: boolean;
         ignoreSchema?: string[];
+        skipTables?: (string | RegExp)[];
+        skipColumns?: Dictionary<(string | RegExp)[]>;
         managementDbName?: string;
     };
     embeddables: {
@@ -403,5 +413,8 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver, EM
     seeder: SeederOptions;
     preferReadReplicas: boolean;
     dynamicImportProvider: (id: string) => Promise<unknown>;
+    hashAlgorithm: 'md5' | 'sha256';
+}
+export interface Options<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = D[typeof EntityManagerType] & EntityManager, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends Pick<MikroORMOptions<D, EM>, Exclude<keyof MikroORMOptions, keyof typeof Configuration.DEFAULTS>>, Partial<MikroORMOptions<D, EM>> {
+    entities?: Entities;
 }
-export type Options<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = D[typeof EntityManagerType] & EntityManager> = Pick<MikroORMOptions<D, EM>, Exclude<keyof MikroORMOptions<D, EM>, keyof typeof Configuration.DEFAULTS>> & Partial<MikroORMOptions<D, EM>>;

package/utils/Configuration.js

@@ -44,14 +44,14 @@ export class Configuration {
         baseDir: process.cwd(),
         hydrator: ObjectHydrator,
         flushMode: FlushMode.AUTO,
-        loadStrategy: LoadStrategy.JOINED,
+        loadStrategy: LoadStrategy.BALANCED,
         dataloader: DataloaderType.NONE,
         populateWhere: PopulateHint.ALL,
-        connect: true,
         ignoreUndefinedInQuery: false,
         onQuery: sql => sql,
         autoJoinOneToOneOwner: true,
         autoJoinRefsForFilters: true,
+        filtersOnRelations: true,
         propagationOnPrototype: true,
         populateAfterFlush: true,
         serialization: {
@@ -68,9 +68,11 @@ export class Configuration {
         upsertManaged: true,
         forceEntityConstructor: false,
         forceUndefined: false,
+        processOnCreateHooksEarly: false,
         ensureDatabase: true,
         ensureIndexes: false,
         batchSize: 300,
+        hashAlgorithm: 'md5',
         debug: false,
         ignoreDeprecations: false,
         verbose: false,
@@ -93,17 +95,21 @@ export class Configuration {
             disableForeignKeys: false,
             createForeignKeyConstraints: true,
             ignoreSchema: [],
+            skipTables: [],
+            skipColumns: {},
         },
         embeddables: {
-            prefixMode: 'absolute',
+            prefixMode: 'relative',
         },
         entityGenerator: {
             forceUndefined: true,
             undefinedDefaults: false,
-            bidirectionalRelations: false,
-            identifiedReferences: false,
             scalarTypeInDecorator: false,
+            bidirectionalRelations: true,
+            identifiedReferences: true,
             scalarPropertiesForRelations: 'never',
+            entityDefinition: 'defineEntity',
+            enumMode: 'dictionary',
             fileName: (className) => className,
             onlyPurePivotTables: false,
             outputPurePivotTables: false,
@@ -144,7 +150,6 @@ export class Configuration {
         }
         this.options = Utils.mergeConfig({}, Configuration.DEFAULTS, options);
         this.options.baseDir = Utils.absolutePath(this.options.baseDir);
-        this.options.preferTs ??= options.preferTs;
         if (validate) {
             this.validateOptions();
         }
@@ -204,15 +209,6 @@ export class Configuration {
         }
         return this.options.dataloader;
     }
-    /**
-     * Gets current client URL (connection string).
-     */
-    getClientUrl(hidePassword = false) {
-        if (hidePassword) {
-            return this.options.clientUrl.replace(/\/\/([^:]+):(.+)@/, '//$1:*****@');
-        }
-        return this.options.clientUrl;
-    }
     getSchema(skipDefaultSchema = false) {
         if (skipDefaultSchema && this.options.schema === this.platform.getDefaultSchemaName()) {
             return undefined;
@@ -268,7 +264,7 @@ export class Configuration {
      * Gets instance of metadata CacheAdapter. (cached)
      */
     getMetadataCacheAdapter() {
-        return this.getCachedService(this.options.metadataCache.adapter, this.options.metadataCache.options, this.options.baseDir, this.options.metadataCache.pretty);
+        return this.getCachedService(this.options.metadataCache.adapter, this.options.metadataCache.options, this.options.baseDir, this.options.metadataCache.pretty, this.options.hashAlgorithm);
     }
     /**
      * Gets instance of CacheAdapter for result cache. (cached)
@@ -315,13 +311,13 @@ export class Configuration {
             this.options.implicitTransactions = this.platform.usesImplicitTransactions();
         }
         try {
-            const url = new URL(this.getClientUrl());
+            const url = new URL(this.options.clientUrl);
             if (url.pathname) {
                 this.options.dbName = this.get('dbName', decodeURIComponent(url.pathname).substring(1));
             }
         }
         catch {
-            const url = this.getClientUrl().match(/:\/\/.*\/([^?]+)/);
+            const url = this.options.clientUrl.match(/:\/\/.*\/([^?]+)/);
             if (url) {
                 this.options.dbName = this.get('dbName', decodeURIComponent(url[1]));
             }
@@ -338,6 +334,9 @@ export class Configuration {
         Object.keys(this.options.filters).forEach(key => {
             this.options.filters[key].default ??= true;
         });
+        if (!this.options.filtersOnRelations) {
+            this.options.autoJoinRefsForFilters ??= false;
+        }
         this.options.subscribers = Utils.unique(this.options.subscribers).map(subscriber => {
             return subscriber.constructor.name === 'Function' ? new subscriber() : subscriber;
         });

package/utils/ConfigurationLoader.d.ts

@@ -13,42 +13,29 @@ export declare class ConfigurationLoader {
      * @param paths Array of possible paths for a configuration file. Files will be checked in order, and the first existing one will be used. Defaults to the output of {@link ConfigurationLoader.getConfigPaths}.
      * @param options Additional options to augment the final configuration with.
      */
-    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(contextName: string, paths?: string[], options?: Partial<Options>): Promise<Configuration<D, EM>>;
-    /**
-     * Gets the default config from the default paths
-     *
-     * @deprecated Prefer to explicitly set the `contextName` at the first argument. This signature is available for backwards compatibility, and may be removed in v7.
-     */
-    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(): Promise<Configuration<D, EM>>;
-    /**
-     * Gets default configuration out of the default paths, and possibly from `process.argv`
-     *
-     * @param validate Whether to validate the final configuration.
-     * @param options Additional options to augment the final configuration with (just before validation).
-     *
-     * @deprecated Use the other overloads of this method. This signature will be removed in v7.
-     */
-    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(validate: boolean, options?: Partial<Options>): Promise<Configuration<D, EM>>;
+    static getConfiguration<D extends IDatabaseDriver = IDatabaseDriver, EM extends D[typeof EntityManagerType] & EntityManager = EntityManager>(contextName?: string, paths?: string[], options?: Partial<Options>): Promise<Configuration<D, EM>>;
     static getConfigFile(paths: string[]): Promise<[string, unknown] | []>;
     static getPackageConfig(basePath?: string): Dictionary;
     static getSettings(): Settings;
-    static configPathsFromArg(): string[] | undefined;
     static getConfigPaths(): string[];
     static isESM(): boolean;
-    static registerTypeScriptSupport(configPath?: string): Promise<boolean>;
-    static registerDotenv<D extends IDatabaseDriver>(options?: Options<D>): void;
+    /**
+     * Tries to register TS support in the following order: swc, tsx, jiti, tsimp
+     * Use `MIKRO_ORM_CLI_TS_LOADER` env var to set the loader explicitly.
+     * This method is used only in CLI context.
+     */
+    static registerTypeScriptSupport(configPath?: string, tsLoader?: 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto'): Promise<boolean>;
+    static registerDotenv<D extends IDatabaseDriver>(options: Options<D>): void;
     static loadEnvironmentVars<D extends IDatabaseDriver>(): Promise<Partial<Options<D>>>;
     static loadEnvironmentVarsSync<D extends IDatabaseDriver>(): Partial<Options<D>>;
     static getORMPackages(): Set<string>;
-    /** @internal */
-    static commonJSCompat(options: Partial<Options>): void;
     static getORMPackageVersion(name: string): string | undefined;
     static checkPackageVersion(): string;
 }
 export interface Settings {
-    alwaysAllowTs?: boolean;
     verbose?: boolean;
     preferTs?: boolean;
+    tsLoader?: 'swc' | 'tsx' | 'jiti' | 'tsimp' | 'auto';
     tsConfigPath?: string;
     configPaths?: string[];
 }