@mikro-orm/core 7.0.0-rc.2 → 7.0.0

package/platforms/Platform.js

@@ -3,7 +3,7 @@ import { EntityRepository } from '../entity/EntityRepository.js';
 import { UnderscoreNamingStrategy } from '../naming-strategy/UnderscoreNamingStrategy.js';
 import { ExceptionConverter } from './ExceptionConverter.js';
 import { ArrayType, BigIntType, BlobType, BooleanType, CharacterType, DateTimeType, DateType, DecimalType, DoubleType, EnumType, FloatType, IntegerType, IntervalType, JsonType, MediumIntType, SmallIntType, StringType, TextType, TimeType, TinyIntType, Type, Uint8ArrayType, UnknownType, UuidType, } from '../types/index.js';
-import { parseJsonSafe } from '../utils/Utils.js';
+import { parseJsonSafe, Utils } from '../utils/Utils.js';
 import { ReferenceKind } from '../enums.js';
 import { Raw } from '../utils/RawQueryFragment.js';
 export const JsonProperty = Symbol('JsonProperty');
@@ -104,6 +104,11 @@ export class Platform {
     getRegExpOperator(val, flags) {
         return 'regexp';
     }
+    mapRegExpCondition(mappedKey, value) {
+        const operator = this.getRegExpOperator(value.$re, value.$flags);
+        const quotedKey = this.quoteIdentifier(mappedKey);
+        return { sql: `${quotedKey} ${operator} ?`, params: [value.$re] };
+    }
     getRegExpValue(val) {
         if (val.flags.includes('i')) {
             return { $re: `(?i)${val.source}` };
@@ -156,7 +161,7 @@ export class Platform {
         return 'interval' + (column.length ? `(${column.length})` : '');
     }
     getTextTypeDeclarationSQL(_column) {
-        return `text`;
+        return 'text';
     }
     getEnumTypeDeclarationSQL(column) {
         if (column.items?.every(item => typeof item === 'string')) {
@@ -180,7 +185,7 @@ export class Platform {
         return this.getVarcharTypeDeclarationSQL(column);
     }
     extractSimpleType(type) {
-        return type.toLowerCase().match(/[^(), ]+/)[0];
+        return /[^(), ]+/.exec(type.toLowerCase())[0];
     }
     /**
      * This should be used only to compare types, it can strip some information like the length.
@@ -198,43 +203,76 @@ export class Platform {
         }
         switch (this.extractSimpleType(type)) {
             case 'character':
-            case 'char': return Type.getType(CharacterType);
+            case 'char':
+                return Type.getType(CharacterType);
             case 'string':
-            case 'varchar': return Type.getType(StringType);
-            case 'interval': return Type.getType(IntervalType);
-            case 'text': return Type.getType(TextType);
+            case 'varchar':
+                return Type.getType(StringType);
+            case 'interval':
+                return Type.getType(IntervalType);
+            case 'text':
+                return Type.getType(TextType);
             case 'int':
-            case 'number': return Type.getType(IntegerType);
-            case 'bigint': return Type.getType(BigIntType);
-            case 'smallint': return Type.getType(SmallIntType);
-            case 'tinyint': return Type.getType(TinyIntType);
-            case 'mediumint': return Type.getType(MediumIntType);
-            case 'float': return Type.getType(FloatType);
-            case 'double': return Type.getType(DoubleType);
-            case 'integer': return Type.getType(IntegerType);
+            case 'number':
+                return Type.getType(IntegerType);
+            case 'bigint':
+                return Type.getType(BigIntType);
+            case 'smallint':
+                return Type.getType(SmallIntType);
+            case 'tinyint':
+                return Type.getType(TinyIntType);
+            case 'mediumint':
+                return Type.getType(MediumIntType);
+            case 'float':
+                return Type.getType(FloatType);
+            case 'double':
+                return Type.getType(DoubleType);
+            case 'integer':
+                return Type.getType(IntegerType);
             case 'decimal':
-            case 'numeric': return Type.getType(DecimalType);
-            case 'boolean': return Type.getType(BooleanType);
+            case 'numeric':
+                return Type.getType(DecimalType);
+            case 'boolean':
+                return Type.getType(BooleanType);
             case 'blob':
-            case 'buffer': return Type.getType(BlobType);
-            case 'uint8array': return Type.getType(Uint8ArrayType);
-            case 'uuid': return Type.getType(UuidType);
-            case 'date': return Type.getType(DateType);
+            case 'buffer':
+                return Type.getType(BlobType);
+            case 'uint8array':
+                return Type.getType(Uint8ArrayType);
+            case 'uuid':
+                return Type.getType(UuidType);
+            case 'date':
+                return Type.getType(DateType);
             case 'datetime':
-            case 'timestamp': return Type.getType(DateTimeType);
-            case 'time': return Type.getType(TimeType);
+            case 'timestamp':
+                return Type.getType(DateTimeType);
+            case 'time':
+                return Type.getType(TimeType);
             case 'object':
-            case 'json': return Type.getType(JsonType);
-            case 'enum': return Type.getType(EnumType);
-            default: return Type.getType(UnknownType);
+            case 'json':
+                return Type.getType(JsonType);
+            case 'enum':
+                return Type.getType(EnumType);
+            default:
+                return Type.getType(UnknownType);
         }
     }
     supportsMultipleCascadePaths() {
         return true;
     }
+    /**
+     * Returns true if the platform supports ON UPDATE foreign key rules.
+     * Oracle doesn't support ON UPDATE rules.
+     */
+    supportsOnUpdate() {
+        return true;
+    }
     supportsMultipleStatements() {
         return this.config.get('multipleStatements');
     }
+    supportsUnionWhere() {
+        return false;
+    }
     getArrayDeclarationSQL() {
         return 'text';
     }
@@ -259,6 +297,31 @@ export class Platform {
     getSearchJsonPropertyKey(path, type, aliased, value) {
         return path.join('.');
     }
+    processJsonCondition(o, value, path, alias) {
+        if (Utils.isPlainObject(value) && !Object.keys(value).some(k => Utils.isOperator(k))) {
+            Utils.keys(value).forEach(k => {
+                this.processJsonCondition(o, value[k], [...path, k], alias);
+            });
+            return o;
+        }
+        if (path.length === 1) {
+            o[path[0]] = value;
+            return o;
+        }
+        const type = this.getJsonValueType(value);
+        const k = this.getSearchJsonPropertyKey(path, type, alias, value);
+        o[k] = value;
+        return o;
+    }
+    getJsonValueType(value) {
+        if (Array.isArray(value)) {
+            return typeof value[0];
+        }
+        if (Utils.isPlainObject(value) && Object.keys(value).every(k => Utils.isOperator(k))) {
+            return this.getJsonValueType(Object.values(value)[0]);
+        }
+        return typeof value;
+    }
     /* v8 ignore next */
     getJsonIndexDefinition(index) {
         return index.columnNames;
@@ -290,6 +353,22 @@ export class Platform {
     convertIntervalToDatabaseValue(value) {
         return value;
     }
+    usesAsKeyword() {
+        return true;
+    }
+    /**
+     * Determines how UUID values are compared in the change set tracking.
+     * Return `'string'` for inline string comparison (fast), or `'any'` for deep comparison via type methods.
+     */
+    compareUuids() {
+        return 'string';
+    }
+    convertUuidToJSValue(value) {
+        return value;
+    }
+    convertUuidToDatabaseValue(value) {
+        return value;
+    }
     parseDate(value) {
         const date = new Date(value);
         /* v8 ignore next */
@@ -354,7 +433,7 @@ export class Platform {
         let j = 0;
         let pos = 0;
         let ret = '';
-        if (sql[0] === '?') {
+        if (sql.startsWith('?')) {
             if (sql[1] === '?') {
                 ret += this.quoteIdentifier(params[j++]);
                 pos = 2;

package/serialization/EntitySerializer.js

@@ -9,7 +9,8 @@ function isVisible(meta, propName, options) {
     if (options.groups && prop?.groups) {
         return prop.groups.some(g => options.groups.includes(g));
     }
-    if (Array.isArray(options.populate) && options.populate?.find(item => item === propName || item.startsWith(propName + '.') || item === '*')) {
+    if (Array.isArray(options.populate) &&
+        options.populate?.find(item => item === propName || item.startsWith(propName + '.') || item === '*')) {
         return true;
     }
     if (options.exclude?.find(item => item === propName)) {
@@ -20,7 +21,8 @@ function isVisible(meta, propName, options) {
     return visible && !prefixed;
 }
 function isPopulated(propName, options) {
-    if (typeof options.populate !== 'boolean' && options.populate?.find(item => item === propName || item.startsWith(propName + '.') || item === '*')) {
+    if (typeof options.populate !== 'boolean' &&
+        options.populate?.find(item => item === propName || item.startsWith(propName + '.') || item === '*')) {
         return true;
     }
     if (typeof options.populate === 'boolean') {
@@ -34,7 +36,7 @@ export class EntitySerializer {
         const meta = wrapped.__meta;
         let contextCreated = false;
         if (!wrapped.__serializationContext.root) {
-            const root = new SerializationContext(wrapped.__config);
+            const root = new SerializationContext();
             SerializationContext.propagate(root, entity, (meta, prop) => meta.properties[prop]?.kind !== ReferenceKind.SCALAR);
             options.populate = (options.populate ? Utils.asArray(options.populate) : options.populate);
             contextCreated = true;
@@ -176,7 +178,9 @@ export class EntitySerializer {
     static extractChildOptions(options, prop) {
         return {
             ...options,
-            populate: Array.isArray(options.populate) ? Utils.extractChildElements(options.populate, prop, '*') : options.populate,
+            populate: Array.isArray(options.populate)
+                ? Utils.extractChildElements(options.populate, prop, '*')
+                : options.populate,
             exclude: Array.isArray(options.exclude) ? Utils.extractChildElements(options.exclude, prop) : options.exclude,
         };
     }

package/serialization/EntityTransformer.js

@@ -20,7 +20,7 @@ export class EntityTransformer {
             return entity;
         }
         if (!wrapped.__serializationContext.root) {
-            const root = new SerializationContext(wrapped.__config, wrapped.__serializationContext.populate, wrapped.__serializationContext.fields, wrapped.__serializationContext.exclude);
+            const root = new SerializationContext(wrapped.__serializationContext.populate, wrapped.__serializationContext.fields, wrapped.__serializationContext.exclude);
             SerializationContext.propagate(root, entity, isVisible);
             contextCreated = true;
         }
@@ -64,6 +64,9 @@ export class EntityTransformer {
                 if (!partiallyLoaded && !populated && !isPrimary) {
                     continue;
                 }
+                if (root.isExcluded(meta.class, prop) && !populated) {
+                    continue;
+                }
             }
             const cycle = root.visit(meta.class, prop);
             if (cycle && visited) {

package/serialization/SerializationContext.d.ts

@@ -1,19 +1,14 @@
 import type { AnyEntity, EntityMetadata, EntityName, PopulateOptions } from '../typings.js';
-import type { Configuration } from '../utils/Configuration.js';
 /**
  * Helper that allows to keep track of where we are currently at when serializing complex entity graph with cycles.
  * 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 extends object> {
-    private readonly config;
-    private readonly populate;
-    private readonly fields?;
-    private readonly exclude?;
+    #private;
     readonly path: [EntityName, string][];
-    readonly visited: Set<Partial<any>>;
-    private entities;
-    constructor(config: Configuration, populate?: PopulateOptions<T>[], fields?: Set<string> | undefined, exclude?: string[] | undefined);
+    readonly visited: Set<AnyEntity>;
+    constructor(populate?: PopulateOptions<T>[], fields?: Set<string>, exclude?: readonly string[]);
     /**
      * Returns true when there is a cycle detected.
      */
@@ -25,6 +20,7 @@ export declare class SerializationContext<T extends object> {
      */
     static propagate(root: SerializationContext<any>, entity: AnyEntity, isVisible: (meta: EntityMetadata, prop: string) => boolean): void;
     isMarkedAsPopulated(entityName: EntityName, prop: string): boolean;
+    isExcluded(entityName: EntityName, prop: string): boolean;
     isPartiallyLoaded(entityName: EntityName, prop: string): boolean;
     private register;
 }

package/serialization/SerializationContext.js

@@ -6,18 +6,16 @@ import { helper } from '../entity/wrap.js';
  * are defined in populate hint). If not, we proceed and call `leave` afterwards.
  */
 export class SerializationContext {
-    config;
-    populate;
-    fields;
-    exclude;
     path = [];
     visited = new Set();
-    entities = new Set();
-    constructor(config, populate = [], fields, exclude) {
-        this.config = config;
-        this.populate = populate;
-        this.fields = fields;
-        this.exclude = exclude;
+    #entities = new Set();
+    #populate;
+    #fields;
+    #exclude;
+    constructor(populate = [], fields, exclude) {
+        this.#populate = populate;
+        this.#fields = fields;
+        this.#exclude = exclude;
     }
     /**
      * Returns true when there is a cycle detected.
@@ -42,7 +40,7 @@ export class SerializationContext {
         }
     }
     close() {
-        for (const entity of this.entities) {
+        for (const entity of this.#entities) {
             delete helper(entity).__serializationContext.root;
         }
     }
@@ -73,7 +71,7 @@ export class SerializationContext {
         }
     }
     isMarkedAsPopulated(entityName, prop) {
-        let populate = this.populate ?? [];
+        let populate = this.#populate ?? [];
         for (const segment of this.path) {
             const hints = populate.filter(p => p.field === segment[1]);
             if (hints.length > 0) {
@@ -92,11 +90,18 @@ export class SerializationContext {
         }
         return !!populate?.some(p => p.field === prop);
     }
+    isExcluded(entityName, prop) {
+        if (!this.#exclude || this.#exclude.length === 0) {
+            return false;
+        }
+        const fullPath = this.path.map(segment => segment[1] + '.').join('') + prop;
+        return this.#exclude.includes(fullPath);
+    }
     isPartiallyLoaded(entityName, prop) {
-        if (!this.fields) {
+        if (!this.#fields) {
             return true;
         }
-        let fields = [...this.fields];
+        let fields = [...this.#fields];
         for (const segment of this.path) {
             /* v8 ignore next */
             if (fields.length === 0) {
@@ -104,12 +109,12 @@ export class SerializationContext {
             }
             fields = fields
                 .filter(field => field.startsWith(`${segment[1]}.`) || field === '*')
-                .map(field => field === '*' ? field : field.substring(segment[1].length + 1));
+                .map(field => (field === '*' ? field : field.substring(segment[1].length + 1)));
         }
         return fields.some(p => p === prop || p === '*');
     }
     register(entity) {
         helper(entity).__serializationContext.root = this;
-        this.entities.add(entity);
+        this.#entities.add(entity);
     }
 }

package/types/UuidType.d.ts

@@ -4,5 +4,7 @@ import type { EntityProperty } from '../typings.js';
 export declare class UuidType extends Type<string | null | undefined> {
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
+    convertToDatabaseValue(value: string | null | undefined, platform: Platform): string | null;
+    convertToJSValue(value: string | null | undefined, platform: Platform): string | null | undefined;
     ensureComparable(): boolean;
 }

package/types/UuidType.js

@@ -4,9 +4,21 @@ export class UuidType extends Type {
         return platform.getUuidTypeDeclarationSQL(prop);
     }
     compareAsType() {
-        return 'string';
+        return this.platform?.compareUuids() ?? 'string';
+    }
+    convertToDatabaseValue(value, platform) {
+        if (value == null) {
+            return value;
+        }
+        return platform.convertUuidToDatabaseValue(value);
+    }
+    convertToJSValue(value, platform) {
+        if (value == null) {
+            return value;
+        }
+        return platform.convertUuidToJSValue(value);
     }
     ensureComparable() {
-        return false;
+        return this.platform?.compareUuids() !== 'string';
     }
 }

package/types/index.d.ts

@@ -23,7 +23,8 @@ import { type IType, type TransformContext, Type } from './Type.js';
 import { Uint8ArrayType } from './Uint8ArrayType.js';
 import { UnknownType } from './UnknownType.js';
 import { UuidType } from './UuidType.js';
-export { Type, DateType, TimeType, DateTimeType, BigIntType, BlobType, Uint8ArrayType, ArrayType, EnumArrayType, EnumType, JsonType, IntegerType, SmallIntType, TinyIntType, MediumIntType, FloatType, DoubleType, BooleanType, DecimalType, StringType, UuidType, TextType, UnknownType, TransformContext, IntervalType, IType, CharacterType, };
+export type { TransformContext, IType };
+export { Type, DateType, TimeType, DateTimeType, BigIntType, BlobType, Uint8ArrayType, ArrayType, EnumArrayType, EnumType, JsonType, IntegerType, SmallIntType, TinyIntType, MediumIntType, FloatType, DoubleType, BooleanType, DecimalType, StringType, UuidType, TextType, UnknownType, IntervalType, CharacterType, };
 export declare const types: {
     readonly date: typeof DateType;
     readonly time: typeof TimeType;

package/typings.d.ts

@@ -36,11 +36,11 @@ export type Compute<T> = {
     [K in keyof T]: T[K];
 } & {};
 type InternalKeys = 'EntityRepositoryType' | 'PrimaryKeyProp' | 'OptionalProps' | 'EagerProps' | 'HiddenProps' | '__selectedType' | '__loadedType';
-export type CleanKeys<T, K extends keyof T, B extends boolean = false> = (T[K] & {}) extends Function ? never : K extends symbol | InternalKeys ? never : B extends true ? (T[K] & {}) extends Scalar ? never : K : K;
+export type CleanKeys<T, K extends keyof T, B extends boolean = false> = T[K] & {} extends Function ? never : K extends symbol | InternalKeys ? never : B extends true ? T[K] & {} extends Scalar ? never : K : K;
 export type FunctionKeys<T, K extends keyof T> = T[K] extends Function ? K : never;
 export type Cast<T, R> = T extends R ? T : R;
-export type IsUnknown<T> = T extends unknown ? unknown extends T ? true : never : never;
-export type IsAny<T> = 0 extends (1 & T) ? true : false;
+export type IsUnknown<T> = T extends unknown ? (unknown extends T ? true : never) : never;
+export type IsAny<T> = 0 extends 1 & T ? true : false;
 export type IsNever<T, True = true, False = false> = [T] extends [never] ? True : False;
 export type MaybePromise<T> = T | Promise<T>;
 /**
@@ -98,9 +98,9 @@ type LoadableShape = CollectionShape | ReferenceShape | readonly any[];
 export type UnionKeys<T> = T extends any ? keyof T : never;
 export type UnionPropertyType<T, K extends PropertyKey> = T extends any ? (K extends keyof T ? T[K] : never) : never;
 type IsUnion<T, U = T> = T extends any ? ([U] extends [T] ? false : true) : false;
-export type MergeUnion<T> = [T] extends [object] ? (T extends Scalar ? T : IsUnion<T> extends true ? {
+export type MergeUnion<T> = [T] extends [object] ? T extends Scalar ? T : IsUnion<T> extends true ? {
     [K in UnionKeys<T>]: UnionPropertyType<T, K>;
-} : T) : T;
+} : T : T;
 export type DeepPartial<T> = T & {
     [P in keyof T]?: T[P] extends (infer U)[] ? DeepPartial<U>[] : T[P] extends Readonly<infer U>[] ? Readonly<DeepPartial<U>>[] : DeepPartial<T[P]>;
 };
@@ -113,7 +113,7 @@ export declare const Config: unique symbol;
 export declare const EntityName: unique symbol;
 export type InferEntityName<T> = T extends {
     [EntityName]?: infer Name;
-} ? Name extends string ? Name : never : never;
+} ? (Name extends string ? Name : never) : never;
 export type Opt<T = unknown> = T & Opt.Brand;
 export declare namespace Opt {
     const __optional: unique symbol;
@@ -173,11 +173,11 @@ export type Primary<T> = IsAny<T> extends true ? any : T extends {
 /** @internal */
 export type PrimaryProperty<T> = T extends {
     [PrimaryKeyProp]?: infer PK;
-} ? (PK extends keyof T ? PK : (PK extends any[] ? PK[number] : never)) : T extends {
+} ? PK extends keyof T ? PK : PK extends any[] ? PK[number] : never : T extends {
     _id?: any;
-} ? (T extends {
+} ? T extends {
     id?: any;
-} ? 'id' | '_id' : '_id') : T extends {
+} ? 'id' | '_id' : '_id' : T extends {
     id?: any;
 } ? 'id' : T extends {
     uuid?: any;
@@ -234,10 +234,20 @@ export type FilterItemValue<T> = T | ExpandScalar<T> | Primary<T> | Raw;
 export type FilterValue<T> = OperatorMap<FilterItemValue<T>> | FilterItemValue<T> | FilterItemValue<T>[] | null;
 type FilterObjectProp<T, K extends PropertyKey> = K extends keyof MergeUnion<T> ? MergeUnion<T>[K] : K extends keyof T ? T[K] : never;
 type ExpandQueryMerged<T> = [T] extends [object] ? [T] extends [Scalar] ? never : FilterQuery<MergeUnion<T>> : FilterValue<T>;
+type ElemMatchCondition<T extends Record<string, any>> = {
+    [K in keyof T]?: T[K] | OperatorMap<T[K]>;
+} & {
+    $or?: ElemMatchCondition<T>[];
+    $and?: ElemMatchCondition<T>[];
+    $not?: ElemMatchCondition<T>;
+};
+type ElemMatchFilter<T> = T extends readonly (infer E)[] ? E extends Record<string, any> ? {
+    $elemMatch: ElemMatchCondition<E>;
+} : never : never;
 export type FilterObject<T> = {
-    -readonly [K in EntityKey<T>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | null;
+    -readonly [K in EntityKey<T>]?: ExpandQuery<ExpandProperty<FilterObjectProp<T, K>>> | ExpandQueryMerged<ExpandProperty<FilterObjectProp<T, K>>> | FilterValue<ExpandProperty<FilterObjectProp<T, K>>> | ElemMatchFilter<FilterObjectProp<T, K>> | null;
 };
-export type ExpandQuery<T> = T extends object ? T extends Scalar ? never : FilterQuery<T> : FilterValue<T>;
+export type ExpandQuery<T> = T extends object ? (T extends Scalar ? never : FilterQuery<T>) : FilterValue<T>;
 export type EntityProps<T> = {
     -readonly [K in EntityKey<T>]?: T[K];
 };
@@ -324,11 +334,11 @@ type NonArrayObject = object & {
 export type EntityDataProp<T, C extends boolean> = T extends Date ? string | Date : T extends Scalar ? T : T extends ScalarReference<infer U> ? EntityDataProp<U, C> : T extends {
     __runtime?: infer Runtime;
     __raw?: infer Raw;
-} ? (C extends true ? Raw : Runtime) : T extends ReferenceShape<infer U> ? EntityDataNested<U, C> : T extends CollectionShape<infer U> ? U | U[] | EntityDataNested<U & object, C> | EntityDataNested<U & object, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | EntityDataNested<U, C> | EntityDataNested<U, C>[] : U[] | EntityDataNested<U, C>[] : EntityDataNested<T, C>;
+} ? C extends true ? Raw : Runtime : T extends ReferenceShape<infer U> ? EntityDataNested<U, C> : T extends CollectionShape<infer U> ? U | U[] | EntityDataNested<U & object, C> | EntityDataNested<U & object, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | EntityDataNested<U, C> | EntityDataNested<U, C>[] : U[] | EntityDataNested<U, C>[] : EntityDataNested<T, C>;
 export type RequiredEntityDataProp<T, O, C extends boolean> = T extends Date ? string | Date : Exclude<T, null> extends RequiredNullable.Brand ? T | null : T extends Scalar ? T : T extends ScalarReference<infer U> ? RequiredEntityDataProp<U, O, C> : T extends {
     __runtime?: infer Runtime;
     __raw?: infer Raw;
-} ? (C extends true ? Raw : Runtime) : T extends ReferenceShape<infer U> ? RequiredEntityDataNested<U, O, C> : T extends CollectionShape<infer U> ? U | U[] | RequiredEntityDataNested<U & object, O, C> | RequiredEntityDataNested<U & object, O, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | RequiredEntityDataNested<U, O, C> | RequiredEntityDataNested<U, O, C>[] : U[] | RequiredEntityDataNested<U, O, C>[] : RequiredEntityDataNested<T, O, C>;
+} ? C extends true ? Raw : Runtime : T extends ReferenceShape<infer U> ? RequiredEntityDataNested<U, O, C> : T extends CollectionShape<infer U> ? U | U[] | RequiredEntityDataNested<U & object, O, C> | RequiredEntityDataNested<U & object, O, C>[] : T extends readonly (infer U)[] ? U extends NonArrayObject ? U | U[] | RequiredEntityDataNested<U, O, C> | RequiredEntityDataNested<U, O, C>[] : U[] | RequiredEntityDataNested<U, O, C>[] : RequiredEntityDataNested<T, O, C>;
 export type EntityDataNested<T, C extends boolean = false> = T extends undefined ? never : T extends any[] ? Readonly<T> : EntityData<T, C> | ExpandEntityProp<T, C>;
 type UnwrapScalarRef<T> = T extends ScalarReference<infer U> ? U : T;
 type EntityDataItem<T, C extends boolean> = C extends false ? UnwrapScalarRef<T> | EntityDataProp<T, C> | Raw | null : EntityDataProp<T, C> | Raw | null;
@@ -368,9 +378,9 @@ export type Rel<T> = T;
 /** Alias for `ScalarReference` (see {@apilink Ref}). */
 export type ScalarRef<T> = ScalarReference<T>;
 /** Alias for `Reference<T> & { id: number }` (see {@apilink Ref}). */
-export type EntityRef<T extends object> = true extends IsUnknown<PrimaryProperty<T>> ? Reference<T> : IsAny<T> extends true ? Reference<T> : ({
+export type EntityRef<T extends object> = true extends IsUnknown<PrimaryProperty<T>> ? Reference<T> : IsAny<T> extends true ? Reference<T> : {
     [K in PrimaryProperty<T> & keyof T]: T[K];
-} & Reference<T>);
+} & Reference<T>;
 /**
  * Ref type represents a `Reference` instance, and adds the primary keys to its prototype automatically, so you can do
  * `ref.id` instead of `ref.unwrap().id`. It resolves to either `ScalarRef` or `EntityRef`, based on the type argument.
@@ -384,7 +394,7 @@ type ExtractHiddenProps<T> = (T extends {
 type ExcludeHidden<T, K extends keyof T> = K extends ExtractHiddenProps<T> ? never : K;
 type ExtractConfig<T> = T extends {
     [Config]?: infer K;
-} ? (K & TypeConfig) : TypeConfig;
+} ? K & TypeConfig : TypeConfig;
 type PreferExplicitConfig<E, I> = IsNever<E, I, E>;
 type PrimaryOrObject<T, U, C extends TypeConfig> = PreferExplicitConfig<C, ExtractConfig<T>>['forceObject'] extends true ? {
     [K in PrimaryProperty<U> & keyof U]: U[K];
@@ -392,7 +402,7 @@ type PrimaryOrObject<T, U, C extends TypeConfig> = PreferExplicitConfig<C, Extra
 type DTOWrapper<T, C extends TypeConfig, Flat extends boolean> = Flat extends true ? EntityDTOFlat<T, C> : EntityDTO<T, C>;
 export type EntityDTOProp<E, T, C extends TypeConfig = never, Flat extends boolean = false> = T extends Scalar ? T : T extends ScalarReference<infer U> ? U : T extends {
     __serialized?: infer U;
-} ? (IsUnknown<U> extends false ? U : T) : T extends LoadedReferenceShape<infer U> ? DTOWrapper<U, C, Flat> : T extends ReferenceShape<infer U> ? PrimaryOrObject<E, U, C> : T extends LoadedCollectionShape<infer U> ? DTOWrapper<U & object, C, Flat>[] : T extends CollectionShape<infer U> ? PrimaryOrObject<E, U & object, C>[] : T extends readonly (infer U)[] ? U extends Scalar ? T : EntityDTOProp<E, U, C, Flat>[] : T extends Relation<T> ? DTOWrapper<T, C, Flat> : T;
+} ? IsUnknown<U> extends false ? U : T : T extends LoadedReferenceShape<infer U> ? DTOWrapper<U, C, Flat> : T extends ReferenceShape<infer U> ? PrimaryOrObject<E, U, C> : T extends LoadedCollectionShape<infer U> ? DTOWrapper<U & object, C, Flat>[] : T extends CollectionShape<infer U> ? PrimaryOrObject<E, U & object, C>[] : T extends readonly (infer U)[] ? U extends Scalar ? T : EntityDTOProp<E, U, C, Flat>[] : T extends Relation<T> ? DTOWrapper<T, C, Flat> : T;
 type UnwrapLoadedEntity<T> = T extends {
     [__loadedType]?: infer U;
 } ? NonNullable<U> : T;
@@ -422,7 +432,7 @@ export type EntityDTOFlat<T, C extends TypeConfig = never> = {
  */
 type SerializeTopHints<H extends string> = H extends `${infer Top}.${string}` ? Top : H;
 type SerializeSubHints<K extends string, H extends string> = H extends `${K}.${infer Rest}` ? Rest : never;
-type SerializePropValue<T, K extends keyof T, H extends string, C extends TypeConfig = never> = (K & string) extends SerializeTopHints<H> ? NonNullable<T[K]> extends CollectionShape<infer U> ? SerializeDTO<U & object, SerializeSubHints<K & string, H>, never, C>[] : SerializeDTO<ExpandProperty<T[K]>, SerializeSubHints<K & string, H>, never, C> | Extract<T[K], null | undefined> : EntityDTOProp<T, T[K], C>;
+type SerializePropValue<T, K extends keyof T, H extends string, C extends TypeConfig = never> = K & string extends SerializeTopHints<H> ? NonNullable<T[K]> extends CollectionShape<infer U> ? SerializeDTO<U & object, SerializeSubHints<K & string, H>, never, C>[] : SerializeDTO<ExpandProperty<T[K]>, SerializeSubHints<K & string, H>, never, C> | Extract<T[K], null | undefined> : EntityDTOProp<T, T[K], C>;
 export type SerializeDTO<T, H extends string = never, E extends string = never, C extends TypeConfig = never> = string extends H ? EntityDTOFlat<T, C> : {
     [K in keyof T as ExcludeHidden<T, K> & CleanKeys<T, K> & (IsNever<E> extends true ? K : Exclude<K, E>)]: SerializePropValue<T, K, H, C> | Extract<T[K], null | undefined>;
 };
@@ -523,6 +533,7 @@ export interface EntityProperty<Owner = any, Target = any> {
     nullable?: boolean;
     inherited?: boolean;
     renamedFrom?: string;
+    stiMerged?: boolean;
     stiFieldNames?: string[];
     stiFieldNameMap?: Dictionary<string>;
     unsigned?: boolean;
@@ -975,7 +986,7 @@ type ExtractStringKeys<T> = {
  * Simplified to just check `T extends object` since ExtractType handles the unwrapping.
  */
 type StringKeys<T, E extends string = never> = T extends object ? ExtractStringKeys<ExtractType<T>> | E : never;
-type GetStringKey<T, K extends StringKeys<T, string>, E extends string> = K extends keyof T ? ExtractType<T[K]> : (K extends E ? keyof T : never);
+type GetStringKey<T, K extends StringKeys<T, string>, E extends string> = K extends keyof T ? ExtractType<T[K]> : K extends E ? keyof T : never;
 type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 type RelationKeys<T> = T extends object ? {
     [K in keyof T]-?: CleanKeys<T, K, true>;
@@ -985,12 +996,12 @@ export type UnboxArray<T> = T extends any[] ? ArrayElement<T> : T;
 export type ArrayElement<ArrayType extends unknown[]> = ArrayType extends (infer ElementType)[] ? ElementType : never;
 export type ExpandProperty<T> = T extends ReferenceShape<infer U> ? NonNullable<U> : T extends CollectionShape<infer U> ? NonNullable<U> : T extends (infer U)[] ? NonNullable<U> : NonNullable<T>;
 type LoadedLoadable<T, E extends object> = T extends CollectionShape ? LoadedCollection<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends ReferenceShape ? T & LoadedReference<E> : T extends Scalar ? T : T extends (infer U)[] ? U extends Scalar ? T : E[] : E;
-type IsTrue<T> = IsNever<T> extends true ? false : T extends boolean ? T extends true ? true : false : false;
-type StringLiteral<T> = T extends string ? string extends T ? never : T : never;
-type Prefix<T, K> = K extends `${infer S}.${string}` ? S : (K extends '*' ? keyof T : K);
+type IsTrue<T> = IsNever<T> extends true ? false : T extends boolean ? (T extends true ? true : false) : false;
+type StringLiteral<T> = T extends string ? (string extends T ? never : T) : never;
+type Prefix<T, K> = K extends `${infer S}.${string}` ? S : K extends '*' ? keyof T : K;
 type IsPrefixedExclude<T, K extends keyof T, E extends string> = K extends E ? never : K;
-export type IsPrefixed<T, K extends keyof T, L extends string, E extends string = never> = IsNever<E> extends false ? IsPrefixedExclude<T, K, E> : K extends symbol ? never : IsTrue<L> extends true ? (T[K] & {} extends LoadableShape ? K : never) : IsNever<StringLiteral<L>> extends true ? never : '*' extends L ? K : K extends Prefix<T, L> ? K : K extends PrimaryProperty<T> ? K : never;
-type Suffix<Key, Hint extends string, All = true | '*'> = Hint extends `${infer Pref}.${infer Suf}` ? (Pref extends Key ? Suf : never) : Hint extends All ? Hint : never;
+export type IsPrefixed<T, K extends keyof T, L extends string, E extends string = never> = IsNever<E> extends false ? IsPrefixedExclude<T, K, E> : K extends symbol ? never : IsTrue<L> extends true ? T[K] & {} extends LoadableShape ? K : never : IsNever<StringLiteral<L>> extends true ? never : '*' extends L ? K : K extends Prefix<T, L> ? K : K extends PrimaryProperty<T> ? K : never;
+type Suffix<Key, Hint extends string, All = true | '*'> = Hint extends `${infer Pref}.${infer Suf}` ? Pref extends Key ? Suf : never : Hint extends All ? Hint : never;
 export type IsSubset<T, U> = keyof U extends keyof T ? {} : string extends keyof U ? {} : {
     [K in keyof U as K extends keyof T ? never : CleanKeys<U, K>]: never;
 };

package/typings.js

@@ -31,11 +31,9 @@ export class EntityMetadata {
         Object.assign(this, meta);
         const name = meta.className ?? meta.name;
         if (!this.class && name) {
-            const Class = this.extends === BaseEntity
-                ? ({ [name]: class extends BaseEntity {
-                    } })[name]
-                : ({ [name]: class {
-                    } })[name];
+            const Class = this.extends === BaseEntity ? { [name]: class extends BaseEntity {
+                } }[name] : { [name]: class {
+                } }[name];
             this.class = Class;
         }
     }
@@ -108,9 +106,7 @@ export class EntityMetadata {
      */
     createSchemaColumnMappingObject() {
         // For TPT entities, only include properties that belong to this entity's table
-        const props = this.inheritanceType === 'tpt' && this.ownProps
-            ? this.ownProps
-            : Object.values(this.properties);
+        const props = this.inheritanceType === 'tpt' && this.ownProps ? this.ownProps : Object.values(this.properties);
         return props.reduce((o, prop) => {
             if (prop.fieldNames) {
                 o[prop.name] = prop.fieldNames[0];
@@ -208,7 +204,11 @@ export class EntityMetadata {
                         const hydrator = wrapped.hydrator;
                         const entity = Reference.unwrapReference(val ?? wrapped.__data[prop.name]);
                         const old = Reference.unwrapReference(wrapped.__data[prop.name]);
-                        if (old && old !== entity && prop.kind === ReferenceKind.MANY_TO_ONE && prop.inversedBy && old[prop.inversedBy]) {
+                        if (old &&
+                            old !== entity &&
+                            prop.kind === ReferenceKind.MANY_TO_ONE &&
+                            prop.inversedBy &&
+                            old[prop.inversedBy]) {
                             old[prop.inversedBy].removeWithoutPropagation(this);
                         }
                         wrapped.__data[prop.name] = Reference.wrapReference(val, prop);

package/unit-of-work/ChangeSet.js

@@ -27,10 +27,10 @@ export class ChangeSet {
         else {
             this.primaryKey = this.originalEntity[this.meta.primaryKeys[0]];
         }
-        if (!this.meta.compositePK
-            && this.meta.getPrimaryProp().targetMeta?.compositePK
-            && typeof this.primaryKey === 'object'
-            && this.primaryKey !== null) {
+        if (!this.meta.compositePK &&
+            this.meta.getPrimaryProp().targetMeta?.compositePK &&
+            typeof this.primaryKey === 'object' &&
+            this.primaryKey !== null) {
             this.primaryKey = this.meta.getPrimaryProp().targetMeta.primaryKeys.map(childPK => {
                 return this.primaryKey[childPK];
             });