@mikro-orm/core 7.0.0-rc.3 → 7.0.1-dev.0

package/unit-of-work/ChangeSetComputer.js

@@ -7,22 +7,22 @@ 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;
+    #comparator;
+    #metadata;
+    #platform;
+    #config;
+    #em;
+    #collectionUpdates;
     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);
+        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) {
-        const meta = this.metadata.get(entity.constructor);
+        const meta = this.#metadata.get(entity.constructor);
         if (meta.readonly) {
             return null;
         }
@@ -38,7 +38,7 @@ export class ChangeSetComputer {
             }
         }
         if (type === ChangeSetType.UPDATE && !wrapped.__initialized) {
-            const data = this.comparator.prepareEntity(entity);
+            const data = this.#comparator.prepareEntity(entity);
             if (Utils.equals(data, wrapped.__originalEntityData)) {
                 return null;
             }
@@ -79,11 +79,11 @@ export class ChangeSetComputer {
             type === ChangeSetType.CREATE &&
             (entity[prop.name] == null ||
                 (Utils.isScalarReference(entity[prop.name]) && entity[prop.name].unwrap() == null))) {
-            entity[prop.name] = prop.onCreate(entity, this.em);
+            entity[prop.name] = prop.onCreate(entity, this.#em);
         }
         if (prop.onUpdate && type === ChangeSetType.UPDATE) {
             const pairs = map.get(entity) ?? [];
-            pairs.push([prop.name, prop.onUpdate(entity, this.em)]);
+            pairs.push([prop.name, prop.onUpdate(entity, this.#em)]);
             map.set(entity, pairs);
         }
         if (prop.kind === ReferenceKind.EMBEDDED && entity[prop.name]) {
@@ -93,7 +93,7 @@ export class ChangeSetComputer {
         }
     }
     computePayload(entity, ignoreUndefined = false) {
-        const data = this.comparator.prepareEntity(entity);
+        const data = this.#comparator.prepareEntity(entity);
         const wrapped = helper(entity);
         const entityName = wrapped.__meta.class;
         const originalEntityData = wrapped.__originalEntityData;
@@ -104,7 +104,7 @@ export class ChangeSetComputer {
             return data;
         }
         if (originalEntityData) {
-            const comparator = this.comparator.getEntityComparator(entityName);
+            const comparator = this.#comparator.getEntityComparator(entityName);
             const diff = comparator(originalEntityData, data);
             if (ignoreUndefined) {
                 Utils.keys(diff)
@@ -144,7 +144,7 @@ export class ChangeSetComputer {
                 if (prop.targetKey && prop.targetMeta) {
                     const targetProp = prop.targetMeta.properties[prop.targetKey];
                     if (targetProp?.customType) {
-                        value = targetProp.customType.convertToDatabaseValue(value, this.platform, { mode: 'serialization' });
+                        value = targetProp.customType.convertToDatabaseValue(value, this.#platform, { mode: 'serialization' });
                     }
                 }
                 if (prop.polymorphic) {
@@ -163,9 +163,9 @@ export class ChangeSetComputer {
             return;
         }
         if (target.isDirty()) {
-            this.collectionUpdates.add(target);
+            this.#collectionUpdates.add(target);
         }
-        if (prop.owner && !this.platform.usesPivotTable()) {
+        if (prop.owner && !this.#platform.usesPivotTable()) {
             changeSet.payload[prop.name] = target.getItems(false).map((item) => {
                 return item.__helper.__identifier ?? item.__helper.getPrimaryKey();
             });

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

@@ -3,15 +3,7 @@ import { type ChangeSet } from './ChangeSet.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;
     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>;

package/unit-of-work/ChangeSetPersister.js

@@ -7,25 +7,25 @@ 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;
+    #platform;
+    #comparator;
+    #usesReturningStatement;
+    #driver;
+    #metadata;
+    #hydrator;
+    #factory;
+    #config;
+    #em;
     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();
+        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();
     }
     async executeInserts(changeSets, options, withSchema) {
         if (!withSchema) {
@@ -33,7 +33,7 @@ export class ChangeSetPersister {
         }
         const meta = changeSets[0].meta;
         changeSets.forEach(changeSet => this.processProperties(changeSet));
-        if (changeSets.length > 1 && this.config.get('useBatchInserts', this.platform.usesBatchInserts())) {
+        if (changeSets.length > 1 && this.#config.get('useBatchInserts', this.#platform.usesBatchInserts())) {
             return this.persistNewEntities(meta, changeSets, options);
         }
         for (const changeSet of changeSets) {
@@ -52,7 +52,7 @@ export class ChangeSetPersister {
         if (batched &&
             changeSets.length > 1 &&
             !hasMixedTypes &&
-            this.config.get('useBatchUpdates', this.platform.usesBatchUpdates())) {
+            this.#config.get('useBatchUpdates', this.#platform.usesBatchUpdates())) {
             return this.persistManagedEntities(meta, changeSets, options);
         }
         for (const changeSet of changeSets) {
@@ -63,14 +63,14 @@ export class ChangeSetPersister {
         if (!withSchema) {
             return this.runForEachSchema(changeSets, 'executeDeletes', options);
         }
-        const size = this.config.get('batchSize');
+        const size = this.#config.get('batchSize');
         const meta = changeSets[0].meta;
         const pk = Utils.getPrimaryKeyHash(meta.primaryKeys);
         for (let i = 0; i < changeSets.length; i += size) {
             const chunk = changeSets.slice(i, i + size);
             const pks = chunk.map(cs => cs.getPrimaryKey());
             options = this.prepareOptions(meta, options);
-            await this.driver.nativeDelete(meta.root.class, { [pk]: { $in: pks } }, options);
+            await this.#driver.nativeDelete(meta.root.class, { [pk]: { $in: pks } }, options);
         }
     }
     async runForEachSchema(changeSets, method, options, ...args) {
@@ -110,7 +110,7 @@ export class ChangeSetPersister {
         for (const prop of meta.relations) {
             this.processProperty(changeSet, prop);
         }
-        if (changeSet.type === ChangeSetType.CREATE && this.config.get('validateRequired')) {
+        if (changeSet.type === ChangeSetType.CREATE && this.#config.get('validateRequired')) {
             this.validateRequired(changeSet.entity);
         }
     }
@@ -121,31 +121,31 @@ export class ChangeSetPersister {
         });
         this.resolveTPTIdentifiers(changeSet);
         // Use changeSet's own meta for STI entities to get correct field mappings
-        const res = await this.driver.nativeInsertMany(changeSet.meta.class, [changeSet.payload], options);
+        const res = await this.#driver.nativeInsertMany(changeSet.meta.class, [changeSet.payload], options);
         if (!wrapped.hasPrimaryKey()) {
-            this.mapPrimaryKey(meta, res.insertId, changeSet);
+            this.mapPrimaryKey(meta, res.insertId ?? res.row?.[meta.primaryKeys[0]], changeSet);
         }
         this.mapReturnedValues(changeSet.entity, changeSet.payload, res.row, meta);
         this.markAsPopulated(changeSet, meta);
         wrapped.__initialized = true;
         wrapped.__managed = true;
-        if (!this.usesReturningStatement) {
+        if (!this.#usesReturningStatement) {
             await this.reloadVersionValues(meta, [changeSet], options);
         }
         changeSet.persisted = true;
     }
     async persistNewEntities(meta, changeSets, options) {
-        const size = this.config.get('batchSize');
+        const size = this.#config.get('batchSize');
         for (let i = 0; i < changeSets.length; i += size) {
             const chunk = changeSets.slice(i, i + size);
             await this.persistNewEntitiesBatch(meta, chunk, options);
-            if (!this.usesReturningStatement) {
+            if (!this.#usesReturningStatement) {
                 await this.reloadVersionValues(meta, chunk, options);
             }
         }
     }
     prepareOptions(meta, options, additionalOptions) {
-        const loggerContext = Utils.merge({ id: this.em._id }, this.em.getLoggerContext({ disableContextResolution: true }));
+        const loggerContext = Utils.merge({ id: this.#em._id }, this.#em.getLoggerContext({ disableContextResolution: true }));
         return {
             ...options,
             ...additionalOptions,
@@ -161,7 +161,7 @@ export class ChangeSetPersister {
         for (const changeSet of changeSets) {
             this.resolveTPTIdentifiers(changeSet);
         }
-        const res = await this.driver.nativeInsertMany(meta.class, changeSets.map(cs => cs.payload), options);
+        const res = await this.#driver.nativeInsertMany(meta.class, changeSets.map(cs => cs.payload), options);
         for (let i = 0; i < changeSets.length; i++) {
             const changeSet = changeSets[i];
             const wrapped = helper(changeSet.entity);
@@ -187,7 +187,7 @@ export class ChangeSetPersister {
         changeSet.persisted = true;
     }
     async persistManagedEntities(meta, changeSets, options) {
-        const size = this.config.get('batchSize');
+        const size = this.#config.get('batchSize');
         for (let i = 0; i < changeSets.length; i += size) {
             const chunk = changeSets.slice(i, i + size);
             await this.persistManagedEntitiesBatch(meta, chunk, options);
@@ -220,9 +220,9 @@ export class ChangeSetPersister {
             cond.push(where);
             payload.push(changeSet.payload);
         }
-        const res = await this.driver.nativeUpdateMany(meta.class, cond, payload, options);
+        const res = await this.#driver.nativeUpdateMany(meta.class, cond, payload, options);
         const map = new Map();
-        res.rows?.forEach(item => map.set(Utils.getCompositeKeyHash(item, meta, true, this.platform, true), item));
+        res.rows?.forEach(item => map.set(Utils.getCompositeKeyHash(item, meta, true, this.#platform, true), item));
         for (const changeSet of changeSets) {
             if (res.rows) {
                 const row = map.get(helper(changeSet.entity).getSerializedPrimaryKey());
@@ -233,7 +233,7 @@ export class ChangeSetPersister {
     }
     mapPrimaryKey(meta, value, changeSet) {
         const prop = meta.properties[meta.primaryKeys[0]];
-        const insertId = prop.customType ? prop.customType.convertToJSValue(value, this.platform) : value;
+        const insertId = prop.customType ? prop.customType.convertToJSValue(value, this.#platform) : value;
         const wrapped = helper(changeSet.entity);
         if (!wrapped.hasPrimaryKey()) {
             wrapped.setPrimaryKey(insertId);
@@ -242,7 +242,7 @@ export class ChangeSetPersister {
         // but we need to have it as string so comparison works in change set tracking, so instead
         // of using the raw value from db, we convert it back to the db value explicitly
         value = prop.customType
-            ? prop.customType.convertToDatabaseValue(insertId, this.platform, { mode: 'serialization' })
+            ? prop.customType.convertToDatabaseValue(insertId, this.#platform, { mode: 'serialization' })
             : value;
         changeSet.payload[wrapped.__meta.primaryKeys[0]] = value;
         if (wrapped.__identifier && !Array.isArray(wrapped.__identifier)) {
@@ -253,8 +253,8 @@ export class ChangeSetPersister {
      * Sets populate flag to new entities so they are serialized like if they were loaded from the db
      */
     markAsPopulated(changeSet, meta) {
-        helper(changeSet.entity).__schema = this.driver.getSchemaName(meta, changeSet);
-        if (!this.config.get('populateAfterFlush')) {
+        helper(changeSet.entity).__schema = this.#driver.getSchemaName(meta, changeSet);
+        if (!this.#config.get('populateAfterFlush')) {
             return;
         }
         helper(changeSet.entity).populated();
@@ -275,13 +275,13 @@ export class ChangeSetPersister {
         });
         if (meta.concurrencyCheckKeys.size === 0 &&
             (!meta.versionProperty || changeSet.entity[meta.versionProperty] == null)) {
-            return this.driver.nativeUpdate(changeSet.meta.class, cond, changeSet.payload, options);
+            return this.#driver.nativeUpdate(changeSet.meta.class, cond, changeSet.payload, options);
         }
         if (meta.versionProperty) {
-            cond[meta.versionProperty] = this.platform.convertVersionValue(changeSet.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
+            cond[meta.versionProperty] = this.#platform.convertVersionValue(changeSet.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
         }
         this.checkConcurrencyKeys(meta, changeSet, cond);
-        return this.driver.nativeUpdate(changeSet.meta.class, cond, changeSet.payload, options);
+        return this.#driver.nativeUpdate(changeSet.meta.class, cond, changeSet.payload, options);
     }
     async checkOptimisticLocks(meta, changeSets, options) {
         if (meta.concurrencyCheckKeys.size === 0 &&
@@ -294,7 +294,7 @@ export class ChangeSetPersister {
             const cond = Utils.getPrimaryKeyCond(cs.originalEntity, meta.primaryKeys.concat(...meta.concurrencyCheckKeys));
             if (meta.versionProperty) {
                 // @ts-ignore
-                cond[meta.versionProperty] = this.platform.convertVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
+                cond[meta.versionProperty] = this.#platform.convertVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
             }
             return cond;
         });
@@ -302,7 +302,7 @@ export class ChangeSetPersister {
         options = this.prepareOptions(meta, options, {
             fields: primaryKeys,
         });
-        const res = await this.driver.find(meta.root.class, { $or }, options);
+        const res = await this.#driver.find(meta.root.class, { $or }, options);
         if (res.length !== changeSets.length) {
             const compare = (a, b, keys) => keys.every(k => a[k] === b[k]);
             const entity = changeSets.find(cs => {
@@ -321,7 +321,7 @@ export class ChangeSetPersister {
      * so we use a single query in case of both versioning and default values is used.
      */
     async reloadVersionValues(meta, changeSets, options) {
-        const reloadProps = meta.versionProperty && !this.usesReturningStatement ? [meta.properties[meta.versionProperty]] : [];
+        const reloadProps = meta.versionProperty && !this.#usesReturningStatement ? [meta.properties[meta.versionProperty]] : [];
         if (changeSets[0].type === ChangeSetType.CREATE) {
             for (const prop of meta.props) {
                 if (prop.persist === false) {
@@ -350,7 +350,7 @@ export class ChangeSetPersister {
                 });
             });
             // reload generated columns
-            if (!this.usesReturningStatement) {
+            if (!this.#usesReturningStatement) {
                 meta.props.filter(prop => prop.generated && !prop.primary).forEach(prop => reloadProps.push(prop));
                 reloadProps.push(...returning);
             }
@@ -363,19 +363,19 @@ export class ChangeSetPersister {
         const pks = changeSets.map(cs => {
             const val = helper(cs.entity).getPrimaryKey(true);
             if (Utils.isPlainObject(val)) {
-                return Utils.getCompositeKeyValue(val, meta, false, this.platform);
+                return Utils.getCompositeKeyValue(val, meta, false, this.#platform);
             }
             return val;
         });
         options = this.prepareOptions(meta, options, {
             fields: Utils.unique(reloadProps.map(prop => prop.name)),
         });
-        const data = await this.driver.find(meta.class, { [pk]: { $in: pks } }, options);
+        const data = await this.#driver.find(meta.class, { [pk]: { $in: pks } }, options);
         const map = new Map();
-        data.forEach(item => map.set(Utils.getCompositeKeyHash(item, meta, false, this.platform, true), item));
+        data.forEach(item => map.set(Utils.getCompositeKeyHash(item, meta, false, this.#platform, true), item));
         for (const changeSet of changeSets) {
             const data = map.get(helper(changeSet.entity).getSerializedPrimaryKey());
-            this.hydrator.hydrate(changeSet.entity, meta, data, this.factory, 'full', false, true);
+            this.#hydrator.hydrate(changeSet.entity, meta, data, this.#factory, 'full', false, true);
             Object.assign(changeSet.payload, data); // merge to the changeset payload, so it gets saved to the entity snapshot
         }
     }
@@ -431,17 +431,17 @@ export class ChangeSetPersister {
      * We do need to map to the change set payload too, as it will be used in the originalEntityData for new entities.
      */
     mapReturnedValues(entity, payload, row, meta, upsert = false) {
-        if ((!this.usesReturningStatement && !upsert) || !row || !Utils.hasObjectKeys(row)) {
+        if ((!this.#usesReturningStatement && !upsert) || !row || !Utils.hasObjectKeys(row)) {
             return;
         }
-        const mapped = this.comparator.mapResult(meta, row);
+        const mapped = this.#comparator.mapResult(meta, row);
         if (entity) {
-            this.hydrator.hydrate(entity, meta, mapped, this.factory, 'full', false, true);
+            this.#hydrator.hydrate(entity, meta, mapped, this.#factory, 'full', false, true);
         }
         if (upsert) {
             for (const prop of meta.props) {
                 if (prop.customType && prop.name in mapped) {
-                    mapped[prop.name] = prop.customType.convertToJSValue(mapped[prop.name], this.platform);
+                    mapped[prop.name] = prop.customType.convertToJSValue(mapped[prop.name], this.#platform);
                 }
             }
         }

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

@@ -26,10 +26,7 @@ export interface Edge {
  * @internal
  */
 export declare class CommitOrderCalculator {
-    /** Matrix of nodes, keys are provided hashes and values are the node definition objects. */
-    private nodes;
-    /** Volatile variable holding calculated nodes during sorting process. */
-    private sortedNodeList;
+    #private;
     /**
      * Checks for node existence in graph.
      */

package/unit-of-work/CommitOrderCalculator.js

@@ -17,26 +17,26 @@ export var NodeState;
  */
 export class CommitOrderCalculator {
     /** Matrix of nodes, keys are provided hashes and values are the node definition objects. */
-    nodes = new Map();
+    #nodes = new Map();
     /** Volatile variable holding calculated nodes during sorting process. */
-    sortedNodeList = [];
+    #sortedNodeList = [];
     /**
      * Checks for node existence in graph.
      */
     hasNode(hash) {
-        return this.nodes.has(hash);
+        return this.#nodes.has(hash);
     }
     /**
      * Adds a new node to the graph, assigning its hash.
      */
     addNode(hash) {
-        this.nodes.set(hash, { hash, state: 0 /* NodeState.NOT_VISITED */, dependencies: new Map() });
+        this.#nodes.set(hash, { hash, state: 0 /* NodeState.NOT_VISITED */, dependencies: new Map() });
     }
     /**
      * Adds a new dependency (edge) to the graph using their hashes.
      */
     addDependency(from, to, weight) {
-        this.nodes.get(from).dependencies.set(to, { from, to, weight });
+        this.#nodes.get(from).dependencies.set(to, { from, to, weight });
     }
     discoverProperty(prop, entityName) {
         const toOneOwner = (prop.kind === ReferenceKind.ONE_TO_ONE && prop.owner) || prop.kind === ReferenceKind.MANY_TO_ONE;
@@ -57,15 +57,15 @@ export class CommitOrderCalculator {
      * @internal Highly performance-sensitive method.
      */
     sort() {
-        for (const vertex of this.nodes.values()) {
+        for (const vertex of this.#nodes.values()) {
             if (vertex.state !== 0 /* NodeState.NOT_VISITED */) {
                 continue;
             }
             this.visit(vertex);
         }
-        const sortedList = this.sortedNodeList.reverse();
-        this.nodes = new Map();
-        this.sortedNodeList = [];
+        const sortedList = this.#sortedNodeList.reverse();
+        this.#nodes = new Map();
+        this.#sortedNodeList = [];
         return sortedList;
     }
     /**
@@ -76,7 +76,7 @@ export class CommitOrderCalculator {
     visit(node) {
         node.state = 1 /* NodeState.IN_PROGRESS */;
         for (const edge of node.dependencies.values()) {
-            const target = this.nodes.get(edge.to);
+            const target = this.#nodes.get(edge.to);
             switch (target.state) {
                 case 2 /* NodeState.VISITED */:
                     break; // Do nothing, since node was already visited
@@ -89,7 +89,7 @@ export class CommitOrderCalculator {
         }
         if (node.state !== 2 /* NodeState.VISITED */) {
             node.state = 2 /* NodeState.VISITED */;
-            this.sortedNodeList.push(node.hash);
+            this.#sortedNodeList.push(node.hash);
         }
     }
     /**
@@ -100,12 +100,12 @@ export class CommitOrderCalculator {
             return;
         }
         for (const edge of target.dependencies.values()) {
-            const targetNode = this.nodes.get(edge.to);
+            const targetNode = this.#nodes.get(edge.to);
             if (targetNode.state === 0 /* NodeState.NOT_VISITED */) {
                 this.visit(targetNode);
             }
         }
         target.state = 2 /* NodeState.VISITED */;
-        this.sortedNodeList.push(target.hash);
+        this.#sortedNodeList.push(target.hash);
     }
 }

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

@@ -1,10 +1,7 @@
 import type { AnyEntity, EntityMetadata } from '../typings.js';
 export declare class IdentityMap {
-    private readonly defaultSchema?;
-    constructor(defaultSchema?: string | undefined);
-    private readonly registry;
-    /** Tracks alternate key hashes for each entity so we can clean them up on delete */
-    private readonly alternateKeys;
+    #private;
+    constructor(defaultSchema?: string);
     store<T>(item: T): void;
     /**
      * Stores an entity under an alternate key (non-PK property).

package/unit-of-work/IdentityMap.js

@@ -1,11 +1,11 @@
 export class IdentityMap {
-    defaultSchema;
+    #defaultSchema;
+    #registry = new Map();
+    /** Tracks alternate key hashes for each entity so we can clean them up on delete */
+    #alternateKeys = new WeakMap();
     constructor(defaultSchema) {
-        this.defaultSchema = defaultSchema;
+        this.#defaultSchema = defaultSchema;
     }
-    registry = new Map();
-    /** Tracks alternate key hashes for each entity so we can clean them up on delete */
-    alternateKeys = new WeakMap();
     store(item) {
         this.getStore(item.__meta.root).set(this.getPkHash(item), item);
     }
@@ -17,10 +17,10 @@ export class IdentityMap {
         const hash = this.getKeyHash(key, value, schema);
         this.getStore(item.__meta.root).set(hash, item);
         // Track this alternate key so we can clean it up when the entity is deleted
-        let keys = this.alternateKeys.get(item);
+        let keys = this.#alternateKeys.get(item);
         if (!keys) {
             keys = new Set();
-            this.alternateKeys.set(item, keys);
+            this.#alternateKeys.set(item, keys);
         }
         keys.add(hash);
     }
@@ -29,12 +29,12 @@ export class IdentityMap {
         const store = this.getStore(meta);
         store.delete(this.getPkHash(item));
         // Also delete any alternate key entries for this entity
-        const altKeys = this.alternateKeys.get(item);
+        const altKeys = this.#alternateKeys.get(item);
         if (altKeys) {
             for (const hash of altKeys) {
                 store.delete(hash);
             }
-            this.alternateKeys.delete(item);
+            this.#alternateKeys.delete(item);
         }
     }
     getByHash(meta, hash) {
@@ -42,26 +42,26 @@ export class IdentityMap {
         return store.has(hash) ? store.get(hash) : undefined;
     }
     getStore(meta) {
-        const store = this.registry.get(meta.class);
+        const store = this.#registry.get(meta.class);
         if (store) {
             return store;
         }
         const newStore = new Map();
-        this.registry.set(meta.class, newStore);
+        this.#registry.set(meta.class, newStore);
         return newStore;
     }
     clear() {
-        this.registry.clear();
+        this.#registry.clear();
     }
     values() {
         const ret = [];
-        for (const store of this.registry.values()) {
+        for (const store of this.#registry.values()) {
             ret.push(...store.values());
         }
         return ret;
     }
     *[Symbol.iterator]() {
-        for (const store of this.registry.values()) {
+        for (const store of this.#registry.values()) {
             for (const item of store.values()) {
                 yield item;
             }
@@ -69,7 +69,7 @@ export class IdentityMap {
     }
     keys() {
         const ret = [];
-        for (const [cls, store] of this.registry) {
+        for (const [cls, store] of this.#registry) {
             ret.push(...[...store.keys()].map(hash => `${cls.name}-${hash}`));
         }
         return ret;
@@ -79,18 +79,18 @@ export class IdentityMap {
      */
     get(hash) {
         const [name, id] = hash.split('-', 2);
-        const cls = [...this.registry.keys()].find(k => k.name === name);
+        const cls = [...this.#registry.keys()].find(k => k.name === name);
         if (!cls) {
             return undefined;
         }
-        const store = this.registry.get(cls);
+        const store = this.#registry.get(cls);
         return store.has(id) ? store.get(id) : undefined;
     }
     getPkHash(item) {
         const wrapped = item.__helper;
         const meta = wrapped.__meta;
         const hash = wrapped.getSerializedPrimaryKey();
-        const schema = wrapped.__schema ?? meta.root.schema ?? this.defaultSchema;
+        const schema = wrapped.__schema ?? meta.root.schema ?? this.#defaultSchema;
         if (schema) {
             return schema + ':' + hash;
         }

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

@@ -7,25 +7,7 @@ import type { EntityManager } from '../EntityManager.js';
 import { IdentityMap } from './IdentityMap.js';
 import type { LockOptions } from '../drivers/IDatabaseDriver.js';
 export declare class UnitOfWork {
-    private readonly em;
-    /** map of references to managed entities */
-    private readonly identityMap;
-    private readonly persistStack;
-    private readonly removeStack;
-    private readonly orphanRemoveStack;
-    private readonly changeSets;
-    private readonly collectionUpdates;
-    private readonly extraUpdates;
-    private readonly metadata;
-    private readonly platform;
-    private readonly eventManager;
-    private readonly comparator;
-    private readonly changeSetComputer;
-    private readonly changeSetPersister;
-    private readonly queuedActions;
-    private readonly loadedEntities;
-    private readonly flushQueue;
-    private working;
+    #private;
     constructor(em: EntityManager);
     merge<T extends object>(entity: T, visited?: Set<AnyEntity>): void;
     /**
@@ -42,6 +24,10 @@ export declare class UnitOfWork {
      * @internal
      */
     dispatchOnLoadEvent(): Promise<void>;
+    /**
+     * @internal
+     */
+    unmarkAsLoaded(entity: AnyEntity): void;
     /**
      * 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`.
      */