@mikro-orm/core 7.0.10 → 7.0.11-dev.1

package/utils/EntityComparator.js

@@ -1,849 +1,757 @@
 import { clone } from './clone.js';
 import { ReferenceKind } from '../enums.js';
-import {
-  compareArrays,
-  compareBooleans,
-  compareBuffers,
-  compareObjects,
-  equals,
-  parseJsonSafe,
-  Utils,
-} from './Utils.js';
+import { compareArrays, compareBooleans, compareBuffers, compareObjects, equals, parseJsonSafe, Utils, } from './Utils.js';
 import { JsonType } from '../types/JsonType.js';
 import { Raw } from './RawQueryFragment.js';
 import { EntityIdentifier } from '../entity/EntityIdentifier.js';
 import { PolymorphicRef } from '../entity/PolymorphicRef.js';
 /** @internal Generates and caches JIT-compiled functions for comparing, snapshotting, and mapping entity data. */
 export class EntityComparator {
-  #comparators = new Map();
-  #mappers = new Map();
-  #snapshotGenerators = new Map();
-  #pkGetters = new Map();
-  #pkGettersConverted = new Map();
-  #pkSerializers = new Map();
-  #tmpIndex = 0;
-  #metadata;
-  #platform;
-  #config;
-  constructor(metadata, platform, config) {
-    this.#metadata = metadata;
-    this.#platform = platform;
-    this.#config = config;
-  }
-  /**
-   * Computes difference between two entities.
-   */
-  diffEntities(entityName, a, b, options) {
-    const comparator = this.getEntityComparator(entityName);
-    return Utils.callCompiledFunction(comparator, a, b, options);
-  }
-  /** Returns true if two entity snapshots are identical (no differences). */
-  matching(entityName, a, b) {
-    const diff = this.diffEntities(entityName, a, b);
-    return Utils.getObjectKeysSize(diff) === 0;
-  }
-  /**
-   * Removes ORM specific code from entities and prepares it for serializing. Used before change set computation.
-   * References will be mapped to primary keys, collections to arrays of primary keys.
-   */
-  prepareEntity(entity) {
-    const generator = this.getSnapshotGenerator(entity.constructor);
-    return Utils.callCompiledFunction(generator, entity);
-  }
-  /**
-   * Maps database columns to properties.
-   */
-  mapResult(meta, result) {
-    const mapper = this.getResultMapper(meta);
-    return Utils.callCompiledFunction(mapper, result);
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getPkGetter(meta) {
-    const exists = this.#pkGetters.get(meta);
-    /* v8 ignore next */
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('isEntityOrRef', val => Utils.isEntity(val, true));
-    if (meta.primaryKeys.length > 1) {
-      lines.push(`  const cond = {`);
-      meta.primaryKeys.forEach(pk => {
-        if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
-          lines.push(
-            `    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`,
-          );
-        } else {
-          lines.push(`    ${pk}: entity${this.wrap(pk)},`);
-        }
-      });
-      lines.push(`  };`);
-      lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
-      lines.push(`  return cond;`);
-    } else {
-      const pk = meta.primaryKeys[0];
-      if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
-        lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) {`);
-        lines.push(`    const pk = entity${this.wrap(pk)}.__helper.getPrimaryKey();`);
-        if (meta.properties[pk].targetMeta.compositePK) {
-          lines.push(`    if (typeof pk === 'object' && pk != null) {`);
-          lines.push(`      return [`);
-          for (const childPK of meta.properties[pk].targetMeta.primaryKeys) {
-            lines.push(`        pk${this.wrap(childPK)},`);
-          }
-          lines.push(`      ];`);
-          lines.push(`    }`);
-        }
-        lines.push(`    return pk;`);
-        lines.push(`  }`);
-      }
-      lines.push(`  return entity${this.wrap(pk)};`);
-    }
-    const code =
-      `// compiled pk getter for entity ${meta.className}\n` + `return function(entity) {\n${lines.join('\n')}\n}`;
-    const fnKey = `pkGetter-${meta.uniqueName}`;
-    const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#pkGetters.set(meta, pkSerializer);
-    return pkSerializer;
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getPkGetterConverted(meta) {
-    const exists = this.#pkGettersConverted.get(meta);
-    /* v8 ignore next */
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('isEntityOrRef', val => Utils.isEntity(val, true));
-    if (meta.primaryKeys.length > 1) {
-      lines.push(`  const cond = {`);
-      meta.primaryKeys.forEach(pk => {
-        if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
-          lines.push(
-            `    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`,
-          );
-        } else {
-          if (meta.properties[pk].customType) {
-            const convertorKey = this.registerCustomType(meta.properties[pk], context);
-            lines.push(`    ${pk}: convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)}),`);
-          } else {
-            lines.push(`    ${pk}: entity${this.wrap(pk)},`);
-          }
-        }
-      });
-      lines.push(`  };`);
-      lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
-      lines.push(`  return cond;`);
-    } else {
-      const pk = meta.primaryKeys[0];
-      if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
-        lines.push(
-          `  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getPrimaryKey(true);`,
-        );
-      }
-      if (meta.properties[pk].customType) {
-        const convertorKey = this.registerCustomType(meta.properties[pk], context);
-        lines.push(`  return convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)});`);
-      } else {
-        lines.push(`  return entity${this.wrap(pk)};`);
-      }
-    }
-    const code =
-      `// compiled pk getter (with converted custom types) for entity ${meta.className}\n` +
-      `return function(entity) {\n${lines.join('\n')}\n}`;
-    const fnKey = `pkGetterConverted-${meta.uniqueName}`;
-    const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#pkGettersConverted.set(meta, pkSerializer);
-    return pkSerializer;
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getPkSerializer(meta) {
-    const exists = this.#pkSerializers.get(meta);
-    /* v8 ignore next */
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('isEntityOrRef', val => Utils.isEntity(val, true));
-    context.set('getCompositeKeyValue', val =>
-      Utils.flatten(Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.#platform)),
-    );
-    context.set('getPrimaryKeyHash', val => Utils.getPrimaryKeyHash(Utils.asArray(val)));
-    if (meta.primaryKeys.length > 1) {
-      lines.push(`  const pks = entity.__helper.__pk ? getCompositeKeyValue(entity.__helper.__pk) : [`);
-      meta.primaryKeys.forEach(pk => {
-        if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
-          lines.push(
-            `    (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey() : entity${this.wrap(pk)},`,
-          );
-        } else {
-          lines.push(`    entity${this.wrap(pk)},`);
-        }
-      });
-      lines.push(`  ];`);
-      lines.push(`  return pks.join('${Utils.PK_SEPARATOR}');`);
-    } else {
-      const pk = meta.primaryKeys[0];
-      const prop = meta.properties[pk];
-      if (prop.kind !== ReferenceKind.SCALAR) {
-        lines.push(
-          `  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey();`,
-        );
-      }
-      const serializedPrimaryKey = meta.props.find(p => p.serializedPrimaryKey);
-      if (serializedPrimaryKey) {
-        lines.push(`  return '' + entity.${serializedPrimaryKey.name};`);
-      } else if (prop.customType) {
-        const convertorKey = this.registerCustomType(meta.properties[pk], context);
-        const idx = this.#tmpIndex++;
-        lines.push(`  const val_${idx} = convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)});`);
-        lines.push(`  return getPrimaryKeyHash(val_${idx});`);
-      } else {
-        lines.push(`  return '' + entity${this.wrap(pk)};`);
-      }
-    }
-    const code =
-      `// compiled pk serializer for entity ${meta.className}\n` + `return function(entity) {\n${lines.join('\n')}\n}`;
-    const fnKey = `pkSerializer-${meta.uniqueName}`;
-    const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#pkSerializers.set(meta, pkSerializer);
-    return pkSerializer;
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getSnapshotGenerator(entityName) {
-    const meta = this.#metadata.find(entityName);
-    const exists = this.#snapshotGenerators.get(meta);
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('clone', clone);
-    context.set('cloneEmbeddable', o => this.#platform.cloneEmbeddable(o)); // do not clone prototypes
-    if (meta.root.inheritanceType === 'sti' && meta.discriminatorValue) {
-      lines.push(`  ret${this.wrap(meta.root.discriminatorColumn)} = '${meta.discriminatorValue}'`);
-    }
-    const getRootProperty = prop => (prop.embedded ? getRootProperty(meta.properties[prop.embedded[0]]) : prop);
-    // copy all comparable props, ignore collections and references, process custom types
-    meta.comparableProps
-      .filter(prop => {
-        const root = getRootProperty(prop);
-        return prop === root || root.kind !== ReferenceKind.EMBEDDED;
-      })
-      .forEach(prop =>
-        lines.push(
-          this.getPropertySnapshot(meta, prop, context, this.wrap(prop.name), this.wrap(prop.name), [prop.name]),
-        ),
-      );
-    const code = `return function(entity) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
-    const fnKey = `snapshotGenerator-${meta.uniqueName}`;
-    const snapshotGenerator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#snapshotGenerators.set(meta, snapshotGenerator);
-    return snapshotGenerator;
-  }
-  /**
-   * @internal
-   */
-  propName(name, parent = 'result') {
-    return parent + this.wrap(name);
-  }
-  /**
-   * @internal respects nested composite keys, e.g. `[1, [2, 3]]`
-   */
-  createCompositeKeyArray(prop, parents = []) {
-    if (!prop.targetMeta) {
-      let fieldName = prop.fieldNames[0];
-      // traverse all parents, mapping my field name to each parent's field name until we reach the root
-      for (let i = parents.length - 1; i >= 0; i--) {
-        const parent = parents[i];
-        // skip m:n since it does not represent any column directly
-        if (parent.pivotEntity) {
-          continue;
-        }
-        const idx = parent.referencedColumnNames.indexOf(fieldName);
-        fieldName = parent.fieldNames[idx];
-      }
-      return this.propName(fieldName);
-    }
-    const parts = [];
-    prop.targetMeta.getPrimaryProps().forEach(pk => {
-      const part = this.createCompositeKeyArray(pk, [...parents, prop]);
-      parts.push(part);
-    });
-    return this.formatCompositeKeyPart(parts);
-  }
-  /**
-   * @internal
-   */
-  formatCompositeKeyPart(part) {
-    if (!Array.isArray(part)) {
-      return part;
-    }
-    if (part.length === 1) {
-      return this.formatCompositeKeyPart(part[0]);
-    }
-    const formatted = part.map(p => this.formatCompositeKeyPart(p)).join(', ');
-    return `[${formatted}]`;
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getResultMapper(meta) {
-    const exists = this.#mappers.get(meta);
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('PolymorphicRef', PolymorphicRef);
-    const tz = this.#platform.getTimezone();
-    const parseDate = (key, value, padding = '') => {
-      lines.push(`${padding}    if (${value} == null || ${value} instanceof Date) {`);
-      lines.push(`${padding}      ${key} = ${value};`);
-      if (!tz || tz === 'local') {
-        lines.push(`${padding}    } else if (typeof ${value} === 'bigint') {`);
-        lines.push(`${padding}      ${key} = parseDate(Number(${value}));`);
-        lines.push(`${padding}    } else {`);
-        lines.push(`${padding}      ${key} = parseDate(${value});`);
-      } else {
-        lines.push(`${padding}    } else if (typeof ${value} === 'bigint') {`);
-        lines.push(`${padding}      ${key} = parseDate(Number(${value}));`);
-        lines.push(
-          `${padding}    } else if (typeof ${value} === 'number' || ${value}.includes('+') || ${value}.lastIndexOf('-') > 10 || ${value}.endsWith('Z')) {`,
-        );
-        lines.push(`${padding}      ${key} = parseDate(${value});`);
-        lines.push(`${padding}    } else {`);
-        lines.push(`${padding}      ${key} = parseDate(${value} + '${tz}');`);
-      }
-      lines.push(`${padding}    }`);
-    };
-    lines.push(`  const mapped = {};`);
-    const mapEntityProperties = (meta, padding = '') => {
-      for (const prop of meta.props) {
-        if (!prop.fieldNames) {
-          continue;
-        }
-        if (prop.polymorphic && prop.fieldNames.length >= 2) {
-          const discriminatorField = prop.fieldNames[0];
-          const idFields = prop.fieldNames.slice(1);
-          lines.push(
-            `${padding}  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`,
-          );
-          lines.push(
-            `${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`,
-          );
-          if (idFields.length === 1) {
-            lines.push(
-              `${padding}    ret${this.wrap(prop.name)} = new PolymorphicRef(${this.propName(discriminatorField)}, ${this.propName(idFields[0])});`,
-            );
-          } else {
-            lines.push(
-              `${padding}    ret${this.wrap(prop.name)} = new PolymorphicRef(${this.propName(discriminatorField)}, [${idFields.map(f => this.propName(f)).join(', ')}]);`,
-            );
-          }
-          lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`));
-          lines.push(
-            `${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n${padding}    ret${this.wrap(prop.name)} = null;`,
-          );
-          lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`), '  }');
-          continue;
-        }
-        if (prop.targetMeta && prop.fieldNames.length > 1) {
-          lines.push(
-            `${padding}  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`,
-          );
-          lines.push(
-            `${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`,
-          );
-          lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.createCompositeKeyArray(prop)};`);
-          lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`));
-          lines.push(
-            `${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n${padding}    ret${this.wrap(prop.name)} = null;`,
-          );
-          lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`), '  }');
-          continue;
-        }
-        if (prop.embedded && (meta.embeddable || meta.properties[prop.embedded[0]].object)) {
-          continue;
-        }
-        if (prop.runtimeType === 'boolean') {
-          lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-          lines.push(
-            `${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : !!${this.propName(prop.fieldNames[0])};`,
-          );
-          lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-          lines.push(`${padding}  }`);
-        } else if (prop.runtimeType === 'Date' && !this.#platform.isNumericProperty(prop)) {
-          lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-          context.set('parseDate', value => this.#platform.parseDate(value));
-          parseDate('ret' + this.wrap(prop.name), this.propName(prop.fieldNames[0]), padding);
-          lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-          lines.push(`${padding}  }`);
-        } else if (prop.kind === ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
-          const idx = this.#tmpIndex++;
-          context.set(`mapEmbeddedResult_${idx}`, data => {
-            const item = parseJsonSafe(data);
-            if (Array.isArray(item)) {
-              return item.map(row => (row == null ? row : this.getResultMapper(prop.targetMeta)(row)));
+    #comparators = new Map();
+    #mappers = new Map();
+    #snapshotGenerators = new Map();
+    #pkGetters = new Map();
+    #pkGettersConverted = new Map();
+    #pkSerializers = new Map();
+    #tmpIndex = 0;
+    #metadata;
+    #platform;
+    #config;
+    constructor(metadata, platform, config) {
+        this.#metadata = metadata;
+        this.#platform = platform;
+        this.#config = config;
+    }
+    /**
+     * Computes difference between two entities.
+     */
+    diffEntities(entityName, a, b, options) {
+        const comparator = this.getEntityComparator(entityName);
+        return Utils.callCompiledFunction(comparator, a, b, options);
+    }
+    /** Returns true if two entity snapshots are identical (no differences). */
+    matching(entityName, a, b) {
+        const diff = this.diffEntities(entityName, a, b);
+        return Utils.getObjectKeysSize(diff) === 0;
+    }
+    /**
+     * Removes ORM specific code from entities and prepares it for serializing. Used before change set computation.
+     * References will be mapped to primary keys, collections to arrays of primary keys.
+     */
+    prepareEntity(entity) {
+        const generator = this.getSnapshotGenerator(entity.constructor);
+        return Utils.callCompiledFunction(generator, entity);
+    }
+    /**
+     * Maps database columns to properties.
+     */
+    mapResult(meta, result) {
+        const mapper = this.getResultMapper(meta);
+        return Utils.callCompiledFunction(mapper, result);
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getPkGetter(meta) {
+        const exists = this.#pkGetters.get(meta);
+        /* v8 ignore next */
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils.isEntity(val, true));
+        if (meta.primaryKeys.length > 1) {
+            lines.push(`  const cond = {`);
+            meta.primaryKeys.forEach(pk => {
+                if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
+                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey() : entity${this.wrap(pk)},`);
+                }
+                else {
+                    lines.push(`    ${pk}: entity${this.wrap(pk)},`);
+                }
+            });
+            lines.push(`  };`);
+            lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
+            lines.push(`  return cond;`);
+        }
+        else {
+            const pk = meta.primaryKeys[0];
+            if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) {`);
+                lines.push(`    const pk = entity${this.wrap(pk)}.__helper.getPrimaryKey();`);
+                if (meta.properties[pk].targetMeta.compositePK) {
+                    lines.push(`    if (typeof pk === 'object' && pk != null) {`);
+                    lines.push(`      return [`);
+                    for (const childPK of meta.properties[pk].targetMeta.primaryKeys) {
+                        lines.push(`        pk${this.wrap(childPK)},`);
+                    }
+                    lines.push(`      ];`);
+                    lines.push(`    }`);
+                }
+                lines.push(`    return pk;`);
+                lines.push(`  }`);
             }
-            return item == null ? item : this.getResultMapper(prop.targetMeta)(item);
-          });
-          lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-          lines.push(
-            `${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : mapEmbeddedResult_${idx}(${this.propName(prop.fieldNames[0])});`,
-          );
-          lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-          lines.push(`${padding}  }`);
-        } else if (prop.kind !== ReferenceKind.EMBEDDED) {
-          lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
-          lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
-          lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
-          lines.push(`${padding}  }`);
-        }
-      }
-    };
-    if (meta.polymorphs && meta.discriminatorColumn) {
-      for (const polymorph of meta.polymorphs) {
-        const first = polymorph === meta.polymorphs[0];
-        lines.push(
-          `  ${first ? '' : 'else '}if (${this.propName(meta.discriminatorColumn)} == '${polymorph.discriminatorValue}') {`,
-        );
-        mapEntityProperties(polymorph, '  ');
-        lines.push(`  }`);
-      }
-      lines.push(`  else {`);
-      mapEntityProperties(meta, '  ');
-      lines.push(`  }`);
-    } else {
-      mapEntityProperties(meta);
-    }
-    lines.push(
-      `  for (let k in result) { if (Object.hasOwn(result, k) && !mapped[k] && ret[k] === undefined) ret[k] = result[k]; }`,
-    );
-    const code =
-      `// compiled mapper for entity ${meta.className}\n` +
-      `return function(result) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
-    const fnKey = `resultMapper-${meta.uniqueName}`;
-    const resultMapper = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#mappers.set(meta, resultMapper);
-    return resultMapper;
-  }
-  getPropertyCondition(path) {
-    const parts = path.slice(); // copy first
-    if (parts.length > 1) {
-      parts.pop();
-    }
-    let tail = '';
-    return parts
-      .map(k => {
-        if (/^\[idx_\d+]$/.exec(k)) {
-          tail += k;
-          return '';
-        }
-        const mapped = `typeof entity${tail ? '.' + tail : ''}${this.wrap(k)} !== 'undefined'`;
-        tail += tail ? '.' + k : k;
-        return mapped;
-      })
-      .filter(k => k)
-      .join(' && ');
-  }
-  getEmbeddedArrayPropertySnapshot(meta, prop, context, level, path, dataKey) {
-    const entityKey = path.map(k => this.wrap(k)).join('');
-    const ret = [];
-    const padding = ' '.repeat(level * 2);
-    const idx = this.#tmpIndex++;
-    ret.push(`${padding}if (Array.isArray(entity${entityKey})) {`);
-    ret.push(`${padding}  ret${dataKey} = [];`);
-    ret.push(`${padding}  entity${entityKey}.forEach((_, idx_${idx}) => {`);
-    ret.push(
-      this.getEmbeddedPropertySnapshot(
-        meta,
-        prop,
-        context,
-        level + 2,
-        [...path, `[idx_${idx}]`],
-        `${dataKey}[idx_${idx}]`,
-        true,
-      ),
-    );
-    ret.push(`${padding}  });`);
-    if (this.shouldSerialize(prop, dataKey)) {
-      ret.push(`${padding}  ret${dataKey} = cloneEmbeddable(ret${dataKey});`);
-    }
-    ret.push(`${padding}}`);
-    return ret.join('\n');
-  }
-  /**
-   * we need to serialize only object embeddables, and only the top level ones, so root object embeddable
-   * properties and first child nested object embeddables with inlined parent
-   */
-  shouldSerialize(prop, dataKey) {
-    dataKey = dataKey.replace(/^\./, '');
-    const contains = (str, re) => (str.match(re) || []).length > 0;
-    const a = contains(dataKey, /\./g);
-    const b = contains(dataKey, /\[idx_/g);
-    return !!prop.object && !a && !b;
-  }
-  getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object = prop.object) {
-    const padding = ' '.repeat(level * 2);
-    const nullCond = `entity${path.map(k => this.wrap(k)).join('')} === null`;
-    let ret = level === 1 ? '' : '\n';
-    if (object) {
-      ret += `${padding}if (${nullCond}) ret${dataKey} = null;\n`;
-    } else {
-      ret += `${padding}if (${nullCond}) {\n`;
-      ret +=
-        this.getInlineEmbeddedNullLines(meta, prop.name, padding, dataKey, !!(meta.embeddable || prop.object)).join(
-          '\n',
-        ) + `\n`;
-      ret += `${padding}}\n`;
-    }
-    const cond = `entity${path.map(k => this.wrap(k)).join('')} != null`;
-    ret += `${padding}if (${cond}) {\n`;
-    if (object) {
-      ret += `${padding}  ret${dataKey} = {};\n`;
-    }
-    function shouldProcessCustomType(childProp) {
-      if (!childProp.customType) {
-        return false;
-      }
-      if (childProp.customType instanceof JsonType) {
-        return !prop.object;
-      }
-      return true;
-    }
-    ret +=
-      meta.props
-        .filter(
-          p =>
-            p.embedded?.[0] === prop.name &&
-            // object for JSON embeddable
-            (p.object || p.persist !== false),
-        )
-        .map(childProp => {
-          const childDataKey =
-            meta.embeddable || prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-          const childEntityKey = [...path, childProp.embedded[1]].map(k => this.wrap(k)).join('');
-          const childCond = `typeof entity${childEntityKey} !== 'undefined'`;
-          if (childProp.kind === ReferenceKind.EMBEDDED) {
-            return this.getPropertySnapshot(
-              meta,
-              childProp,
-              context,
-              childDataKey,
-              childEntityKey,
-              [...path, childProp.embedded[1]],
-              level + 1,
-              prop.object,
-            );
-          }
-          if (childProp.kind !== ReferenceKind.SCALAR) {
-            return this.getPropertySnapshot(
-              meta,
-              childProp,
-              context,
-              childDataKey,
-              childEntityKey,
-              [...path, childProp.embedded[1]],
-              level,
-              prop.object,
-            )
-              .split('\n')
-              .map(l => padding + l)
-              .join('\n');
-          }
-          if (shouldProcessCustomType(childProp)) {
-            const convertorKey = this.registerCustomType(childProp, context);
-            if (
-              ['number', 'string', 'boolean', 'bigint'].includes(childProp.customType.compareAsType().toLowerCase())
-            ) {
-              return `${padding}  if (${childCond}) ret${childDataKey} = convertToDatabaseValue_${convertorKey}(entity${childEntityKey});`;
+            lines.push(`  return entity${this.wrap(pk)};`);
+        }
+        const code = `// compiled pk getter for entity ${meta.className}\n` + `return function(entity) {\n${lines.join('\n')}\n}`;
+        const fnKey = `pkGetter-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#pkGetters.set(meta, pkSerializer);
+        return pkSerializer;
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getPkGetterConverted(meta) {
+        const exists = this.#pkGettersConverted.get(meta);
+        /* v8 ignore next */
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils.isEntity(val, true));
+        if (meta.primaryKeys.length > 1) {
+            lines.push(`  const cond = {`);
+            meta.primaryKeys.forEach(pk => {
+                if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
+                    lines.push(`    ${pk}: (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getPrimaryKey(true) : entity${this.wrap(pk)},`);
+                }
+                else {
+                    if (meta.properties[pk].customType) {
+                        const convertorKey = this.registerCustomType(meta.properties[pk], context);
+                        lines.push(`    ${pk}: convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)}),`);
+                    }
+                    else {
+                        lines.push(`    ${pk}: entity${this.wrap(pk)},`);
+                    }
+                }
+            });
+            lines.push(`  };`);
+            lines.push(`  if (${meta.primaryKeys.map(pk => `cond.${pk} == null`).join(' || ')}) return null;`);
+            lines.push(`  return cond;`);
+        }
+        else {
+            const pk = meta.primaryKeys[0];
+            if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getPrimaryKey(true);`);
+            }
+            if (meta.properties[pk].customType) {
+                const convertorKey = this.registerCustomType(meta.properties[pk], context);
+                lines.push(`  return convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)});`);
+            }
+            else {
+                lines.push(`  return entity${this.wrap(pk)};`);
+            }
+        }
+        const code = `// compiled pk getter (with converted custom types) for entity ${meta.className}\n` +
+            `return function(entity) {\n${lines.join('\n')}\n}`;
+        const fnKey = `pkGetterConverted-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#pkGettersConverted.set(meta, pkSerializer);
+        return pkSerializer;
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getPkSerializer(meta) {
+        const exists = this.#pkSerializers.get(meta);
+        /* v8 ignore next */
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
+        context.set('isEntityOrRef', (val) => Utils.isEntity(val, true));
+        context.set('getCompositeKeyValue', (val) => Utils.flatten(Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.#platform)));
+        context.set('getPrimaryKeyHash', (val) => Utils.getPrimaryKeyHash(Utils.asArray(val)));
+        if (meta.primaryKeys.length > 1) {
+            lines.push(`  const pks = entity.__helper.__pk ? getCompositeKeyValue(entity.__helper.__pk) : [`);
+            meta.primaryKeys.forEach(pk => {
+                if (meta.properties[pk].kind !== ReferenceKind.SCALAR) {
+                    lines.push(`    (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) ? entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey() : entity${this.wrap(pk)},`);
+                }
+                else {
+                    lines.push(`    entity${this.wrap(pk)},`);
+                }
+            });
+            lines.push(`  ];`);
+            lines.push(`  return pks.join('${Utils.PK_SEPARATOR}');`);
+        }
+        else {
+            const pk = meta.primaryKeys[0];
+            const prop = meta.properties[pk];
+            if (prop.kind !== ReferenceKind.SCALAR) {
+                lines.push(`  if (entity${this.wrap(pk)} != null && isEntityOrRef(entity${this.wrap(pk)})) return entity${this.wrap(pk)}.__helper.getSerializedPrimaryKey();`);
+            }
+            const serializedPrimaryKey = meta.props.find(p => p.serializedPrimaryKey);
+            if (serializedPrimaryKey) {
+                lines.push(`  return '' + entity.${serializedPrimaryKey.name};`);
+            }
+            else if (prop.customType) {
+                const convertorKey = this.registerCustomType(meta.properties[pk], context);
+                const idx = this.#tmpIndex++;
+                lines.push(`  const val_${idx} = convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)});`);
+                lines.push(`  return getPrimaryKeyHash(val_${idx});`);
             }
-            return `${padding}  if (${childCond}) ret${childDataKey} = clone(convertToDatabaseValue_${convertorKey}(entity${childEntityKey}));`;
-          }
-          return `${padding}  if (${childCond}) ret${childDataKey} = clone(entity${childEntityKey});`;
+            else {
+                lines.push(`  return '' + entity${this.wrap(pk)};`);
+            }
+        }
+        const code = `// compiled pk serializer for entity ${meta.className}\n` + `return function(entity) {\n${lines.join('\n')}\n}`;
+        const fnKey = `pkSerializer-${meta.uniqueName}`;
+        const pkSerializer = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#pkSerializers.set(meta, pkSerializer);
+        return pkSerializer;
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getSnapshotGenerator(entityName) {
+        const meta = this.#metadata.find(entityName);
+        const exists = this.#snapshotGenerators.get(meta);
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
+        context.set('clone', clone);
+        context.set('cloneEmbeddable', (o) => this.#platform.cloneEmbeddable(o)); // do not clone prototypes
+        if (meta.root.inheritanceType === 'sti' && meta.discriminatorValue) {
+            lines.push(`  ret${this.wrap(meta.root.discriminatorColumn)} = '${meta.discriminatorValue}'`);
+        }
+        const getRootProperty = (prop) => prop.embedded ? getRootProperty(meta.properties[prop.embedded[0]]) : prop;
+        // copy all comparable props, ignore collections and references, process custom types
+        meta.comparableProps
+            .filter(prop => {
+            const root = getRootProperty(prop);
+            return prop === root || root.kind !== ReferenceKind.EMBEDDED;
         })
-        .join('\n') + `\n`;
-    if (this.shouldSerialize(prop, dataKey)) {
-      return `${ret + padding}  ret${dataKey} = cloneEmbeddable(ret${dataKey});\n${padding}}`;
-    }
-    return `${ret}${padding}}`;
-  }
-  getInlineEmbeddedNullLines(meta, parentName, padding, dataKey, useEmbeddedKey) {
-    return meta.props
-      .filter(p => p.embedded?.[0] === parentName && (p.object || p.persist !== false))
-      .flatMap(childProp => {
-        const childDataKey = useEmbeddedKey ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
-        if (childProp.kind === ReferenceKind.EMBEDDED && !childProp.object) {
-          return this.getInlineEmbeddedNullLines(meta, childProp.name, padding, childDataKey, useEmbeddedKey);
-        }
-        return [`${padding}  ret${childDataKey} = null;`];
-      });
-  }
-  registerCustomType(prop, context) {
-    const convertorKey = this.safeKey(prop.name);
-    context.set(`convertToDatabaseValue_${convertorKey}`, val => {
-      /* v8 ignore next */
-      if (Raw.isKnownFragment(val)) {
-        return val;
-      }
-      return prop.customType.convertToDatabaseValue(val, this.#platform, { mode: 'serialization' });
-    });
-    return convertorKey;
-  }
-  getPropertySnapshot(meta, prop, context, dataKey, entityKey, path, level = 1, object) {
-    const unwrap = prop.ref ? '?.unwrap()' : '';
-    let ret = `  if (${this.getPropertyCondition(path)}`;
-    if (prop.lazy && prop.ref) {
-      ret += ` && entity${path.map(k => this.wrap(k)).join('')}?.isInitialized()`;
-    }
-    ret += `) {\n`;
-    if (['number', 'string', 'boolean'].includes(prop.type.toLowerCase())) {
-      return ret + `    ret${dataKey} = entity${entityKey}${unwrap};\n  }\n`;
-    }
-    if (prop.kind === ReferenceKind.EMBEDDED) {
-      if (prop.array) {
-        return this.getEmbeddedArrayPropertySnapshot(meta, prop, context, level, path, dataKey) + '\n';
-      }
-      return this.getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object) + '\n';
-    }
-    if (prop.kind === ReferenceKind.ONE_TO_ONE || prop.kind === ReferenceKind.MANY_TO_ONE) {
-      if (prop.mapToPk) {
-        if (prop.customType) {
-          const convertorKey = this.registerCustomType(prop, context);
-          ret += `    ret${dataKey} = convertToDatabaseValue_${convertorKey}(entity${entityKey});\n`;
-        } else {
-          ret += `    ret${dataKey} = entity${entityKey};\n`;
-        }
-      } else if (prop.polymorphic) {
-        const discriminatorMapKey = `discriminatorMapReverse_${prop.name}`;
-        const reverseMap = new Map();
-        for (const [key, value] of Object.entries(prop.discriminatorMap)) {
-          reverseMap.set(value, key);
-        }
-        context.set(discriminatorMapKey, reverseMap);
-        this.setToArrayHelper(context);
-        context.set('EntityIdentifier', EntityIdentifier);
+            .forEach(prop => lines.push(this.getPropertySnapshot(meta, prop, context, this.wrap(prop.name), this.wrap(prop.name), [prop.name])));
+        const code = `return function(entity) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
+        const fnKey = `snapshotGenerator-${meta.uniqueName}`;
+        const snapshotGenerator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#snapshotGenerators.set(meta, snapshotGenerator);
+        return snapshotGenerator;
+    }
+    /**
+     * @internal
+     */
+    propName(name, parent = 'result') {
+        return parent + this.wrap(name);
+    }
+    /**
+     * @internal respects nested composite keys, e.g. `[1, [2, 3]]`
+     */
+    createCompositeKeyArray(prop, parents = []) {
+        if (!prop.targetMeta) {
+            let fieldName = prop.fieldNames[0];
+            // traverse all parents, mapping my field name to each parent's field name until we reach the root
+            for (let i = parents.length - 1; i >= 0; i--) {
+                const parent = parents[i];
+                // skip m:n since it does not represent any column directly
+                if (parent.pivotEntity) {
+                    continue;
+                }
+                const idx = parent.referencedColumnNames.indexOf(fieldName);
+                fieldName = parent.fieldNames[idx];
+            }
+            return this.propName(fieldName);
+        }
+        const parts = [];
+        prop.targetMeta.getPrimaryProps().forEach(pk => {
+            const part = this.createCompositeKeyArray(pk, [...parents, prop]);
+            parts.push(part);
+        });
+        return this.formatCompositeKeyPart(parts);
+    }
+    /**
+     * @internal
+     */
+    formatCompositeKeyPart(part) {
+        if (!Array.isArray(part)) {
+            return part;
+        }
+        if (part.length === 1) {
+            return this.formatCompositeKeyPart(part[0]);
+        }
+        const formatted = part.map(p => this.formatCompositeKeyPart(p)).join(', ');
+        return `[${formatted}]`;
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getResultMapper(meta) {
+        const exists = this.#mappers.get(meta);
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
         context.set('PolymorphicRef', PolymorphicRef);
-        ret += `    if (entity${entityKey} === null) {\n`;
-        ret += `      ret${dataKey} = null;\n`;
-        ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
-        ret += `      const val${level} = entity${entityKey}${unwrap};\n`;
-        ret += `      const discriminator = ${discriminatorMapKey}.get(val${level}?.constructor);\n`;
-        ret += `      const pk = val${level}?.__helper?.__identifier && !val${level}?.__helper?.hasPrimaryKey()\n`;
-        ret += `        ? val${level}.__helper.__identifier\n`;
-        ret += `        : toArray(val${level}?.__helper?.getPrimaryKey(true));\n`;
-        ret += `      ret${dataKey} = new PolymorphicRef(discriminator, pk);\n`;
-        ret += `    }\n`;
-      } else if (prop.targetKey) {
-        // When targetKey is set, extract that property value instead of the PK
-        const targetProp = prop.targetMeta?.properties[prop.targetKey];
-        ret += `    if (entity${entityKey} === null) {\n`;
-        ret += `      ret${dataKey} = null;\n`;
-        ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
-        ret += `      const val${level} = entity${entityKey}${unwrap};\n`;
-        if (targetProp?.customType) {
-          // If targetKey property has a custom type, convert to database value
-          const convertorKey = this.registerCustomType(targetProp, context);
-          ret += `      ret${dataKey} = convertToDatabaseValue_${convertorKey}(val${level}?.${prop.targetKey});\n`;
-        } else {
-          ret += `      ret${dataKey} = val${level}?.${prop.targetKey};\n`;
-        }
-        ret += `    }\n`;
-      } else {
-        this.setToArrayHelper(context);
-        context.set('EntityIdentifier', EntityIdentifier);
-        ret += `    if (entity${entityKey} === null) {\n`;
-        ret += `      ret${dataKey} = null;\n`;
-        ret += `    } else if (entity${entityKey}?.__helper.__identifier && !entity${entityKey}.__helper.hasPrimaryKey()) {\n`;
-        ret += `      ret${dataKey} = entity${entityKey}?.__helper.__identifier;\n`;
-        ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
-        ret += `      ret${dataKey} = toArray(entity${entityKey}.__helper.getPrimaryKey(true));\n`;
-        ret += `    }\n`;
-      }
-      return ret + '  }\n';
-    }
-    if (prop.customType) {
-      const convertorKey = this.registerCustomType(prop, context);
-      if (['number', 'string', 'boolean', 'bigint'].includes(prop.customType.compareAsType().toLowerCase())) {
-        return ret + `    ret${dataKey} = convertToDatabaseValue_${convertorKey}(entity${entityKey}${unwrap});\n  }\n`;
-      }
-      return (
-        ret + `    ret${dataKey} = clone(convertToDatabaseValue_${convertorKey}(entity${entityKey}${unwrap}));\n  }\n`
-      );
-    }
-    if (prop.runtimeType === 'Date') {
-      context.set('processDateProperty', this.#platform.processDateProperty.bind(this.#platform));
-      return ret + `    ret${dataKey} = clone(processDateProperty(entity${entityKey}${unwrap}));\n  }\n`;
-    }
-    return ret + `    ret${dataKey} = clone(entity${entityKey}${unwrap});\n  }\n`;
-  }
-  /**
-   * @internal Highly performance-sensitive method.
-   */
-  getEntityComparator(entityName) {
-    const meta = this.#metadata.find(entityName);
-    const exists = this.#comparators.get(meta);
-    if (exists) {
-      return exists;
-    }
-    const lines = [];
-    const context = new Map();
-    context.set('compareArrays', compareArrays);
-    context.set('compareBooleans', compareBooleans);
-    context.set('compareBuffers', compareBuffers);
-    context.set('compareObjects', compareObjects);
-    context.set('equals', equals);
-    for (const prop of meta.comparableProps) {
-      lines.push(this.getPropertyComparator(prop, context));
-    }
-    // also compare 1:1 inverse sides, important for `factory.mergeData`
-    lines.push(`if (options?.includeInverseSides) {`);
-    for (const prop of meta.bidirectionalRelations) {
-      if (prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner && prop.hydrate !== false) {
-        lines.push(this.getPropertyComparator(prop, context));
-      }
-    }
-    lines.push(`}`);
-    const code =
-      `// compiled comparator for entity ${meta.className}\n` +
-      `return function(last, current, options) {\n  const diff = {};\n${lines.join('\n')}\n  return diff;\n}`;
-    const fnKey = `comparator-${meta.uniqueName}`;
-    const comparator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
-    this.#comparators.set(meta, comparator);
-    return comparator;
-  }
-  getGenericComparator(prop, cond) {
-    return (
-      `  if (current${prop} === null && last${prop} === undefined) {\n` +
-      `    diff${prop} = current${prop};\n` +
-      `  } else if (current${prop} == null && last${prop} == null) {\n\n` +
-      `  } else if ((current${prop} != null && last${prop} == null) || (current${prop} == null && last${prop} != null)) {\n` +
-      `    diff${prop} = current${prop};\n` +
-      `  } else if (${cond}) {\n` +
-      `    diff${prop} = current${prop};\n` +
-      `  }\n`
-    );
-  }
-  getPropertyComparator(prop, context) {
-    let type = prop.type.toLowerCase();
-    if (prop.kind !== ReferenceKind.SCALAR && prop.kind !== ReferenceKind.EMBEDDED) {
-      if (prop.polymorphic) {
-        type = 'object';
-      } else {
-        const meta2 = prop.targetMeta;
-        if (meta2.primaryKeys.length > 1) {
-          type = 'array';
-        } else {
-          type = meta2.getPrimaryProp().type.toLowerCase();
-        }
-      }
+        const tz = this.#platform.getTimezone();
+        const parseDate = (key, value, padding = '') => {
+            lines.push(`${padding}    if (${value} == null || ${value} instanceof Date) {`);
+            lines.push(`${padding}      ${key} = ${value};`);
+            if (!tz || tz === 'local') {
+                lines.push(`${padding}    } else if (typeof ${value} === 'bigint') {`);
+                lines.push(`${padding}      ${key} = parseDate(Number(${value}));`);
+                lines.push(`${padding}    } else {`);
+                lines.push(`${padding}      ${key} = parseDate(${value});`);
+            }
+            else {
+                lines.push(`${padding}    } else if (typeof ${value} === 'bigint') {`);
+                lines.push(`${padding}      ${key} = parseDate(Number(${value}));`);
+                lines.push(`${padding}    } else if (typeof ${value} === 'number' || ${value}.includes('+') || ${value}.lastIndexOf('-') > 10 || ${value}.endsWith('Z')) {`);
+                lines.push(`${padding}      ${key} = parseDate(${value});`);
+                lines.push(`${padding}    } else {`);
+                lines.push(`${padding}      ${key} = parseDate(${value} + '${tz}');`);
+            }
+            lines.push(`${padding}    }`);
+        };
+        lines.push(`  const mapped = {};`);
+        const mapEntityProperties = (meta, padding = '') => {
+            for (const prop of meta.props) {
+                if (!prop.fieldNames) {
+                    continue;
+                }
+                if (prop.polymorphic && prop.fieldNames.length >= 2) {
+                    const discriminatorField = prop.fieldNames[0];
+                    const idFields = prop.fieldNames.slice(1);
+                    lines.push(`${padding}  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`);
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`);
+                    if (idFields.length === 1) {
+                        lines.push(`${padding}    ret${this.wrap(prop.name)} = new PolymorphicRef(${this.propName(discriminatorField)}, ${this.propName(idFields[0])});`);
+                    }
+                    else {
+                        lines.push(`${padding}    ret${this.wrap(prop.name)} = new PolymorphicRef(${this.propName(discriminatorField)}, [${idFields.map(f => this.propName(f)).join(', ')}]);`);
+                    }
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`));
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n${padding}    ret${this.wrap(prop.name)} = null;`);
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`), '  }');
+                    continue;
+                }
+                if (prop.targetMeta && prop.fieldNames.length > 1) {
+                    lines.push(`${padding}  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`);
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.createCompositeKeyArray(prop)};`);
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`));
+                    lines.push(`${padding}  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n${padding}    ret${this.wrap(prop.name)} = null;`);
+                    lines.push(...prop.fieldNames.map(field => `${padding}    ${this.propName(field, 'mapped')} = true;`), '  }');
+                    continue;
+                }
+                if (prop.embedded && (meta.embeddable || meta.properties[prop.embedded[0]].object)) {
+                    continue;
+                }
+                if (prop.runtimeType === 'boolean') {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : !!${this.propName(prop.fieldNames[0])};`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.runtimeType === 'Date' && !this.#platform.isNumericProperty(prop)) {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    context.set('parseDate', (value) => this.#platform.parseDate(value));
+                    parseDate('ret' + this.wrap(prop.name), this.propName(prop.fieldNames[0]), padding);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.kind === ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
+                    const idx = this.#tmpIndex++;
+                    context.set(`mapEmbeddedResult_${idx}`, (data) => {
+                        const item = parseJsonSafe(data);
+                        if (Array.isArray(item)) {
+                            return item.map(row => (row == null ? row : this.getResultMapper(prop.targetMeta)(row)));
+                        }
+                        return item == null ? item : this.getResultMapper(prop.targetMeta)(item);
+                    });
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : mapEmbeddedResult_${idx}(${this.propName(prop.fieldNames[0])});`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+                else if (prop.kind !== ReferenceKind.EMBEDDED) {
+                    lines.push(`${padding}  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                    lines.push(`${padding}    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
+                    lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
+                    lines.push(`${padding}  }`);
+                }
+            }
+        };
+        if (meta.polymorphs && meta.discriminatorColumn) {
+            for (const polymorph of meta.polymorphs) {
+                const first = polymorph === meta.polymorphs[0];
+                lines.push(`  ${first ? '' : 'else '}if (${this.propName(meta.discriminatorColumn)} == '${polymorph.discriminatorValue}') {`);
+                mapEntityProperties(polymorph, '  ');
+                lines.push(`  }`);
+            }
+            lines.push(`  else {`);
+            mapEntityProperties(meta, '  ');
+            lines.push(`  }`);
+        }
+        else {
+            mapEntityProperties(meta);
+        }
+        lines.push(`  for (let k in result) { if (Object.hasOwn(result, k) && !mapped[k] && ret[k] === undefined) ret[k] = result[k]; }`);
+        const code = `// compiled mapper for entity ${meta.className}\n` +
+            `return function(result) {\n  const ret = {};\n${lines.join('\n')}\n  return ret;\n}`;
+        const fnKey = `resultMapper-${meta.uniqueName}`;
+        const resultMapper = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#mappers.set(meta, resultMapper);
+        return resultMapper;
+    }
+    getPropertyCondition(path) {
+        const parts = path.slice(); // copy first
+        if (parts.length > 1) {
+            parts.pop();
+        }
+        let tail = '';
+        return parts
+            .map(k => {
+            if (/^\[idx_\d+]$/.exec(k)) {
+                tail += k;
+                return '';
+            }
+            const mapped = `typeof entity${tail ? '.' + tail : ''}${this.wrap(k)} !== 'undefined'`;
+            tail += tail ? '.' + k : k;
+            return mapped;
+        })
+            .filter(k => k)
+            .join(' && ');
     }
-    if (prop.customType) {
-      if (prop.customType.compareValues) {
+    getEmbeddedArrayPropertySnapshot(meta, prop, context, level, path, dataKey) {
+        const entityKey = path.map(k => this.wrap(k)).join('');
+        const ret = [];
+        const padding = ' '.repeat(level * 2);
         const idx = this.#tmpIndex++;
-        context.set(`compareValues_${idx}`, (a, b) => {
-          if (Raw.isKnownFragment(a) || Raw.isKnownFragment(b)) {
-            return Raw.getKnownFragment(a) === Raw.getKnownFragment(b);
-          }
-          return prop.customType.compareValues(a, b);
+        ret.push(`${padding}if (Array.isArray(entity${entityKey})) {`);
+        ret.push(`${padding}  ret${dataKey} = [];`);
+        ret.push(`${padding}  entity${entityKey}.forEach((_, idx_${idx}) => {`);
+        ret.push(this.getEmbeddedPropertySnapshot(meta, prop, context, level + 2, [...path, `[idx_${idx}]`], `${dataKey}[idx_${idx}]`, true));
+        ret.push(`${padding}  });`);
+        if (this.shouldSerialize(prop, dataKey)) {
+            ret.push(`${padding}  ret${dataKey} = cloneEmbeddable(ret${dataKey});`);
+        }
+        ret.push(`${padding}}`);
+        return ret.join('\n');
+    }
+    /**
+     * we need to serialize only object embeddables, and only the top level ones, so root object embeddable
+     * properties and first child nested object embeddables with inlined parent
+     */
+    shouldSerialize(prop, dataKey) {
+        dataKey = dataKey.replace(/^\./, '');
+        const contains = (str, re) => (str.match(re) || []).length > 0;
+        const a = contains(dataKey, /\./g);
+        const b = contains(dataKey, /\[idx_/g);
+        return !!prop.object && !a && !b;
+    }
+    getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object = prop.object) {
+        const padding = ' '.repeat(level * 2);
+        const nullCond = `entity${path.map(k => this.wrap(k)).join('')} === null`;
+        let ret = level === 1 ? '' : '\n';
+        if (object) {
+            ret += `${padding}if (${nullCond}) ret${dataKey} = null;\n`;
+        }
+        else {
+            ret += `${padding}if (${nullCond}) {\n`;
+            ret +=
+                this.getInlineEmbeddedNullLines(meta, prop.name, padding, dataKey, !!(meta.embeddable || prop.object)).join('\n') + `\n`;
+            ret += `${padding}}\n`;
+        }
+        const cond = `entity${path.map(k => this.wrap(k)).join('')} != null`;
+        ret += `${padding}if (${cond}) {\n`;
+        if (object) {
+            ret += `${padding}  ret${dataKey} = {};\n`;
+        }
+        function shouldProcessCustomType(childProp) {
+            if (!childProp.customType) {
+                return false;
+            }
+            if (childProp.customType instanceof JsonType) {
+                return !prop.object;
+            }
+            return true;
+        }
+        ret +=
+            meta.props
+                .filter(p => p.embedded?.[0] === prop.name &&
+                // object for JSON embeddable
+                (p.object || p.persist !== false))
+                .map(childProp => {
+                const childDataKey = meta.embeddable || prop.object ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+                const childEntityKey = [...path, childProp.embedded[1]].map(k => this.wrap(k)).join('');
+                const childCond = `typeof entity${childEntityKey} !== 'undefined'`;
+                if (childProp.kind === ReferenceKind.EMBEDDED) {
+                    return this.getPropertySnapshot(meta, childProp, context, childDataKey, childEntityKey, [...path, childProp.embedded[1]], level + 1, prop.object);
+                }
+                if (childProp.kind !== ReferenceKind.SCALAR) {
+                    return this.getPropertySnapshot(meta, childProp, context, childDataKey, childEntityKey, [...path, childProp.embedded[1]], level, prop.object)
+                        .split('\n')
+                        .map(l => padding + l)
+                        .join('\n');
+                }
+                if (shouldProcessCustomType(childProp)) {
+                    const convertorKey = this.registerCustomType(childProp, context);
+                    if (['number', 'string', 'boolean', 'bigint'].includes(childProp.customType.compareAsType().toLowerCase())) {
+                        return `${padding}  if (${childCond}) ret${childDataKey} = convertToDatabaseValue_${convertorKey}(entity${childEntityKey});`;
+                    }
+                    return `${padding}  if (${childCond}) ret${childDataKey} = clone(convertToDatabaseValue_${convertorKey}(entity${childEntityKey}));`;
+                }
+                return `${padding}  if (${childCond}) ret${childDataKey} = clone(entity${childEntityKey});`;
+            })
+                .join('\n') + `\n`;
+        if (this.shouldSerialize(prop, dataKey)) {
+            return `${ret + padding}  ret${dataKey} = cloneEmbeddable(ret${dataKey});\n${padding}}`;
+        }
+        return `${ret}${padding}}`;
+    }
+    getInlineEmbeddedNullLines(meta, parentName, padding, dataKey, useEmbeddedKey) {
+        return meta.props
+            .filter(p => p.embedded?.[0] === parentName && (p.object || p.persist !== false))
+            .flatMap(childProp => {
+            const childDataKey = useEmbeddedKey ? dataKey + this.wrap(childProp.embedded[1]) : this.wrap(childProp.name);
+            if (childProp.kind === ReferenceKind.EMBEDDED && !childProp.object) {
+                return this.getInlineEmbeddedNullLines(meta, childProp.name, padding, childDataKey, useEmbeddedKey);
+            }
+            return [`${padding}  ret${childDataKey} = null;`];
         });
-        return this.getGenericComparator(
-          this.wrap(prop.name),
-          `!compareValues_${idx}(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`,
-        );
-      }
-      type = prop.customType.compareAsType().toLowerCase();
-    }
-    if (type.endsWith('[]')) {
-      type = 'array';
-    }
-    if (['string', 'number', 'bigint'].includes(type)) {
-      return this.getGenericComparator(
-        this.wrap(prop.name),
-        `last${this.wrap(prop.name)} !== current${this.wrap(prop.name)}`,
-      );
-    }
-    if (type === 'boolean') {
-      return this.getGenericComparator(
-        this.wrap(prop.name),
-        `!compareBooleans(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`,
-      );
-    }
-    if (['array'].includes(type) || type.endsWith('[]')) {
-      return this.getGenericComparator(
-        this.wrap(prop.name),
-        `!compareArrays(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`,
-      );
-    }
-    if (['buffer', 'uint8array'].includes(type)) {
-      return this.getGenericComparator(
-        this.wrap(prop.name),
-        `!compareBuffers(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`,
-      );
-    }
-    if (type === 'date') {
-      return this.getGenericComparator(
-        this.wrap(prop.name),
-        `last${this.wrap(prop.name)}.valueOf() !== current${this.wrap(prop.name)}.valueOf()`,
-      );
     }
-    if (type === 'objectid') {
-      // We might be comparing PK to object, in case we compare with cached data of populated entity
-      // in such case we just ignore the comparison and fallback to `equals()` (which will still mark
-      // it as not equal as we compare PK to plain object).
-      const cond = `last${this.wrap(prop.name)}.toHexString?.() !== current${this.wrap(prop.name)}.toHexString?.()`;
-      return this.getGenericComparator(this.wrap(prop.name), cond);
+    registerCustomType(prop, context) {
+        const convertorKey = this.safeKey(prop.name);
+        context.set(`convertToDatabaseValue_${convertorKey}`, (val) => {
+            /* v8 ignore next */
+            if (Raw.isKnownFragment(val)) {
+                return val;
+            }
+            return prop.customType.convertToDatabaseValue(val, this.#platform, { mode: 'serialization' });
+        });
+        return convertorKey;
     }
-    return this.getGenericComparator(
-      this.wrap(prop.name),
-      `!equals(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`,
-    );
-  }
-  wrap(key) {
-    if (/^\[.*]$/.exec(key)) {
-      return key;
+    getPropertySnapshot(meta, prop, context, dataKey, entityKey, path, level = 1, object) {
+        const unwrap = prop.ref ? '?.unwrap()' : '';
+        let ret = `  if (${this.getPropertyCondition(path)}`;
+        if (prop.lazy && prop.ref) {
+            ret += ` && entity${path.map(k => this.wrap(k)).join('')}?.isInitialized()`;
+        }
+        ret += `) {\n`;
+        if (['number', 'string', 'boolean'].includes(prop.type.toLowerCase())) {
+            return ret + `    ret${dataKey} = entity${entityKey}${unwrap};\n  }\n`;
+        }
+        if (prop.kind === ReferenceKind.EMBEDDED) {
+            if (prop.array) {
+                return this.getEmbeddedArrayPropertySnapshot(meta, prop, context, level, path, dataKey) + '\n';
+            }
+            return this.getEmbeddedPropertySnapshot(meta, prop, context, level, path, dataKey, object) + '\n';
+        }
+        if (prop.kind === ReferenceKind.ONE_TO_ONE || prop.kind === ReferenceKind.MANY_TO_ONE) {
+            if (prop.mapToPk) {
+                if (prop.customType) {
+                    const convertorKey = this.registerCustomType(prop, context);
+                    ret += `    ret${dataKey} = convertToDatabaseValue_${convertorKey}(entity${entityKey});\n`;
+                }
+                else {
+                    ret += `    ret${dataKey} = entity${entityKey};\n`;
+                }
+            }
+            else if (prop.polymorphic) {
+                const discriminatorMapKey = `discriminatorMapReverse_${prop.name}`;
+                const reverseMap = new Map();
+                for (const [key, value] of Object.entries(prop.discriminatorMap)) {
+                    reverseMap.set(value, key);
+                }
+                context.set(discriminatorMapKey, reverseMap);
+                this.setToArrayHelper(context);
+                context.set('EntityIdentifier', EntityIdentifier);
+                context.set('PolymorphicRef', PolymorphicRef);
+                ret += `    if (entity${entityKey} === null) {\n`;
+                ret += `      ret${dataKey} = null;\n`;
+                ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
+                ret += `      const val${level} = entity${entityKey}${unwrap};\n`;
+                ret += `      const discriminator = ${discriminatorMapKey}.get(val${level}?.constructor);\n`;
+                ret += `      const pk = val${level}?.__helper?.__identifier && !val${level}?.__helper?.hasPrimaryKey()\n`;
+                ret += `        ? val${level}.__helper.__identifier\n`;
+                ret += `        : toArray(val${level}?.__helper?.getPrimaryKey(true));\n`;
+                ret += `      ret${dataKey} = new PolymorphicRef(discriminator, pk);\n`;
+                ret += `    }\n`;
+            }
+            else if (prop.targetKey) {
+                // When targetKey is set, extract that property value instead of the PK
+                const targetProp = prop.targetMeta?.properties[prop.targetKey];
+                ret += `    if (entity${entityKey} === null) {\n`;
+                ret += `      ret${dataKey} = null;\n`;
+                ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
+                ret += `      const val${level} = entity${entityKey}${unwrap};\n`;
+                if (targetProp?.customType) {
+                    // If targetKey property has a custom type, convert to database value
+                    const convertorKey = this.registerCustomType(targetProp, context);
+                    ret += `      ret${dataKey} = convertToDatabaseValue_${convertorKey}(val${level}?.${prop.targetKey});\n`;
+                }
+                else {
+                    ret += `      ret${dataKey} = val${level}?.${prop.targetKey};\n`;
+                }
+                ret += `    }\n`;
+            }
+            else {
+                this.setToArrayHelper(context);
+                context.set('EntityIdentifier', EntityIdentifier);
+                ret += `    if (entity${entityKey} === null) {\n`;
+                ret += `      ret${dataKey} = null;\n`;
+                ret += `    } else if (entity${entityKey}?.__helper.__identifier && !entity${entityKey}.__helper.hasPrimaryKey()) {\n`;
+                ret += `      ret${dataKey} = entity${entityKey}?.__helper.__identifier;\n`;
+                ret += `    } else if (typeof entity${entityKey} !== 'undefined') {\n`;
+                ret += `      ret${dataKey} = toArray(entity${entityKey}.__helper.getPrimaryKey(true));\n`;
+                ret += `    }\n`;
+            }
+            return ret + '  }\n';
+        }
+        if (prop.customType) {
+            const convertorKey = this.registerCustomType(prop, context);
+            if (['number', 'string', 'boolean', 'bigint'].includes(prop.customType.compareAsType().toLowerCase())) {
+                return ret + `    ret${dataKey} = convertToDatabaseValue_${convertorKey}(entity${entityKey}${unwrap});\n  }\n`;
+            }
+            return (ret + `    ret${dataKey} = clone(convertToDatabaseValue_${convertorKey}(entity${entityKey}${unwrap}));\n  }\n`);
+        }
+        if (prop.runtimeType === 'Date') {
+            context.set('processDateProperty', this.#platform.processDateProperty.bind(this.#platform));
+            return ret + `    ret${dataKey} = clone(processDateProperty(entity${entityKey}${unwrap}));\n  }\n`;
+        }
+        return ret + `    ret${dataKey} = clone(entity${entityKey}${unwrap});\n  }\n`;
+    }
+    /**
+     * @internal Highly performance-sensitive method.
+     */
+    getEntityComparator(entityName) {
+        const meta = this.#metadata.find(entityName);
+        const exists = this.#comparators.get(meta);
+        if (exists) {
+            return exists;
+        }
+        const lines = [];
+        const context = new Map();
+        context.set('compareArrays', compareArrays);
+        context.set('compareBooleans', compareBooleans);
+        context.set('compareBuffers', compareBuffers);
+        context.set('compareObjects', compareObjects);
+        context.set('equals', equals);
+        for (const prop of meta.comparableProps) {
+            lines.push(this.getPropertyComparator(prop, context));
+        }
+        // also compare 1:1 inverse sides, important for `factory.mergeData`
+        lines.push(`if (options?.includeInverseSides) {`);
+        for (const prop of meta.bidirectionalRelations) {
+            if (prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner && prop.hydrate !== false) {
+                lines.push(this.getPropertyComparator(prop, context));
+            }
+        }
+        lines.push(`}`);
+        const code = `// compiled comparator for entity ${meta.className}\n` +
+            `return function(last, current, options) {\n  const diff = {};\n${lines.join('\n')}\n  return diff;\n}`;
+        const fnKey = `comparator-${meta.uniqueName}`;
+        const comparator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#comparators.set(meta, comparator);
+        return comparator;
+    }
+    getGenericComparator(prop, cond) {
+        return (`  if (current${prop} === null && last${prop} === undefined) {\n` +
+            `    diff${prop} = current${prop};\n` +
+            `  } else if (current${prop} == null && last${prop} == null) {\n\n` +
+            `  } else if ((current${prop} != null && last${prop} == null) || (current${prop} == null && last${prop} != null)) {\n` +
+            `    diff${prop} = current${prop};\n` +
+            `  } else if (${cond}) {\n` +
+            `    diff${prop} = current${prop};\n` +
+            `  }\n`);
+    }
+    getPropertyComparator(prop, context) {
+        let type = prop.type.toLowerCase();
+        if (prop.kind !== ReferenceKind.SCALAR && prop.kind !== ReferenceKind.EMBEDDED) {
+            if (prop.polymorphic) {
+                type = 'object';
+            }
+            else {
+                const meta2 = prop.targetMeta;
+                if (meta2.primaryKeys.length > 1) {
+                    type = 'array';
+                }
+                else {
+                    type = meta2.getPrimaryProp().type.toLowerCase();
+                }
+            }
+        }
+        if (prop.customType) {
+            if (prop.customType.compareValues) {
+                const idx = this.#tmpIndex++;
+                context.set(`compareValues_${idx}`, (a, b) => {
+                    if (Raw.isKnownFragment(a) || Raw.isKnownFragment(b)) {
+                        return Raw.getKnownFragment(a) === Raw.getKnownFragment(b);
+                    }
+                    return prop.customType.compareValues(a, b);
+                });
+                return this.getGenericComparator(this.wrap(prop.name), `!compareValues_${idx}(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
+            }
+            type = prop.customType.compareAsType().toLowerCase();
+        }
+        if (type.endsWith('[]')) {
+            type = 'array';
+        }
+        if (['string', 'number', 'bigint'].includes(type)) {
+            return this.getGenericComparator(this.wrap(prop.name), `last${this.wrap(prop.name)} !== current${this.wrap(prop.name)}`);
+        }
+        if (type === 'boolean') {
+            return this.getGenericComparator(this.wrap(prop.name), `!compareBooleans(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
+        }
+        if (['array'].includes(type) || type.endsWith('[]')) {
+            return this.getGenericComparator(this.wrap(prop.name), `!compareArrays(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
+        }
+        if (['buffer', 'uint8array'].includes(type)) {
+            return this.getGenericComparator(this.wrap(prop.name), `!compareBuffers(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
+        }
+        if (type === 'date') {
+            return this.getGenericComparator(this.wrap(prop.name), `last${this.wrap(prop.name)}.valueOf() !== current${this.wrap(prop.name)}.valueOf()`);
+        }
+        if (type === 'objectid') {
+            // We might be comparing PK to object, in case we compare with cached data of populated entity
+            // in such case we just ignore the comparison and fallback to `equals()` (which will still mark
+            // it as not equal as we compare PK to plain object).
+            const cond = `last${this.wrap(prop.name)}.toHexString?.() !== current${this.wrap(prop.name)}.toHexString?.()`;
+            return this.getGenericComparator(this.wrap(prop.name), cond);
+        }
+        return this.getGenericComparator(this.wrap(prop.name), `!equals(last${this.wrap(prop.name)}, current${this.wrap(prop.name)})`);
     }
-    return /^\w+$/.exec(key) ? `.${key}` : `['${key}']`;
-  }
-  safeKey(key) {
-    return key.replace(/\W/g, '_');
-  }
-  /**
-   * Sets the toArray helper in the context if not already set.
-   * Used for converting composite PKs to arrays.
-   */
-  setToArrayHelper(context) {
-    if (context.has('toArray')) {
-      return;
+    wrap(key) {
+        if (/^\[.*]$/.exec(key)) {
+            return key;
+        }
+        return /^\w+$/.exec(key) ? `.${key}` : `['${key}']`;
+    }
+    safeKey(key) {
+        return key.replace(/\W/g, '_');
+    }
+    /**
+     * Sets the toArray helper in the context if not already set.
+     * Used for converting composite PKs to arrays.
+     */
+    setToArrayHelper(context) {
+        if (context.has('toArray')) {
+            return;
+        }
+        const toArray = (val) => {
+            if (Utils.isPlainObject(val)) {
+                return Object.values(val).map(v => toArray(v));
+            }
+            return val;
+        };
+        context.set('toArray', toArray);
+    }
+    /**
+     * perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison
+     */
+    static isComparable(prop, root) {
+        const virtual = prop.persist === false || (prop.generated && !prop.primary);
+        const inverse = prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner;
+        const discriminator = prop.name === root.discriminatorColumn;
+        const collection = prop.kind === ReferenceKind.ONE_TO_MANY || prop.kind === ReferenceKind.MANY_TO_MANY;
+        return !virtual && !collection && !inverse && !discriminator && !prop.version;
     }
-    const toArray = val => {
-      if (Utils.isPlainObject(val)) {
-        return Object.values(val).map(v => toArray(v));
-      }
-      return val;
-    };
-    context.set('toArray', toArray);
-  }
-  /**
-   * perf: used to generate list of comparable properties during discovery, so we speed up the runtime comparison
-   */
-  static isComparable(prop, root) {
-    const virtual = prop.persist === false || (prop.generated && !prop.primary);
-    const inverse = prop.kind === ReferenceKind.ONE_TO_ONE && !prop.owner;
-    const discriminator = prop.name === root.discriminatorColumn;
-    const collection = prop.kind === ReferenceKind.ONE_TO_MANY || prop.kind === ReferenceKind.MANY_TO_MANY;
-    return !virtual && !collection && !inverse && !discriminator && !prop.version;
-  }
 }