@mikro-orm/core 6.2.10-dev.74 → 6.2.10-dev.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.2.10-dev.74",
+  "version": "6.2.10-dev.75",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.2.10-dev.74",
+    "mikro-orm": "6.2.10-dev.75",
     "reflect-metadata": "0.2.2"
   }
 }

package/serialization/SerializationContext.d.ts

@@ -5,7 +5,7 @@ import type { Configuration } from '../utils/Configuration';
  * Before we process a property, we call `visit` that checks if it is not a cycle path (but allows to pass cycles that
  * are defined in populate hint). If not, we proceed and call `leave` afterwards.
  */
-export declare class SerializationContext<T> {
+export declare class SerializationContext<T extends object> {
     private readonly config;
     private readonly populate;
     private readonly fields?;
@@ -23,7 +23,7 @@ export declare class SerializationContext<T> {
     /**
      * When initializing new context, we need to propagate it to the whole entity graph recursively.
      */
-    static propagate(root: SerializationContext<AnyEntity>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
+    static propagate(root: SerializationContext<any>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
     isMarkedAsPopulated(entityName: string, prop: string): boolean;
     isPartiallyLoaded(entityName: string, prop: string): boolean;
     private register;

package/typings.d.ts

@@ -13,9 +13,9 @@ export type Constructor<T = unknown> = new (...args: any[]) => T;
 export type Dictionary<T = any> = {
     [k: string]: T;
 };
-export type EntityKey<T = unknown, B extends boolean = false> = string & keyof {
-    [K in keyof T as CleanKeys<T, K, B>]?: unknown;
-};
+export type EntityKey<T = unknown, B extends boolean = false> = string & {
+    [K in keyof T]-?: CleanKeys<T, K, B> extends never ? never : K;
+}[keyof T];
 export type EntityValue<T> = T[EntityKey<T>];
 export type FilterKey<T> = keyof FilterQuery<T>;
 export type AsyncFunction<R = any, T = Dictionary> = (args: T) => Promise<T>;
@@ -126,7 +126,7 @@ export type ExpandQuery<T> = T extends object ? T extends Scalar ? never : Filte
 export type EntityProps<T> = {
     -readonly [K in EntityKey<T>]?: T[K];
 };
-export type ObjectQuery<T> = OperatorMap<T> & ExpandObject<T>;
+export type ObjectQuery<T> = OperatorMap<T> & FilterObject<T>;
 export type FilterQuery<T> = ObjectQuery<T> | NonNullable<ExpandScalar<Primary<T>>> | NonNullable<EntityProps<T> & OperatorMap<T>> | FilterQuery<T>[];
 export type QBFilterQuery<T = any> = ObjectQuery<T> | Dictionary;
 export interface IWrappedEntity<Entity extends object> {