@mikro-orm/core 7.1.6-dev.0 → 7.1.6-dev.10

package/EntityManager.d.ts

@@ -196,7 +196,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      * }
      * ```
      */
-    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = never, Excludes extends string = never, IncludeCount extends boolean = true, Using extends string = never>(entityName: EntityName<Entity>, options: WithUsingOptions<FindByCursorOptions<Entity, Hint, Fields, Excludes, IncludeCount>, Entity, Using>): Promise<Cursor<Entity, Hint, Fields, Excludes, IncludeCount>>;
+    findByCursor<Entity extends object, Hint extends string = never, Fields extends string = never, Excludes extends string = never, IncludeCount extends boolean = true, Using extends string = never>(entityName: EntityName<Entity>, options: WithUsingOptions<FindByCursorOptions<NoInfer<Entity>, Hint, Fields, Excludes, IncludeCount>, NoInfer<Entity>, Using>): Promise<Cursor<Entity, Hint, Fields, Excludes, IncludeCount>>;
     /**
      * Refreshes the persistent state of an entity from the database, overriding any local changes that have not yet been
      * persisted. Returns the same entity instance (same object reference), but re-hydrated. If the entity is no longer
@@ -319,7 +319,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Fires native insert query. Calling this has no side effects on the context (identity map).
      */
-    insert<Entity extends object>(entityNameOrEntity: EntityName<Entity> | Entity, data?: RequiredEntityData<Entity> | Entity, options?: NativeInsertUpdateOptions<Entity>): Promise<Primary<Entity>>;
+    insert<Entity extends object>(entityNameOrEntity: EntityName<Entity> | Entity, data?: NoInfer<RequiredEntityData<Entity> | Entity>, options?: NativeInsertUpdateOptions<Entity>): Promise<Primary<Entity>>;
     /**
      * Clones rows matching the condition at the database level via INSERT...SELECT.
      * Automatically excludes auto-increment PKs, generated columns, and resets version properties.
@@ -342,7 +342,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
     /**
      * Fires native multi-insert query. Calling this has no side effects on the context (identity map).
      */
-    insertMany<Entity extends object>(entityNameOrEntities: EntityName<Entity> | Entity[], data?: RequiredEntityData<Entity>[] | Entity[], options?: NativeInsertUpdateOptions<Entity>): Promise<Primary<Entity>[]>;
+    insertMany<Entity extends object>(entityNameOrEntities: EntityName<Entity> | Entity[], data?: NoInfer<RequiredEntityData<Entity>[] | Entity[]>, options?: NativeInsertUpdateOptions<Entity>): Promise<Primary<Entity>[]>;
     /**
      * Fires native update query. Calling this has no side effects on the context (identity map).
      */

package/entity/defineEntity.d.ts

@@ -1,6 +1,6 @@
 import type { EntityManager } from '../EntityManager.js';
 import type { ColumnType, PropertyOptions, ReferenceOptions, EnumOptions, EmbeddedOptions, ManyToOneOptions, OneToManyOptions, OneToOneOptions, ManyToManyOptions, IndexColumnOptions } from '../metadata/types.js';
-import type { AnyString, GeneratedColumnCallback, Constructor, CheckCallback, FilterQuery, EntityName, Dictionary, EntityMetadata, PrimaryKeyProp, EntityRepositoryType, Hidden, Opt, Primary, EntityClass, EntitySchemaWithMeta, InferEntity, MaybeReturnType, Ref, LazyRef, IndexCallback, TriggerCallback, FormulaCallback, EntityCtor, IsNever, IWrappedEntity, DefineConfig, Config, MaybePromise, IndexHints } from '../typings.js';
+import type { AnyString, GeneratedColumnCallback, Constructor, CheckCallback, FilterQuery, EntityName, Dictionary, EntityMetadata, PrimaryKeyProp, EntityRepositoryType, Hidden, Opt, Primary, EntityClass, EntitySchemaWithMeta, InferEntity, MaybeReturnType, Ref, LazyRef, IndexCallback, TriggerCallback, FormulaCallback, EntityCtor, IsNever, IWrappedEntity, DefineConfig, Config, MaybePromise, IndexHints, ExtractDefineEntityProperties } from '../typings.js';
 import type { Raw } from '../utils/RawQueryFragment.js';
 import type { ScalarReference } from './Reference.js';
 import type { SerializeOptions } from '../serialization/EntitySerializer.js';
@@ -745,8 +745,9 @@ export type InferEntityFromProperties<Properties extends Record<string, any>, PK
         forceObject: true;
     }>;
 } : {}) & {
-    [IndexHints]?: [Properties];
+    [IndexHints]?: [Omit<ExtractBaseProperties<Base>, keyof Properties> & Properties];
 };
+type ExtractBaseProperties<Base> = [ExtractDefineEntityProperties<Base>] extends [infer P extends Record<string, any>] ? [P] extends [never] ? {} : P : {};
 type NarrowDiscriminator<Base, DiscColumn extends string | undefined, DiscValue> = DiscColumn extends string ? DiscColumn extends keyof Base ? DiscValue extends string | number ? Omit<Base, DiscColumn> & {
     [K in DiscColumn]: DiscValue;
 } : Base : Base : Base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.6-dev.0",
+  "version": "7.1.6-dev.10",
   "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.",
   "keywords": [
     "data-mapper",

package/types/TimeType.d.ts

@@ -2,8 +2,8 @@ import { Type } from './Type.js';
 import type { Platform } from '../platforms/Platform.js';
 import type { EntityProperty } from '../typings.js';
 /** Maps a database TIME column to a JS `string` in HH:MM:SS format. */
-export declare class TimeType extends Type {
-    convertToDatabaseValue(value: any, platform: Platform): string;
+export declare class TimeType extends Type<string | null | undefined, string | null | undefined> {
+    convertToDatabaseValue(value: string | null | undefined, platform: Platform): string | null | undefined;
     compareAsType(): string;
     ensureComparable(): boolean;
     getColumnType(prop: EntityProperty, platform: Platform): string;

package/types/TimeType.js

@@ -3,7 +3,7 @@ import { ValidationError } from '../errors.js';
 /** Maps a database TIME column to a JS `string` in HH:MM:SS format. */
 export class TimeType extends Type {
     convertToDatabaseValue(value, platform) {
-        if (value && !value.toString().match(/^\d{2,}:(?:[0-5]\d):(?:[0-5]\d)$/)) {
+        if (value && !/^\d{2,}:(?:[0-5]\d):(?:[0-5]\d)$/.test(value)) {
             throw ValidationError.invalidType(TimeType, value, 'JS');
         }
         return super.convertToDatabaseValue(value, platform);

package/utils/Utils.js

@@ -141,7 +141,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.1.6-dev.0';
+    static #ORM_VERSION = '7.1.6-dev.10';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */