@mikro-orm/core 7.0.0-dev.247 → 7.0.0-dev.249

package/drivers/IDatabaseDriver.d.ts

@@ -155,12 +155,18 @@ export interface FindOptions<Entity, Hint extends string = never, Fields extends
     lockTableAliases?: string[];
     ctx?: Transaction;
     connectionType?: ConnectionType;
-    /** sql only */
-    indexHint?: string;
+    /** SQL: appended to FROM clause (e.g. `'force index(my_index)'`); MongoDB: index name or spec passed as `hint`. */
+    indexHint?: string | Dictionary;
     /** sql only */
     comments?: string | string[];
     /** sql only */
     hintComments?: string | string[];
+    /** SQL: collation name string applied as COLLATE to ORDER BY; MongoDB: CollationOptions object. */
+    collation?: CollationOptions | string;
+    /** mongodb only */
+    maxTimeMS?: number;
+    /** mongodb only */
+    allowDiskUse?: boolean;
     loggerContext?: LogContext;
     logging?: LoggingOptions;
     /** @internal used to apply filters to the auto-joined relations */
@@ -211,12 +217,16 @@ export interface CountOptions<T extends object, P extends string = never> {
     ctx?: Transaction;
     connectionType?: ConnectionType;
     flushMode?: FlushMode | `${FlushMode}`;
-    /** sql only */
-    indexHint?: string;
+    /** SQL: appended to FROM clause (e.g. `'force index(my_index)'`); MongoDB: index name or spec passed as `hint`. */
+    indexHint?: string | Dictionary;
     /** sql only */
     comments?: string | string[];
     /** sql only */
     hintComments?: string | string[];
+    /** SQL: collation name string applied as COLLATE; MongoDB: CollationOptions object. */
+    collation?: CollationOptions | string;
+    /** mongodb only */
+    maxTimeMS?: number;
     loggerContext?: LogContext;
     logging?: LoggingOptions;
     /** @internal used to apply filters to the auto-joined relations */
@@ -244,6 +254,16 @@ export interface DriverMethodOptions {
     schema?: string;
     loggerContext?: LogContext;
 }
+export interface CollationOptions {
+    locale: string;
+    caseLevel?: boolean;
+    caseFirst?: string;
+    strength?: number;
+    numericOrdering?: boolean;
+    alternate?: string;
+    maxVariable?: string;
+    backwards?: boolean;
+}
 export interface GetReferenceOptions {
     wrapped?: boolean;
     convertCustomTypes?: boolean;

package/package.json

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

@@ -335,7 +335,7 @@ type ExplicitlyOptionalProps<T> = (T extends {
     [K in keyof T]: T[K] extends Opt ? K : never;
 }[keyof T] & {});
 type NullableKeys<T, V = null> = {
-    [K in keyof T]: V extends T[K] ? K : never;
+    [K in keyof T]: unknown extends T[K] ? never : V extends T[K] ? K : never;
 }[keyof T];
 type RequiredNullableKeys<T> = {
     [K in keyof T]: Exclude<T[K], null> extends RequiredNullable.Brand ? K : never;

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