@mikro-orm/knex 6.0.0-dev.36 → 6.0.0-dev.38

package/index.mjs

@@ -34,6 +34,7 @@ export const ConfigurationLoader = mod.ConfigurationLoader;
 export const Connection = mod.Connection;
 export const ConnectionException = mod.ConnectionException;
 export const ConstraintViolationException = mod.ConstraintViolationException;
+export const CreateRequestContext = mod.CreateRequestContext;
 export const CriteriaNode = mod.CriteriaNode;
 export const CriteriaNodeFactory = mod.CriteriaNodeFactory;
 export const Cursor = mod.Cursor;
@@ -51,6 +52,7 @@ export const DoubleType = mod.DoubleType;
 export const DriverException = mod.DriverException;
 export const Embeddable = mod.Embeddable;
 export const Embedded = mod.Embedded;
+export const EnsureRequestContext = mod.EnsureRequestContext;
 export const Entity = mod.Entity;
 export const EntityAssigner = mod.EntityAssigner;
 export const EntityCaseNamingStrategy = mod.EntityCaseNamingStrategy;
@@ -169,7 +171,6 @@ export const Unique = mod.Unique;
 export const UniqueConstraintViolationException = mod.UniqueConstraintViolationException;
 export const UnitOfWork = mod.UnitOfWork;
 export const UnknownType = mod.UnknownType;
-export const UseRequestContext = mod.UseRequestContext;
 export const Utils = mod.Utils;
 export const UuidType = mod.UuidType;
 export const ValidationError = mod.ValidationError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.36",
+  "version": "6.0.0-dev.38",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.6.8"
+    "@mikro-orm/core": "^5.6.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.36"
+    "@mikro-orm/core": "~6.0.0-dev.38"
   }
 }

package/query/QueryBuilder.js

@@ -466,7 +466,27 @@ class QueryBuilder {
         if (this._joinedProps.size > 0) {
             res = this.driver.mergeJoinedResult(res, this.mainAlias.metadata);
         }
-        return res.map(r => this.em.map(this.mainAlias.entityName, r, { schema: this._schema }));
+        const entities = [];
+        function propagatePopulateHint(entity, hint) {
+            (0, core_1.helper)(entity).__serializationContext.populate ??= hint;
+            hint.forEach(pop => {
+                const value = entity[pop.field];
+                if (core_1.Utils.isEntity(value, true)) {
+                    (0, core_1.helper)(value).populated();
+                    propagatePopulateHint(value, pop.children ?? []);
+                }
+                else if (core_1.Utils.isCollection(value)) {
+                    value.populated();
+                    value.getItems(false).forEach(item => propagatePopulateHint(item, pop.children ?? []));
+                }
+            });
+        }
+        for (const r of res) {
+            const entity = this.em.map(this.mainAlias.entityName, r, { schema: this._schema });
+            propagatePopulateHint(entity, this._populate);
+            entities.push(entity);
+        }
+        return entities;
     }
     /**
      * Executes the query, returning the first result or null