@mikro-orm/core 7.1.2-dev.0 → 7.1.2-dev.10

package/entity/defineEntity.d.ts

@@ -614,6 +614,9 @@ export type PropertyBuilders = {
 };
 /** Own keys + base entity keys (when TBase is not `never`). Guards against `keyof never = string | number | symbol`. */
 type AllKeys<TProperties, TBase> = keyof TProperties | (IsNever<TBase> extends true ? never : keyof TBase);
+type PartialWhere<TProperties, TBase> = string | FilterQuery<{
+    [K in AllKeys<TProperties, TBase> & string]?: unknown;
+}>;
 /** Metadata descriptor for `defineEntity()`, combining entity options with property definitions. */
 export interface EntityMetadataWithProperties<TName extends string, TTableName extends string, TProperties extends Record<string, any>, TPK extends (keyof TProperties)[] | undefined = undefined, TBase = never, TRepository = never, TForceObject extends boolean = false, TDiscriminatorColumn extends string | undefined = undefined, TDiscriminatorValue extends string | number | undefined = undefined, TBaseDiscriminatorColumn extends string | undefined = undefined> extends Omit<Partial<EntityMetadata<InferEntityFromProperties<TProperties, TPK, TBase, TRepository>>>, 'properties' | 'extends' | 'primaryKeys' | 'hooks' | 'discriminator' | 'discriminatorColumn' | 'discriminatorValue' | 'versionProperty' | 'concurrencyCheckKeys' | 'serializedPrimaryKey' | 'indexes' | 'uniques' | 'triggers' | 'repository' | 'filters' | 'orderBy'> {
     name: TName;
@@ -656,7 +659,7 @@ export interface EntityMetadataWithProperties<TName extends string, TTableName e
         type?: string;
         options?: Dictionary;
         expression?: string | IndexCallback<InferEntityFromProperties<TProperties, TPK, TBase>>;
-        where?: string | FilterQuery<InferEntityFromProperties<TProperties, TPK, TBase>>;
+        where?: PartialWhere<TProperties, TBase>;
         columns?: IndexColumnOptions[];
         include?: NoInfer<AllKeys<TProperties, TBase>> | NoInfer<AllKeys<TProperties, TBase>>[];
         fillFactor?: number;
@@ -669,7 +672,7 @@ export interface EntityMetadataWithProperties<TName extends string, TTableName e
         name?: string;
         options?: Dictionary;
         expression?: string | IndexCallback<InferEntityFromProperties<TProperties, TPK, TBase>>;
-        where?: string | FilterQuery<InferEntityFromProperties<TProperties, TPK, TBase>>;
+        where?: PartialWhere<TProperties, TBase>;
         deferMode?: DeferMode | `${DeferMode}`;
         columns?: IndexColumnOptions[];
         include?: NoInfer<AllKeys<TProperties, TBase>> | NoInfer<AllKeys<TProperties, TBase>>[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.2-dev.0",
+  "version": "7.1.2-dev.10",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "keywords": [
     "data-mapper",

package/platforms/Platform.d.ts

@@ -167,6 +167,13 @@ export declare abstract class Platform {
         precision?: number;
         scale?: number;
     }): string;
+    /**
+     * Rounds a decimal value to the column's scale and returns it as a number. Used to compare
+     * decimal values across representations — `EntityComparator` for `compareValues`, and the
+     * schema layer for collapsing snapshot defaults like `0` / `0.00` to the same canonical form
+     * so databases that pad to scale (mysql) don't churn no-op migrations.
+     */
+    formatDecimal(value: string | number, scale?: number): number;
     getUuidTypeDeclarationSQL(column: {
         length?: number;
     }): string;

package/platforms/Platform.js

@@ -232,6 +232,19 @@ export class Platform {
         const scale = column.scale ?? 0;
         return `numeric(${precision},${scale})`;
     }
+    /**
+     * Rounds a decimal value to the column's scale and returns it as a number. Used to compare
+     * decimal values across representations — `EntityComparator` for `compareValues`, and the
+     * schema layer for collapsing snapshot defaults like `0` / `0.00` to the same canonical form
+     * so databases that pad to scale (mysql) don't churn no-op migrations.
+     */
+    formatDecimal(value, scale) {
+        if (scale == null) {
+            return +value;
+        }
+        const base = Math.pow(10, scale);
+        return Math.round((+value + Number.EPSILON) * base) / base;
+    }
     getUuidTypeDeclarationSQL(column) {
         column.length ??= 36;
         return this.getVarcharTypeDeclarationSQL(column);

package/types/DecimalType.d.ts

@@ -9,7 +9,6 @@ export declare class DecimalType<Mode extends 'number' | 'string' = 'string'> ex
     constructor(mode?: Mode | undefined);
     convertToJSValue(value: string): JSTypeByMode<Mode>;
     compareValues(a: string, b: string): boolean;
-    private format;
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
 }

package/types/DecimalType.js

@@ -16,15 +16,7 @@ export class DecimalType extends Type {
         return String(value);
     }
     compareValues(a, b) {
-        return this.format(a) === this.format(b);
-    }
-    format(val) {
-        /* v8 ignore next */
-        if (this.prop?.scale == null) {
-            return +val;
-        }
-        const base = Math.pow(10, this.prop.scale);
-        return Math.round((+val + Number.EPSILON) * base) / base;
+        return this.platform.formatDecimal(a, this.prop?.scale) === this.platform.formatDecimal(b, this.prop?.scale);
     }
     getColumnType(prop, platform) {
         return platform.getDecimalTypeDeclarationSQL(prop);

package/utils/QueryHelper.js

@@ -75,7 +75,10 @@ export class QueryHelper {
         }
         const keys = Object.keys(where);
         const groupOperator = keys.find(k => {
-            return (k in GroupOperator &&
+            return (
+            // sole-key only: caller drops the parent, so siblings would be silently lost
+            keys.length === 1 &&
+                k in GroupOperator &&
                 Array.isArray(where[k]) &&
                 where[k].every(cond => {
                     return (Utils.isPlainObject(cond) &&

package/utils/Utils.js

@@ -141,7 +141,7 @@ export function parseJsonSafe(value) {
 /** Collection of general-purpose utility methods used throughout the ORM. */
 export class Utils {
     static PK_SEPARATOR = '~~~';
-    static #ORM_VERSION = '7.1.2-dev.0';
+    static #ORM_VERSION = '7.1.2-dev.10';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */