@mikro-orm/core 7.0.0-dev.233 → 7.0.0-dev.235

package/entity/defineEntity.d.ts

@@ -345,7 +345,7 @@ export declare class UniversalPropertyOptionsBuilder<Value, Options, IncludeKeys
     /** Override the default database column name on the target entity (see {@doclink naming-strategy | Naming Strategy}). This option is suitable for composite keys, where one property is represented by multiple columns. */
     referencedColumnNames(...referencedColumnNames: string[]): Pick<UniversalPropertyOptionsBuilder<Value, Options, IncludeKeys>, IncludeKeys>;
     /** Specify the property name on the target entity that this FK references instead of the primary key. */
-    targetKey(targetKey: string): Pick<UniversalPropertyOptionsBuilder<Value, Options, IncludeKeys>, IncludeKeys>;
+    targetKey(targetKey: keyof Value): Pick<UniversalPropertyOptionsBuilder<Value, Options, IncludeKeys>, IncludeKeys>;
     /** What to do when the target entity gets deleted. */
     deleteRule(deleteRule: 'cascade' | 'no action' | 'set null' | 'set default' | AnyString): Pick<UniversalPropertyOptionsBuilder<Value, Options, IncludeKeys>, IncludeKeys>;
     /** What to do when the reference to the target entity gets updated. */
@@ -373,7 +373,7 @@ export declare class OneToManyOptionsBuilderOnlyMappedBy<Value extends object> e
     kind: '1:m';
 }, IncludeKeysForOneToManyOptions> {
     /** Point to the owning side property name. */
-    mappedBy(mappedBy: (AnyString & keyof Value) | ((e: Value) => any)): Pick<UniversalPropertyOptionsBuilder<Value, EmptyOptions & {
+    mappedBy(mappedBy: (keyof Value) | ((e: Value) => any)): Pick<UniversalPropertyOptionsBuilder<Value, EmptyOptions & {
         kind: '1:m';
     }, IncludeKeysForOneToManyOptions>, IncludeKeysForOneToManyOptions>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.233",
+  "version": "7.0.0-dev.235",
   "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",

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

@@ -1,18 +1,15 @@
-import { type Configuration } from '../utils/Configuration.js';
-import type { MetadataStorage } from '../metadata/MetadataStorage.js';
 import type { AnyEntity } from '../typings.js';
 import { ChangeSet } from './ChangeSet.js';
 import { type Collection } from '../entity/Collection.js';
-import type { Platform } from '../platforms/Platform.js';
 import type { EntityManager } from '../EntityManager.js';
 export declare class ChangeSetComputer {
+    private readonly em;
     private readonly collectionUpdates;
+    private readonly comparator;
     private readonly metadata;
     private readonly platform;
     private readonly config;
-    private readonly em;
-    private readonly comparator;
-    constructor(collectionUpdates: Set<Collection<AnyEntity>>, metadata: MetadataStorage, platform: Platform, config: Configuration, em: EntityManager);
+    constructor(em: EntityManager, collectionUpdates: Set<Collection<AnyEntity>>);
     computeChangeSet<T extends object>(entity: T): ChangeSet<T> | null;
     /**
      * Traverses entity graph and executes `onCreate` and `onUpdate` methods, assigning the values to given properties.

package/unit-of-work/ChangeSetComputer.js

@@ -7,18 +7,18 @@ import { Reference } from '../entity/Reference.js';
 import { PolymorphicRef } from '../entity/PolymorphicRef.js';
 import { ReferenceKind } from '../enums.js';
 export class ChangeSetComputer {
+    em;
     collectionUpdates;
+    comparator;
     metadata;
     platform;
     config;
-    em;
-    comparator;
-    constructor(collectionUpdates, metadata, platform, config, em) {
-        this.collectionUpdates = collectionUpdates;
-        this.metadata = metadata;
-        this.platform = platform;
-        this.config = config;
+    constructor(em, collectionUpdates) {
         this.em = em;
+        this.collectionUpdates = collectionUpdates;
+        this.config = this.em.config;
+        this.metadata = this.em.getMetadata();
+        this.platform = this.em.getPlatform();
         this.comparator = this.config.getComparator(this.metadata);
     }
     computeChangeSet(entity) {

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

@@ -1,21 +1,18 @@
-import type { MetadataStorage } from '../metadata/MetadataStorage.js';
-import type { Dictionary, EntityDictionary, EntityMetadata, IHydrator } from '../typings.js';
-import { type EntityFactory } from '../entity/EntityFactory.js';
+import type { Dictionary, EntityDictionary, EntityMetadata } from '../typings.js';
 import { type ChangeSet } from './ChangeSet.js';
-import { type Configuration } from '../utils/Configuration.js';
-import type { DriverMethodOptions, IDatabaseDriver } from '../drivers/IDatabaseDriver.js';
+import type { DriverMethodOptions } from '../drivers/IDatabaseDriver.js';
 import type { EntityManager } from '../EntityManager.js';
 export declare class ChangeSetPersister {
+    private readonly em;
+    private readonly platform;
+    private readonly comparator;
+    private readonly usesReturningStatement;
     private readonly driver;
     private readonly metadata;
     private readonly hydrator;
     private readonly factory;
     private readonly config;
-    private readonly em;
-    private readonly platform;
-    private readonly comparator;
-    private readonly usesReturningStatement;
-    constructor(driver: IDatabaseDriver, metadata: MetadataStorage, hydrator: IHydrator, factory: EntityFactory, config: Configuration, em: EntityManager);
+    constructor(em: EntityManager);
     executeInserts<T extends object>(changeSets: ChangeSet<T>[], options?: DriverMethodOptions, withSchema?: boolean): Promise<void>;
     executeUpdates<T extends object>(changeSets: ChangeSet<T>[], batched: boolean, options?: DriverMethodOptions, withSchema?: boolean): Promise<void>;
     executeDeletes<T extends object>(changeSets: ChangeSet<T>[], options?: DriverMethodOptions, withSchema?: boolean): Promise<void>;

package/unit-of-work/ChangeSetPersister.js

@@ -7,23 +7,23 @@ import { Utils } from '../utils/Utils.js';
 import { OptimisticLockError, ValidationError } from '../errors.js';
 import { ReferenceKind } from '../enums.js';
 export class ChangeSetPersister {
+    em;
+    platform;
+    comparator;
+    usesReturningStatement;
     driver;
     metadata;
     hydrator;
     factory;
     config;
-    em;
-    platform;
-    comparator;
-    usesReturningStatement;
-    constructor(driver, metadata, hydrator, factory, config, em) {
-        this.driver = driver;
-        this.metadata = metadata;
-        this.hydrator = hydrator;
-        this.factory = factory;
-        this.config = config;
+    constructor(em) {
         this.em = em;
+        this.driver = this.em.getDriver();
+        this.config = this.em.config;
+        this.metadata = this.em.getMetadata();
+        this.factory = this.em.getEntityFactory();
         this.platform = this.driver.getPlatform();
+        this.hydrator = this.config.getHydrator(this.metadata);
         this.comparator = this.config.getComparator(this.metadata);
         this.usesReturningStatement = this.platform.usesReturningStatement() || this.platform.usesOutputStatement();
     }

package/unit-of-work/UnitOfWork.js

@@ -42,8 +42,8 @@ export class UnitOfWork {
         this.identityMap = new IdentityMap(this.platform.getDefaultSchemaName());
         this.eventManager = this.em.getEventManager();
         this.comparator = this.em.getComparator();
-        this.changeSetComputer = new ChangeSetComputer(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.config, this.em);
+        this.changeSetComputer = new ChangeSetComputer(this.em, this.collectionUpdates);
+        this.changeSetPersister = new ChangeSetPersister(this.em);
     }
     merge(entity, visited) {
         const wrapped = helper(entity);

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.233';
+    static #ORM_VERSION = '7.0.0-dev.235';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */