@mikro-orm/core 7.0.0-dev.120 → 7.0.0-dev.121

package/EntityManager.js

@@ -571,8 +571,8 @@ export class EntityManager {
         let found = false;
         for (const e of fork.unitOfWork.getIdentityMap()) {
             const ref = em.getReference(e.constructor, helper(e).getPrimaryKey());
-            const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: true });
-            em.config.getHydrator(this.metadata).hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, true);
+            const data = helper(e).serialize({ ignoreSerializers: true, includeHidden: true, convertCustomTypes: false });
+            em.config.getHydrator(this.metadata).hydrate(ref, helper(ref).__meta, data, em.entityFactory, 'full', false, false);
             Utils.merge(helper(ref).__originalEntityData, this.comparator.prepareEntity(e));
             found ||= ref === entity;
         }

package/drivers/DatabaseDriver.js

@@ -286,26 +286,26 @@ export class DatabaseDriver {
                                     if (!sub.embeddedProps[kkk]) {
                                         throw ValidationError.invalidEmbeddableQuery(meta.class, kkk, sub.type);
                                     }
-                                    inline(payload[sub.embedded[1]], sub.embeddedProps[kkk], [...path, sub.embedded[1]]);
+                                    inline(payload[sub.embedded[1]], sub.embeddedProps[kkk], [...path, sub.fieldNames[0]]);
                                 });
                             }
-                            data[`${path.join('.')}.${sub.embedded[1]}`] = payload[sub.embedded[1]];
+                            data[`${path.join('.')}.${sub.fieldNames[0]}`] = payload[sub.embedded[1]];
                         };
                         const parentPropName = kk.substring(0, kk.indexOf('.'));
                         // we might be using some native JSON operator, e.g. with mongodb's `$geoWithin` or `$exists`
                         if (props[kk]) {
                             /* v8 ignore next */
-                            inline(data[prop.name], props[kk] || props[parentPropName], [prop.name]);
+                            inline(data[prop.name], props[kk] || props[parentPropName], [prop.fieldNames[0]]);
                         }
                         else if (props[parentPropName]) {
-                            data[`${prop.name}.${kk}`] = data[prop.name][kk];
+                            data[`${prop.fieldNames[0]}.${kk}`] = data[prop.name][kk];
                         }
                         else {
                             unknownProp = true;
                         }
                     }
                     else if (props[kk]) {
-                        data[props[kk].name] = data[prop.name][props[kk].embedded[1]];
+                        data[props[kk].fieldNames[0]] = data[prop.name][props[kk].embedded[1]];
                     }
                     else {
                         throw ValidationError.invalidEmbeddableQuery(meta.class, kk, prop.type);

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 } from '../metadata/types.js';
-import type { AnyString, GeneratedColumnCallback, Constructor, CheckCallback, FilterQuery, EntityName, Dictionary, EntityMetadata, PrimaryKeyProp, Hidden, Opt, Primary, EntityClass, EntitySchemaWithMeta, InferEntity, MaybeReturnType, Ref, IndexCallback } from '../typings.js';
+import type { AnyString, GeneratedColumnCallback, Constructor, CheckCallback, FilterQuery, EntityName, Dictionary, EntityMetadata, PrimaryKeyProp, Hidden, Opt, Primary, EntityClass, EntitySchemaWithMeta, InferEntity, MaybeReturnType, Ref, IndexCallback, EntityCtor } from '../typings.js';
 import type { ScalarReference } from './Reference.js';
 import type { SerializeOptions } from '../serialization/EntitySerializer.js';
 import type { Cascade, DeferMode, EmbeddedPrefixMode, EventType, LoadStrategy, QueryOrderMap } from '../enums.js';
@@ -436,13 +436,13 @@ export interface EntityMetadataWithProperties<TName extends string, TTableName e
     }[];
 }
 export declare function defineEntity<const TName extends string, const TTableName extends string, const TProperties extends Record<string, any>, const TPK extends (keyof TProperties)[] | undefined = undefined, const TBase = never>(meta: EntityMetadataWithProperties<TName, TTableName, TProperties, TPK, TBase>): EntitySchemaWithMeta<TName, TTableName, InferEntityFromProperties<TProperties, TPK>, TBase, TProperties>;
-export declare function defineEntity<const TEntity = any, const TProperties extends Record<string, any> = Record<string, any>, const TClassName extends string = string, const TTableName extends string = string, const TBase = never>(meta: Omit<Partial<EntityMetadata<TEntity>>, 'properties' | 'extends' | 'className' | 'tableName'> & {
-    class: EntityClass<TEntity>;
+export declare function defineEntity<const TEntity = any, const TProperties extends Record<string, any> = Record<string, any>, const TClassName extends string = string, const TTableName extends string = string, const TBase = never, const TClass extends EntityCtor = any>(meta: Omit<Partial<EntityMetadata<TEntity>>, 'properties' | 'extends' | 'className' | 'tableName'> & {
+    class: TClass;
     className?: TClassName;
     tableName?: TTableName;
     extends?: EntityName<TBase>;
     properties: TProperties | ((properties: typeof propertyBuilders) => TProperties);
-}): EntitySchemaWithMeta<TClassName, TTableName, TEntity, TBase, TProperties>;
+}): EntitySchemaWithMeta<TClassName, TTableName, TEntity, TBase, TProperties, TClass>;
 export declare namespace defineEntity {
     var properties: {
         bigint: <Mode extends "bigint" | "number" | "string" = "bigint">(mode?: Mode) => UniversalPropertyOptionsBuilder<(Mode extends "bigint" ? bigint : Mode extends "number" ? number : string) & {}, EmptyOptions, IncludeKeysForProperty>;

package/index.d.ts

@@ -3,7 +3,7 @@
  * @module core
  */
 export { EntityMetadata, PrimaryKeyProp, EntityRepositoryType, OptionalProps, EagerProps, HiddenProps, Config } from './typings.js';
-export type { Constructor, ConnectionType, Dictionary, Primary, IPrimaryKey, ObjectQuery, FilterQuery, IWrappedEntity, EntityName, EntityData, Highlighter, MaybePromise, AnyEntity, EntityClass, EntityProperty, QBFilterQuery, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection, IMigrator, IMigrationGenerator, MigratorEvent, GetRepository, MigrationObject, DeepPartial, PrimaryProperty, Cast, IsUnknown, EntityDictionary, EntityDTO, MigrationDiff, GenerateOptions, FilterObject, IEntityGenerator, ISeedManager, RequiredEntityData, CheckCallback, IndexCallback, SimpleColumnMeta, Rel, Ref, ScalarRef, EntityRef, ISchemaGenerator, UmzugMigration, MigrateOptions, MigrationResult, MigrationRow, EntityKey, EntityValue, EntityDataValue, FilterKey, EntityType, FromEntityType, Selected, IsSubset, NoInfer, EntityProps, ExpandProperty, ExpandScalar, FilterItemValue, ExpandQuery, Scalar, ExpandHint, FilterValue, MergeLoaded, MergeSelected, TypeConfig, AnyString, ClearDatabaseOptions, CreateSchemaOptions, EnsureDatabaseOptions, UpdateSchemaOptions, DropSchemaOptions, RefreshDatabaseOptions, AutoPath, UnboxArray, MetadataProcessor, ImportsResolver, RequiredNullable, DefineConfig, Opt, Hidden, EntitySchemaWithMeta, InferEntity, CheckConstraint, GeneratedColumnCallback, FilterDef, } from './typings.js';
+export type { Constructor, ConnectionType, Dictionary, Primary, IPrimaryKey, ObjectQuery, FilterQuery, IWrappedEntity, EntityName, EntityData, Highlighter, MaybePromise, AnyEntity, EntityClass, EntityProperty, QBFilterQuery, PopulateOptions, Populate, Loaded, New, LoadedReference, LoadedCollection, IMigrator, IMigrationGenerator, MigratorEvent, GetRepository, MigrationObject, DeepPartial, PrimaryProperty, Cast, IsUnknown, EntityDictionary, EntityDTO, MigrationDiff, GenerateOptions, FilterObject, IEntityGenerator, ISeedManager, RequiredEntityData, CheckCallback, IndexCallback, SimpleColumnMeta, Rel, Ref, ScalarRef, EntityRef, ISchemaGenerator, UmzugMigration, MigrateOptions, MigrationResult, MigrationRow, EntityKey, EntityValue, EntityDataValue, FilterKey, EntityType, FromEntityType, Selected, IsSubset, NoInfer, EntityProps, ExpandProperty, ExpandScalar, FilterItemValue, ExpandQuery, Scalar, ExpandHint, FilterValue, MergeLoaded, MergeSelected, TypeConfig, AnyString, ClearDatabaseOptions, CreateSchemaOptions, EnsureDatabaseOptions, UpdateSchemaOptions, DropSchemaOptions, RefreshDatabaseOptions, AutoPath, UnboxArray, MetadataProcessor, ImportsResolver, RequiredNullable, DefineConfig, Opt, Hidden, EntitySchemaWithMeta, InferEntity, CheckConstraint, GeneratedColumnCallback, FilterDef, EntityCtor, } from './typings.js';
 export * from './enums.js';
 export * from './errors.js';
 export * from './exceptions.js';

package/metadata/EntitySchema.d.ts

@@ -1,4 +1,4 @@
-import { EntityMetadata, type AnyEntity, type EntityKey, type Constructor, type DeepPartial, type EntityName, type EntityProperty, type CleanKeys, type ExpandProperty, type IsNever, type EntityClass } from '../typings.js';
+import { EntityMetadata, type AnyEntity, type EntityKey, type Constructor, type DeepPartial, type EntityName, type EntityProperty, type CleanKeys, type ExpandProperty, type IsNever, type EntityCtor } from '../typings.js';
 import { ReferenceKind } from '../enums.js';
 import { Type } from '../types/Type.js';
 import type { PropertyOptions, ManyToOneOptions, OneToOneOptions, OneToManyOptions, ManyToManyOptions, EmbeddedOptions, EnumOptions, PrimaryKeyOptions, SerializedPrimaryKeyOptions, IndexOptions, UniqueOptions } from './types.js';
@@ -27,10 +27,10 @@ export type EntitySchemaProperty<Target, Owner> = ({
     enum: true;
 } & EnumOptions<Owner>) | (TypeDef<Target> & PropertyOptions<Owner>);
 type OmitBaseProps<Entity, Base> = IsNever<Base> extends true ? Entity : Omit<Entity, keyof Base>;
-export type EntitySchemaMetadata<Entity, Base = never> = Omit<Partial<EntityMetadata<Entity>>, 'name' | 'properties' | 'extends'> & ({
+export type EntitySchemaMetadata<Entity, Base = never, Class extends EntityCtor = any> = Omit<Partial<EntityMetadata<Entity>>, 'name' | 'properties' | 'extends'> & ({
     name: string;
 } | {
-    class: EntityClass<Entity>;
+    class: Class;
     name?: string;
 }) & {
     extends?: EntityName<Base>;
@@ -39,16 +39,16 @@ export type EntitySchemaMetadata<Entity, Base = never> = Omit<Partial<EntityMeta
         [Key in keyof OmitBaseProps<Entity, Base> as CleanKeys<OmitBaseProps<Entity, Base>, Key>]-?: EntitySchemaProperty<ExpandProperty<NonNullable<Entity[Key]>>, Entity>;
     };
 };
-export declare class EntitySchema<Entity = any, Base = never> {
+export declare class EntitySchema<Entity = any, Base = never, Class extends EntityCtor = any> {
     /**
      * When schema links the entity class via `class` option, this registry allows the lookup from opposite side,
      * so we can use the class in `entities` option just like the EntitySchema instance.
      */
-    static REGISTRY: Map<Partial<any>, EntitySchema<any, never>>;
+    static REGISTRY: Map<Partial<any>, EntitySchema<any, never, any>>;
     private readonly _meta;
     private internal;
     private initialized;
-    constructor(meta: EntitySchemaMetadata<Entity, Base>);
+    constructor(meta: EntitySchemaMetadata<Entity, Base, Class>);
     static fromMetadata<T = AnyEntity, U = never>(meta: EntityMetadata<T> | DeepPartial<EntityMetadata<T>>): EntitySchema<T, U>;
     addProperty(name: EntityKey<Entity>, type?: TypeType, options?: PropertyOptions<Entity> | EntityProperty<Entity>): void;
     addEnum(name: EntityKey<Entity>, type?: TypeType, options?: EnumOptions<Entity>): void;
@@ -64,11 +64,13 @@ export declare class EntitySchema<Entity = any, Base = never> {
     addUnique<Key extends string>(options: UniqueOptions<Entity, Key>): void;
     setCustomRepository(repository: () => Constructor): void;
     setExtends(base: EntityName): void;
-    setClass(cls: EntityClass<Entity>): void;
-    get meta(): EntityMetadata<Entity>;
+    setClass(cls: Class): void;
+    get meta(): EntityMetadata<Entity, Class>;
     get name(): string | EntityName<Entity>;
     get tableName(): string;
+    get class(): Class;
     get properties(): Record<string, any>;
+    new(...params: ConstructorParameters<Class>): Entity;
     /**
      * @internal
      */

package/metadata/EntitySchema.js

@@ -175,9 +175,15 @@ export class EntitySchema {
     get tableName() {
         return this._meta.tableName;
     }
+    get class() {
+        return this._meta.class;
+    }
     get properties() {
         return this._meta.properties;
     }
+    new(...params) {
+        return new this._meta.class(...params);
+    }
     /**
      * @internal
      */

package/package.json

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

@@ -209,7 +209,7 @@ export type AnyEntity<T = any> = Partial<T>;
 export type EntityClass<T = any> = Function & {
     prototype: T;
 };
-export type EntityName<T = any> = EntityClass<T> | EntitySchema<T, any> | {
+export type EntityName<T = any> = EntityClass<T> | EntityCtor<T> | EntitySchema<T, any> | {
     name: string;
 };
 export type GetRepository<Entity extends {
@@ -416,15 +416,15 @@ export interface EntityProperty<Owner = any, Target = any> {
     createForeignKeyConstraint: boolean;
     foreignKeyName?: string;
 }
-export declare class EntityMetadata<T = any> {
+export declare class EntityMetadata<Entity = any, Class extends EntityCtor<Entity> = EntityCtor<Entity>> {
     private static counter;
     readonly _id: number;
     readonly propertyOrder: Map<string, number>;
     constructor(meta?: Partial<EntityMetadata>);
-    addProperty(prop: Partial<EntityProperty<T>>): void;
+    addProperty(prop: Partial<EntityProperty<Entity>>): void;
     removeProperty(name: string, sync?: boolean): void;
-    getPrimaryProps(flatten?: boolean): EntityProperty<T>[];
-    getPrimaryProp(): EntityProperty<T>;
+    getPrimaryProps(flatten?: boolean): EntityProperty<Entity>[];
+    getPrimaryProp(): EntityProperty<Entity>;
     createColumnMappingObject(): Dictionary<any>;
     get tableName(): string;
     set tableName(name: string);
@@ -438,67 +438,68 @@ export interface SimpleColumnMeta {
     name: string;
     type: string;
 }
-export interface EntityMetadata<T = any> {
+export type EntityCtor<T = any> = abstract new (...args: any[]) => T;
+export interface EntityMetadata<Entity = any, Class extends EntityCtor<Entity> = EntityCtor<Entity>> {
     name?: string;
     className: string;
     tableName: string;
     schema?: string;
     pivotTable?: boolean;
     virtual?: boolean;
-    expression?: string | ((em: any, where: ObjectQuery<T>, options: FindOptions<T, any, any, any>, stream?: boolean) => MaybePromise<Raw | object | string>);
-    discriminatorColumn?: EntityKey<T> | AnyString;
+    expression?: string | ((em: any, where: ObjectQuery<Entity>, options: FindOptions<Entity, any, any, any>, stream?: boolean) => MaybePromise<Raw | object | string>);
+    discriminatorColumn?: EntityKey<Entity> | AnyString;
     discriminatorValue?: number | string;
     discriminatorMap?: Dictionary<EntityClass>;
     embeddable: boolean;
-    constructorParams?: (keyof T)[];
+    constructorParams?: (keyof Entity)[];
     forceConstructor: boolean;
-    extends?: EntityName<T>;
+    extends?: EntityName<Entity>;
     collection: string;
     path: string;
-    primaryKeys: EntityKey<T>[];
+    primaryKeys: EntityKey<Entity>[];
     simplePK: boolean;
     compositePK: boolean;
-    versionProperty: EntityKey<T>;
-    concurrencyCheckKeys: Set<EntityKey<T>>;
-    serializedPrimaryKey?: EntityKey<T>;
+    versionProperty: EntityKey<Entity>;
+    concurrencyCheckKeys: Set<EntityKey<Entity>>;
+    serializedPrimaryKey?: EntityKey<Entity>;
     properties: {
-        [K in EntityKey<T>]: EntityProperty<T>;
+        [K in EntityKey<Entity>]: EntityProperty<Entity>;
     };
-    props: EntityProperty<T>[];
-    relations: EntityProperty<T>[];
-    bidirectionalRelations: EntityProperty<T>[];
+    props: EntityProperty<Entity>[];
+    relations: EntityProperty<Entity>[];
+    bidirectionalRelations: EntityProperty<Entity>[];
     referencingProperties: {
-        meta: EntityMetadata<T>;
-        prop: EntityProperty<T>;
+        meta: EntityMetadata<Entity>;
+        prop: EntityProperty<Entity>;
     }[];
-    comparableProps: EntityProperty<T>[];
-    trackingProps: EntityProperty<T>[];
-    hydrateProps: EntityProperty<T>[];
-    validateProps: EntityProperty<T>[];
-    uniqueProps: EntityProperty<T>[];
-    getterProps: EntityProperty<T>[];
+    comparableProps: EntityProperty<Entity>[];
+    trackingProps: EntityProperty<Entity>[];
+    hydrateProps: EntityProperty<Entity>[];
+    validateProps: EntityProperty<Entity>[];
+    uniqueProps: EntityProperty<Entity>[];
+    getterProps: EntityProperty<Entity>[];
     indexes: {
-        properties?: EntityKey<T> | EntityKey<T>[];
+        properties?: EntityKey<Entity> | EntityKey<Entity>[];
         name?: string;
         type?: string;
         options?: Dictionary;
-        expression?: string | IndexCallback<T>;
+        expression?: string | IndexCallback<Entity>;
     }[];
     uniques: {
-        properties?: EntityKey<T> | EntityKey<T>[];
+        properties?: EntityKey<Entity> | EntityKey<Entity>[];
         name?: string;
         options?: Dictionary;
-        expression?: string | IndexCallback<T>;
+        expression?: string | IndexCallback<Entity>;
         deferMode?: DeferMode | `${DeferMode}`;
     }[];
-    checks: CheckConstraint<T>[];
+    checks: CheckConstraint<Entity>[];
     repositoryClass?: string;
     repository: () => EntityClass<EntityRepository<any>>;
     hooks: {
-        [K in EventType]?: (keyof T | EventSubscriber<T>[EventType])[];
+        [K in EventType]?: (keyof Entity | EventSubscriber<Entity>[EventType])[];
     };
-    prototype: T;
-    class: EntityClass<T>;
+    prototype: Entity;
+    class: Class;
     abstract: boolean;
     filters: Dictionary<FilterDef>;
     comment?: string;
@@ -506,7 +507,7 @@ export interface EntityMetadata<T = any> {
     hasUniqueProps?: boolean;
     readonly?: boolean;
     polymorphs?: EntityMetadata[];
-    root: EntityMetadata<T>;
+    root: EntityMetadata<Entity>;
     definedProperties: Dictionary;
     hasTriggers?: boolean;
     /** @internal can be used for computed numeric cache keys */
@@ -849,7 +850,7 @@ export interface Seeder<T extends Dictionary = Dictionary> {
 export type ConnectionType = 'read' | 'write';
 export type MetadataProcessor = (metadata: EntityMetadata[], platform: Platform) => MaybePromise<void>;
 export type MaybeReturnType<T> = T extends (...args: any[]) => infer R ? R : T;
-export interface EntitySchemaWithMeta<TName extends string = string, TTableName extends string = string, TEntity = any, TBase = never, TProperties extends Record<string, any> = Record<string, any>> extends EntitySchema<TEntity, TBase> {
+export interface EntitySchemaWithMeta<TName extends string = string, TTableName extends string = string, TEntity = any, TBase = never, TProperties extends Record<string, any> = Record<string, any>, TClass extends EntityCtor = any> extends EntitySchema<TEntity, TBase, TClass> {
     readonly name: TName;
     readonly properties: TProperties;
     readonly tableName: TTableName;

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