@mikro-orm/core 7.0.0-dev.33 → 7.0.0-dev.331

package/entity/EntityAssigner.js

@@ -1,12 +1,11 @@
-import { inspect } from 'node:util';
 import { Collection } from './Collection.js';
 import { Utils } from '../utils/Utils.js';
 import { Reference } from './Reference.js';
 import { ReferenceKind, SCALAR_TYPES } from '../enums.js';
-import { EntityValidator } from './EntityValidator.js';
+import { validateProperty } from './validators.js';
 import { helper, wrap } from './wrap.js';
 import { EntityHelper } from './EntityHelper.js';
-const validator = new EntityValidator(false);
+import { ValidationError } from '../errors.js';
 export class EntityAssigner {
     static assign(entity, data, options = {}) {
         let opts = options;
@@ -72,13 +71,16 @@ export class EntityAssigner {
             value = customType.convertToJSValue(value, options.platform);
         }
         if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop?.kind) && value != null) {
-            if (options.updateNestedEntities && Object.hasOwn(entity, propName) && Utils.isEntity(entity[propName], true) && Utils.isPlainObject(value)) {
+            if (options.updateNestedEntities &&
+                Object.hasOwn(entity, propName) &&
+                Utils.isEntity(entity[propName], true) &&
+                Utils.isPlainObject(value)) {
                 const unwrappedEntity = Reference.unwrapReference(entity[propName]);
                 const wrapped = helper(unwrappedEntity);
                 if (options.updateByPrimaryKey) {
                     const pk = Utils.extractPK(value, prop.targetMeta);
                     if (pk) {
-                        const ref = options.em.getReference(prop.type, pk, options);
+                        const ref = options.em.getReference(prop.targetMeta.class, pk, options);
                         // if the PK differs, we want to change the target entity, not update it
                         const wrappedChild = helper(ref);
                         const sameTarget = wrappedChild.getSerializedPrimaryKey() === wrapped.getSerializedPrimaryKey();
@@ -94,13 +96,16 @@ export class EntityAssigner {
             }
             return EntityAssigner.assignReference(entity, value, prop, options.em, options);
         }
-        if (prop.kind === ReferenceKind.SCALAR && SCALAR_TYPES.includes(prop.runtimeType) && (prop.setter || !prop.getter)) {
-            return entity[prop.name] = validator.validateProperty(prop, value, entity);
+        if (prop.kind === ReferenceKind.SCALAR && SCALAR_TYPES.has(prop.runtimeType) && (prop.setter || !prop.getter)) {
+            validateProperty(prop, value, entity);
+            return (entity[prop.name] = value);
         }
         if (prop.kind === ReferenceKind.EMBEDDED && EntityAssigner.validateEM(options.em)) {
             return EntityAssigner.assignEmbeddable(entity, value, prop, options.em, options);
         }
-        if (options.mergeObjectProperties && Utils.isPlainObject(entity[propName]) && Utils.isPlainObject(value)) {
+        if (options.mergeObjectProperties &&
+            Utils.isPlainObject(entity[propName]) &&
+            Utils.isPlainObject(value)) {
             entity[propName] ??= {};
             entity[propName] = Utils.merge({}, entity[propName], value);
         }
@@ -120,7 +125,7 @@ export class EntityAssigner {
         }
         const meta2 = helper(ref).__meta;
         const prop2 = meta2.properties[prop.inversedBy || prop.mappedBy];
-        /* v8 ignore next 7 */
+        /* v8 ignore next */
         if (prop2 && !ref[prop2.name]) {
             if (Reference.isReference(ref)) {
                 ref.unwrap()[prop2.name] = Reference.wrapReference(entity, prop2);
@@ -141,13 +146,15 @@ export class EntityAssigner {
             entity[prop.name] = Reference.wrapReference(value, prop);
         }
         else if (Utils.isPrimaryKey(value, true) && EntityAssigner.validateEM(em)) {
-            entity[prop.name] = prop.mapToPk ? value : Reference.wrapReference(em.getReference(prop.type, value, options), prop);
+            entity[prop.name] = prop.mapToPk
+                ? value
+                : Reference.wrapReference(em.getReference(prop.targetMeta.class, value, options), prop);
         }
         else if (Utils.isPlainObject(value) && options.merge && EntityAssigner.validateEM(em)) {
-            entity[prop.name] = Reference.wrapReference(em.merge(prop.type, value, options), prop);
+            entity[prop.name] = Reference.wrapReference(em.merge(prop.targetMeta.class, value, options), prop);
         }
         else if (Utils.isPlainObject(value) && EntityAssigner.validateEM(em)) {
-            entity[prop.name] = Reference.wrapReference(em.create(prop.type, value, options), prop);
+            entity[prop.name] = Reference.wrapReference(em.create(prop.targetMeta.class, value, options), prop);
         }
         else {
             const name = entity.constructor.name;
@@ -166,27 +173,31 @@ export class EntityAssigner {
             if (options.updateNestedEntities && options.updateByPrimaryKey && Utils.isPlainObject(item)) {
                 const pk = Utils.extractPK(item, prop.targetMeta);
                 if (pk && EntityAssigner.validateEM(em)) {
-                    const ref = em.getUnitOfWork().getById(prop.type, pk, options.schema);
+                    const ref = em.getUnitOfWork().getById(prop.targetMeta.class, pk, options.schema);
                     if (ref) {
                         return EntityAssigner.assign(ref, item, options);
                     }
                 }
                 return this.createCollectionItem(item, em, prop, invalid, options);
             }
-            /* v8 ignore next 3 */
-            if (options.updateNestedEntities && !options.updateByPrimaryKey && collection[idx] && helper(collection[idx])?.isInitialized()) {
+            /* v8 ignore next */
+            if (options.updateNestedEntities &&
+                !options.updateByPrimaryKey &&
+                collection[idx] &&
+                helper(collection[idx])?.isInitialized()) {
                 return EntityAssigner.assign(collection[idx], item, options);
             }
             return this.createCollectionItem(item, em, prop, invalid, options);
         });
         if (invalid.length > 0) {
             const name = entity.constructor.name;
-            throw new Error(`Invalid collection values provided for '${name}.${prop.name}' in ${name}.assign(): ${inspect(invalid)}`);
+            throw ValidationError.invalidCollectionValues(name, prop.name, invalid);
         }
         if (Array.isArray(value)) {
             collection.set(items);
         }
-        else { // append to the collection in case of assigning a single value instead of array
+        else {
+            // append to the collection in case of assigning a single value instead of array
             collection.add(items);
         }
     }
@@ -207,11 +218,12 @@ export class EntityAssigner {
                 entity[propName].push(...Object.values(tmp));
             });
         }
-        const create = () => EntityAssigner.validateEM(em) && em.getEntityFactory().createEmbeddable(prop.type, value, {
-            convertCustomTypes: options.convertCustomTypes,
-            newEntity: options.mergeEmbeddedProperties ? !('propName' in entity) : true,
-        });
-        entity[propName] = (options.mergeEmbeddedProperties ? (entity[propName] || create()) : create());
+        const create = () => EntityAssigner.validateEM(em) &&
+            em.getEntityFactory().createEmbeddable(prop.targetMeta.class, value, {
+                convertCustomTypes: options.convertCustomTypes,
+                newEntity: options.mergeEmbeddedProperties ? !('propName' in entity) : true,
+            });
+        entity[propName] = (options.mergeEmbeddedProperties ? entity[propName] || create() : create());
         Object.keys(value).forEach(key => {
             EntityAssigner.assignProperty(entity[propName], key, prop.embeddedProps, value, options);
         });
@@ -221,13 +233,13 @@ export class EntityAssigner {
             return item;
         }
         if (Utils.isPrimaryKey(item) && EntityAssigner.validateEM(em)) {
-            return em.getReference(prop.type, item, options);
+            return em.getReference(prop.targetMeta.class, item, options);
         }
         if (Utils.isPlainObject(item) && options.merge && EntityAssigner.validateEM(em)) {
-            return em.merge(prop.type, item, options);
+            return em.merge(prop.targetMeta.class, item, options);
         }
         if (Utils.isPlainObject(item) && EntityAssigner.validateEM(em)) {
-            return em.create(prop.type, item, options);
+            return em.create(prop.targetMeta.class, item, options);
         }
         invalid.push(item);
         return item;

package/entity/EntityFactory.d.ts

@@ -15,20 +15,19 @@ export interface FactoryOptions {
     recomputeSnapshot?: boolean;
     schema?: string;
     parentSchema?: string;
+    normalizeAccessors?: boolean;
+    /**
+     * Property name to use for identity map lookup instead of the primary key.
+     * This is useful for creating references by unique non-PK properties.
+     */
+    key?: string;
 }
 export declare class EntityFactory {
-    private readonly em;
-    private readonly driver;
-    private readonly platform;
-    private readonly config;
-    private readonly metadata;
-    private readonly hydrator;
-    private readonly eventManager;
-    private readonly comparator;
+    #private;
     constructor(em: EntityManager);
     create<T extends object, P extends string = string>(entityName: EntityName<T>, data: EntityData<T>, options?: FactoryOptions): New<T, P>;
     mergeData<T extends object>(meta: EntityMetadata<T>, entity: T, data: EntityData<T>, options?: FactoryOptions): void;
-    createReference<T extends object>(entityName: EntityName<T>, id: Primary<T> | Primary<T>[] | Record<string, Primary<T>>, options?: Pick<FactoryOptions, 'merge' | 'convertCustomTypes' | 'schema'>): T;
+    createReference<T extends object>(entityName: EntityName<T>, id: Primary<T> | Primary<T>[] | Record<string, Primary<T>>, options?: Pick<FactoryOptions, 'merge' | 'convertCustomTypes' | 'schema' | 'key'>): T;
     createEmbeddable<T extends object>(entityName: EntityName<T>, data: EntityData<T>, options?: Pick<FactoryOptions, 'newEntity' | 'convertCustomTypes'>): T;
     getComparator(): EntityComparator;
     private createEntity;

package/entity/EntityFactory.js

@@ -4,24 +4,25 @@ import { EventType, ReferenceKind } from '../enums.js';
 import { Reference } from './Reference.js';
 import { helper } from './wrap.js';
 import { EntityHelper } from './EntityHelper.js';
+import { JsonType } from '../types/JsonType.js';
 export class EntityFactory {
-    em;
-    driver;
-    platform;
-    config;
-    metadata;
-    hydrator;
-    eventManager;
-    comparator;
+    #driver;
+    #platform;
+    #config;
+    #metadata;
+    #hydrator;
+    #eventManager;
+    #comparator;
+    #em;
     constructor(em) {
-        this.em = em;
-        this.driver = this.em.getDriver();
-        this.platform = this.driver.getPlatform();
-        this.config = this.em.config;
-        this.metadata = this.em.getMetadata();
-        this.hydrator = this.config.getHydrator(this.metadata);
-        this.eventManager = this.em.getEventManager();
-        this.comparator = this.em.getComparator();
+        this.#em = em;
+        this.#driver = this.#em.getDriver();
+        this.#platform = this.#driver.getPlatform();
+        this.#config = this.#em.config;
+        this.#metadata = this.#em.getMetadata();
+        this.#hydrator = this.#config.getHydrator(this.#metadata);
+        this.#eventManager = this.#em.getEventManager();
+        this.#comparator = this.#em.getComparator();
     }
     create(entityName, data, options = {}) {
         data = Reference.unwrapReference(data);
@@ -29,16 +30,15 @@ export class EntityFactory {
         if (data.__entity) {
             return data;
         }
-        entityName = Utils.className(entityName);
-        const meta = this.metadata.get(entityName);
+        const meta = this.#metadata.get(entityName);
         if (meta.virtual) {
             data = { ...data };
             const entity = this.createEntity(data, meta, options);
             this.hydrate(entity, meta, data, options);
             return entity;
         }
-        if (this.platform.usesDifferentSerializedPrimaryKey()) {
-            meta.primaryKeys.forEach(pk => this.denormalizePrimaryKey(data, pk, meta.properties[pk]));
+        if (meta.serializedPrimaryKey) {
+            this.denormalizePrimaryKey(meta, data);
         }
         const meta2 = this.processDiscriminatorColumn(meta, data);
         const exists = this.findEntity(data, meta2, options);
@@ -59,7 +59,7 @@ export class EntityFactory {
         wrapped.__initialized = options.initialized;
         if (options.newEntity || meta.forceConstructor || meta.virtual) {
             const tmp = { ...data };
-            meta.constructorParams.forEach(prop => delete tmp[prop]);
+            meta.constructorParams?.forEach(prop => delete tmp[prop]);
             this.hydrate(entity, meta2, tmp, options);
             // since we now process only a copy of the `data` via hydrator, but later we register the state with the full snapshot,
             // we need to go through all props with custom types that have `ensureComparable: true` and ensure they are comparable
@@ -70,10 +70,16 @@ export class EntityFactory {
                         if ([ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(prop.kind)) {
                             continue;
                         }
-                        if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(data[prop.name])) {
+                        if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                            Utils.isPlainObject(data[prop.name])) {
                             data[prop.name] = Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta, true);
                         }
-                        data[prop.name] = prop.customType.convertToDatabaseValue(data[prop.name], this.platform, { key: prop.name, mode: 'hydration' });
+                        if (prop.customType instanceof JsonType && this.#platform.convertsJsonAutomatically()) {
+                            data[prop.name] = prop.customType.convertToDatabaseValue(data[prop.name], this.#platform, {
+                                key: prop.name,
+                                mode: 'hydration',
+                            });
+                        }
                     }
                 }
             }
@@ -81,8 +87,7 @@ export class EntityFactory {
         else {
             this.hydrate(entity, meta2, data, options);
         }
-        wrapped.__touched = false;
-        if (exists && meta.discriminatorColumn && !(entity instanceof meta2.class)) {
+        if (exists && meta.root.inheritanceType && !(entity instanceof meta2.class)) {
             Object.setPrototypeOf(entity, meta2.prototype);
         }
         if (options.merge && wrapped.hasPrimaryKey()) {
@@ -94,11 +99,11 @@ export class EntityFactory {
                 loaded: options.initialized,
             });
             if (options.recomputeSnapshot) {
-                wrapped.__originalEntityData = this.comparator.prepareEntity(entity);
+                wrapped.__originalEntityData = this.#comparator.prepareEntity(entity);
             }
         }
-        if (this.eventManager.hasListeners(EventType.onInit, meta2)) {
-            this.eventManager.dispatchEvent(EventType.onInit, { entity, meta: meta2, em: this.em });
+        if (this.#eventManager.hasListeners(EventType.onInit, meta2)) {
+            this.#eventManager.dispatchEvent(EventType.onInit, { entity, meta: meta2, em: this.#em });
         }
         wrapped.__processing = false;
         return entity;
@@ -106,60 +111,92 @@ export class EntityFactory {
     mergeData(meta, entity, data, options = {}) {
         // merge unchanged properties automatically
         data = QueryHelper.processParams(data);
-        const existsData = this.comparator.prepareEntity(entity);
+        const existsData = this.#comparator.prepareEntity(entity);
         const originalEntityData = helper(entity).__originalEntityData ?? {};
-        const diff = this.comparator.diffEntities(meta.className, originalEntityData, existsData);
+        const diff = this.#comparator.diffEntities(meta.class, originalEntityData, existsData);
         // version properties are not part of entity snapshots
-        if (meta.versionProperty && data[meta.versionProperty] && data[meta.versionProperty] !== originalEntityData[meta.versionProperty]) {
+        if (meta.versionProperty &&
+            data[meta.versionProperty] &&
+            data[meta.versionProperty] !== originalEntityData[meta.versionProperty]) {
             diff[meta.versionProperty] = data[meta.versionProperty];
         }
-        const diff2 = this.comparator.diffEntities(meta.className, existsData, data, { includeInverseSides: true });
+        const diff2 = this.#comparator.diffEntities(meta.class, existsData, data, { includeInverseSides: true });
         // do not override values changed by user
         Utils.keys(diff).forEach(key => delete diff2[key]);
-        Utils.keys(diff2).filter(key => {
+        Utils.keys(diff2)
+            .filter(key => {
             // ignore null values if there is already present non-null value
             if (existsData[key] != null) {
                 return diff2[key] == null;
             }
             return diff2[key] === undefined;
-        }).forEach(key => delete diff2[key]);
+        })
+            .forEach(key => delete diff2[key]);
         // but always add collection properties and formulas if they are part of the `data`
         Utils.keys(data)
-            .filter(key => meta.properties[key]?.formula || [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
-            .forEach(key => diff2[key] = data[key]);
+            .filter(key => meta.properties[key]?.formula ||
+            [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(meta.properties[key]?.kind))
+            .forEach(key => (diff2[key] = data[key]));
         // rehydrated with the new values, skip those changed by user
-        this.hydrate(entity, meta, diff2, options);
+        // use full hydration if the entity is already initialized, even if the caller used `initialized: false`
+        // (e.g. from createReference), otherwise scalar properties in diff2 won't be applied
+        const initialized = options.initialized || helper(entity).__initialized;
+        this.hydrate(entity, meta, diff2, initialized ? { ...options, initialized } : options);
         // we need to update the entity data only with keys that were not present before
-        const nullVal = this.config.get('forceUndefined') ? undefined : null;
+        const nullVal = this.#config.get('forceUndefined') ? undefined : null;
         Utils.keys(diff2).forEach(key => {
             const prop = meta.properties[key];
-            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(data[prop.name])) {
+            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                Utils.isPlainObject(data[prop.name])) {
+                // oxfmt-ignore
                 diff2[key] = entity[prop.name] ? helper(entity[prop.name]).getPrimaryKey(options.convertCustomTypes) : null;
             }
+            if (!options.convertCustomTypes &&
+                [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE, ReferenceKind.SCALAR].includes(prop.kind) &&
+                prop.customType?.ensureComparable(meta, prop) &&
+                diff2[key] != null) {
+                const converted = prop.customType.convertToJSValue(diff2[key], this.#platform, { force: true });
+                diff2[key] = prop.customType.convertToDatabaseValue(converted, this.#platform, { fromQuery: true });
+            }
             originalEntityData[key] = diff2[key] === null ? nullVal : diff2[key];
             helper(entity).__loadedProperties.add(key);
         });
         // in case of joined loading strategy, we need to cascade the merging to possibly loaded relations manually
         meta.relations.forEach(prop => {
-            if ([ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(prop.kind) && Array.isArray(data[prop.name])) {
+            if ([ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(prop.kind) &&
+                Array.isArray(data[prop.name])) {
                 // instead of trying to match the collection items (which could easily fail if the collection was loaded with different ordering),
                 // we just create the entity from scratch, which will automatically pick the right one from the identity map and call `mergeData` on it
                 data[prop.name]
                     .filter(child => Utils.isPlainObject(child)) // objects with prototype can be PKs (e.g. `ObjectId`)
-                    .forEach(child => this.create(prop.type, child, options)); // we can ignore the value, we just care about the `mergeData` call
+                    .forEach(child => this.create(prop.targetMeta.class, child, options)); // we can ignore the value, we just care about the `mergeData` call
                 return;
             }
-            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(data[prop.name]) && entity[prop.name] && helper(entity[prop.name]).__initialized) {
-                this.create(prop.type, data[prop.name], options); // we can ignore the value, we just care about the `mergeData` call
+            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                Utils.isPlainObject(data[prop.name]) &&
+                entity[prop.name] &&
+                helper(entity[prop.name]).__initialized) {
+                this.create(prop.targetMeta.class, data[prop.name], options); // we can ignore the value, we just care about the `mergeData` call
             }
         });
-        helper(entity).__touched = false;
+        this.unitOfWork.normalizeEntityData(meta, originalEntityData);
     }
     createReference(entityName, id, options = {}) {
         options.convertCustomTypes ??= true;
-        entityName = Utils.className(entityName);
-        const meta = this.metadata.get(entityName);
-        const schema = this.driver.getSchemaName(meta, options);
+        const meta = this.#metadata.get(entityName);
+        const schema = this.#driver.getSchemaName(meta, options);
+        // Handle alternate key lookup
+        if (options.key) {
+            const value = '' + (Array.isArray(id) ? id[0] : Utils.isPlainObject(id) ? id[options.key] : id);
+            const exists = this.unitOfWork.getByKey(entityName, options.key, value, schema, options.convertCustomTypes);
+            if (exists) {
+                return exists;
+            }
+            // Create entity stub - storeByKey will set the alternate key property and store in identity map
+            const entity = this.create(entityName, {}, { ...options, initialized: false });
+            this.unitOfWork.storeByKey(entity, options.key, value, schema, options.convertCustomTypes);
+            return entity;
+        }
         if (meta.simplePK) {
             const exists = this.unitOfWork.getById(entityName, id, schema);
             if (exists) {
@@ -171,7 +208,7 @@ export class EntityFactory {
         if (Array.isArray(id)) {
             id = Utils.getPrimaryKeyCondFromArray(id, meta);
         }
-        const pks = Utils.getOrderedPrimaryKeys(id, meta, this.platform);
+        const pks = Utils.getOrderedPrimaryKeys(id, meta, this.#platform);
         const exists = this.unitOfWork.getById(entityName, pks, schema, options.convertCustomTypes);
         if (exists) {
             return exists;
@@ -182,19 +219,18 @@ export class EntityFactory {
         return this.create(entityName, id, { ...options, initialized: false });
     }
     createEmbeddable(entityName, data, options = {}) {
-        entityName = Utils.className(entityName);
         data = { ...data };
-        const meta = this.metadata.get(entityName);
+        const meta = this.#metadata.get(entityName);
         const meta2 = this.processDiscriminatorColumn(meta, data);
         return this.createEntity(data, meta2, options);
     }
     getComparator() {
-        return this.comparator;
+        return this.#comparator;
     }
     createEntity(data, meta, options) {
-        const schema = this.driver.getSchemaName(meta, options);
+        const schema = this.#driver.getSchemaName(meta, options);
         if (options.newEntity || meta.forceConstructor || meta.virtual) {
-            if (!meta.class) {
+            if (meta.polymorphs) {
                 throw new Error(`Cannot create entity ${meta.className}, class prototype is unknown`);
             }
             const params = this.extractConstructorParams(meta, data, options);
@@ -203,7 +239,7 @@ export class EntityFactory {
             const entity = new Entity(...params);
             // creating managed entity instance when `forceEntityConstructor` is enabled,
             // we need to wipe all the values as they would cause update queries on next flush
-            if (!options.newEntity && (meta.forceConstructor || this.config.get('forceEntityConstructor'))) {
+            if (!options.newEntity && (meta.forceConstructor || this.#config.get('forceEntityConstructor'))) {
                 meta.props
                     .filter(prop => prop.persist !== false && !prop.primary && data[prop.name] === undefined)
                     .forEach(prop => delete entity[prop.name]);
@@ -223,7 +259,7 @@ export class EntityFactory {
         helper(entity).__processing = !meta.embeddable && !meta.virtual;
         helper(entity).__schema = schema;
         if (options.merge && !options.newEntity) {
-            this.hydrator.hydrateReference(entity, meta, data, this, options.convertCustomTypes, options.schema, options.parentSchema);
+            this.#hydrator.hydrateReference(entity, meta, data, this, options.convertCustomTypes, options.schema, options.parentSchema);
             this.unitOfWork.register(entity);
         }
         if (options.initialized) {
@@ -234,112 +270,128 @@ export class EntityFactory {
     assignDefaultValues(entity, meta) {
         for (const prop of meta.props) {
             if (prop.onCreate) {
-                entity[prop.name] ??= prop.onCreate(entity, this.em);
+                entity[prop.name] ??= prop.onCreate(entity, this.#em);
             }
         }
     }
     hydrate(entity, meta, data, options) {
         if (options.initialized) {
-            this.hydrator.hydrate(entity, meta, data, this, 'full', options.newEntity, options.convertCustomTypes, options.schema, this.driver.getSchemaName(meta, options));
+            this.#hydrator.hydrate(entity, meta, data, this, 'full', options.newEntity, options.convertCustomTypes, options.schema, this.#driver.getSchemaName(meta, options), options.normalizeAccessors);
         }
         else {
-            this.hydrator.hydrateReference(entity, meta, data, this, options.convertCustomTypes, options.schema, this.driver.getSchemaName(meta, options));
+            this.#hydrator.hydrateReference(entity, meta, data, this, options.convertCustomTypes, options.schema, this.#driver.getSchemaName(meta, options), options.normalizeAccessors);
         }
         Utils.keys(data).forEach(key => {
             helper(entity)?.__loadedProperties.add(key);
             helper(entity)?.__serializationContext.fields?.add(key);
         });
-        const processOnCreateHooksEarly = options.processOnCreateHooksEarly ?? this.config.get('processOnCreateHooksEarly');
+        const processOnCreateHooksEarly = options.processOnCreateHooksEarly ?? this.#config.get('processOnCreateHooksEarly');
         if (options.newEntity && processOnCreateHooksEarly) {
             this.assignDefaultValues(entity, meta);
         }
     }
     findEntity(data, meta, options) {
-        const schema = this.driver.getSchemaName(meta, options);
+        const schema = this.#driver.getSchemaName(meta, options);
         if (meta.simplePK) {
-            return this.unitOfWork.getById(meta.className, data[meta.primaryKeys[0]], schema);
+            return this.unitOfWork.getById(meta.class, data[meta.primaryKeys[0]], schema);
         }
         if (!Array.isArray(data) && meta.primaryKeys.some(pk => data[pk] == null)) {
             return undefined;
         }
-        const pks = Utils.getOrderedPrimaryKeys(data, meta, this.platform, options.convertCustomTypes);
-        return this.unitOfWork.getById(meta.className, pks, schema);
+        const pks = Utils.getOrderedPrimaryKeys(data, meta, this.#platform, options.convertCustomTypes);
+        return this.unitOfWork.getById(meta.class, pks, schema);
     }
     processDiscriminatorColumn(meta, data) {
-        if (!meta.root.discriminatorColumn) {
+        // Handle STI discriminator (persisted column)
+        if (meta.root.inheritanceType === 'sti') {
+            const prop = meta.properties[meta.root.discriminatorColumn];
+            const value = data[prop.name];
+            const type = meta.root.discriminatorMap[value];
+            meta = type ? this.#metadata.get(type) : meta;
             return meta;
         }
-        const prop = meta.properties[meta.root.discriminatorColumn];
-        const value = data[prop.name];
-        const type = meta.root.discriminatorMap[value];
-        meta = type ? this.metadata.find(type) : meta;
+        // Handle TPT discriminator (computed at query time)
+        if (meta.root.inheritanceType === 'tpt' && meta.root.discriminatorMap) {
+            const value = data[meta.root.tptDiscriminatorColumn];
+            if (value) {
+                const type = meta.root.discriminatorMap[value];
+                meta = type ? this.#metadata.get(type) : meta;
+            }
+        }
         return meta;
     }
     /**
      * denormalize PK to value required by driver (e.g. ObjectId)
      */
-    denormalizePrimaryKey(data, primaryKey, prop) {
-        const pk = this.platform.getSerializedPrimaryKeyField(primaryKey);
-        if (data[pk] != null || data[primaryKey] != null) {
-            let id = (data[pk] || data[primaryKey]);
-            if (prop.type.toLowerCase() === 'objectid') {
-                id = this.platform.denormalizePrimaryKey(id);
-            }
-            delete data[pk];
-            data[primaryKey] = id;
+    denormalizePrimaryKey(meta, data) {
+        const pk = meta.getPrimaryProp();
+        const spk = meta.properties[meta.serializedPrimaryKey];
+        if (!spk?.serializedPrimaryKey) {
+            return;
+        }
+        if (pk.type === 'ObjectId' && (data[pk.name] != null || data[spk.name] != null)) {
+            data[pk.name] = this.#platform.denormalizePrimaryKey((data[spk.name] || data[pk.name]));
+            delete data[spk.name];
         }
     }
     /**
      * returns parameters for entity constructor, creating references from plain ids
      */
     extractConstructorParams(meta, data, options) {
+        if (!meta.constructorParams) {
+            return [data];
+        }
         return meta.constructorParams.map(k => {
-            if (meta.properties[k] && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(meta.properties[k].kind) && data[k]) {
-                const pk = Reference.unwrapReference(data[k]);
-                const entity = this.unitOfWork.getById(meta.properties[k].type, pk, options.schema, true);
+            const prop = meta.properties[k];
+            const value = data[k];
+            if (prop && [ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && value) {
+                const pk = Reference.unwrapReference(value);
+                const entity = this.unitOfWork.getById(prop.targetMeta.class, pk, options.schema, true);
                 if (entity) {
                     return entity;
                 }
-                if (Utils.isEntity(data[k])) {
-                    return data[k];
+                if (Utils.isEntity(value)) {
+                    return value;
                 }
-                const nakedPk = Utils.extractPK(data[k], meta.properties[k].targetMeta, true);
-                if (Utils.isObject(data[k]) && !nakedPk) {
-                    return this.create(meta.properties[k].type, data[k], options);
+                const nakedPk = Utils.extractPK(value, prop.targetMeta, true);
+                if (Utils.isObject(value) && !nakedPk) {
+                    return this.create(prop.targetMeta.class, value, options);
                 }
                 const { newEntity, initialized, ...rest } = options;
-                const target = this.createReference(meta.properties[k].type, nakedPk, rest);
-                return Reference.wrapReference(target, meta.properties[k]);
+                const target = this.createReference(prop.targetMeta.class, nakedPk, rest);
+                return Reference.wrapReference(target, prop);
             }
-            if (meta.properties[k]?.kind === ReferenceKind.EMBEDDED && data[k]) {
-                /* v8 ignore next 3 */
-                if (Utils.isEntity(data[k])) {
-                    return data[k];
+            if (prop?.kind === ReferenceKind.EMBEDDED && value) {
+                /* v8 ignore next */
+                if (Utils.isEntity(value)) {
+                    return value;
                 }
-                return this.createEmbeddable(meta.properties[k].type, data[k], options);
+                return this.createEmbeddable(prop.targetMeta.class, value, options);
             }
-            if (!meta.properties[k]) {
+            if (!prop) {
                 const tmp = { ...data };
                 for (const prop of meta.props) {
                     if (!options.convertCustomTypes || !prop.customType || tmp[prop.name] == null) {
                         continue;
                     }
-                    if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils.isPlainObject(tmp[prop.name]) && !Utils.extractPK(tmp[prop.name], meta.properties[prop.name].targetMeta, true)) {
-                        tmp[prop.name] = Reference.wrapReference(this.create(meta.properties[prop.name].type, tmp[prop.name], options), prop);
+                    if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) &&
+                        Utils.isPlainObject(tmp[prop.name]) &&
+                        !Utils.extractPK(tmp[prop.name], prop.targetMeta, true)) {
+                        tmp[prop.name] = Reference.wrapReference(this.create(prop.targetMeta.class, tmp[prop.name], options), prop);
                     }
                     else if (prop.kind === ReferenceKind.SCALAR) {
-                        tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.platform);
+                        tmp[prop.name] = prop.customType.convertToJSValue(tmp[prop.name], this.#platform);
                     }
                 }
                 return tmp;
             }
-            if (options.convertCustomTypes && meta.properties[k].customType && data[k] != null) {
-                return meta.properties[k].customType.convertToJSValue(data[k], this.platform);
+            if (options.convertCustomTypes && prop.customType && value != null) {
+                return prop.customType.convertToJSValue(value, this.#platform);
             }
-            return data[k];
+            return value;
         });
     }
     get unitOfWork() {
-        return this.em.getUnitOfWork(false);
+        return this.#em.getUnitOfWork(false);
     }
 }