@mikro-orm/core 7.0.0-dev.33 → 7.0.0-dev.331

package/unit-of-work/ChangeSetPersister.js

@@ -1,40 +1,39 @@
 import { EntityIdentifier } from '../entity/EntityIdentifier.js';
+import { PolymorphicRef } from '../entity/PolymorphicRef.js';
 import { helper } from '../entity/wrap.js';
 import { ChangeSetType } from './ChangeSet.js';
 import { isRaw } from '../utils/RawQueryFragment.js';
 import { Utils } from '../utils/Utils.js';
-import { OptimisticLockError } from '../errors.js';
+import { OptimisticLockError, ValidationError } from '../errors.js';
 import { ReferenceKind } from '../enums.js';
 export class ChangeSetPersister {
-    driver;
-    metadata;
-    hydrator;
-    factory;
-    validator;
-    config;
-    em;
-    platform;
-    comparator;
-    usesReturningStatement;
-    constructor(driver, metadata, hydrator, factory, validator, config, em) {
-        this.driver = driver;
-        this.metadata = metadata;
-        this.hydrator = hydrator;
-        this.factory = factory;
-        this.validator = validator;
-        this.config = config;
-        this.em = em;
-        this.platform = this.driver.getPlatform();
-        this.comparator = this.config.getComparator(this.metadata);
-        this.usesReturningStatement = this.platform.usesReturningStatement() || this.platform.usesOutputStatement();
+    #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();
     }
     async executeInserts(changeSets, options, withSchema) {
         if (!withSchema) {
             return this.runForEachSchema(changeSets, 'executeInserts', options);
         }
-        const meta = this.metadata.find(changeSets[0].name);
+        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) {
@@ -45,9 +44,15 @@ export class ChangeSetPersister {
         if (!withSchema) {
             return this.runForEachSchema(changeSets, 'executeUpdates', options, batched);
         }
-        const meta = this.metadata.find(changeSets[0].name);
+        const meta = changeSets[0].meta;
         changeSets.forEach(changeSet => this.processProperties(changeSet));
-        if (batched && changeSets.length > 1 && this.config.get('useBatchUpdates', this.platform.usesBatchUpdates())) {
+        // For STI with conflicting fieldNames (renamedFrom properties), we can't batch mixed child types
+        const hasSTIConflicts = meta.root.props.some(p => p.renamedFrom);
+        const hasMixedTypes = hasSTIConflicts && changeSets.some(cs => cs.meta.class !== meta.class);
+        if (batched &&
+            changeSets.length > 1 &&
+            !hasMixedTypes &&
+            this.#config.get('useBatchUpdates', this.#platform.usesBatchUpdates())) {
             return this.persistManagedEntities(meta, changeSets, options);
         }
         for (const changeSet of changeSets) {
@@ -58,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.className, { [pk]: { $in: pks } }, options);
+            await this.#driver.nativeDelete(meta.root.class, { [pk]: { $in: pks } }, options);
         }
     }
     async runForEachSchema(changeSets, method, options, ...args) {
@@ -81,13 +86,32 @@ export class ChangeSetPersister {
             await this[method](group, ...args, options, true);
         }
     }
+    validateRequired(entity) {
+        const wrapped = helper(entity);
+        for (const prop of wrapped.__meta.props) {
+            if (!prop.nullable &&
+                !prop.autoincrement &&
+                !prop.default &&
+                !prop.defaultRaw &&
+                !prop.onCreate &&
+                !prop.generated &&
+                !prop.embedded &&
+                ![ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind) &&
+                prop.name !== wrapped.__meta.root.discriminatorColumn &&
+                prop.type !== 'ObjectId' &&
+                prop.persist !== false &&
+                entity[prop.name] == null) {
+                throw ValidationError.propertyRequired(entity, prop);
+            }
+        }
+    }
     processProperties(changeSet) {
-        const meta = this.metadata.find(changeSet.name);
+        const meta = changeSet.meta;
         for (const prop of meta.relations) {
             this.processProperty(changeSet, prop);
         }
-        if (changeSet.type === ChangeSetType.CREATE && this.config.get('validateRequired')) {
-            this.validator.validateRequired(changeSet.entity);
+        if (changeSet.type === ChangeSetType.CREATE && this.#config.get('validateRequired')) {
+            this.validateRequired(changeSet.entity);
         }
     }
     async persistNewEntity(meta, changeSet, options) {
@@ -95,31 +119,33 @@ export class ChangeSetPersister {
         options = this.prepareOptions(meta, options, {
             convertCustomTypes: false,
         });
-        const res = await this.driver.nativeInsertMany(meta.className, [changeSet.payload], options);
+        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);
         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,
@@ -132,7 +158,10 @@ export class ChangeSetPersister {
             convertCustomTypes: false,
             processCollections: false,
         });
-        const res = await this.driver.nativeInsertMany(meta.className, changeSets.map(cs => cs.payload), options);
+        for (const changeSet of changeSets) {
+            this.resolveTPTIdentifiers(changeSet);
+        }
+        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);
@@ -150,7 +179,7 @@ export class ChangeSetPersister {
         }
     }
     async persistManagedEntity(changeSet, options) {
-        const meta = this.metadata.find(changeSet.name);
+        const meta = changeSet.meta;
         const res = await this.updateEntity(meta, changeSet, options);
         this.checkOptimisticLock(meta, changeSet, res);
         this.mapReturnedValues(changeSet.entity, changeSet.payload, res.row, meta);
@@ -158,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);
@@ -191,9 +220,9 @@ export class ChangeSetPersister {
             cond.push(where);
             payload.push(changeSet.payload);
         }
-        const res = await this.driver.nativeUpdateMany(meta.className, 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());
@@ -204,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);
@@ -212,7 +241,9 @@ export class ChangeSetPersister {
         // some drivers might be returning bigint PKs as numbers when the number is small enough,
         // 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' }) : value;
+        value = prop.customType
+            ? prop.customType.convertToDatabaseValue(insertId, this.#platform, { mode: 'serialization' })
+            : value;
         changeSet.payload[wrapped.__meta.primaryKeys[0]] = value;
         if (wrapped.__identifier && !Array.isArray(wrapped.__identifier)) {
             wrapped.__identifier.setValue(value);
@@ -222,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();
@@ -242,17 +273,19 @@ export class ChangeSetPersister {
         options = this.prepareOptions(meta, options, {
             convertCustomTypes: false,
         });
-        if (meta.concurrencyCheckKeys.size === 0 && (!meta.versionProperty || changeSet.entity[meta.versionProperty] == null)) {
-            return this.driver.nativeUpdate(changeSet.name, cond, changeSet.payload, options);
+        if (meta.concurrencyCheckKeys.size === 0 &&
+            (!meta.versionProperty || changeSet.entity[meta.versionProperty] == null)) {
+            return this.#driver.nativeUpdate(changeSet.meta.class, cond, changeSet.payload, options);
         }
         if (meta.versionProperty) {
-            cond[meta.versionProperty] = this.platform.quoteVersionValue(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.name, 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 && (!meta.versionProperty || changeSets.every(cs => cs.entity[meta.versionProperty] == null))) {
+        if (meta.concurrencyCheckKeys.size === 0 &&
+            (!meta.versionProperty || changeSets.every(cs => cs.entity[meta.versionProperty] == null))) {
             return;
         }
         // skip entity references as they don't have version values loaded
@@ -261,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.quoteVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
+                cond[meta.versionProperty] = this.#platform.convertVersionValue(cs.entity[meta.versionProperty], meta.properties[meta.versionProperty]);
             }
             return cond;
         });
@@ -269,7 +302,7 @@ export class ChangeSetPersister {
         options = this.prepareOptions(meta, options, {
             fields: primaryKeys,
         });
-        const res = await this.driver.find(meta.root.className, { $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 => {
@@ -288,13 +321,24 @@ 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) {
-            // do not reload things that already had a runtime value
-            meta.props
-                .filter(prop => prop.persist !== false && (prop.autoincrement || prop.generated || prop.defaultRaw))
-                .filter(prop => (changeSets[0].entity[prop.name] == null && prop.defaultRaw !== 'null') || isRaw(changeSets[0].entity[prop.name]))
-                .forEach(prop => reloadProps.push(prop));
+            for (const prop of meta.props) {
+                if (prop.persist === false) {
+                    continue;
+                }
+                if (isRaw(changeSets[0].entity[prop.name])) {
+                    reloadProps.push(prop);
+                    continue;
+                }
+                // do not reload things that already had a runtime value
+                if (changeSets[0].entity[prop.name] != null || prop.defaultRaw === 'null') {
+                    continue;
+                }
+                if (prop.autoincrement || prop.generated || prop.defaultRaw) {
+                    reloadProps.push(prop);
+                }
+            }
         }
         if (changeSets[0].type === ChangeSetType.UPDATE) {
             const returning = new Set();
@@ -306,10 +350,8 @@ export class ChangeSetPersister {
                 });
             });
             // reload generated columns
-            if (!this.usesReturningStatement) {
-                meta.props
-                    .filter(prop => prop.generated && !prop.primary)
-                    .forEach(prop => reloadProps.push(prop));
+            if (!this.#usesReturningStatement) {
+                meta.props.filter(prop => prop.generated && !prop.primary).forEach(prop => reloadProps.push(prop));
                 reloadProps.push(...returning);
             }
         }
@@ -321,35 +363,56 @@ 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.className, { [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
         }
     }
+    /**
+     * For TPT child tables, resolve EntityIdentifier values in PK fields.
+     * The parent table insert assigns the actual PK value, which the child table references.
+     */
+    resolveTPTIdentifiers(changeSet) {
+        if (changeSet.meta.inheritanceType !== 'tpt' || !changeSet.meta.tptParent) {
+            return;
+        }
+        for (const pk of changeSet.meta.primaryKeys) {
+            const value = changeSet.payload[pk];
+            if (value instanceof EntityIdentifier) {
+                changeSet.payload[pk] = value.getValue();
+            }
+        }
+    }
     processProperty(changeSet, prop) {
-        const meta = this.metadata.find(changeSet.name);
+        const meta = changeSet.meta;
         const value = changeSet.payload[prop.name]; // for inline embeddables
         if (value instanceof EntityIdentifier) {
             changeSet.payload[prop.name] = value.getValue();
             return;
         }
+        if (value instanceof PolymorphicRef) {
+            if (value.id instanceof EntityIdentifier) {
+                value.id = value.id.getValue();
+            }
+            return;
+        }
         if (Array.isArray(value) && value.every(item => item instanceof EntityIdentifier)) {
             changeSet.payload[prop.name] = value.map(item => item.getValue());
             return;
         }
         if (prop.kind === ReferenceKind.MANY_TO_MANY && Array.isArray(value)) {
-            changeSet.payload[prop.name] = value.map(val => val instanceof EntityIdentifier ? val.getValue() : val);
+            changeSet.payload[prop.name] = value.map(val => (val instanceof EntityIdentifier ? val.getValue() : val));
             return;
         }
         if (prop.name in changeSet.payload) {
@@ -368,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.className, 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

@@ -1,17 +1,18 @@
-import type { Dictionary, EntityProperty } from '../typings.js';
+import type { EntityProperty } from '../typings.js';
 export declare const enum NodeState {
     NOT_VISITED = 0,
     IN_PROGRESS = 1,
     VISITED = 2
 }
+type Hash = number;
 export interface Node {
-    hash: string;
+    hash: Hash;
     state: NodeState;
-    dependencies: Dictionary<Edge>;
+    dependencies: Map<Hash, Edge>;
 }
 export interface Edge {
-    from: string;
-    to: string;
+    from: Hash;
+    to: Hash;
     weight: number;
 }
 /**
@@ -25,30 +26,27 @@ 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.
      */
-    hasNode(hash: string): boolean;
+    hasNode(hash: Hash): boolean;
     /**
      * Adds a new node to the graph, assigning its hash.
      */
-    addNode(hash: string): void;
+    addNode(hash: Hash): void;
     /**
      * Adds a new dependency (edge) to the graph using their hashes.
      */
-    addDependency(from: string, to: string, weight: number): void;
-    discoverProperty(prop: EntityProperty, entityName: string): void;
+    addDependency(from: Hash, to: Hash, weight: number): void;
+    discoverProperty(prop: EntityProperty, entityName: Hash): void;
     /**
      * Return a valid order list of all current nodes.
      * The desired topological sorting is the reverse post order of these searches.
      *
      * @internal Highly performance-sensitive method.
      */
-    sort(): string[];
+    sort(): Hash[];
     /**
      * Visit a given node definition for reordering.
      *
@@ -60,3 +58,4 @@ export declare class CommitOrderCalculator {
      */
     private visitOpenNode;
 }
+export {};

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 = {};
+    #nodes = new Map();
     /** Volatile variable holding calculated nodes during sorting process. */
-    sortedNodeList = [];
+    #sortedNodeList = [];
     /**
      * Checks for node existence in graph.
      */
     hasNode(hash) {
-        return hash in this.nodes;
+        return this.#nodes.has(hash);
     }
     /**
      * Adds a new node to the graph, assigning its hash.
      */
     addNode(hash) {
-        this.nodes[hash] = { hash, state: 0 /* NodeState.NOT_VISITED */, dependencies: {} };
+        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[from].dependencies[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;
@@ -44,8 +44,8 @@ export class CommitOrderCalculator {
         if (!toOneOwner && !toManyOwner) {
             return;
         }
-        const propertyType = prop.targetMeta?.root.className;
-        if (!propertyType || !this.hasNode(propertyType)) {
+        const propertyType = prop.targetMeta?.root._id;
+        if (propertyType == null || !this.hasNode(propertyType)) {
             return;
         }
         this.addDependency(propertyType, entityName, prop.nullable || prop.persist === false ? 0 : 1);
@@ -57,15 +57,15 @@ export class CommitOrderCalculator {
      * @internal Highly performance-sensitive method.
      */
     sort() {
-        for (const vertex of Object.values(this.nodes)) {
+        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 = {};
-        this.sortedNodeList = [];
+        const sortedList = this.#sortedNodeList.reverse();
+        this.#nodes = new Map();
+        this.#sortedNodeList = [];
         return sortedList;
     }
     /**
@@ -75,35 +75,37 @@ export class CommitOrderCalculator {
      */
     visit(node) {
         node.state = 1 /* NodeState.IN_PROGRESS */;
-        for (const edge of Object.values(node.dependencies)) {
-            const target = this.nodes[edge.to];
+        for (const edge of node.dependencies.values()) {
+            const target = this.#nodes.get(edge.to);
             switch (target.state) {
-                case 2 /* NodeState.VISITED */: break; // Do nothing, since node was already visited
+                case 2 /* NodeState.VISITED */:
+                    break; // Do nothing, since node was already visited
                 case 1 /* NodeState.IN_PROGRESS */:
                     this.visitOpenNode(node, target, edge);
                     break;
-                case 0 /* NodeState.NOT_VISITED */: this.visit(target);
+                case 0 /* NodeState.NOT_VISITED */:
+                    this.visit(target);
             }
         }
         if (node.state !== 2 /* NodeState.VISITED */) {
             node.state = 2 /* NodeState.VISITED */;
-            this.sortedNodeList.push(node.hash);
+            this.#sortedNodeList.push(node.hash);
         }
     }
     /**
      * Visits all target's dependencies if in cycle with given node
      */
     visitOpenNode(node, target, edge) {
-        if (!target.dependencies[node.hash] || target.dependencies[node.hash].weight >= edge.weight) {
+        if (!target.dependencies.has(node.hash) || target.dependencies.get(node.hash).weight >= edge.weight) {
             return;
         }
-        for (const edge of Object.values(target.dependencies)) {
-            const targetNode = this.nodes[edge.to];
+        for (const edge of target.dependencies.values()) {
+            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,9 +1,13 @@
 import type { AnyEntity, EntityMetadata } from '../typings.js';
 export declare class IdentityMap {
-    private readonly defaultSchema?;
-    constructor(defaultSchema?: string | undefined);
-    private readonly registry;
+    #private;
+    constructor(defaultSchema?: string);
     store<T>(item: T): void;
+    /**
+     * Stores an entity under an alternate key (non-PK property).
+     * This allows looking up entities by unique properties that are not the primary key.
+     */
+    storeByKey<T>(item: T, key: string, value: string, schema?: string): void;
     delete<T>(item: T): void;
     getByHash<T>(meta: EntityMetadata<T>, hash: string): T | undefined;
     getStore<T>(meta: EntityMetadata<T>): Map<string, T>;
@@ -16,4 +20,9 @@ export declare class IdentityMap {
      */
     get<T>(hash: string): T | undefined;
     private getPkHash;
+    /**
+     * Creates a hash for an alternate key lookup.
+     * Format: `[key]value` or `schema:[key]value`
+     */
+    getKeyHash(key: string, value: string, schema?: string): string;
 }