@mikro-orm/core 7.0.0-dev.190 → 7.0.0-dev.192

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mikro-orm/core",
   "type": "module",
-  "version": "7.0.0-dev.190",
+  "version": "7.0.0-dev.192",
   "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

@@ -820,11 +820,26 @@ export type IsSubset<T, U> = keyof U extends keyof T ? {} : string extends keyof
 };
 declare const __selectedType: unique symbol;
 declare const __loadedType: unique symbol;
-type AnyStringToNever<T> = string extends T ? never : T;
-export type MergeSelected<T, U, F extends string> = T extends Loaded<infer TT, infer P, infer FF, infer E> ? IsNever<Exclude<E, F>> extends true ? Loaded<TT, P, AnyStringToNever<F> | AnyStringToNever<FF>> : Loaded<TT, AnyStringToNever<P>, AnyStringToNever<FF>, AnyStringToNever<Exclude<E, F>>> : T;
-type MergeFields<F1 extends string, F2 extends string, P1, P2> = P1 | P2 extends '*' ? '*' : F1 | F2;
-type MergeExcludes<F extends string, E extends string> = F extends E ? never : Exclude<E, F>;
-export type MergeLoaded<T, U, P extends string, F extends string, E extends string, R extends boolean = false> = T extends Loaded<U, infer PP, infer FF, infer EE> ? string extends FF ? Loaded<T, P, F, AnyStringToNever<EE> | E> : string extends P ? Loaded<U, never, F | (FF & string), MergeExcludes<F | (FF & string), EE | E>> : Loaded<U, P | AnyStringToNever<PP>, MergeFields<F, AnyStringToNever<FF>, P, PP>, MergeExcludes<MergeFields<F, AnyStringToNever<FF>, P, PP>, (R extends true ? never : EE) | E>> : Loaded<T, P, F>;
+/**
+ * Fast check if T is a Loaded type by looking for the marker symbol.
+ * This is much cheaper than matching against the full Loaded structure.
+ */
+type IsLoadedType<T> = T extends {
+    [__loadedType]?: any;
+} ? true : false;
+/**
+ * Optimized MergeSelected using intersection instead of extraction.
+ * When T is already Loaded, we intersect with a new Loaded type for the selected fields.
+ * This avoids the expensive pattern matching needed to extract hints from Loaded types.
+ */
+export type MergeSelected<T, U, F extends string> = IsLoadedType<T> extends true ? T & Loaded<U, never, F, never> : T;
+/**
+ * Optimized MergeLoaded using intersection instead of extraction.
+ * When T is already Loaded, we intersect with a new Loaded type for the additional hints.
+ * This avoids the expensive pattern matching needed to extract hints from Loaded types.
+ * Used for `em.populate` and `em.refresh`.
+ */
+export type MergeLoaded<T, U, P extends string, F extends string, E extends string, R extends boolean = false> = IsLoadedType<T> extends true ? T & Loaded<U, P, F, E> : Loaded<T, P, F, E>;
 export type AddOptional<T> = undefined | null extends T ? null | undefined : null extends T ? null : undefined extends T ? undefined : never;
 type LoadedProp<T, L extends string = never, F extends string = '*', E extends string = never> = LoadedLoadable<T, Loaded<ExtractType<T>, L, F, E>>;
 export type AddEager<T> = ExtractEagerProps<T> & string;

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