@mikro-orm/core 6.4.2-dev.1 → 6.4.2-dev.11

package/drivers/DatabaseDriver.d.ts

@@ -47,7 +47,7 @@ export declare abstract class DatabaseDriver<C extends Connection> implements ID
         orderBy: OrderDefinition<T>[];
         where: FilterQuery<T>;
     };
-    protected createCursorCondition<T extends object>(definition: (readonly [keyof T & string, QueryOrder])[], offsets: Dictionary[], inverse: boolean): FilterQuery<T>;
+    protected createCursorCondition<T extends object>(definition: (readonly [keyof T & string, QueryOrder])[], offsets: Dictionary[], inverse: boolean, meta: EntityMetadata<T>): FilterQuery<T>;
     /** @internal */
     mapDataToFieldNames(data: Dictionary, stringifyJsonArrays: boolean, properties?: Record<string, EntityProperty>, convertCustomTypes?: boolean, object?: boolean): Dictionary;
     protected inlineEmbeddables<T extends object>(meta: EntityMetadata<T>, data: T, where?: boolean): void;

package/drivers/DatabaseDriver.js

@@ -125,7 +125,7 @@ class DatabaseDriver {
             /* istanbul ignore next */
             const offsets = def ? utils_1.Cursor.decode(def) : [];
             if (definition.length === offsets.length) {
-                return this.createCursorCondition(definition, offsets, inverse);
+                return this.createCursorCondition(definition, offsets, inverse, meta);
             }
             /* istanbul ignore next */
             return {};
@@ -157,11 +157,17 @@ class DatabaseDriver {
         };
     }
     /* istanbul ignore next */
-    createCursorCondition(definition, offsets, inverse) {
+    createCursorCondition(definition, offsets, inverse, meta) {
         const createCondition = (prop, direction, offset, eq = false) => {
+            if (offset === null) {
+                throw errors_1.CursorError.missingValue(meta.className, prop);
+            }
             if (utils_1.Utils.isPlainObject(direction)) {
                 const value = utils_1.Utils.keys(direction).reduce((o, key) => {
-                    Object.assign(o, createCondition(key, direction[key], offset[prop][key], eq));
+                    if (utils_1.Utils.isEmpty(offset[key])) {
+                        throw errors_1.CursorError.missingValue(meta.className, `${prop}.${key}`);
+                    }
+                    Object.assign(o, createCondition(key, direction[key], offset[key], eq));
                     return o;
                 }, {});
                 return ({ [prop]: value });
@@ -180,7 +186,7 @@ class DatabaseDriver {
             ...createCondition(prop, direction, offset, true),
             $or: [
                 createCondition(prop, direction, offset),
-                this.createCursorCondition(otherOrders, otherOffsets, inverse),
+                this.createCursorCondition(otherOrders, otherOffsets, inverse, meta),
             ],
         };
     }

package/entity/EntityLoader.js

@@ -147,7 +147,7 @@ class EntityLoader {
             return this.findChildrenFromPivotTable(filtered, prop, options, innerOrderBy, populate, !!ref);
         }
         const where = await this.extractChildCondition(options, prop);
-        const data = await this.findChildren(entities, prop, populate, { ...options, where, orderBy: innerOrderBy }, !!ref);
+        const data = await this.findChildren(entities, prop, populate, { ...options, where, orderBy: innerOrderBy }, !!(ref || prop.mapToPk));
         this.initializeCollections(filtered, prop, field, data, innerOrderBy.length > 0);
         return data;
     }

package/errors.d.ts

@@ -28,6 +28,7 @@ export declare class ValidationError<T extends AnyEntity = AnyEntity> extends Er
 }
 export declare class CursorError<T extends AnyEntity = AnyEntity> extends ValidationError<T> {
     static entityNotPopulated(entity: AnyEntity, prop: string): ValidationError;
+    static missingValue(entityName: string, prop: string): ValidationError;
 }
 export declare class OptimisticLockError<T extends AnyEntity = AnyEntity> extends ValidationError<T> {
     static notVersioned(meta: EntityMetadata): OptimisticLockError;

package/errors.js

@@ -107,6 +107,9 @@ class CursorError extends ValidationError {
     static entityNotPopulated(entity, prop) {
         return new CursorError(`Cannot create cursor, value for '${entity.constructor.name}.${prop}' is missing.`);
     }
+    static missingValue(entityName, prop) {
+        return new CursorError(`Invalid cursor condition, value for '${entityName}.${prop}' is missing.`);
+    }
 }
 exports.CursorError = CursorError;
 class OptimisticLockError extends ValidationError {

package/metadata/MetadataDiscovery.js

@@ -501,11 +501,10 @@ class MetadataDiscovery {
     }
     findReferencingProperties(meta, metadata) {
         for (const meta2 of metadata) {
-            const prop2 = meta2.relations.find(prop2 => {
-                return prop2.kind !== enums_1.ReferenceKind.SCALAR && prop2.type === meta.className;
-            });
-            if (prop2) {
-                meta.referencingProperties.push({ meta: meta2, prop: prop2 });
+            for (const prop2 of meta2.relations) {
+                if (prop2.kind !== enums_1.ReferenceKind.SCALAR && prop2.type === meta.className) {
+                    meta.referencingProperties.push({ meta: meta2, prop: prop2 });
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "6.4.2-dev.1",
+  "version": "6.4.2-dev.11",
   "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.4.2-dev.1",
+    "mikro-orm": "6.4.2-dev.11",
     "reflect-metadata": "0.2.2"
   }
 }

package/unit-of-work/UnitOfWork.js

@@ -348,6 +348,7 @@ class UnitOfWork {
     unsetIdentity(entity) {
         this.identityMap.delete(entity);
         const wrapped = (0, entity_1.helper)(entity);
+        const serializedPK = wrapped.getSerializedPrimaryKey();
         // remove references of this entity in all managed entities, otherwise flushing could reinsert the entity
         for (const { meta, prop } of wrapped.__meta.referencingProperties) {
             for (const referrer of this.identityMap.getStore(meta).values()) {
@@ -355,8 +356,13 @@ class UnitOfWork {
                 if (Utils_1.Utils.isCollection(rel)) {
                     rel.removeWithoutPropagation(entity);
                 }
-                else if (rel === entity) {
-                    delete (0, entity_1.helper)(referrer).__data[prop.name];
+                else if (rel && (prop.mapToPk ? (0, entity_1.helper)(this.em.getReference(prop.type, rel)).getSerializedPrimaryKey() === serializedPK : rel === entity)) {
+                    if (prop.formula) {
+                        delete referrer[prop.name];
+                    }
+                    else {
+                        delete (0, entity_1.helper)(referrer).__data[prop.name];
+                    }
                 }
             }
         }

package/utils/Cursor.js

@@ -98,11 +98,10 @@ class Cursor {
     from(entity) {
         const processEntity = (entity, prop, direction, object = false) => {
             if (Utils_1.Utils.isPlainObject(direction)) {
-                const value = Utils_1.Utils.keys(direction).reduce((o, key) => {
+                return Utils_1.Utils.keys(direction).reduce((o, key) => {
                     Object.assign(o, processEntity(Reference_1.Reference.unwrapReference(entity[prop]), key, direction[key], true));
                     return o;
                 }, {});
-                return ({ [prop]: value });
             }
             if (entity[prop] == null) {
                 throw errors_1.CursorError.entityNotPopulated(entity, prop);