@mikro-orm/core 7.0.0-dev.1 → 7.0.0-dev.100

package/events/EventManager.js

@@ -1,27 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventManager = void 0;
-const Utils_1 = require("../utils/Utils");
-const enums_1 = require("../enums");
-class EventManager {
+import { Utils } from '../utils/Utils.js';
+import { EventType, EventTypeMap } from '../enums.js';
+export class EventManager {
     listeners = {};
     entities = new Map();
     cache = new Map();
-    subscribers = [];
+    subscribers = new Set();
     constructor(subscribers) {
-        subscribers.forEach(subscriber => this.registerSubscriber(subscriber));
+        for (const subscriber of subscribers) {
+            this.registerSubscriber(subscriber);
+        }
     }
     registerSubscriber(subscriber) {
-        this.subscribers.push(subscriber);
+        if (this.subscribers.has(subscriber)) {
+            return;
+        }
+        this.subscribers.add(subscriber);
         this.entities.set(subscriber, this.getSubscribedEntities(subscriber));
         this.cache.clear();
-        Utils_1.Utils.keys(enums_1.EventType)
+        Utils.keys(EventType)
             .filter(event => event in subscriber)
             .forEach(event => {
-            this.listeners[event] ??= [];
-            this.listeners[event].push(subscriber);
+            this.listeners[event] ??= new Set();
+            this.listeners[event].add(subscriber);
         });
     }
+    getSubscribers() {
+        return this.subscribers;
+    }
     dispatchEvent(event, args, meta) {
         const listeners = [];
         const entity = args.entity;
@@ -33,19 +38,19 @@ class EventManager {
             const handler = typeof hook === 'function' ? hook : entity[hook] ?? prototypeHook;
             return handler.bind(entity);
         }));
-        for (const listener of this.listeners[event] || []) {
+        for (const listener of this.listeners[event] ?? new Set()) {
             const entities = this.entities.get(listener);
-            if (entities.length === 0 || !entity || entities.includes(entity.constructor.name)) {
+            if (entities.size === 0 || !entity || entities.has(entity.constructor.name)) {
                 listeners.push(listener[event].bind(listener));
             }
         }
-        if (event === enums_1.EventType.onInit) {
+        if (event === EventType.onInit) {
             return listeners.forEach(listener => listener(args));
         }
-        return Utils_1.Utils.runSerial(listeners, listener => listener(args));
+        return Utils.runSerial(listeners, listener => listener(args));
     }
     hasListeners(event, meta) {
-        const cacheKey = meta._id + enums_1.EventTypeMap[event];
+        const cacheKey = meta._id + EventTypeMap[event];
         if (this.cache.has(cacheKey)) {
             return this.cache.get(cacheKey);
         }
@@ -54,9 +59,9 @@ class EventManager {
             this.cache.set(cacheKey, true);
             return true;
         }
-        for (const listener of this.listeners[event] ?? []) {
+        for (const listener of this.listeners[event] ?? new Set()) {
             const entities = this.entities.get(listener);
-            if (entities.length === 0 || entities.includes(meta.className)) {
+            if (entities.size === 0 || entities.has(meta.className)) {
                 this.cache.set(cacheKey, true);
                 return true;
             }
@@ -69,9 +74,8 @@ class EventManager {
     }
     getSubscribedEntities(listener) {
         if (!listener.getSubscribedEntities) {
-            return [];
+            return new Set();
         }
-        return listener.getSubscribedEntities().map(name => Utils_1.Utils.className(name));
+        return new Set(listener.getSubscribedEntities().map(name => Utils.className(name)));
     }
 }
-exports.EventManager = EventManager;

package/events/EventSubscriber.d.ts

@@ -1,7 +1,8 @@
-import type { EntityName, EntityMetadata } from '../typings';
-import type { EntityManager } from '../EntityManager';
-import type { ChangeSet, UnitOfWork } from '../unit-of-work';
-import type { Transaction } from '../connections';
+import type { EntityName, EntityMetadata } from '../typings.js';
+import type { EntityManager } from '../EntityManager.js';
+import type { UnitOfWork } from '../unit-of-work/UnitOfWork.js';
+import type { ChangeSet } from '../unit-of-work/ChangeSet.js';
+import type { Transaction } from '../connections/Connection.js';
 export interface EventArgs<T> {
     entity: T;
     em: EntityManager;
@@ -12,7 +13,9 @@ export interface FlushEventArgs extends Omit<EventArgs<any>, 'entity' | 'changeS
     uow: UnitOfWork;
 }
 export interface TransactionEventArgs extends Omit<EventArgs<any>, 'entity' | 'meta' | 'changeSet'> {
-    transaction?: Transaction;
+    transaction?: Transaction & {
+        savepointName?: string;
+    };
     uow?: UnitOfWork;
 }
 export interface EventSubscriber<T = any> {

package/events/EventSubscriber.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/events/TransactionEventBroadcaster.d.ts

@@ -1,6 +1,6 @@
-import type { Transaction } from '../connections';
-import type { EntityManager } from '../EntityManager';
-import type { TransactionEventType } from '../enums';
+import type { Transaction } from '../connections/Connection.js';
+import type { EntityManager } from '../EntityManager.js';
+import type { TransactionEventType } from '../enums.js';
 export declare class TransactionEventBroadcaster {
     private readonly em;
     readonly context?: {

package/events/TransactionEventBroadcaster.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionEventBroadcaster = void 0;
-class TransactionEventBroadcaster {
+export class TransactionEventBroadcaster {
     em;
     context;
     constructor(em, context) {
@@ -16,4 +13,3 @@ class TransactionEventBroadcaster {
         });
     }
 }
-exports.TransactionEventBroadcaster = TransactionEventBroadcaster;

package/events/index.d.ts

@@ -1,3 +1,3 @@
-export * from './EventSubscriber';
-export * from './EventManager';
-export * from './TransactionEventBroadcaster';
+export * from './EventSubscriber.js';
+export * from './EventManager.js';
+export * from './TransactionEventBroadcaster.js';

package/events/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./EventSubscriber"), exports);
-__exportStar(require("./EventManager"), exports);
-__exportStar(require("./TransactionEventBroadcaster"), exports);
+export * from './EventSubscriber.js';
+export * from './EventManager.js';
+export * from './TransactionEventBroadcaster.js';

package/exceptions.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniqueConstraintViolationException = exports.TableNotFoundException = exports.TableExistsException = exports.SyntaxErrorException = exports.ReadOnlyException = exports.NotNullConstraintViolationException = exports.NonUniqueFieldNameException = exports.LockWaitTimeoutException = exports.InvalidFieldNameException = exports.CheckConstraintViolationException = exports.ForeignKeyConstraintViolationException = exports.DeadlockException = exports.DatabaseObjectNotFoundException = exports.DatabaseObjectExistsException = exports.ConstraintViolationException = exports.ServerException = exports.ConnectionException = exports.DriverException = void 0;
 /**
  * Base class for all errors detected in the driver.
  */
-class DriverException extends Error {
+export class DriverException extends Error {
     code;
     errno;
     sqlState;
@@ -18,25 +15,21 @@ class DriverException extends Error {
         this.stack += '\n\n' + previous.stack.split('\n').filter(l => l.trim().startsWith('at ')).join('\n');
     }
 }
-exports.DriverException = DriverException;
 /**
  * Base class for all connection related errors detected in the driver.
  */
-class ConnectionException extends DriverException {
+export class ConnectionException extends DriverException {
 }
-exports.ConnectionException = ConnectionException;
 /**
  * Base class for all server related errors detected in the driver.
  */
-class ServerException extends DriverException {
+export class ServerException extends DriverException {
 }
-exports.ServerException = ServerException;
 /**
  * Base class for all constraint violation related errors detected in the driver.
  */
-class ConstraintViolationException extends ServerException {
+export class ConstraintViolationException extends ServerException {
 }
-exports.ConstraintViolationException = ConstraintViolationException;
 /**
  * Base class for all already existing database object related errors detected in the driver.
  *
@@ -44,9 +37,8 @@ exports.ConstraintViolationException = ConstraintViolationException;
  * such as schemas, tables, views, sequences, triggers,  constraints, indexes,
  * functions, stored procedures etc.
  */
-class DatabaseObjectExistsException extends ServerException {
+export class DatabaseObjectExistsException extends ServerException {
 }
-exports.DatabaseObjectExistsException = DatabaseObjectExistsException;
 /**
  * Base class for all unknown database object related errors detected in the driver.
  *
@@ -54,78 +46,65 @@ exports.DatabaseObjectExistsException = DatabaseObjectExistsException;
  * such as schemas, tables, views, sequences, triggers,  constraints, indexes,
  * functions, stored procedures etc.
  */
-class DatabaseObjectNotFoundException extends ServerException {
+export class DatabaseObjectNotFoundException extends ServerException {
 }
-exports.DatabaseObjectNotFoundException = DatabaseObjectNotFoundException;
 /**
  * Exception for a deadlock error of a transaction detected in the driver.
  */
-class DeadlockException extends ServerException {
+export class DeadlockException extends ServerException {
 }
-exports.DeadlockException = DeadlockException;
 /**
  * Exception for a foreign key constraint violation detected in the driver.
  */
-class ForeignKeyConstraintViolationException extends ConstraintViolationException {
+export class ForeignKeyConstraintViolationException extends ConstraintViolationException {
 }
-exports.ForeignKeyConstraintViolationException = ForeignKeyConstraintViolationException;
 /**
  * Exception for a check constraint violation detected in the driver.
  */
-class CheckConstraintViolationException extends ConstraintViolationException {
+export class CheckConstraintViolationException extends ConstraintViolationException {
 }
-exports.CheckConstraintViolationException = CheckConstraintViolationException;
 /**
  * Exception for an invalid specified field name in a statement detected in the driver.
  */
-class InvalidFieldNameException extends ServerException {
+export class InvalidFieldNameException extends ServerException {
 }
-exports.InvalidFieldNameException = InvalidFieldNameException;
 /**
  * Exception for a lock wait timeout error of a transaction detected in the driver.
  */
-class LockWaitTimeoutException extends ServerException {
+export class LockWaitTimeoutException extends ServerException {
 }
-exports.LockWaitTimeoutException = LockWaitTimeoutException;
 /**
  * Exception for a non-unique/ambiguous specified field name in a statement detected in the driver.
  */
-class NonUniqueFieldNameException extends ServerException {
+export class NonUniqueFieldNameException extends ServerException {
 }
-exports.NonUniqueFieldNameException = NonUniqueFieldNameException;
 /**
  * Exception for a NOT NULL constraint violation detected in the driver.
  */
-class NotNullConstraintViolationException extends ConstraintViolationException {
+export class NotNullConstraintViolationException extends ConstraintViolationException {
 }
-exports.NotNullConstraintViolationException = NotNullConstraintViolationException;
 /**
  * Exception for a write operation attempt on a read-only database element detected in the driver.
  */
-class ReadOnlyException extends ServerException {
+export class ReadOnlyException extends ServerException {
 }
-exports.ReadOnlyException = ReadOnlyException;
 /**
  * Exception for a syntax error in a statement detected in the driver.
  */
-class SyntaxErrorException extends ServerException {
+export class SyntaxErrorException extends ServerException {
 }
-exports.SyntaxErrorException = SyntaxErrorException;
 /**
  * Exception for an already existing table referenced in a statement detected in the driver.
  */
-class TableExistsException extends DatabaseObjectExistsException {
+export class TableExistsException extends DatabaseObjectExistsException {
 }
-exports.TableExistsException = TableExistsException;
 /**
  * Exception for an unknown table referenced in a statement detected in the driver.
  */
-class TableNotFoundException extends DatabaseObjectNotFoundException {
+export class TableNotFoundException extends DatabaseObjectNotFoundException {
 }
-exports.TableNotFoundException = TableNotFoundException;
 /**
  * Exception for a unique constraint violation detected in the driver.
  */
-class UniqueConstraintViolationException extends ConstraintViolationException {
+export class UniqueConstraintViolationException extends ConstraintViolationException {
 }
-exports.UniqueConstraintViolationException = UniqueConstraintViolationException;

package/hydration/Hydrator.d.ts

@@ -1,8 +1,8 @@
-import type { EntityData, EntityMetadata, EntityProperty, IHydrator } from '../typings';
-import type { EntityFactory } from '../entity/EntityFactory';
-import type { Platform } from '../platforms/Platform';
-import type { MetadataStorage } from '../metadata/MetadataStorage';
-import type { Configuration } from '../utils/Configuration';
+import type { EntityData, EntityMetadata, EntityProperty, IHydrator } from '../typings.js';
+import type { EntityFactory } from '../entity/EntityFactory.js';
+import type { Platform } from '../platforms/Platform.js';
+import type { MetadataStorage } from '../metadata/MetadataStorage.js';
+import type { Configuration } from '../utils/Configuration.js';
 export declare abstract class Hydrator implements IHydrator {
     protected readonly metadata: MetadataStorage;
     protected readonly platform: Platform;

package/hydration/Hydrator.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Hydrator = void 0;
-/* istanbul ignore next */
-class Hydrator {
+/* v8 ignore next */
+export class Hydrator {
     metadata;
     platform;
     config;
@@ -48,4 +45,3 @@ class Hydrator {
         entity[prop.name] = data[prop.name];
     }
 }
-exports.Hydrator = Hydrator;

package/hydration/ObjectHydrator.d.ts

@@ -1,22 +1,22 @@
-import type { EntityData, EntityMetadata } from '../typings';
-import { Hydrator } from './Hydrator';
-import type { EntityFactory } from '../entity/EntityFactory';
-type EntityHydrator<T extends object> = (entity: T, data: EntityData<T>, factory: EntityFactory, newEntity: boolean, convertCustomTypes: boolean, schema?: string, parentSchema?: string) => void;
+import type { EntityData, EntityMetadata } from '../typings.js';
+import { Hydrator } from './Hydrator.js';
+import type { EntityFactory } from '../entity/EntityFactory.js';
+type EntityHydrator<T extends object> = (entity: T, data: EntityData<T>, factory: EntityFactory, newEntity: boolean, convertCustomTypes: boolean, schema?: string, parentSchema?: string, normalizeAccessors?: boolean) => void;
 export declare class ObjectHydrator extends Hydrator {
     private readonly hydrators;
     private tmpIndex;
     /**
      * @inheritDoc
      */
-    hydrate<T extends object>(entity: T, meta: EntityMetadata<T>, data: EntityData<T>, factory: EntityFactory, type: 'full' | 'reference', newEntity?: boolean, convertCustomTypes?: boolean, schema?: string, parentSchema?: string): void;
+    hydrate<T extends object>(entity: T, meta: EntityMetadata<T>, data: EntityData<T>, factory: EntityFactory, type: 'full' | 'reference', newEntity?: boolean, convertCustomTypes?: boolean, schema?: string, parentSchema?: string, normalizeAccessors?: boolean): void;
     /**
      * @inheritDoc
      */
-    hydrateReference<T extends object>(entity: T, meta: EntityMetadata<T>, data: EntityData<T>, factory: EntityFactory, convertCustomTypes?: boolean, schema?: string, parentSchema?: string): void;
+    hydrateReference<T extends object>(entity: T, meta: EntityMetadata<T>, data: EntityData<T>, factory: EntityFactory, convertCustomTypes?: boolean, schema?: string, parentSchema?: string, normalizeAccessors?: boolean): void;
     /**
      * @internal Highly performance-sensitive method.
      */
-    getEntityHydrator<T extends object>(meta: EntityMetadata<T>, type: 'full' | 'reference'): EntityHydrator<T>;
+    getEntityHydrator<T extends object>(meta: EntityMetadata<T>, type: 'full' | 'reference', normalizeAccessors?: boolean): EntityHydrator<T>;
     private createCollectionItemMapper;
     private wrap;
     private safeKey;

package/hydration/ObjectHydrator.js

@@ -1,57 +1,58 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectHydrator = void 0;
-const Hydrator_1 = require("./Hydrator");
-const Collection_1 = require("../entity/Collection");
-const Reference_1 = require("../entity/Reference");
-const Utils_1 = require("../utils/Utils");
-const enums_1 = require("../enums");
-const RawQueryFragment_1 = require("../utils/RawQueryFragment");
-class ObjectHydrator extends Hydrator_1.Hydrator {
+import { Hydrator } from './Hydrator.js';
+import { Collection } from '../entity/Collection.js';
+import { Reference, ScalarReference } from '../entity/Reference.js';
+import { parseJsonSafe, Utils } from '../utils/Utils.js';
+import { ReferenceKind } from '../enums.js';
+import { RawQueryFragment } from '../utils/RawQueryFragment.js';
+export class ObjectHydrator extends Hydrator {
     hydrators = {
-        full: new Map(),
-        reference: new Map(),
+        'full~true': new Map(),
+        'full~false': new Map(),
+        'reference~true': new Map(),
+        'reference~false': new Map(),
     };
     tmpIndex = 0;
     /**
      * @inheritDoc
      */
-    hydrate(entity, meta, data, factory, type, newEntity = false, convertCustomTypes = false, schema, parentSchema) {
-        const hydrate = this.getEntityHydrator(meta, type);
+    hydrate(entity, meta, data, factory, type, newEntity = false, convertCustomTypes = false, schema, parentSchema, normalizeAccessors) {
+        const hydrate = this.getEntityHydrator(meta, type, normalizeAccessors);
         const running = this.running;
         // the running state is used to consider propagation as hydration, saving the values directly to the entity data,
         // but we don't want that for new entities, their propagation should result in entity updates when flushing
         this.running = !newEntity;
-        Utils_1.Utils.callCompiledFunction(hydrate, entity, data, factory, newEntity, convertCustomTypes, schema, parentSchema);
+        Utils.callCompiledFunction(hydrate, entity, data, factory, newEntity, convertCustomTypes, schema, parentSchema, normalizeAccessors);
         this.running = running;
     }
     /**
      * @inheritDoc
      */
-    hydrateReference(entity, meta, data, factory, convertCustomTypes = false, schema, parentSchema) {
-        const hydrate = this.getEntityHydrator(meta, 'reference');
+    hydrateReference(entity, meta, data, factory, convertCustomTypes = false, schema, parentSchema, normalizeAccessors) {
+        const hydrate = this.getEntityHydrator(meta, 'reference', normalizeAccessors);
         const running = this.running;
         this.running = true;
-        Utils_1.Utils.callCompiledFunction(hydrate, entity, data, factory, false, convertCustomTypes, schema, parentSchema);
+        Utils.callCompiledFunction(hydrate, entity, data, factory, false, convertCustomTypes, schema, parentSchema, normalizeAccessors);
         this.running = running;
     }
     /**
      * @internal Highly performance-sensitive method.
      */
-    getEntityHydrator(meta, type) {
-        const exists = this.hydrators[type].get(meta.className);
+    getEntityHydrator(meta, type, normalizeAccessors = false) {
+        const key = `${type}~${normalizeAccessors}`;
+        const exists = this.hydrators[key].get(meta.className);
         if (exists) {
             return exists;
         }
         const lines = [];
         const context = new Map();
         const props = this.getProperties(meta, type);
-        context.set('isPrimaryKey', Utils_1.Utils.isPrimaryKey);
-        context.set('Collection', Collection_1.Collection);
-        context.set('Reference', Reference_1.Reference);
+        context.set('isPrimaryKey', Utils.isPrimaryKey);
+        context.set('Collection', Collection);
+        context.set('Reference', Reference);
         const registerCustomType = (prop, convertorKey, method, context) => {
             context.set(`${method}_${convertorKey}`, (val) => {
-                if (RawQueryFragment_1.RawQueryFragment.isKnownFragment(val)) {
+                /* v8 ignore next */
+                if (RawQueryFragment.isKnownFragment(val)) {
                     return val;
                 }
                 return prop.customType[method](val, this.platform, { mode: 'serialization' });
@@ -65,15 +66,22 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             const ret = [];
             const idx = this.tmpIndex++;
             const nullVal = this.config.get('forceUndefined') ? 'undefined' : 'null';
-            if (prop.getter && !prop.setter) {
+            if (prop.getter && !prop.setter && prop.persist === false) {
                 return [];
             }
             if (prop.ref) {
-                context.set('ScalarReference', Reference_1.ScalarReference);
+                context.set('ScalarReference', ScalarReference);
                 ret.push(`  const oldValue_${idx} = entity${entityKey};`);
             }
             ret.push(`  if (data${dataKey} === null) {`);
-            ret.push(`    entity${entityKey} = ${nullVal};`);
+            if (prop.ref) {
+                ret.push(`    entity${entityKey} = new ScalarReference();`);
+                ret.push(`    entity${entityKey}.bind(entity, '${prop.name}');`);
+                ret.push(`    entity${entityKey}.set(${nullVal});`);
+            }
+            else {
+                ret.push(`    entity${entityKey} = ${nullVal};`);
+            }
             ret.push(`  } else if (typeof data${dataKey} !== 'undefined') {`);
             if (prop.customType) {
                 registerCustomType(prop, convertorKey, 'convertToJSValue', context);
@@ -128,21 +136,21 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             ret.push(`  } else if (typeof data${dataKey} !== 'undefined') {`);
             ret.push(`    if (isPrimaryKey(data${dataKey}, true)) {`);
             if (prop.ref) {
-                ret.push(`      entity${entityKey} = Reference.create(factory.createReference('${prop.type}', data${dataKey}, { merge: true, convertCustomTypes, schema }));`);
+                ret.push(`      entity${entityKey} = Reference.create(factory.createReference('${prop.type}', data${dataKey}, { merge: true, convertCustomTypes, normalizeAccessors, schema }));`);
             }
             else {
-                ret.push(`      entity${entityKey} = factory.createReference('${prop.type}', data${dataKey}, { merge: true, convertCustomTypes, schema });`);
+                ret.push(`      entity${entityKey} = factory.createReference('${prop.type}', data${dataKey}, { merge: true, convertCustomTypes, normalizeAccessors, schema });`);
             }
             ret.push(`    } else if (data${dataKey} && typeof data${dataKey} === 'object') {`);
             if (prop.ref) {
-                ret.push(`      entity${entityKey} = Reference.create(factory.${method}('${prop.type}', data${dataKey}, { initialized: true, merge: true, newEntity, convertCustomTypes, schema }));`);
+                ret.push(`      entity${entityKey} = Reference.create(factory.${method}('${prop.type}', data${dataKey}, { initialized: true, merge: true, newEntity, convertCustomTypes, normalizeAccessors, schema }));`);
             }
             else {
-                ret.push(`      entity${entityKey} = factory.${method}('${prop.type}', data${dataKey}, { initialized: true, merge: true, newEntity, convertCustomTypes, schema });`);
+                ret.push(`      entity${entityKey} = factory.${method}('${prop.type}', data${dataKey}, { initialized: true, merge: true, newEntity, convertCustomTypes, normalizeAccessors, schema });`);
             }
             ret.push(`    }`);
             ret.push(`  }`);
-            if (prop.kind === enums_1.ReferenceKind.ONE_TO_ONE) {
+            if (prop.kind === ReferenceKind.ONE_TO_ONE) {
                 const meta2 = this.metadata.get(prop.type);
                 const prop2 = meta2.properties[prop.inversedBy || prop.mappedBy];
                 if (prop2 && !prop2.mapToPk) {
@@ -175,7 +183,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             ret.push(`    }`);
             ret.push(`  } else if (!entity${entityKey} && data${dataKey} instanceof Collection) {`);
             ret.push(`    entity${entityKey} = data${dataKey};`);
-            if (!this.platform.usesPivotTable() && prop.owner && prop.kind === enums_1.ReferenceKind.MANY_TO_MANY) {
+            if (!this.platform.usesPivotTable() && prop.owner && prop.kind === ReferenceKind.MANY_TO_MANY) {
                 ret.push(`  } else if (!entity${entityKey} && Array.isArray(data${dataKey})) {`);
                 const items = this.platform.usesPivotTable() || !prop.owner ? 'undefined' : '[]';
                 ret.push(`    const coll = Collection.create(entity, '${prop.name}', ${items}, !!data${dataKey} || newEntity);`);
@@ -200,7 +208,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         };
         const parseObjectEmbeddable = (prop, dataKey, ret) => {
             if (!this.platform.convertsJsonAutomatically() && (prop.object || prop.array)) {
-                context.set('parseJsonSafe', Utils_1.parseJsonSafe);
+                context.set('parseJsonSafe', parseJsonSafe);
                 ret.push(`  if (typeof data${dataKey} === 'string') {`, `    data${dataKey} = parseJsonSafe(data${dataKey});`, `  }`);
             }
         };
@@ -214,7 +222,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                 meta.props
                     .filter(p => p.embedded?.[0] === prop.name)
                     .forEach(p => {
-                    if (p.kind === enums_1.ReferenceKind.EMBEDDED && !p.object && !p.array) {
+                    if (p.kind === ReferenceKind.EMBEDDED && !p.object && !p.array) {
                         conds.push(...createCond(p, dataKey + this.wrap(p.embedded[1]), cond));
                         return;
                     }
@@ -247,7 +255,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                     // weak comparison as we can have numbers that might have been converted to strings due to being object keys
                     ret.push(`    if (data${childDataKey} == '${childMeta.discriminatorValue}') {`);
                     ret.push(`      if (entity${entityKey} == null) {`);
-                    ret.push(`        entity${entityKey} = factory.createEmbeddable('${childMeta.className}', embeddedData, { newEntity, convertCustomTypes });`);
+                    ret.push(`        entity${entityKey} = factory.createEmbeddable('${childMeta.className}', embeddedData, { newEntity, convertCustomTypes, normalizeAccessors });`);
                     ret.push(`      }`);
                     meta.props
                         .filter(p => p.embedded?.[0] === prop.name)
@@ -258,6 +266,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                             ...prop2,
                             name: childProp.name,
                             embedded: childProp.embedded,
+                            embeddedProps: childProp.embeddedProps,
                         };
                         // eslint-disable-next-line @typescript-eslint/no-use-before-define
                         ret.push(...hydrateProperty(prop3, childProp.object, [...path, childProp.embedded[1]], childDataKey).map(l => '    ' + l));
@@ -267,7 +276,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
             }
             else {
                 ret.push(`    if (entity${entityKey} == null) {`);
-                ret.push(`      entity${entityKey} = factory.createEmbeddable('${prop.targetMeta.className}', embeddedData, { newEntity, convertCustomTypes });`);
+                ret.push(`      entity${entityKey} = factory.createEmbeddable('${prop.targetMeta.className}', embeddedData, { newEntity, convertCustomTypes, normalizeAccessors });`);
                 ret.push(`    }`);
                 meta.props
                     .filter(p => p.embedded?.[0] === prop.name)
@@ -277,7 +286,7 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
                     ret.push(...hydrateProperty(childProp, prop.object, [...path, childProp.embedded[1]], childDataKey).map(l => '  ' + l));
                 });
             }
-            /* istanbul ignore next */
+            /* v8 ignore next */
             const nullVal = this.config.get('forceUndefined') ? 'undefined' : 'null';
             if (prop.object) {
                 ret.push(`  } else if (data${dataKey} === null) {`);
@@ -305,15 +314,15 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         };
         const hydrateProperty = (prop, object = prop.object, path = [prop.name], dataKey) => {
             const entityKey = path.map(k => this.wrap(k)).join('');
-            dataKey = dataKey ?? (object ? entityKey : this.wrap(prop.name));
+            dataKey = dataKey ?? (object ? entityKey : this.wrap(normalizeAccessors ? (prop.accessor ?? prop.name) : prop.name));
             const ret = [];
-            if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && !prop.mapToPk) {
+            if ([ReferenceKind.MANY_TO_ONE, ReferenceKind.ONE_TO_ONE].includes(prop.kind) && !prop.mapToPk) {
                 ret.push(...hydrateToOne(prop, dataKey, entityKey));
             }
-            else if (prop.kind === enums_1.ReferenceKind.ONE_TO_MANY || prop.kind === enums_1.ReferenceKind.MANY_TO_MANY) {
+            else if (prop.kind === ReferenceKind.ONE_TO_MANY || prop.kind === ReferenceKind.MANY_TO_MANY) {
                 ret.push(...hydrateToMany(prop, dataKey, entityKey));
             }
-            else if (prop.kind === enums_1.ReferenceKind.EMBEDDED) {
+            else if (prop.kind === ReferenceKind.EMBEDDED) {
                 if (prop.array) {
                     ret.push(...hydrateEmbeddedArray(prop, path, dataKey));
                 }
@@ -335,11 +344,11 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         for (const prop of props) {
             lines.push(...hydrateProperty(prop));
         }
-        const code = `// compiled hydrator for entity ${meta.className} (${type})\n`
-            + `return function(entity, data, factory, newEntity, convertCustomTypes, schema) {\n`
+        const code = `// compiled hydrator for entity ${meta.className} (${type + normalizeAccessors ? ' normalized' : ''})\n`
+            + `return function(entity, data, factory, newEntity, convertCustomTypes, schema, parentSchema, normalizeAccessors) {\n`
             + `${lines.join('\n')}\n}`;
-        const hydrator = Utils_1.Utils.createFunction(context, code);
-        this.hydrators[type].set(meta.className, hydrator);
+        const hydrator = Utils.createFunction(context, code);
+        this.hydrators[key].set(meta.className, hydrator);
         return hydrator;
     }
     createCollectionItemMapper(prop) {
@@ -347,14 +356,14 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         const lines = [];
         lines.push(`  const createCollectionItem_${this.safeKey(prop.name)} = (value, entity) => {`);
         const prop2 = prop.targetMeta.properties[prop.mappedBy];
-        if (prop.kind === enums_1.ReferenceKind.ONE_TO_MANY && prop2.primary) {
+        if (prop.kind === ReferenceKind.ONE_TO_MANY && prop2.primary) {
             lines.push(`    if (typeof value === 'object' && value?.['${prop2.name}'] == null) {`);
             lines.push(`      value = { ...value, ['${prop2.name}']: Reference.wrapReference(entity, { ref: ${prop2.ref} }) };`);
             lines.push(`    }`);
         }
-        lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference('${prop.type}', value, { convertCustomTypes, schema, merge: true });`);
+        lines.push(`    if (isPrimaryKey(value, ${meta.compositePK})) return factory.createReference('${prop.type}', value, { convertCustomTypes, schema, normalizeAccessors, merge: true });`);
         lines.push(`    if (value && value.__entity) return value;`);
-        lines.push(`    return factory.create('${prop.type}', value, { newEntity, convertCustomTypes, schema, merge: true });`);
+        lines.push(`    return factory.create('${prop.type}', value, { newEntity, convertCustomTypes, schema, normalizeAccessors, merge: true });`);
         lines.push(`  }`);
         return lines;
     }
@@ -368,4 +377,3 @@ class ObjectHydrator extends Hydrator_1.Hydrator {
         return key.replace(/\W/g, '_');
     }
 }
-exports.ObjectHydrator = ObjectHydrator;