@mikro-orm/core 6.3.14-dev.2 → 6.3.14-dev.20

package/decorators/Property.d.ts

@@ -177,6 +177,19 @@ export interface PropertyOptions<Owner> {
      * ```
      */
     getter?: boolean;
+    /**
+     * When defining a property over a method (not a getter, a regular function), you can use this option to point
+     * to the method name.
+     *
+     * @example
+     * ```
+     * @Property({ getter: true })
+     * getFullName() {
+     *   return this.firstName + this.lastName;
+     * }
+     * ```
+     */
+    getterName?: keyof Owner;
     /**
      * Set to define serialized primary key for MongoDB. (virtual)
      * Alias for `@SerializedPrimaryKey()` decorator.

package/entity/EntityFactory.js

@@ -69,6 +69,9 @@ class EntityFactory {
             if (options.convertCustomTypes) {
                 for (const prop of meta.props) {
                     if (prop.customType?.ensureComparable(meta, prop) && data[prop.name]) {
+                        if ([enums_1.ReferenceKind.MANY_TO_ONE, enums_1.ReferenceKind.ONE_TO_ONE].includes(prop.kind) && Utils_1.Utils.isPlainObject(data[prop.name])) {
+                            data[prop.name] = Utils_1.Utils.getPrimaryKeyValues(data[prop.name], prop.targetMeta.primaryKeys, true);
+                        }
                         data[prop.name] = prop.customType.convertToDatabaseValue(data[prop.name], this.platform, { key: prop.name, mode: 'hydration' });
                     }
                 }

package/entity/EntityHelper.js

@@ -176,10 +176,15 @@ class EntityHelper {
                 inverse.addWithoutPropagation(owner);
                 (0, wrap_1.helper)(owner).__em?.getUnitOfWork().cancelOrphanRemoval(owner);
             }
-            if (prop.kind === enums_1.ReferenceKind.ONE_TO_ONE && entity && (!prop.owner || (0, wrap_1.helper)(entity).__initialized)) {
+            if (prop.kind === enums_1.ReferenceKind.ONE_TO_ONE) {
                 if ((value != null && Reference_1.Reference.unwrapReference(inverse) !== owner) ||
-                    (value == null && entity[prop2.name] != null)) {
-                    EntityHelper.propagateOneToOne(entity, owner, prop, prop2, value, old);
+                    (value == null && entity?.[prop2.name] != null)) {
+                    if (entity && (!prop.owner || (0, wrap_1.helper)(entity).__initialized)) {
+                        EntityHelper.propagateOneToOne(entity, owner, prop, prop2, value, old);
+                    }
+                    if (old && prop.orphanRemoval) {
+                        (0, wrap_1.helper)(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
+                    }
                 }
             }
         }
@@ -203,9 +208,6 @@ class EntityHelper {
         else {
             entity[prop2.name] = Reference_1.Reference.wrapReference(owner, prop);
         }
-        if (old && prop.orphanRemoval) {
-            (0, wrap_1.helper)(old).__em?.getUnitOfWork().scheduleOrphanRemoval(old);
-        }
         if (old?.[prop2.name] != null) {
             delete (0, wrap_1.helper)(old).__data[prop2.name];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.3.14-dev.2",
+  "version": "6.3.14-dev.20",
   "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.",
   "main": "index.js",
   "module": "index.mjs",
@@ -64,7 +64,7 @@
     "esprima": "4.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.1.0",
-    "mikro-orm": "6.3.14-dev.2",
+    "mikro-orm": "6.3.14-dev.20",
     "reflect-metadata": "0.2.2"
   }
 }

package/types/DecimalType.d.ts

@@ -8,6 +8,7 @@ export declare class DecimalType extends Type<string | number, string> {
     mode?: ("number" | "string") | undefined;
     constructor(mode?: ("number" | "string") | undefined);
     convertToJSValue(value: string): number | string;
+    compareValues(a: string, b: string): boolean;
     getColumnType(prop: EntityProperty, platform: Platform): string;
     compareAsType(): string;
 }

package/types/DecimalType.js

@@ -17,6 +17,9 @@ class DecimalType extends Type_1.Type {
         }
         return value;
     }
+    compareValues(a, b) {
+        return String(a) === String(b);
+    }
     getColumnType(prop, platform) {
         return platform.getDecimalTypeDeclarationSQL(prop);
     }

package/utils/DataloaderUtils.d.ts

@@ -23,7 +23,7 @@ export declare class DataloaderUtils {
     static groupInversedOrMappedKeysByEntityAndOpts(collsWithOpts: readonly [Collection<any>, Omit<InitCollectionOptions<any, any>, 'dataloader'>?][]): Map<string, Map<string, Set<Primary<any>>>>;
     /**
      * Turn the entity+options map into actual queries.
-     * The keys are the entity names + a strigified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
+     * The keys are the entity names + a stringified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
      * We must populate the inverse side of the relationship in order to be able to later retrieve the PK(s) from its item(s).
      * Together with the query the promises will also return the key which can be used to narrow down the results pertaining to a certain set of options.
      */
@@ -33,7 +33,7 @@ export declare class DataloaderUtils {
      * First checks if the Entity type matches, then retrieves the inverse side of the relationship
      * where the filtering will be done in order to match the target collection.
      */
-    static getColFilter<T, S extends T>(collection: Collection<any, object>): (result: T) => result is S;
+    static getColFilter<T, S extends T>(collection: Collection<any>): (result: T) => result is S;
     /**
      * Returns the collection dataloader batchLoadFn, which aggregates collections by entity,
      * makes one query per entity and maps each input collection to the corresponding result.

package/utils/DataloaderUtils.js

@@ -4,6 +4,7 @@ exports.DataloaderUtils = void 0;
 const Collection_1 = require("../entity/Collection");
 const wrap_1 = require("../entity/wrap");
 const enums_1 = require("../enums");
+const Reference_1 = require("../entity/Reference");
 class DataloaderUtils {
     /**
      * Groups identified references by entity and returns a Map with the
@@ -92,7 +93,7 @@ class DataloaderUtils {
     }
     /**
      * Turn the entity+options map into actual queries.
-     * The keys are the entity names + a strigified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
+     * The keys are the entity names + a stringified version of the options and the values are filter Maps which will be used as the values of an $or operator so we end up with a query per entity+opts.
      * We must populate the inverse side of the relationship in order to be able to later retrieve the PK(s) from its item(s).
      * Together with the query the promises will also return the key which can be used to narrow down the results pertaining to a certain set of options.
      */
@@ -139,20 +140,21 @@ class DataloaderUtils {
             // There is no need to check if Entity matches because we already matched the key which is entity+options.
             // This is the inverse side of the relationship where the filtering will be done in order to match the target collection
             // Either inversedBy or mappedBy exist because we already checked in groupInversedOrMappedKeysByEntity
-            const refOrCol = result[(collection.property.inversedBy ?? collection.property.mappedBy)];
-            if (refOrCol instanceof Collection_1.Collection) {
-                // The inverse side is a Collection
-                // We keep the result if any of PKs of the inverse side matches the PK of the collection owner
-                for (const item of refOrCol.getItems()) {
-                    if ((0, wrap_1.helper)(item).getSerializedPrimaryKey() === (0, wrap_1.helper)(collection.owner).getSerializedPrimaryKey()) {
+            const inverseProp = collection.property.inversedBy ?? collection.property.mappedBy;
+            const target = Reference_1.Reference.unwrapReference(result[inverseProp]);
+            if (target instanceof Collection_1.Collection) {
+                for (const item of target) {
+                    if (item === collection.owner) {
                         return true;
                     }
                 }
             }
-            else {
-                // The inverse side is a Reference
-                // We keep the result if the PK of the inverse side matches the PK of the collection owner
-                return (0, wrap_1.helper)(refOrCol).getSerializedPrimaryKey() === (0, wrap_1.helper)(collection.owner).getSerializedPrimaryKey();
+            else if (target) {
+                return target === collection.owner;
+            }
+            // FIXME https://github.com/mikro-orm/mikro-orm/issues/6031
+            if (!target && collection.property.kind === enums_1.ReferenceKind.MANY_TO_MANY) {
+                throw new Error(`Inverse side is required for M:N relations with dataloader: ${collection.owner.constructor.name}.${collection.property.name}`);
             }
             return false;
         };

package/utils/Utils.js

@@ -50,7 +50,12 @@ function compareObjects(a, b) {
         return a.sql === b.sql && compareArrays(a.params, b.params);
     }
     if ((a instanceof Date && b instanceof Date)) {
-        return a.toISOString() === b.toISOString();
+        const timeA = a.getTime();
+        const timeB = b.getTime();
+        if (isNaN(timeA) || isNaN(timeB)) {
+            throw new Error('Comparing invalid dates is not supported');
+        }
+        return timeA === timeB;
     }
     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

package/utils/clone.js

@@ -75,7 +75,7 @@ function clone(parent, respectCustomCloneMethod = true) {
                 child.lastIndex = parent.lastIndex;
             }
         }
-        else if (parent instanceof Date || (typeof parent === 'object' && parent.constructor.name === 'Date')) {
+        else if (parent instanceof Date) {
             child = new Date(parent.getTime());
         }
         else if (Buffer.isBuffer(parent)) {