@mikro-orm/core 7.0.0-dev.51 → 7.0.0-dev.52

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.51",
+  "version": "7.0.0-dev.52",
   "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",
@@ -54,7 +54,7 @@
     "dataloader": "2.2.3",
     "dotenv": "17.2.3",
     "esprima": "4.0.1",
-    "mikro-orm": "7.0.0-dev.51",
+    "mikro-orm": "7.0.0-dev.52",
     "reflect-metadata": "0.2.2",
     "tinyglobby": "0.2.13"
   }

package/utils/Utils.d.ts

@@ -134,7 +134,7 @@ export declare class Utils {
     static getCompositeKeyHash<T>(data: EntityData<T>, meta: EntityMetadata<T>, convertCustomTypes?: boolean, platform?: Platform, flat?: boolean): string;
     static getPrimaryKeyHash(pks: (string | Buffer | Date)[]): string;
     static splitPrimaryKeys<T extends object>(key: string): EntityKey<T>[];
-    static getPrimaryKeyValues<T>(entity: T, primaryKeys: string[] | EntityMetadata<T>, allowScalar?: boolean, convertCustomTypes?: boolean): any;
+    static getPrimaryKeyValues<T>(entity: T, meta: EntityMetadata<T>, allowScalar?: boolean, convertCustomTypes?: boolean): any;
     static getPrimaryKeyCond<T>(entity: T, primaryKeys: EntityKey<T>[]): Record<string, Primary<T>> | null;
     /**
      * Maps nested FKs from `[1, 2, 3]` to `[1, [2, 3]]`.

package/utils/Utils.js

@@ -6,7 +6,7 @@ import { existsSync, mkdirSync, readFileSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { tokenize } from 'esprima';
 import { clone } from './clone.js';
-import { ARRAY_OPERATORS, JSON_KEY_OPERATORS, GroupOperator, PlainObject, QueryOperator, ReferenceKind } from '../enums.js';
+import { ARRAY_OPERATORS, GroupOperator, JSON_KEY_OPERATORS, PlainObject, QueryOperator, ReferenceKind, } from '../enums.js';
 import { helper } from '../entity/wrap.js';
 export const ObjectBindingPattern = Symbol('ObjectBindingPattern');
 function compareConstructors(a, b) {
@@ -486,8 +486,7 @@ export class Utils {
     static splitPrimaryKeys(key) {
         return key.split(this.PK_SEPARATOR);
     }
-    // TODO v7: remove support for `primaryKeys: string[]`
-    static getPrimaryKeyValues(entity, primaryKeys, allowScalar = false, convertCustomTypes = false) {
+    static getPrimaryKeyValues(entity, meta, allowScalar = false, convertCustomTypes = false) {
         /* v8 ignore next 3 */
         if (entity == null) {
             return entity;
@@ -498,15 +497,13 @@ export class Utils {
             }
             return val;
         }
-        const meta = Array.isArray(primaryKeys) ? undefined : primaryKeys;
-        primaryKeys = Array.isArray(primaryKeys) ? primaryKeys : meta.primaryKeys;
         let pk;
         if (Utils.isEntity(entity, true)) {
             pk = helper(entity).getPrimaryKey(convertCustomTypes);
         }
         else {
-            pk = primaryKeys.reduce((o, pk) => {
-                const targetMeta = meta?.properties[pk].targetMeta;
+            pk = meta.primaryKeys.reduce((o, pk) => {
+                const targetMeta = meta.properties[pk].targetMeta;
                 if (targetMeta && Utils.isPlainObject(entity[pk])) {
                     o[pk] = Utils.getPrimaryKeyValues(entity[pk], targetMeta, allowScalar, convertCustomTypes);
                 }
@@ -516,12 +513,12 @@ export class Utils {
                 return o;
             }, {});
         }
-        if (primaryKeys.length > 1) {
+        if (meta.primaryKeys.length > 1) {
             return toArray(pk);
         }
         if (allowScalar) {
             if (Utils.isPlainObject(pk)) {
-                return pk[primaryKeys[0]];
+                return pk[(meta.primaryKeys)[0]];
             }
             return pk;
         }