@mikro-orm/core 6.2.10-dev.8 → 6.2.10-dev.81

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;