@mikro-orm/core 7.0.0-dev.21 → 7.0.0-dev.211

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;
 }
 /**
@@ -32,23 +33,23 @@ export declare class CommitOrderCalculator {
     /**
      * 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 +61,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 = [];
     /**
      * 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,14 +57,14 @@ 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.nodes = new Map();
         this.sortedNodeList = [];
         return sortedList;
     }
@@ -75,8 +75,8 @@ 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 1 /* NodeState.IN_PROGRESS */:
@@ -94,11 +94,11 @@ export class CommitOrderCalculator {
      * 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);
             }

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

@@ -3,7 +3,14 @@ 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;
     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 +23,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;
 }

package/unit-of-work/IdentityMap.js

@@ -4,11 +4,38 @@ export class IdentityMap {
         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);
     }
+    /**
+     * 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(item, key, value, schema) {
+        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);
+        if (!keys) {
+            keys = new Set();
+            this.alternateKeys.set(item, keys);
+        }
+        keys.add(hash);
+    }
     delete(item) {
-        this.getStore(item.__meta.root).delete(this.getPkHash(item));
+        const meta = item.__meta.root;
+        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);
+        if (altKeys) {
+            for (const hash of altKeys) {
+                store.delete(hash);
+            }
+            this.alternateKeys.delete(item);
+        }
     }
     getByHash(meta, hash) {
         const store = this.getStore(meta);
@@ -69,4 +96,15 @@ export class IdentityMap {
         }
         return hash;
     }
+    /**
+     * Creates a hash for an alternate key lookup.
+     * Format: `[key]value` or `schema:[key]value`
+     */
+    getKeyHash(key, value, schema) {
+        const hash = `[${key}]${value}`;
+        if (schema) {
+            return schema + ':' + hash;
+        }
+        return hash;
+    }
 }

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

@@ -1,4 +1,4 @@
-import type { AnyEntity, EntityData, EntityMetadata, EntityProperty, FilterQuery, Primary } from '../typings.js';
+import type { AnyEntity, EntityData, EntityMetadata, EntityName, EntityProperty, FilterQuery, Primary } from '../typings.js';
 import { Collection } from '../entity/Collection.js';
 import { Reference } from '../entity/Reference.js';
 import { ChangeSet, ChangeSetType } from './ChangeSet.js';
@@ -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,8 +45,21 @@ 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;
-    tryGetById<T extends object>(entityName: string, where: FilterQuery<T>, schema?: string, strict?: boolean): T | null;
+    getById<T extends object>(entityName: EntityName<T>, id: Primary<T> | Primary<T>[], schema?: string, convertCustomTypes?: boolean): T | undefined;
+    /**
+     * Returns entity from the identity map by an alternate key (non-PK property).
+     * @param convertCustomTypes - If true, the value is in database format and will be converted to JS format for lookup.
+     *                             If false (default), the value is assumed to be in JS format already.
+     */
+    getByKey<T extends object>(entityName: EntityName<T>, key: string, value: unknown, schema?: string, convertCustomTypes?: boolean): T | undefined;
+    /**
+     * Stores an entity in the identity map under an alternate key (non-PK property).
+     * Also sets the property value on the entity.
+     * @param convertCustomTypes - If true, the value is in database format and will be converted to JS format.
+     *                             If false (default), the value is assumed to be in JS format already.
+     */
+    storeByKey<T extends object>(entity: T, key: string, value: unknown, schema?: string, convertCustomTypes?: boolean): void;
+    tryGetById<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>, schema?: string, strict?: boolean): T | null;
     /**
      * Returns map of all managed entities.
      */
@@ -103,6 +122,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)
      */