@mikro-orm/core 7.1.5-dev.24 → 7.1.5-dev.26

package/metadata/MetadataDiscovery.js

@@ -1394,7 +1394,10 @@ export class MetadataDiscovery {
             // The primary key column is shared by every subtype, so it stays NOT NULL —
             // only subtype-specific columns become nullable for the rows of other subtypes.
             newProp.nullable = !newProp.primary;
-            newProp.inherited = !rootProp;
+            // A subtype-specific property is `inherited` on the root so it is not pushed down to
+            // sibling subtypes that don't declare it. When a second child redeclares the same
+            // property, the root prop was already marked inherited by the first child, so keep it.
+            newProp.inherited = !rootProp || !!rootProp.inherited;
             // For narrowed relation overrides, keep the root's declaration intact so
             // the full target union (e.g. `Food`) is preserved for populates from the
             // abstract root — otherwise the last child processed would win.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/core",
-  "version": "7.1.5-dev.24",
+  "version": "7.1.5-dev.26",
   "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/EntityComparator.js

@@ -549,7 +549,13 @@ export class EntityComparator {
     }
     getPropertySnapshot(meta, prop, context, dataKey, entityKey, path, level = 1, object) {
         const unwrap = prop.ref ? '?.unwrap()' : '';
-        let ret = `  if (${this.getPropertyCondition(path)}`;
+        let condition = this.getPropertyCondition(path);
+        // a getter may dereference state that only exists once hydrated, so when snapshotting an
+        // unhydrated reference we short-circuit the read behind the initialized check
+        if (prop.getter && !prop.setter && path.length === 1) {
+            condition = `entity.__helper.__initialized && ${condition}`;
+        }
+        let ret = `  if (${condition}`;
         if (prop.lazy && prop.ref) {
             ret += ` && entity${path.map(k => this.wrap(k)).join('')}?.isInitialized()`;
         }

package/utils/RequestContext.d.ts

@@ -1,5 +1,4 @@
-import type { EntityManager } from '../EntityManager.js';
-import { type LoggingOptions } from '../logging/Logger.js';
+import type { EntityManager, ForkOptions } from '../EntityManager.js';
 /**
  * Uses `AsyncLocalStorage` to create async context that holds the current EM fork.
  */
@@ -35,8 +34,6 @@ export declare class RequestContext {
     static getEntityManager(name?: string): EntityManager | undefined;
     private static createContext;
 }
-/** Options for creating a new RequestContext, allowing schema and logger overrides. */
-export interface CreateContextOptions {
-    schema?: string;
-    loggerContext?: LoggingOptions;
+/** Options for creating a new RequestContext, allowing global overrides. */
+export interface CreateContextOptions extends Omit<ForkOptions, 'useContext' | 'disableContextResolution' | 'keepTransactionContext' | 'clear'> {
 }

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.1.5-dev.24';
+    static #ORM_VERSION = '7.1.5-dev.26';
     /**
      * Checks if the argument is instance of `Object`. Returns false for arrays.
      */