@mikro-orm/core 7.0.0-dev.113 → 7.0.0-dev.115

package/utils/Utils.d.ts

@@ -2,6 +2,7 @@ import type { Dictionary, EntityData, EntityDictionary, EntityKey, EntityMetadat
 import type { Collection } from '../entity/Collection.js';
 import type { Platform } from '../platforms/Platform.js';
 import type { ScalarReference } from '../entity/Reference.js';
+import { type RawQueryFragmentSymbol } from './RawQueryFragment.js';
 export declare function compareObjects(a: any, b: any): boolean;
 export declare function compareArrays(a: any[] | string, b: any[] | string): boolean;
 export declare function compareBooleans(a: unknown, b: unknown): boolean;
@@ -109,7 +110,7 @@ export declare class Utils {
     /**
      * Gets string name of given class.
      */
-    static className<T>(classOrName: EntityName<T>): string;
+    static className<T>(classOrName: string | EntityName<T>): string;
     static extractChildElements(items: string[], prefix: string, allSymbol?: string): string[];
     /**
      * Tries to detect TypeScript support.
@@ -155,4 +156,5 @@ export declare class Utils {
     static values<T extends object>(obj: T): T[keyof T][];
     static entries<T extends object>(obj: T): [keyof T, T[keyof T]][];
     static primaryKeyToObject<T>(meta: EntityMetadata<T>, primaryKey: Primary<T> | T, visible?: (keyof T)[]): T;
+    static getObjectQueryKeys<T extends Dictionary, K extends string = Extract<keyof T, string>>(obj: T): (K | RawQueryFragmentSymbol)[];
 }

package/utils/Utils.js

@@ -1,6 +1,7 @@
 import { clone } from './clone.js';
 import { GroupOperator, PlainObject, QueryOperator, ReferenceKind } from '../enums.js';
 import { helper } from '../entity/wrap.js';
+import { Raw } from './RawQueryFragment.js';
 function compareConstructors(a, b) {
     if (a.constructor === b.constructor) {
         return true;
@@ -34,7 +35,6 @@ export function compareObjects(a, b) {
     }
     /* v8 ignore next */
     if ((typeof a === 'function' && typeof b === 'function') ||
-        (typeof a === 'object' && a.client && ['Ref', 'Raw'].includes(a.constructor.name) && typeof b === 'object' && b.client && ['Ref', 'Raw'].includes(b.constructor.name)) || // knex qb
         (a instanceof RegExp && b instanceof RegExp) ||
         (a instanceof String && b instanceof String) ||
         (a instanceof Number && b instanceof Number)) {
@@ -123,7 +123,7 @@ export function parseJsonSafe(value) {
 }
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.0.0-dev.113';
+    static #ORM_VERSION = '7.0.0-dev.115';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */
@@ -824,4 +824,12 @@ export class Utils {
             return o;
         }, {});
     }
+    static getObjectQueryKeys(obj) {
+        return Reflect.ownKeys(obj).filter(key => {
+            if (!Object.prototype.propertyIsEnumerable.call(obj, key)) {
+                return false;
+            }
+            return typeof key === 'string' || Raw.isKnownFragmentSymbol(key);
+        });
+    }
 }

package/utils/clone.js

@@ -3,7 +3,6 @@
  * clone `EventEmitter`s to get around https://github.com/mikro-orm/mikro-orm/issues/2748
  * @internal
  */
-import { RawQueryFragment } from './RawQueryFragment.js';
 /**
  * Get the property descriptor of a property on an object or its prototype chain.
  *
@@ -29,10 +28,6 @@ export function clone(parent, respectCustomCloneMethod = true) {
         if (parent === null) {
             return null;
         }
-        const raw = RawQueryFragment.getKnownFragment(parent, false);
-        if (raw && respectCustomCloneMethod) {
-            return raw.clone();
-        }
         if (typeof parent !== 'object') {
             return parent;
         }
@@ -113,25 +108,16 @@ export function clone(parent, respectCustomCloneMethod = true) {
             if (attrs && typeof attrs.get === 'function' && attrs.set == null) {
                 continue;
             }
-            const raw = RawQueryFragment.getKnownFragment(i, false);
-            if (raw && respectCustomCloneMethod) {
-                const i2 = raw.clone().toString();
-                child[i2] = _clone(parent[i]);
-                continue;
-            }
             child[i] = _clone(parent[i]);
         }
-        if (Object.getOwnPropertySymbols) {
-            const symbols = Object.getOwnPropertySymbols(parent);
-            for (let i = 0; i < symbols.length; i++) {
-                const symbol = symbols[i];
-                const descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
-                /* v8 ignore next */
-                if (descriptor && !descriptor.enumerable) {
-                    continue;
-                }
-                child[symbol] = _clone(parent[symbol]);
+        const symbols = Object.getOwnPropertySymbols(parent);
+        for (let i = 0; i < symbols.length; i++) {
+            const symbol = symbols[i];
+            const descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+            if (descriptor && !descriptor.enumerable) {
+                continue;
             }
+            child[symbol] = _clone(parent[symbol]);
         }
         return child;
     }

package/utils/env-vars.js

@@ -60,7 +60,6 @@ export function loadEnvironmentVars() {
     read1('warnWhenNoEntities', bool);
     read1('checkDuplicateTableNames', bool);
     read1('checkDuplicateFieldNames', bool);
-    read1('checkDuplicateEntities', bool);
     read1('checkNonPersistentCompositeProps', bool);
     read1('inferDefaultValues', bool);
     read1('tsConfigPath');

package/utils/upsert-utils.d.ts

@@ -1,12 +1,12 @@
 import type { EntityData, EntityMetadata, FilterQuery } from '../typings.js';
 import type { UpsertOptions } from '../drivers/IDatabaseDriver.js';
-import { type RawQueryFragment } from '../utils/RawQueryFragment.js';
+import { type Raw } from '../utils/RawQueryFragment.js';
 /** @internal */
-export declare function getOnConflictFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | RawQueryFragment, options: UpsertOptions<T>): (keyof T)[];
+export declare function getOnConflictFields<T>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | Raw, options: UpsertOptions<T>): (keyof T)[];
 /** @internal */
-export declare function getOnConflictReturningFields<T, P extends string>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | RawQueryFragment, options: UpsertOptions<T, P>): (keyof T)[] | '*';
+export declare function getOnConflictReturningFields<T, P extends string>(meta: EntityMetadata<T> | undefined, data: EntityData<T>, uniqueFields: (keyof T)[] | Raw, options: UpsertOptions<T, P>): (keyof T)[] | '*';
 /** @internal */
-export declare function getWhereCondition<T extends object>(meta: EntityMetadata<T>, onConflictFields: (keyof T)[] | RawQueryFragment | undefined, data: EntityData<T>, where: FilterQuery<T>): {
+export declare function getWhereCondition<T extends object>(meta: EntityMetadata<T>, onConflictFields: (keyof T)[] | Raw | undefined, data: EntityData<T>, where: FilterQuery<T>): {
     where: FilterQuery<T>;
     propIndex: number | false;
 };