@mikro-orm/core 7.0.0-dev.163 → 7.0.0-dev.165

package/EntityManager.js

@@ -1736,21 +1736,17 @@ export class EntityManager {
             return { key: cacheKey, data: cached };
         }
         let data;
+        const createOptions = {
+            merge: true,
+            convertCustomTypes: false,
+            refresh,
+            recomputeSnapshot: true,
+        };
         if (Array.isArray(cached) && merge) {
-            data = cached.map(item => em.entityFactory.create(entityName, item, {
-                merge: true,
-                convertCustomTypes: true,
-                refresh,
-                recomputeSnapshot: true,
-            }));
+            data = cached.map(item => em.entityFactory.create(entityName, item, createOptions));
         }
         else if (Utils.isObject(cached) && merge) {
-            data = em.entityFactory.create(entityName, cached, {
-                merge: true,
-                convertCustomTypes: true,
-                refresh,
-                recomputeSnapshot: true,
-            });
+            data = em.entityFactory.create(entityName, cached, createOptions);
         }
         else {
             data = cached;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.163",
+  "version": "7.0.0-dev.165",
   "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/typings.d.ts

@@ -778,7 +778,7 @@ type Prefix<T, K> = K extends `${infer S}.${string}` ? S : (K extends '*' ? keyo
 type IsPrefixedExclude<T, K extends keyof T, E extends string> = K extends E ? never : K;
 export type IsPrefixed<T, K extends keyof T, L extends string, E extends string = never> = IsNever<E> extends false ? IsPrefixedExclude<T, K, E> : K extends symbol ? never : IsTrue<L> extends true ? (T[K] & {} extends Loadable<any> ? K : never) : IsNever<StringLiteral<L>> extends true ? never : K extends Prefix<T, L> ? K : K extends PrimaryProperty<T> ? K : never;
 type Suffix<Key, Hint extends string, All = true | '*'> = Hint extends `${infer Pref}.${infer Suf}` ? (Pref extends Key ? Suf : never) : Hint extends All ? Hint : never;
-export type IsSubset<T, U> = keyof U extends keyof T ? {} : Dictionary extends U ? {} : {
+export type IsSubset<T, U> = keyof U extends keyof T ? {} : string extends keyof U ? {} : {
     [K in keyof U as K extends keyof T ? never : CleanKeys<U, K>]: never;
 };
 declare const __selectedType: unique symbol;

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.163';
+    static #ORM_VERSION = '7.0.0-dev.165';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */