@mikro-orm/core 7.0.10-dev.13 → 7.0.10-dev.15

package/EntityManager.d.ts

@@ -324,6 +324,7 @@ export declare class EntityManager<Driver extends IDatabaseDriver = IDatabaseDri
      */
     map<Entity extends object>(entityName: EntityName<Entity>, result: EntityDictionary<Entity>, options?: {
         schema?: string;
+        mapped?: boolean;
     }): Entity;
     /**
      * Merges given entity to this EntityManager so it becomes managed. You can force refreshing of existing entities

package/EntityManager.js

@@ -1295,8 +1295,9 @@ export class EntityManager {
      * Maps raw database result to an entity and merges it to this EntityManager.
      */
     map(entityName, result, options = {}) {
+        const { mapped, ...rest } = options;
         const meta = this.metadata.get(entityName);
-        const data = this.driver.mapResult(result, meta);
+        const data = (mapped ? result : this.driver.mapResult(result, meta));
         for (const k of Object.keys(data)) {
             const prop = meta.properties[k];
             if (prop?.kind === ReferenceKind.SCALAR &&
@@ -1310,7 +1311,7 @@ export class EntityManager {
             convertCustomTypes: true,
             refresh: true,
             validate: false,
-            ...options,
+            ...rest,
         });
     }
     /**

package/entity/EntityLoader.js

@@ -489,6 +489,22 @@ export class EntityLoader {
             }
         }
         if (populated.length === 0 && !populate.children) {
+            // Populate child-specific relations for TPT entities already in the identity map (GH #7529).
+            // Pass a sentinel hint so the existing TPT child handling in `populate()` does the real work.
+            if (populate.all && prop.targetMeta?.inheritanceType === 'tpt') {
+                const visited = options.visited;
+                const pending = Utils.unique(children).filter(c => helper(c).__meta !== prop.targetMeta && !visited.has(c));
+                if (pending.length > 0) {
+                    const hint = [
+                        { field: prop.targetMeta.primaryKeys[0], strategy: LoadStrategy.SELECT_IN, all: true },
+                    ];
+                    await this.populate(prop.targetMeta.class, pending, hint, {
+                        ...options,
+                        lookup: false,
+                        validate: false,
+                    });
+                }
+            }
             return;
         }
         const fields = this.buildFields(options.fields, prop);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.0.10-dev.13",
+  "version": "7.0.10-dev.15",
   "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

@@ -141,7 +141,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.0.10-dev.13';
+    static #ORM_VERSION = '7.0.10-dev.15';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */