@mikro-orm/core 6.2.10-dev.6 → 6.2.10-dev.60

package/utils/EntityComparator.js

@@ -206,6 +206,50 @@ class EntityComparator {
         this.snapshotGenerators.set(entityName, 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];
+                // look for the field name in the parent's referencedColumnNames, except for M:N without a custom pivot entity
+                //   (in that case, the field names are the referenced PK's )
+                const target = parent.kind === enums_1.ReferenceKind.MANY_TO_MANY && parent.pivotEntity === parent.pivotTable ?
+                    parent.referencedPKs : parent.referencedColumnNames;
+                const idx = target.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(this.formatCompositeKeyPart).join(', ');
+        return `[${formatted}]`;
+    }
     /**
      * @internal Highly performance-sensitive method.
      */
@@ -217,22 +261,6 @@ class EntityComparator {
         const meta = this.metadata.get(entityName);
         const lines = [];
         const context = new Map();
-        const propName = (name, parent = 'result') => parent + this.wrap(name);
-        // respects nested composite keys, e.g. `[1, [2, 3]]`
-        const createCompositeKeyArray = (prop, fieldNames = prop.fieldNames, idx = 0) => {
-            if (!prop.targetMeta) {
-                return propName(fieldNames[idx++]);
-            }
-            const parts = [];
-            for (const pk of prop.targetMeta.getPrimaryProps()) {
-                parts.push(createCompositeKeyArray(pk, fieldNames, idx));
-                idx += pk.fieldNames.length;
-            }
-            if (parts.length < 2) {
-                return parts[0];
-            }
-            return '[' + parts.join(', ') + ']';
-        };
         const tz = this.platform.getTimezone();
         const parseDate = (key, value, padding = '') => {
             lines.push(`${padding}    if (${value} == null || ${value} instanceof Date) {`);
@@ -255,28 +283,28 @@ class EntityComparator {
                 return;
             }
             if (prop.targetMeta && prop.fieldNames.length > 1) {
-                lines.push(`  if (${prop.fieldNames.map(field => `typeof ${propName(field)} === 'undefined'`).join(' && ')}) {`);
-                lines.push(`  } else if (${prop.fieldNames.map(field => `${propName(field)} != null`).join(' && ')}) {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${createCompositeKeyArray(prop)};`);
-                lines.push(...prop.fieldNames.map(field => `    ${propName(field, 'mapped')} = true;`));
-                lines.push(`  } else if (${prop.fieldNames.map(field => `${propName(field)} == null`).join(' && ')}) {\n    ret${this.wrap(prop.name)} = null;`);
-                lines.push(...prop.fieldNames.map(field => `    ${propName(field, 'mapped')} = true;`), '  }');
+                lines.push(`  if (${prop.fieldNames.map(field => `typeof ${this.propName(field)} === 'undefined'`).join(' && ')}) {`);
+                lines.push(`  } else if (${prop.fieldNames.map(field => `${this.propName(field)} != null`).join(' && ')}) {`);
+                lines.push(`    ret${this.wrap(prop.name)} = ${this.createCompositeKeyArray(prop)};`);
+                lines.push(...prop.fieldNames.map(field => `    ${this.propName(field, 'mapped')} = true;`));
+                lines.push(`  } else if (${prop.fieldNames.map(field => `${this.propName(field)} == null`).join(' && ')}) {\n    ret${this.wrap(prop.name)} = null;`);
+                lines.push(...prop.fieldNames.map(field => `    ${this.propName(field, 'mapped')} = true;`), '  }');
                 return;
             }
             if (prop.embedded && (meta.embeddable || meta.properties[prop.embedded[0]].object)) {
                 return;
             }
             if (prop.runtimeType === 'boolean') {
-                lines.push(`  if (typeof ${propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${propName(prop.fieldNames[0])} == null ? ${propName(prop.fieldNames[0])} : !!${propName(prop.fieldNames[0])};`);
-                lines.push(`    ${propName(prop.fieldNames[0], 'mapped')} = true;`);
+                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                lines.push(`    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])} == null ? ${this.propName(prop.fieldNames[0])} : !!${this.propName(prop.fieldNames[0])};`);
+                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                 lines.push(`  }`);
             }
             else if (prop.runtimeType === 'Date') {
-                lines.push(`  if (typeof ${propName(prop.fieldNames[0])} !== 'undefined') {`);
+                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
                 context.set('parseDate', (value) => this.platform.parseDate(value));
-                parseDate('ret' + this.wrap(prop.name), propName(prop.fieldNames[0]));
-                lines.push(`    ${propName(prop.fieldNames[0], 'mapped')} = true;`);
+                parseDate('ret' + this.wrap(prop.name), this.propName(prop.fieldNames[0]));
+                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                 lines.push(`  }`);
             }
             else if (prop.kind === enums_1.ReferenceKind.EMBEDDED && (prop.object || meta.embeddable)) {
@@ -288,15 +316,15 @@ class EntityComparator {
                     }
                     return item == null ? item : this.getResultMapper(prop.type)(item);
                 });
-                lines.push(`  if (typeof ${propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${propName(prop.fieldNames[0])} == null ? ${propName(prop.fieldNames[0])} : mapEmbeddedResult_${idx}(${propName(prop.fieldNames[0])});`);
-                lines.push(`    ${propName(prop.fieldNames[0], 'mapped')} = true;`);
+                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                lines.push(`    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(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                 lines.push(`  }`);
             }
             else if (prop.kind !== enums_1.ReferenceKind.EMBEDDED) {
-                lines.push(`  if (typeof ${propName(prop.fieldNames[0])} !== 'undefined') {`);
-                lines.push(`    ret${this.wrap(prop.name)} = ${propName(prop.fieldNames[0])};`);
-                lines.push(`    ${propName(prop.fieldNames[0], 'mapped')} = true;`);
+                lines.push(`  if (typeof ${this.propName(prop.fieldNames[0])} !== 'undefined') {`);
+                lines.push(`    ret${this.wrap(prop.name)} = ${this.propName(prop.fieldNames[0])};`);
+                lines.push(`    ${this.propName(prop.fieldNames[0], 'mapped')} = true;`);
                 lines.push(`  }`);
             }
         });

package/utils/RawQueryFragment.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { inspect } from 'util';
 import type { AnyString, Dictionary, EntityKey } from '../typings';
 export declare class RawQueryFragment {
@@ -89,7 +88,7 @@ export declare function raw<T extends object = any, R = any>(sql: EntityKey<T> |
 export declare function sql(sql: readonly string[], ...values: unknown[]): any;
 export declare namespace sql {
     var ref: <T extends object>(...keys: string[]) => RawQueryFragment;
-    var now: (length?: number | undefined) => string;
+    var now: (length?: number) => string;
     var lower: <T extends object>(key: string | ((alias: string) => string)) => string;
     var upper: <T extends object>(key: string | ((alias: string) => string)) => string;
 }

package/utils/RawQueryFragment.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSqlFunction = exports.sql = exports.raw = exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.RawQueryFragment = void 0;
+exports.ALIAS_REPLACEMENT_RE = exports.ALIAS_REPLACEMENT = exports.RawQueryFragment = void 0;
+exports.raw = raw;
+exports.sql = sql;
+exports.createSqlFunction = createSqlFunction;
 const util_1 = require("util");
 const Utils_1 = require("./Utils");
 class RawQueryFragment {
@@ -152,7 +155,6 @@ function raw(sql, params) {
     }
     return new RawQueryFragment(sql, params);
 }
-exports.raw = raw;
 /**
  * Alternative to the `raw()` helper allowing to use it as a tagged template function for the simple cases.
  *
@@ -174,14 +176,12 @@ function sql(sql, ...values) {
         return valueExists ? text + '?' : text;
     }, ''), values);
 }
-exports.sql = sql;
 function createSqlFunction(func, key) {
     if (typeof key === 'string') {
         return raw(`${func}(${key})`);
     }
     return raw(a => `${func}(${(key(a))})`);
 }
-exports.createSqlFunction = createSqlFunction;
 sql.ref = (...keys) => raw('??', [keys.join('.')]);
 sql.now = (length) => raw('current_timestamp' + (length == null ? '' : `(${length})`));
 sql.lower = (key) => createSqlFunction('lower', key);

package/utils/Utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { type GlobbyOptions } from 'globby';
 import { type URL } from 'url';
 import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadata, EntityName, EntityProperty, IMetadataStorage, Primary } from '../typings';
@@ -190,9 +188,9 @@ export declare class Utils {
     static isCollection<T extends object, O extends object = object>(item: any): item is Collection<T, O>;
     static fileURLToPath(url: string | URL): string;
     /**
-     * Resolves and normalizes a series of path parts relative to each preceeding part.
+     * Resolves and normalizes a series of path parts relative to each preceding part.
      * If any part is a `file:` URL, it is converted to a local path. If any part is an
-     * absolute path, it replaces preceeding paths (similar to `path.resolve` in NodeJS).
+     * absolute path, it replaces preceding paths (similar to `path.resolve` in NodeJS).
      * Trailing directory separators are removed, and all directory separators are converted
      * to POSIX-style separators (`/`).
      */
@@ -257,10 +255,10 @@ export declare class Utils {
     static keys<T extends object>(obj: T): (keyof T)[];
     static values<T extends object>(obj: T): T[keyof T][];
     static entries<T extends object>(obj: T): [keyof T, T[keyof T]][];
-    static isRawSql(value: unknown): value is {
+    static isRawSql<T = {
         sql: string;
         params: unknown[];
         use: () => void;
-    };
+    }>(value: unknown): value is T;
     static primaryKeyToObject<T>(meta: EntityMetadata<T>, primaryKey: Primary<T> | T, visible?: (keyof T)[]): T;
 }

package/utils/Utils.js

@@ -3,7 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Utils = exports.parseJsonSafe = exports.equals = exports.compareBuffers = exports.compareBooleans = exports.compareArrays = exports.compareObjects = exports.ObjectBindingPattern = void 0;
+exports.Utils = exports.ObjectBindingPattern = void 0;
+exports.compareObjects = compareObjects;
+exports.compareArrays = compareArrays;
+exports.compareBooleans = compareBooleans;
+exports.compareBuffers = compareBuffers;
+exports.equals = equals;
+exports.parseJsonSafe = parseJsonSafe;
 const module_1 = require("module");
 const globby_1 = __importDefault(require("globby"));
 const path_1 = require("path");
@@ -67,7 +73,6 @@ function compareObjects(a, b) {
     }
     return true;
 }
-exports.compareObjects = compareObjects;
 function compareArrays(a, b) {
     const length = a.length;
     if (length !== b.length) {
@@ -81,13 +86,11 @@ function compareArrays(a, b) {
     }
     return true;
 }
-exports.compareArrays = compareArrays;
 function compareBooleans(a, b) {
     a = typeof a === 'number' ? Boolean(a) : a;
     b = typeof b === 'number' ? Boolean(b) : b;
     return a === b;
 }
-exports.compareBooleans = compareBooleans;
 function compareBuffers(a, b) {
     const length = a.length;
     if (length !== b.length) {
@@ -100,7 +103,6 @@ function compareBuffers(a, b) {
     }
     return true;
 }
-exports.compareBuffers = compareBuffers;
 /**
  * Checks if arguments are deeply (but not strictly) equal.
  */
@@ -119,7 +121,6 @@ function equals(a, b) {
     }
     return Number.isNaN(a) && Number.isNaN(b);
 }
-exports.equals = equals;
 const equalsFn = equals;
 function parseJsonSafe(value) {
     if (typeof value === 'string') {
@@ -133,7 +134,6 @@ function parseJsonSafe(value) {
     }
     return value;
 }
-exports.parseJsonSafe = parseJsonSafe;
 class Utils {
     static PK_SEPARATOR = '~~~';
     /* istanbul ignore next */
@@ -386,20 +386,23 @@ class Utils {
         const ret = [];
         const tokens = this.tokenize(func);
         let inside = 0;
+        let currentBlockStart = 0;
         for (let i = 0; i < tokens.length; i++) {
             const token = tokens[i];
             if (token.type === 'Identifier' && token.value === methodName) {
                 inside = 1;
+                currentBlockStart = i;
                 continue;
             }
             if (inside === 1 && token.type === 'Punctuator' && token.value === '(') {
                 inside = 2;
+                currentBlockStart = i;
                 continue;
             }
             if (inside === 2 && token.type === 'Punctuator' && token.value === ')') {
                 break;
             }
-            if (inside === 2 && token.type === 'Punctuator' && token.value === '{') {
+            if (inside === 2 && token.type === 'Punctuator' && token.value === '{' && i === currentBlockStart + 1) {
                 ret.push(exports.ObjectBindingPattern);
                 i = tokens.findIndex((t, idx) => idx > i + 2 && t.type === 'Punctuator' && t.value === '}');
                 continue;
@@ -704,9 +707,9 @@ class Utils {
         return (0, url_1.fileURLToPath)(url);
     }
     /**
-     * Resolves and normalizes a series of path parts relative to each preceeding part.
+     * Resolves and normalizes a series of path parts relative to each preceding part.
      * If any part is a `file:` URL, it is converted to a local path. If any part is an
-     * absolute path, it replaces preceeding paths (similar to `path.resolve` in NodeJS).
+     * absolute path, it replaces preceding paths (similar to `path.resolve` in NodeJS).
      * Trailing directory separators are removed, and all directory separators are converted
      * to POSIX-style separators (`/`).
      */

package/utils/clone.js

@@ -5,7 +5,7 @@
  * @internal
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clone = void 0;
+exports.clone = clone;
 const events_1 = require("events");
 const RawQueryFragment_1 = require("./RawQueryFragment");
 function clone(parent, respectCustomCloneMethod = true) {
@@ -124,4 +124,3 @@ function clone(parent, respectCustomCloneMethod = true) {
     }
     return _clone(parent);
 }
-exports.clone = clone;

package/utils/upsert-utils.d.ts

@@ -1,6 +1,7 @@
 import type { EntityData, EntityMetadata } from '../typings';
 import type { UpsertOptions } from '../drivers/IDatabaseDriver';
+import type { RawQueryFragment } from '../utils/RawQueryFragment';
 /** @internal */
-export declare function getOnConflictFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[], options: UpsertOptions<T>): (keyof T)[];
+export declare function getOnConflictFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | RawQueryFragment, options: UpsertOptions<T>): (keyof T)[];
 /** @internal */
-export declare function getOnConflictReturningFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[], options: UpsertOptions<T>): (keyof T)[] | '*';
+export declare function getOnConflictReturningFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | RawQueryFragment, options: UpsertOptions<T>): (keyof T)[] | '*';

package/utils/upsert-utils.js

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOnConflictReturningFields = exports.getOnConflictFields = void 0;
+exports.getOnConflictFields = getOnConflictFields;
+exports.getOnConflictReturningFields = getOnConflictReturningFields;
 /** @internal */
 function getOnConflictFields(meta, data, uniqueFields, options) {
     if (options.onConflictMergeFields) {
         return options.onConflictMergeFields;
     }
     const keys = Object.keys(data).filter(f => {
-        return !uniqueFields.includes(f) && !meta?.properties[f]?.embeddable;
+        return Array.isArray(uniqueFields) && !uniqueFields.includes(f) && !meta?.properties[f]?.embeddable;
     });
     if (options.onConflictExcludeFields) {
         return keys.filter(f => !options.onConflictExcludeFields.includes(f));
     }
     return keys;
 }
-exports.getOnConflictFields = getOnConflictFields;
 /** @internal */
 function getOnConflictReturningFields(meta, data, uniqueFields, options) {
     if (!meta) {
         return '*';
     }
-    const keys = meta.comparableProps.filter(p => !p.lazy && !p.embeddable && !uniqueFields.includes(p.name)).map(p => p.name);
+    const keys = meta.comparableProps.filter(p => !p.lazy && !p.embeddable && Array.isArray(uniqueFields) && !uniqueFields.includes(p.name)).map(p => p.name);
     if (meta.versionProperty) {
         keys.push(meta.versionProperty);
     }
@@ -35,4 +35,3 @@ function getOnConflictReturningFields(meta, data, uniqueFields, options) {
     }
     return keys.filter(key => !(key in data));
 }
-exports.getOnConflictReturningFields = getOnConflictReturningFields;