@mikro-orm/core 7.0.0-rc.2 → 7.0.0-rc.3

package/utils/QueryHelper.js

@@ -50,17 +50,21 @@ export class QueryHelper {
         }
         const keys = Object.keys(where);
         const groupOperator = keys.find(k => {
-            return k in GroupOperator && Array.isArray(where[k]) && where[k].every(cond => {
-                return Utils.isPlainObject(cond) && Object.keys(cond).every(k2 => {
-                    if (Utils.isOperator(k2, false)) {
-                        if (k2 === '$not') {
-                            return Object.keys(cond[k2]).every(k3 => meta.primaryKeys.includes(k3));
-                        }
-                        return true;
-                    }
-                    return meta.primaryKeys.includes(k2);
-                });
-            });
+            return (k in GroupOperator &&
+                Array.isArray(where[k]) &&
+                where[k].every(cond => {
+                    return (Utils.isPlainObject(cond) &&
+                        Object.keys(cond).every(k2 => {
+                            if (Utils.isOperator(k2, false)) {
+                                if (k2 === '$not') {
+                                    return Object.keys(cond[k2]).every(k3 => meta.primaryKeys.includes(k3));
+                                }
+                                /* v8 ignore next */
+                                return true;
+                            }
+                            return meta.primaryKeys.includes(k2);
+                        }));
+                }));
         });
         if (groupOperator) {
             return groupOperator;
@@ -96,15 +100,21 @@ export class QueryHelper {
             return false;
         }
         if (meta.primaryKeys.every(pk => pk in where) && Utils.getObjectKeysSize(where) === meta.primaryKeys.length) {
-            return !!key && !GroupOperator[key] && key !== '$not' && Object.keys(where).every(k => !Utils.isPlainObject(where[k]) || Object.keys(where[k]).every(v => {
-                if (Utils.isOperator(v, false)) {
-                    return true;
-                }
-                if (meta.properties[k].primary && [ReferenceKind.ONE_TO_ONE, ReferenceKind.MANY_TO_ONE].includes(meta.properties[k].kind)) {
-                    return this.inlinePrimaryKeyObjects(where[k], meta.properties[k].targetMeta, metadata, v);
-                }
-                return true;
-            }));
+            return (!!key &&
+                !GroupOperator[key] &&
+                key !== '$not' &&
+                Object.keys(where).every(k => !Utils.isPlainObject(where[k]) ||
+                    Object.keys(where[k]).every(v => {
+                        if (Utils.isOperator(v, false)) {
+                            return true;
+                        }
+                        if (meta.properties[k].primary &&
+                            [ReferenceKind.ONE_TO_ONE, ReferenceKind.MANY_TO_ONE].includes(meta.properties[k].kind)) {
+                            return this.inlinePrimaryKeyObjects(where[k], meta.properties[k].targetMeta, metadata, v);
+                        }
+                        /* v8 ignore next */
+                        return true;
+                    })));
         }
         Object.keys(where).forEach(k => {
             const meta2 = metadata.find(meta.properties[k]?.targetMeta?.class) || meta;
@@ -139,7 +149,9 @@ export class QueryHelper {
             let cond = { [rootPrimaryKey]: { $in: where } };
             // @ts-ignore
             // detect tuple comparison, use `$or` in case the number of constituents don't match
-            if (meta && !where.every(c => Utils.isPrimaryKey(c) || (Array.isArray(c) && c.length === meta.primaryKeys.length && c.every(i => Utils.isPrimaryKey(i))))) {
+            if (meta &&
+                !where.every(c => Utils.isPrimaryKey(c) ||
+                    (Array.isArray(c) && c.length === meta.primaryKeys.length && c.every(i => Utils.isPrimaryKey(i))))) {
                 cond = { $or: where };
             }
             return QueryHelper.processWhere({ ...options, where: cond, root: false });
@@ -170,10 +182,12 @@ export class QueryHelper {
             if (prop?.customType && convertCustomTypes && !isRaw(value)) {
                 value = QueryHelper.processCustomType(prop, value, platform, undefined, true);
             }
+            // oxfmt-ignore
             const isJsonProperty = prop?.customType instanceof JsonType && Utils.isPlainObject(value) && !isRaw(value) && Object.keys(value)[0] !== '$eq';
             if (isJsonProperty && prop?.kind !== ReferenceKind.EMBEDDED) {
                 return this.processJsonCondition(o, value, [prop.fieldNames[0]], platform, aliased);
             }
+            // oxfmt-ignore
             if (Array.isArray(value) && !Utils.isOperator(key) && !QueryHelper.isSupportedOperator(key) && !(customExpression && Raw.getKnownFragment(key).params.length > 0) && options.type !== 'orderBy') {
                 // comparing single composite key - use $eq instead of $in
                 const op = composite && !value.every(v => Array.isArray(v)) ? '$eq' : '$in';
@@ -200,10 +214,10 @@ export class QueryHelper {
         }
         const opts = {};
         if (Array.isArray(options)) {
-            options.forEach(filter => opts[filter] = true);
+            options.forEach(filter => (opts[filter] = true));
         }
         else if (Utils.isPlainObject(options)) {
-            Object.keys(options).forEach(filter => opts[filter] = options[filter]);
+            Object.keys(options).forEach(filter => (opts[filter] = options[filter]));
         }
         return Object.keys(filters)
             .filter(f => QueryHelper.isFilterActive(meta, f, filters[f], opts))
@@ -252,9 +266,7 @@ export class QueryHelper {
             }, {});
         }
         if (key && JSON_KEY_OPERATORS.includes(key)) {
-            return Array.isArray(cond)
-                ? platform.marshallArray(cond)
-                : cond;
+            return Array.isArray(cond) ? platform.marshallArray(cond) : cond;
         }
         if (Array.isArray(cond) && !(key && ARRAY_OPERATORS.includes(key))) {
             return cond.map(v => QueryHelper.processCustomType(prop, v, platform, key, fromQuery));

package/utils/RawQueryFragment.js

@@ -39,7 +39,8 @@ export class RawQueryFragment {
         return typeof key === 'symbol' && this.#rawQueryReferences.has(key);
     }
     static hasObjectFragments(object) {
-        return Utils.isPlainObject(object) && Object.getOwnPropertySymbols(object).some(symbol => this.isKnownFragmentSymbol(symbol));
+        return (Utils.isPlainObject(object) &&
+            Object.getOwnPropertySymbols(object).some(symbol => this.isKnownFragmentSymbol(symbol)));
     }
     static isKnownFragment(key) {
         if (key instanceof RawQueryFragment) {
@@ -181,7 +182,7 @@ export function createSqlFunction(func, key) {
     if (typeof key === 'string') {
         return raw(`${func}(${key})`);
     }
-    return raw(a => `${func}(${(key(a))})`);
+    return raw(a => `${func}(${key(a)})`);
 }
 sql.ref = (...keys) => raw('??', [keys.join('.')]);
 sql.now = (length) => raw('current_timestamp' + (length == null ? '' : `(${length})`));

package/utils/TransactionManager.js

@@ -183,7 +183,8 @@ export class TransactionManager {
     registerDeletionHandler(fork, parent) {
         fork.getEventManager().registerSubscriber({
             afterFlush: (args) => {
-                const deletionChangeSets = args.uow.getChangeSets()
+                const deletionChangeSets = args.uow
+                    .getChangeSets()
                     .filter(cs => cs.type === ChangeSetType.DELETE || cs.type === ChangeSetType.DELETE_EARLY);
                 for (const cs of deletionChangeSets) {
                     parent.getUnitOfWork(false).unsetIdentity(cs.entity);

package/utils/Utils.d.ts

@@ -147,7 +147,7 @@ export declare class Utils {
     static callCompiledFunction<T extends unknown[], R>(fn: (...args: T) => R, ...args: T): R;
     static unwrapProperty<T>(entity: T, meta: EntityMetadata<T>, prop: EntityProperty<T>, payload?: boolean): [unknown, number[]][];
     static setPayloadProperty<T>(entity: EntityDictionary<T>, meta: EntityMetadata<T>, prop: EntityProperty<T>, value: unknown, idx: number[]): void;
-    static tryImport<T extends Dictionary = any>({ module, warning }: {
+    static tryImport<T extends Dictionary = any>({ module, warning, }: {
         module: string;
         warning?: string;
     }): Promise<T | undefined>;

package/utils/Utils.js

@@ -25,7 +25,7 @@ export function compareObjects(a, b) {
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         return a.sql === b.sql && compareArrays(a.params, b.params);
     }
-    if ((a instanceof Date && b instanceof Date)) {
+    if (a instanceof Date && b instanceof Date) {
         const timeA = a.getTime();
         const timeB = b.getTime();
         if (isNaN(timeA) || isNaN(timeB)) {
@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-rc.2';
+    static #ORM_VERSION = '7.0.0-rc.3';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -305,7 +305,7 @@ export class Utils {
             .split(',')
             .map(s => s.trim().replace(/=.*$/, '').trim())
             .filter(Boolean)
-            .map(raw => raw.startsWith('{') && raw.endsWith('}') ? '' : raw);
+            .map(raw => (raw.startsWith('{') && raw.endsWith('}') ? '' : raw));
     }
     /**
      * Checks whether the argument looks like primary key (string, number or ObjectId).
@@ -374,7 +374,8 @@ export class Utils {
         return Utils.getPrimaryKeyHash(pks);
     }
     static getPrimaryKeyHash(pks) {
-        return pks.map(pk => {
+        return pks
+            .map(pk => {
             if (Buffer.isBuffer(pk)) {
                 return pk.toString('hex');
             }
@@ -382,7 +383,8 @@ export class Utils {
                 return pk.toISOString();
             }
             return pk;
-        }).join(this.PK_SEPARATOR);
+        })
+            .join(this.PK_SEPARATOR);
     }
     static splitPrimaryKeys(key) {
         return key.split(this.PK_SEPARATOR);
@@ -419,7 +421,7 @@ export class Utils {
         }
         if (allowScalar) {
             if (Utils.isPlainObject(pk)) {
-                return pk[(meta.primaryKeys)[0]];
+                return pk[meta.primaryKeys[0]];
             }
             return pk;
         }
@@ -527,7 +529,7 @@ export class Utils {
     static extractChildElements(items, prefix, allSymbol) {
         return items
             .filter(field => field === allSymbol || field.startsWith(`${prefix}.`))
-            .map(field => field === allSymbol ? allSymbol : field.substring(prefix.length + 1));
+            .map(field => (field === allSymbol ? allSymbol : field.substring(prefix.length + 1)));
     }
     /**
      * Tries to detect TypeScript support.
@@ -536,17 +538,17 @@ export class Utils {
         /* v8 ignore next */
         const process = globalThis.process ?? {};
         /* v8 ignore next */
-        return process.argv?.[0]?.endsWith('ts-node') // running via ts-node directly
-            || !!process.env?.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS // forced explicitly or enabled via `registerTypeScriptSupport()`
-            || !!process.env?.TS_JEST // check if ts-jest is used
-            || !!process.env?.VITEST // check if vitest is used
-            || !!process.versions?.bun // check if bun is used
-            || process.argv?.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) // executing `.ts` file
-            || process.execArgv?.some(arg => {
-                return arg.includes('ts-node') // check for ts-node loader
-                    || arg.includes('@swc-node/register') // check for swc-node/register loader
-                    || arg.includes('node_modules/tsx/'); // check for tsx loader
-            });
+        return (process.argv?.[0]?.endsWith('ts-node') || // running via ts-node directly
+            !!process.env?.MIKRO_ORM_CLI_ALWAYS_ALLOW_TS || // forced explicitly or enabled via `registerTypeScriptSupport()`
+            !!process.env?.TS_JEST || // check if ts-jest is used
+            !!process.env?.VITEST || // check if vitest is used
+            !!process.versions?.bun || // check if bun is used
+            process.argv?.slice(1).some(arg => arg.match(/\.([mc]?ts|tsx)$/)) || // executing `.ts` file
+            process.execArgv?.some(arg => {
+                return (arg.includes('ts-node') || // check for ts-node loader
+                    arg.includes('@swc-node/register') || // check for swc-node/register loader
+                    arg.includes('node_modules/tsx/')); // check for tsx loader
+            }));
     }
     /**
      * Gets the type of the argument.
@@ -567,12 +569,13 @@ export class Utils {
      * Checks whether the value is POJO (e.g. `{ foo: 'bar' }`, and not instance of `Foo`)
      */
     static isPlainObject(value) {
-        return (value !== null
-            && typeof value === 'object'
-            && typeof value.constructor === 'function'
-            && (Object.hasOwn(value.constructor.prototype, 'isPrototypeOf') || Object.getPrototypeOf(value.constructor.prototype) === null))
-            || (value && Object.getPrototypeOf(value) === null)
-            || value instanceof PlainObject;
+        return ((value !== null &&
+            typeof value === 'object' &&
+            typeof value.constructor === 'function' &&
+            (Object.hasOwn(value.constructor.prototype, 'isPrototypeOf') ||
+                Object.getPrototypeOf(value.constructor.prototype) === null)) ||
+            (value && Object.getPrototypeOf(value) === null) ||
+            value instanceof PlainObject);
     }
     /**
      * Executes the `cb` promise serially on every element of the `items` array and returns array of resolved values.
@@ -633,17 +636,20 @@ export class Utils {
         const keys = Object.keys(target);
         const values = Object.values(target);
         const numeric = !!values.find(v => typeof v === 'number');
-        const constEnum = values.length % 2 === 0 // const enum will have even number of items
-            && values.slice(0, values.length / 2).every(v => typeof v === 'string') // first half are strings
-            && values.slice(values.length / 2).every(v => typeof v === 'number') // second half are numbers
-            && this.equals(keys, values.slice(values.length / 2).concat(values.slice(0, values.length / 2)).map(v => '' + v)); // and when swapped, it will match the keys
+        const constEnum = values.length % 2 === 0 && // const enum will have even number of items
+            values.slice(0, values.length / 2).every(v => typeof v === 'string') && // first half are strings
+            values.slice(values.length / 2).every(v => typeof v === 'number') && // second half are numbers
+            this.equals(keys, values
+                .slice(values.length / 2)
+                .concat(values.slice(0, values.length / 2))
+                .map(v => '' + v)); // and when swapped, it will match the keys
         if (numeric || constEnum) {
             return values.filter(val => !keys.includes(val));
         }
         return values;
     }
     static flatten(arrays, deep) {
-        return arrays.flatMap(v => deep && Array.isArray(v) ? this.flatten(v, true) : v);
+        return arrays.flatMap(v => (deep && Array.isArray(v) ? this.flatten(v, true) : v));
     }
     static isOperator(key, includeGroupOperators = true) {
         if (!includeGroupOperators) {
@@ -784,7 +790,7 @@ export class Utils {
             }
         }
     }
-    static async tryImport({ module, warning }) {
+    static async tryImport({ module, warning, }) {
         try {
             return await import(module);
         }

package/utils/env-vars.js

@@ -13,10 +13,11 @@ export function getEnv(key) {
 export function loadEnvironmentVars() {
     const ret = {};
     const getEnvKey = (key, envPrefix = 'MIKRO_ORM_') => {
-        return envPrefix + key
-            .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
-            .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2')
-            .toUpperCase();
+        return (envPrefix +
+            key
+                .replace(/([a-z0-9])([A-Z])/g, '$1_$2')
+                .replace(/([A-Z])([A-Z][a-z])/g, '$1_$2')
+                .toUpperCase());
     };
     const array = (v) => v.split(',').map(vv => vv.trim());
     const bool = (v) => ['true', 't', '1'].includes(v.toLowerCase());
@@ -28,7 +29,7 @@ export function loadEnvironmentVars() {
             o[key] = mapper(getEnv(envKey));
         }
     };
-    const cleanup = (o, k) => Utils.hasObjectKeys(o[k]) ? {} : delete o[k];
+    const cleanup = (o, k) => (Utils.hasObjectKeys(o[k]) ? {} : delete o[k]);
     const read0 = read.bind(null, ret, 'MIKRO_ORM_');
     read0('baseDir');
     read0('entities', array);

package/utils/fs-utils.js

@@ -95,10 +95,7 @@ export const fs = {
     },
     getORMPackages() {
         const pkg = this.getPackageConfig();
-        return new Set([
-            ...Object.keys(pkg.dependencies ?? {}),
-            ...Object.keys(pkg.devDependencies ?? {}),
-        ]);
+        return new Set([...Object.keys(pkg.dependencies ?? {}), ...Object.keys(pkg.devDependencies ?? {})]);
     },
     getORMPackageVersion(name) {
         try {
@@ -153,7 +150,7 @@ export const fs = {
         }
         let path = parts.join('/').replace(/\\/g, '/').replace(/\/$/, '');
         path = normalize(path).replace(/\\/g, '/');
-        return (path.match(/^[/.]|[a-zA-Z]:/) || path.startsWith('!')) ? path : './' + path;
+        return path.match(/^[/.]|[a-zA-Z]:/) || path.startsWith('!') ? path : './' + path;
     },
     /**
      * Determines the relative path between two paths. If either path is a `file:` URL,

package/utils/upsert-utils.js

@@ -73,7 +73,8 @@ export function getOnConflictReturningFields(meta, data, uniqueFields, options)
     if (!meta) {
         return '*';
     }
-    const keys = meta.comparableProps.filter(p => {
+    const keys = meta.comparableProps
+        .filter(p => {
         if (p.lazy || p.embeddable) {
             return false;
         }
@@ -81,7 +82,8 @@ export function getOnConflictReturningFields(meta, data, uniqueFields, options)
             return true;
         }
         return Array.isArray(uniqueFields) && !uniqueFields.includes(p.name);
-    }).map(p => p.name);
+    })
+        .map(p => p.name);
     if (meta.versionProperty) {
         keys.push(meta.versionProperty);
     }
@@ -113,7 +115,8 @@ function getPropertyValue(obj, key) {
 /** @internal */
 export function getWhereCondition(meta, onConflictFields, data, where) {
     const unique = onConflictFields ?? meta.props.filter(p => p.unique).map(p => p.name);
-    const propIndex = !isRaw(unique) && unique.findIndex(p => data[p] ?? data[p.substring(0, p.indexOf('.'))] != null);
+    const propIndex = !isRaw(unique) &&
+        unique.findIndex(p => data[p] ?? data[p.substring(0, p.indexOf('.'))] != null);
     if (onConflictFields || where == null) {
         if (propIndex !== false && propIndex >= 0) {
             let key = unique[propIndex];