@mikro-orm/core 6.3.3-dev.6 → 6.3.3-dev.7

package/entity/EntityLoader.d.ts

@@ -58,6 +58,7 @@ export declare class EntityLoader {
     private buildFields;
     private getChildReferences;
     private filterCollections;
+    private isPropertyLoaded;
     private filterReferences;
     private filterByReferences;
     private lookupAllRelationships;

package/entity/EntityLoader.js

@@ -493,6 +493,20 @@ class EntityLoader {
         }
         return entities.filter(e => Utils_1.Utils.isCollection(e[field]) && !e[field].isInitialized(!ref));
     }
+    isPropertyLoaded(entity, field) {
+        if (!entity) {
+            return true;
+        }
+        const wrapped = (0, wrap_1.helper)(entity);
+        if (!field.includes('.')) {
+            return wrapped.__loadedProperties.has(field);
+        }
+        const [f, ...r] = field.split('.');
+        if (wrapped.__loadedProperties.has(f) && wrapped.__meta.properties[f]?.targetMeta) {
+            return this.isPropertyLoaded(entity[f], r.join('.'));
+        }
+        return false;
+    }
     filterReferences(entities, field, options, ref) {
         if (ref) {
             return [];
@@ -504,28 +518,12 @@ class EntityLoader {
         if (options.fields) {
             return children
                 .filter(e => {
-                const wrapped = (0, wrap_1.helper)(e[field]);
+                const target = e[field];
+                const wrapped = (0, wrap_1.helper)(target);
                 const childFields = options.fields
                     .filter(f => f.startsWith(`${field}.`))
                     .map(f => f.substring(field.length + 1));
-                function nest(entity, field) {
-                    const wrapped = (0, wrap_1.helper)(entity);
-                    if (wrapped.__loadedProperties.has(field)) {
-                        return true;
-                    }
-                    if (!field.includes('.')) {
-                        return false;
-                    }
-                    const [f, ...r] = field.split('.');
-                    if (wrapped.__loadedProperties.has(f) && wrapped.__meta.properties[f]?.targetMeta && entity[f]) {
-                        if (r.length > 0) {
-                            return nest(entity[f], r.join('.'));
-                        }
-                    }
-                    return false;
-                }
-                const ent = e[field];
-                return !wrapped.__initialized || !childFields.every(field => nest(ent, field));
+                return !wrapped.__initialized || !childFields.every(cf => this.isPropertyLoaded(target, cf));
             })
                 .map(e => Reference_1.Reference.unwrapReference(e[field]));
         }

package/package.json

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