@mikro-orm/core 7.0.0-dev.321 → 7.0.0-dev.322

package/utils/EntityComparator.js

@@ -6,20 +6,20 @@ import { Raw } from './RawQueryFragment.js';
 import { EntityIdentifier } from '../entity/EntityIdentifier.js';
 import { PolymorphicRef } from '../entity/PolymorphicRef.js';
 export class EntityComparator {
-    metadata;
-    platform;
-    config;
-    comparators = new Map();
-    mappers = new Map();
-    snapshotGenerators = new Map();
-    pkGetters = new Map();
-    pkGettersConverted = new Map();
-    pkSerializers = new Map();
-    tmpIndex = 0;
+    #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;
+        this.#metadata = metadata;
+        this.#platform = platform;
+        this.#config = config;
     }
     /**
      * Computes difference between two entities.
@@ -51,7 +51,7 @@ export class EntityComparator {
      * @internal Highly performance-sensitive method.
      */
     getPkGetter(meta) {
-        const exists = this.pkGetters.get(meta);
+        const exists = this.#pkGetters.get(meta);
         /* v8 ignore next */
         if (exists) {
             return exists;
@@ -93,15 +93,15 @@ export class EntityComparator {
         }
         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);
+        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);
+        const exists = this.#pkGettersConverted.get(meta);
         /* v8 ignore next */
         if (exists) {
             return exists;
@@ -144,22 +144,22 @@ export class EntityComparator {
         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);
+        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);
+        const exists = this.#pkSerializers.get(meta);
         /* v8 ignore next */
         if (exists) {
             return exists;
         }
         const lines = [];
         const context = new Map();
-        context.set('getCompositeKeyValue', (val) => Utils.flatten(Utils.getCompositeKeyValue(val, meta, 'convertToDatabaseValue', this.platform)));
+        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) : [`);
@@ -186,7 +186,7 @@ export class EntityComparator {
             }
             else if (prop.customType) {
                 const convertorKey = this.registerCustomType(meta.properties[pk], context);
-                const idx = this.tmpIndex++;
+                const idx = this.#tmpIndex++;
                 lines.push(`  const val_${idx} = convertToDatabaseValue_${convertorKey}(entity${this.wrap(pk)});`);
                 lines.push(`  return getPrimaryKeyHash(val_${idx});`);
             }
@@ -196,23 +196,23 @@ export class EntityComparator {
         }
         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);
+        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);
+        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
+        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}'`);
         }
@@ -226,8 +226,8 @@ export class EntityComparator {
             .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);
+        const snapshotGenerator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#snapshotGenerators.set(meta, snapshotGenerator);
         return snapshotGenerator;
     }
     /**
@@ -278,14 +278,14 @@ export class EntityComparator {
      * @internal Highly performance-sensitive method.
      */
     getResultMapper(meta) {
-        const exists = this.mappers.get(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 tz = this.#platform.getTimezone();
         const parseDate = (key, value, padding = '') => {
             lines.push(`${padding}    if (${value} == null || ${value} instanceof Date) {`);
             lines.push(`${padding}      ${key} = ${value};`);
@@ -345,15 +345,15 @@ export class EntityComparator {
                     lines.push(`${padding}    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                     lines.push(`${padding}  }`);
                 }
-                else if (prop.runtimeType === 'Date' && !this.platform.isNumericProperty(prop)) {
+                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));
+                    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++;
+                    const idx = this.#tmpIndex++;
                     context.set(`mapEmbeddedResult_${idx}`, (data) => {
                         const item = parseJsonSafe(data);
                         if (Array.isArray(item)) {
@@ -392,8 +392,8 @@ export class EntityComparator {
         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);
+        const resultMapper = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#mappers.set(meta, resultMapper);
         return resultMapper;
     }
     getPropertyCondition(path) {
@@ -419,7 +419,7 @@ export class EntityComparator {
         const entityKey = path.map(k => this.wrap(k)).join('');
         const ret = [];
         const padding = ' '.repeat(level * 2);
-        const idx = this.tmpIndex++;
+        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}) => {`);
@@ -517,7 +517,7 @@ export class EntityComparator {
             if (Raw.isKnownFragment(val)) {
                 return val;
             }
-            return prop.customType.convertToDatabaseValue(val, this.platform, { mode: 'serialization' });
+            return prop.customType.convertToDatabaseValue(val, this.#platform, { mode: 'serialization' });
         });
         return convertorKey;
     }
@@ -602,7 +602,7 @@ export class EntityComparator {
             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));
+            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`;
@@ -611,8 +611,8 @@ export class EntityComparator {
      * @internal Highly performance-sensitive method.
      */
     getEntityComparator(entityName) {
-        const meta = this.metadata.find(entityName);
-        const exists = this.comparators.get(meta);
+        const meta = this.#metadata.find(entityName);
+        const exists = this.#comparators.get(meta);
         if (exists) {
             return exists;
         }
@@ -637,8 +637,8 @@ export class EntityComparator {
         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);
+        const comparator = Utils.createFunction(context, code, this.#config?.get('compiledFunctions'), fnKey);
+        this.#comparators.set(meta, comparator);
         return comparator;
     }
     getGenericComparator(prop, cond) {
@@ -669,7 +669,7 @@ export class EntityComparator {
         }
         if (prop.customType) {
             if (prop.customType.compareValues) {
-                const idx = this.tmpIndex++;
+                const idx = this.#tmpIndex++;
                 context.set(`compareValues_${idx}`, (a, b) => {
                     if (Raw.isKnownFragment(a) || Raw.isKnownFragment(b)) {
                         return Raw.getKnownFragment(a) === Raw.getKnownFragment(b);

package/utils/TransactionManager.js

@@ -160,8 +160,7 @@ export class TransactionManager {
         for (const entity of fork.getUnitOfWork(false).getIdentityMap()) {
             const wrapped = helper(entity);
             const meta = wrapped.__meta;
-            // eslint-disable-next-line dot-notation
-            const parentEntity = parentUoW.getById(meta.class, wrapped.getPrimaryKey(), parent['_schema'], true);
+            const parentEntity = parentUoW.getById(meta.class, wrapped.getPrimaryKey(), parent.schema, true);
             if (parentEntity && parentEntity !== entity) {
                 const parentWrapped = helper(parentEntity);
                 parentWrapped.__data = wrapped.__data;

package/utils/Utils.js

@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.321';
+    static #ORM_VERSION = '7.0.0-dev.322';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */

package/utils/clone.js

@@ -76,7 +76,7 @@ export function clone(parent, respectCustomCloneMethod = true) {
             return child;
         }
         else if (parent instanceof TypedArray) {
-            child = parent.copyWithin(0);
+            child = parent.slice();
             return child;
         }
         else if (parent instanceof Error) {