@mikro-orm/core 7.2.1-dev.2 → 7.2.1-dev.21

package/EntityManager.d.ts

@@ -11,7 +11,7 @@ import type { AnyString, ArrayElement, AutoPath, ConnectionType, Dictionary, Ent
 import type { Routine } from './metadata/Routine.js';
 import { FlushMode, LockMode, PopulatePath, type TransactionOptions } from './enums.js';
 import type { MetadataStorage } from './metadata/MetadataStorage.js';
-import type { AbortQueryOptions, InflightQueryAbortStrategy, Transaction } from './connections/Connection.js';
+import type { AbortQueryOptions, Connection, InflightQueryAbortStrategy, Transaction } from './connections/Connection.js';
 import { EventManager } from './events/EventManager.js';
 import type { EntityComparator } from './utils/EntityComparator.js';
 /**
@@ -130,7 +130,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      *
      * @internal
      */
-    withSessionContext<T>(ctx: Transaction | undefined, cb: (ctx?: Transaction) => Promise<T>): Promise<T>;
+    withSessionContext<T>(ctx: Transaction | undefined, cb: (ctx?: Transaction) => Promise<T>, connection?: Connection): Promise<T>;
     /**
      * Sets logger context for this entity manager.
      */

package/EntityManager.js

@@ -399,13 +399,16 @@ export class EntityManager {
      *
      * @internal
      */
-    async withSessionContext(ctx, cb) {
+    async withSessionContext(ctx, cb, connection) {
         const em = this.getContext(false);
         const sessionContext = ctx ? undefined : em.getTransactionSessionContext();
         if (!sessionContext) {
             return cb(ctx);
         }
-        return em.getConnection('write').transactional(trx => cb(trx), { sessionContext, loggerContext: em.loggerContext });
+        return (connection ?? em.getConnection('write')).transactional(trx => cb(trx), {
+            sessionContext,
+            loggerContext: em.loggerContext,
+        });
     }
     /**
      * Sets logger context for this entity manager.
@@ -486,7 +489,8 @@ export class EntityManager {
             return userFilter;
         }
         const ret = {};
-        for (const hint of options.populate) {
+        const populate = options.populate;
+        for (const hint of populate) {
             const field = hint.field.split(':')[0];
             const prop = meta.properties[field];
             const strategy = getLoadingStrategy(prop.strategy || hint.strategy || options.strategy || this.config.get('loadStrategy'), prop.kind);
@@ -530,6 +534,16 @@ export class EntityManager {
         if (userFilter) {
             Utils.merge(ret, userFilter);
         }
+        for (const hint of populate) {
+            const [field, ref] = hint.field.split(':');
+            // Filtered M:N refs need the target join and its PKs (unless a plain hint for the field already provides them).
+            if (ref &&
+                meta.properties[field].kind === ReferenceKind.MANY_TO_MANY &&
+                ret[field] &&
+                !populate.some(other => other.field === field)) {
+                hint.filter = true;
+            }
+        }
         return Utils.hasObjectKeys(ret) ? ret : undefined;
     }
     /**

package/entity/EntityFactory.js

@@ -16,6 +16,7 @@ export class EntityFactory {
     #eventManager;
     #comparator;
     #em;
+    #recomputeSnapshot = false;
     constructor(em) {
         this.#em = em;
         this.#driver = this.#em.getDriver();
@@ -30,6 +31,8 @@ export class EntityFactory {
     create(entityName, data, options = {}) {
         data = Reference.unwrapReference(data);
         options.initialized ??= true;
+        // nested relations created by the hydrator need the same DB-form snapshot as the root (GH #8268)
+        options.recomputeSnapshot ??= this.#recomputeSnapshot;
         if (EntityHelper.isEntity(data)) {
             return data;
         }
@@ -356,12 +359,15 @@ export class EntityFactory {
         }
     }
     hydrate(entity, meta, data, options) {
+        const recomputeSnapshot = this.#recomputeSnapshot;
+        this.#recomputeSnapshot = !!options.recomputeSnapshot;
         if (options.initialized) {
             this.#hydrator.hydrate(entity, meta, data, this, 'full', options.newEntity, options.convertCustomTypes, options.schema, this.#driver.getSchemaName(meta, options), options.normalizeAccessors);
         }
         else {
             this.#hydrator.hydrateReference(entity, meta, data, this, options.convertCustomTypes, options.schema, this.#driver.getSchemaName(meta, options), options.normalizeAccessors);
         }
+        this.#recomputeSnapshot = recomputeSnapshot;
         Utils.keys(data).forEach(key => {
             helper(entity)?.__loadedProperties.add(key);
             helper(entity)?.__serializationContext.fields?.add(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.2.1-dev.2",
+  "version": "7.2.1-dev.21",
   "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.1-dev.2';
+    static #ORM_VERSION = '7.2.1-dev.21';
     /** Default session variable name backing an RLS filter argument (`current_setting('mikro.<filter>.<arg>')`). */
     static getRlsSettingName(filterName, argName) {
         return `mikro.${filterName}.${argName}`;