@mikro-orm/core 6.3.10-dev.15 → 6.3.10-dev.17

package/decorators/CreateRequestContext.js

@@ -11,15 +11,9 @@ function CreateRequestContext(getContext, respectExistingContext = false) {
     return function (target, propertyKey, descriptor) {
         const originalMethod = descriptor.value;
         descriptor.value = async function (...args) {
-            // reuse existing context if available
-            if (respectExistingContext && RequestContext_1.RequestContext.currentRequestContext()) {
-                return originalMethod.apply(this, args);
-            }
-            // If we are inside explicit transaction context, we need to create another tx context.
             // Otherwise, the outer tx context would be preferred.
             const txContext = TransactionContext_1.TransactionContext.currentTransactionContext();
             const provider = txContext ? TransactionContext_1.TransactionContext : RequestContext_1.RequestContext;
-            /* istanbul ignore next */
             let orm;
             let em;
             if (typeof getContext === 'function') {
@@ -35,6 +29,10 @@ function CreateRequestContext(getContext, respectExistingContext = false) {
                 em = await this.em;
             }
             const create = async (em) => {
+                // reuse existing context if available for given respect `contextName`
+                if (respectExistingContext && RequestContext_1.RequestContext.getEntityManager(em.name)) {
+                    return originalMethod.apply(this, args);
+                }
                 if (txContext) {
                     em = em.fork({ useContext: true });
                 }

package/package.json

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

package/typings.d.ts

@@ -683,7 +683,7 @@ export type AutoPath<O, P extends string | boolean, E extends string = never, D
 export type UnboxArray<T> = T extends any[] ? ArrayElement<T> : T;
 export type ArrayElement<ArrayType extends unknown[]> = ArrayType extends (infer ElementType)[] ? ElementType : never;
 export type ExpandProperty<T> = T extends Reference<infer U> ? NonNullable<U> : T extends Collection<infer U, any> ? NonNullable<U> : T extends (infer U)[] ? NonNullable<U> : NonNullable<T>;
-type LoadedLoadable<T, E extends object> = T extends Collection<any, any> ? LoadedCollection<E> : T extends Reference<any> ? LoadedReference<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends Scalar | any[] ? T : E;
+type LoadedLoadable<T, E extends object> = T extends Collection<any, any> ? LoadedCollection<E> : T extends Reference<any> ? T & LoadedReference<E> : T extends ScalarReference<infer U> ? LoadedScalarReference<U> : T extends Scalar | any[] ? T : E;
 type IsTrue<T> = IsNever<T> extends true ? false : T extends boolean ? T extends true ? true : false : false;
 type StringLiteral<T> = T extends string ? string extends T ? never : T : never;
 type Prefix<T, K> = K extends `${infer S}.${string}` ? S : (K extends '*' ? keyof T : K);