@mikro-orm/core 7.2.9-dev.1 → 7.2.9-dev.3

package/EntityManager.js

@@ -1318,7 +1318,7 @@ export class EntityManager {
         // an empty condition identifies no row, it must not turn into a reload condition matching every row
         const getRowUniqueFields = (where) => Utils.isPlainObject(where) && !Utils.hasObjectKeys(where) ? uniqueFields : getUniqueFields(where);
         const platform = this.getPlatform();
-        const returning = getOnConflictReturningFields(meta, data[dataIndexes[0]], uniqueFields, options, platform);
+        const returning = getOnConflictReturningFields(meta, allData[0], uniqueFields, options, platform);
         if (options.onConflictWhere && res.rows?.length !== allData.length) {
             returning.push(...meta.comparableProps.filter(p => !p.lazy && !p.embeddable).map(p => p.name));
         }
@@ -2399,7 +2399,17 @@ export class EntityManager {
         }
         let autoRefresh;
         if (options.fields) {
-            autoRefresh = options.fields.some(field => !helper(entity).__loadedProperties.has(field));
+            // inline embeddables track only their leaf properties as loaded, not the parent
+            const isLoaded = (prop) => helper(entity).__loadedProperties.has(prop.name) ||
+                (prop.kind === ReferenceKind.EMBEDDED && !prop.object && Object.values(prop.embeddedProps).every(isLoaded));
+            autoRefresh = options.fields.some(field => {
+                const [first, ...rest] = field.split('.');
+                let prop = meta.properties[first];
+                for (const part of rest) {
+                    prop = prop?.kind === ReferenceKind.EMBEDDED && !prop.object ? prop.embeddedProps[part] : undefined;
+                }
+                return !prop || !isLoaded(prop);
+            });
         }
         else {
             autoRefresh = meta.comparableProps.some(prop => {

package/entity/EntityLoader.js

@@ -501,6 +501,11 @@ export class EntityLoader {
             for (const entity of entities) {
                 const ref = entity[prop.name];
                 if (ref == null) {
+                    // an inverse 1:1 with no matching row is resolved as empty, mark it so it is not queried again
+                    if (isInverseOneToOne && !partial && childrenMap.has(getKey(entity))) {
+                        entity[prop.name] = nullVal;
+                        helper(entity).__loadedProperties.add(prop.name);
+                    }
                     continue;
                 }
                 const refKey = getKey(ref);
@@ -883,7 +888,11 @@ export class EntityLoader {
             if (value === null) {
                 return false;
             }
-            if (value === undefined || !Utils.isEntity(value, true)) {
+            // with `forceUndefined`, an empty relation that was already loaded is `undefined` instead of `null`
+            if (value === undefined) {
+                return !helper(e).__loadedProperties.has(prop.name);
+            }
+            if (!Utils.isEntity(value, true)) {
                 return true;
             }
             const target = Reference.unwrapReference(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.9-dev.1",
+  "version": "7.2.9-dev.3",
   "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/utils/Utils.js

@@ -153,7 +153,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.2.9-dev.1';
+    static #ORM_VERSION = '7.2.9-dev.3';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;