@tsed/mikro-orm 7.0.0-beta.8 → 7.0.0-rc.2

package/jest.config.js

@@ -5,10 +5,10 @@ module.exports = {
   ...require("@tsed/jest-config")(__dirname, "mikro-orm"),
   coverageThreshold: {
     global: {
-      branches: 90.38,
-      functions: 91.42,
-      lines: 96.52,
-      statements: 97.1
+      branches: 95.83,
+      functions: 94.73,
+      lines: 97.43,
+      statements: 97.88
     }
   }
 };

package/lib/cjs/MikroOrmModule.d.ts

@@ -1,4 +1,5 @@
-import { OnDestroy, OnInit } from "@tsed/di";
+import "./services/MikroOrmFactory";
+import { AlterRunInContext, OnDestroy, OnInit } from "@tsed/di";
 import { Options } from "@mikro-orm/core";
 declare global {
     namespace TsED {
@@ -11,9 +12,12 @@ declare global {
         }
     }
 }
-export declare class MikroOrmModule implements OnDestroy, OnInit {
+export declare class MikroOrmModule implements OnDestroy, OnInit, AlterRunInContext {
     private readonly settings;
-    private readonly mikroOrmRegistry;
+    private readonly registry;
+    private readonly context;
     $onInit(): Promise<void>;
     $onDestroy(): Promise<void>;
+    $alterRunInContext(next: (...args: unknown[]) => unknown): () => unknown | Promise<() => unknown>;
+    private createContext;
 }

package/lib/cjs/MikroOrmModule.js

@@ -2,17 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MikroOrmModule = void 0;
 const tslib_1 = require("tslib");
+require("./services/MikroOrmFactory");
 const di_1 = require("@tsed/di");
 const MikroOrmRegistry_1 = require("./services/MikroOrmRegistry");
-const DBContext_1 = require("./services/DBContext");
 const RetryStrategy_1 = require("./services/RetryStrategy");
+const OptimisticLockErrorFilter_1 = require("./filters/OptimisticLockErrorFilter");
+const MikroOrmContext_1 = require("./services/MikroOrmContext");
 let MikroOrmModule = class MikroOrmModule {
+    settings;
+    registry;
+    context;
     async $onInit() {
-        const promises = this.settings.map((opts) => this.mikroOrmRegistry.register(opts));
+        const promises = this.settings.map((opts) => this.registry.register(opts));
         await Promise.all(promises);
     }
     $onDestroy() {
-        return this.mikroOrmRegistry.clear();
+        return this.registry.clear();
+    }
+    $alterRunInContext(next) {
+        return () => this.createContext(next);
+    }
+    createContext(next) {
+        const instances = [...this.registry.values()];
+        const managers = instances.map((orm) => orm.em);
+        return this.context.run(managers, next);
     }
 };
 tslib_1.__decorate([
@@ -22,11 +35,14 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, di_1.Inject)(),
     tslib_1.__metadata("design:type", MikroOrmRegistry_1.MikroOrmRegistry)
-], MikroOrmModule.prototype, "mikroOrmRegistry", void 0);
+], MikroOrmModule.prototype, "registry", void 0);
+tslib_1.__decorate([
+    (0, di_1.Inject)(),
+    tslib_1.__metadata("design:type", MikroOrmContext_1.MikroOrmContext)
+], MikroOrmModule.prototype, "context", void 0);
 MikroOrmModule = tslib_1.__decorate([
     (0, di_1.Module)({
-        imports: [DBContext_1.DBContext, MikroOrmRegistry_1.MikroOrmRegistry],
-        deps: [di_1.Configuration, MikroOrmRegistry_1.MikroOrmRegistry]
+        responseFilters: [OptimisticLockErrorFilter_1.OptimisticLockErrorFilter]
     })
 ], MikroOrmModule);
 exports.MikroOrmModule = MikroOrmModule;

package/lib/cjs/MikroOrmModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmModule.js","sourceRoot":"","sources":["../../src/MikroOrmModule.ts"],"names":[],"mappings":";;;;AAAA,iCAAsG;AAEtG,kEAA6D;AAC7D,oDAA+C;AAC/C,4DAAuD;AAmBvD,IAAa,cAAc,GAA3B,MAAa,cAAc;IAOlB,KAAK,CAAC,OAAO;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAEnF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;CACF,CAAA;AAdC;IADC,IAAA,aAAQ,EAAC,UAAU,EAAE,EAAE,CAAC;;gDACa;AAGtC;IADC,IAAA,WAAM,GAAE;sCAC2B,mCAAgB;wDAAC;AAL1C,cAAc;IAJ1B,IAAA,WAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAS,EAAE,mCAAgB,CAAC;QACtC,IAAI,EAAE,CAAC,kBAAa,EAAE,mCAAgB,CAAC;KACxC,CAAC;GACW,cAAc,CAgB1B;AAhBY,wCAAc;AAkB3B,uGAAuG;AACvG,IAAA,qBAAgB,EAAC,EAAC,OAAO,EAAE,6BAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import {Configuration, Constant, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\nimport {MikroOrmRegistry} from \"./services/MikroOrmRegistry\";\nimport {DBContext} from \"./services/DBContext\";\nimport {RetryStrategy} from \"./services/RetryStrategy\";\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace TsED {\n    interface Configuration {\n      /**\n       * The the ORM configuration, entity metadata.\n       * If you omit the `options` parameter, your CLI config will be used.\n       */\n      mikroOrm?: Options[];\n    }\n  }\n}\n\n@Module({\n  imports: [DBContext, MikroOrmRegistry],\n  deps: [Configuration, MikroOrmRegistry]\n})\nexport class MikroOrmModule implements OnDestroy, OnInit {\n  @Constant(\"mikroOrm\", [])\n  private readonly settings!: Options[];\n\n  @Inject()\n  private readonly mikroOrmRegistry!: MikroOrmRegistry;\n\n  public async $onInit(): Promise<void> {\n    const promises = this.settings.map((opts) => this.mikroOrmRegistry.register(opts));\n\n    await Promise.all(promises);\n  }\n\n  public $onDestroy(): Promise<void> {\n    return this.mikroOrmRegistry.clear();\n  }\n}\n\n// TODO: the IoC container should provide null or undefined by default until tsedio/tsed#1694 is closed\nregisterProvider({provide: RetryStrategy, useValue: null});\n"]}
+{"version":3,"file":"MikroOrmModule.js","sourceRoot":"","sources":["../../src/MikroOrmModule.ts"],"names":[],"mappings":";;;;AAAA,sCAAoC;AACpC,iCAAqH;AAErH,kEAA6D;AAC7D,4DAAuD;AACvD,mFAA8E;AAC9E,gEAA2D;AAkB3D,IAAa,cAAc,GAA3B,MAAa,cAAc;IAER,QAAQ,CAAa;IAGrB,QAAQ,CAAoB;IAG5B,OAAO,CAAmB;IAEpC,KAAK,CAAC,OAAO;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3E,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEM,kBAAkB,CAAC,IAAqC;QAC7D,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEO,aAAa,CAAC,IAAqC;QACzD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AA5BC;IADC,IAAA,aAAQ,EAAC,UAAU,EAAE,EAAE,CAAC;;gDACa;AAGtC;IADC,IAAA,WAAM,GAAE;sCACmB,mCAAgB;gDAAC;AAG7C;IADC,IAAA,WAAM,GAAE;sCACkB,iCAAe;+CAAC;AARhC,cAAc;IAH1B,IAAA,WAAM,EAAC;QACN,eAAe,EAAE,CAAC,qDAAyB,CAAC;KAC7C,CAAC;GACW,cAAc,CA8B1B;AA9BY,wCAAc;AAgC3B,uGAAuG;AACvG,IAAA,qBAAgB,EAAC,EAAC,OAAO,EAAE,6BAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import \"./services/MikroOrmFactory\";\nimport {AlterRunInContext, Constant, DIContext, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\nimport {MikroOrmRegistry} from \"./services/MikroOrmRegistry\";\nimport {RetryStrategy} from \"./services/RetryStrategy\";\nimport {OptimisticLockErrorFilter} from \"./filters/OptimisticLockErrorFilter\";\nimport {MikroOrmContext} from \"./services/MikroOrmContext\";\n\ndeclare global {\n  // eslint-disable-next-line @typescript-eslint/no-namespace\n  namespace TsED {\n    interface Configuration {\n      /**\n       * The the ORM configuration, entity metadata.\n       * If you omit the `options` parameter, your CLI config will be used.\n       */\n      mikroOrm?: Options[];\n    }\n  }\n}\n\n@Module({\n  responseFilters: [OptimisticLockErrorFilter]\n})\nexport class MikroOrmModule implements OnDestroy, OnInit, AlterRunInContext {\n  @Constant(\"mikroOrm\", [])\n  private readonly settings!: Options[];\n\n  @Inject()\n  private readonly registry!: MikroOrmRegistry;\n\n  @Inject()\n  private readonly context!: MikroOrmContext;\n\n  public async $onInit(): Promise<void> {\n    const promises = this.settings.map((opts) => this.registry.register(opts));\n\n    await Promise.all(promises);\n  }\n\n  public $onDestroy(): Promise<void> {\n    return this.registry.clear();\n  }\n\n  public $alterRunInContext(next: (...args: unknown[]) => unknown): () => unknown | Promise<() => unknown> {\n    return () => this.createContext(next);\n  }\n\n  private createContext(next: (...args: unknown[]) => unknown): unknown {\n    const instances = [...this.registry.values()];\n    const managers = instances.map((orm) => orm.em);\n\n    return this.context.run(managers, next);\n  }\n}\n\n// TODO: the IoC container should provide null or undefined by default until tsedio/tsed#1694 is closed\nregisterProvider({provide: RetryStrategy, useValue: null});\n"]}

package/lib/cjs/decorators/entityManager.d.ts

@@ -4,11 +4,11 @@
  * @decorator
  * @mikroOrm
  */
-export declare const EntityManager: (contextName?: string | undefined) => PropertyDecorator;
+export declare const EntityManager: (contextName?: string) => PropertyDecorator;
 /**
  * Get the entity manager for the given context name.
  * @param {String} connectionName
  * @decorator
  * @mikroOrm
  */
-export declare const Em: (contextName?: string | undefined) => PropertyDecorator;
+export declare const Em: (contextName?: string) => PropertyDecorator;

package/lib/cjs/decorators/entityManager.js

@@ -9,7 +9,7 @@ const MikroOrmRegistry_1 = require("../services/MikroOrmRegistry");
  * @decorator
  * @mikroOrm
  */
-const EntityManager = (contextName) => (0, di_1.Inject)(MikroOrmRegistry_1.MikroOrmRegistry, (registry) => { var _a; return (_a = registry.get(contextName)) === null || _a === void 0 ? void 0 : _a.em; });
+const EntityManager = (contextName) => (0, di_1.Inject)(MikroOrmRegistry_1.MikroOrmRegistry, (registry) => registry.get(contextName)?.em);
 exports.EntityManager = EntityManager;
 /**
  * Get the entity manager for the given context name.

package/lib/cjs/decorators/entityManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"entityManager.js","sourceRoot":"","sources":["../../../src/decorators/entityManager.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,mEAA8D;AAE9D;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAqB,EAAE,CACvE,IAAA,WAAM,EAAC,mCAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,EAAE,CAAA,EAAA,CAAsB,CAAC;AADlG,QAAA,aAAa,iBACqF;AAE/G;;;;;GAKG;AACU,QAAA,EAAE,GAAG,qBAAa,CAAC","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {MikroOrmRegistry} from \"../services/MikroOrmRegistry\";\n\n/**\n * Get the entity manager for the given context name.\n * @param {String} contextName\n * @decorator\n * @mikroOrm\n */\nexport const EntityManager = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)?.em) as PropertyDecorator;\n\n/**\n * Get the entity manager for the given context name.\n * @param {String} connectionName\n * @decorator\n * @mikroOrm\n */\nexport const Em = EntityManager;\n"]}
+{"version":3,"file":"entityManager.js","sourceRoot":"","sources":["../../../src/decorators/entityManager.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,mEAA8D;AAE9D;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAqB,EAAE,CACvE,IAAA,WAAM,EAAC,mCAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,CAAsB,CAAC;AADlG,QAAA,aAAa,iBACqF;AAE/G;;;;;GAKG;AACU,QAAA,EAAE,GAAG,qBAAa,CAAC","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {MikroOrmRegistry} from \"../services/MikroOrmRegistry\";\n\n/**\n * Get the entity manager for the given context name.\n * @param {String} contextName\n * @decorator\n * @mikroOrm\n */\nexport const EntityManager = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)?.em) as PropertyDecorator;\n\n/**\n * Get the entity manager for the given context name.\n * @param {String} connectionName\n * @decorator\n * @mikroOrm\n */\nexport const Em = EntityManager;\n"]}

package/lib/cjs/decorators/orm.d.ts

@@ -2,4 +2,4 @@
  * Get the ORM for the given context name.
  * @param {String} contextName
  */
-export declare const Orm: (contextName?: string | undefined) => PropertyDecorator;
+export declare const Orm: (contextName?: string) => PropertyDecorator;

package/lib/cjs/decorators/transactional.d.ts

@@ -3,4 +3,4 @@ import { TransactionOptions } from "../interceptors/TransactionalInterceptor";
  * Register a new request context for your method and execute it inside the context.
  * @param {String | TransactionOptions} contextNameOrOptions
  */
-export declare const Transactional: (contextNameOrOptions?: string | TransactionOptions | undefined) => MethodDecorator;
+export declare const Transactional: (contextNameOrOptions?: string | TransactionOptions) => MethodDecorator;

package/lib/cjs/index.d.ts

@@ -7,7 +7,7 @@ export * from "./decorators/orm";
 export * from "./decorators/transactional";
 export * from "./filters/OptimisticLockErrorFilter";
 export * from "./interceptors/TransactionalInterceptor";
-export * from "./services/DBContext";
+export * from "./services/MikroOrmContext";
 export * from "./services/MikroOrmFactory";
 export * from "./services/MikroOrmRegistry";
 export * from "./services/RetryStrategy";

package/lib/cjs/index.js

@@ -10,7 +10,7 @@ tslib_1.__exportStar(require("./decorators/orm"), exports);
 tslib_1.__exportStar(require("./decorators/transactional"), exports);
 tslib_1.__exportStar(require("./filters/OptimisticLockErrorFilter"), exports);
 tslib_1.__exportStar(require("./interceptors/TransactionalInterceptor"), exports);
-tslib_1.__exportStar(require("./services/DBContext"), exports);
+tslib_1.__exportStar(require("./services/MikroOrmContext"), exports);
 tslib_1.__exportStar(require("./services/MikroOrmFactory"), exports);
 tslib_1.__exportStar(require("./services/MikroOrmRegistry"), exports);
 tslib_1.__exportStar(require("./services/RetryStrategy"), exports);

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,2DAAiC;AACjC,qEAA2C;AAC3C,2DAAiC;AACjC,qEAA2C;AAC3C,8EAAoD;AACpD,kFAAwD;AACxD,+DAAqC;AACrC,qEAA2C;AAC3C,sEAA4C;AAC5C,mEAAyC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./MikroOrmModule\";\nexport * from \"./decorators/entityManager\";\nexport * from \"./decorators/orm\";\nexport * from \"./decorators/transactional\";\nexport * from \"./filters/OptimisticLockErrorFilter\";\nexport * from \"./interceptors/TransactionalInterceptor\";\nexport * from \"./services/DBContext\";\nexport * from \"./services/MikroOrmFactory\";\nexport * from \"./services/MikroOrmRegistry\";\nexport * from \"./services/RetryStrategy\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,2DAAiC;AACjC,qEAA2C;AAC3C,2DAAiC;AACjC,qEAA2C;AAC3C,8EAAoD;AACpD,kFAAwD;AACxD,qEAA2C;AAC3C,qEAA2C;AAC3C,sEAA4C;AAC5C,mEAAyC","sourcesContent":["/**\n * @file Automatically generated by barrelsby.\n */\n\nexport * from \"./MikroOrmModule\";\nexport * from \"./decorators/entityManager\";\nexport * from \"./decorators/orm\";\nexport * from \"./decorators/transactional\";\nexport * from \"./filters/OptimisticLockErrorFilter\";\nexport * from \"./interceptors/TransactionalInterceptor\";\nexport * from \"./services/MikroOrmContext\";\nexport * from \"./services/MikroOrmFactory\";\nexport * from \"./services/MikroOrmRegistry\";\nexport * from \"./services/RetryStrategy\";\n"]}

package/lib/cjs/interceptors/TransactionalInterceptor.d.ts

@@ -1,10 +1,14 @@
 import { InterceptorContext, InterceptorMethods, InterceptorNext } from "@tsed/di";
 import { Logger } from "@tsed/logger";
-import { MikroOrmRegistry } from "../services/MikroOrmRegistry";
-import { DBContext } from "../services/DBContext";
 import { RetryStrategy } from "../services/RetryStrategy";
+import { MikroOrmContext } from "../services/MikroOrmContext";
+import { MikroOrmRegistry } from "../services/MikroOrmRegistry";
+import { FlushMode, IsolationLevel } from "@mikro-orm/core";
 export interface TransactionOptions {
     retry?: boolean;
+    disabled?: boolean;
+    isolationLevel?: IsolationLevel;
+    flushMode?: FlushMode;
     contextName?: string;
 }
 export declare class TransactionalInterceptor implements InterceptorMethods {
@@ -12,10 +16,10 @@ export declare class TransactionalInterceptor implements InterceptorMethods {
     private readonly context;
     private readonly logger;
     private readonly retryStrategy?;
-    constructor(registry: MikroOrmRegistry, context: DBContext, logger: Logger, retryStrategy?: RetryStrategy | undefined);
+    constructor(registry: MikroOrmRegistry, context: MikroOrmContext, logger: Logger, retryStrategy?: RetryStrategy | undefined);
     intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown>;
+    private runWithinCtx;
     private runWithinNewCtx;
-    private runUnderCtx;
     private extractContextName;
     private executeInTransaction;
 }

package/lib/cjs/interceptors/TransactionalInterceptor.js

@@ -4,10 +4,15 @@ exports.TransactionalInterceptor = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@tsed/di");
 const logger_1 = require("@tsed/logger");
-const MikroOrmRegistry_1 = require("../services/MikroOrmRegistry");
-const DBContext_1 = require("../services/DBContext");
 const RetryStrategy_1 = require("../services/RetryStrategy");
+const MikroOrmContext_1 = require("../services/MikroOrmContext");
+const MikroOrmRegistry_1 = require("../services/MikroOrmRegistry");
+const core_1 = require("@mikro-orm/core");
 let TransactionalInterceptor = class TransactionalInterceptor {
+    registry;
+    context;
+    logger;
+    retryStrategy;
     constructor(registry, context, logger, retryStrategy) {
         this.registry = registry;
         this.context = context;
@@ -19,65 +24,59 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         if (options.retry && !this.retryStrategy) {
             this.logger.warn(`To retry a transaction you have to implement a "${RetryStrategy_1.RetryStrategy.description}" interface`);
         }
-        const ctx = this.context.entries();
-        if (!ctx) {
-            return this.runWithinNewCtx(next, options);
+        if (this.context.has(options.contextName)) {
+            return this.runWithinCtx(next, options);
         }
-        if (ctx.has(options.contextName)) {
-            return next();
-        }
-        return this.runUnderCtx(next, ctx, options);
+        return this.runWithinNewCtx(next, options);
     }
-    runWithinNewCtx(next, options) {
-        const ctx = new Map();
-        return this.runUnderCtx(next, ctx, options);
+    runWithinCtx(next, options) {
+        const callback = () => this.executeInTransaction(next, options);
+        return options.retry && this.retryStrategy ? this.retryStrategy.acquire(callback) : callback();
     }
-    runUnderCtx(next, ctx, options) {
+    runWithinNewCtx(next, options) {
         const orm = this.registry.get(options.contextName);
         if (!orm) {
             throw new Error(`No such context: ${options.contextName}. Please register a corresponding MikroOrm instance using '@Configuration()' decorator.`);
         }
-        /**
-         * The fork method signature has been changed since v5.x,
-         * which might lead to unexpected behavior while using the @Transactional() decorator.
-         *
-         * ```diff
-         * - fork(clear = true, useContext = false): D[typeof EntityManagerType]
-         * + fork(options: ForkOptions = {}): D[typeof EntityManagerType] {
-         * ```
-         *
-         * To ensure backward compatibility with v4.x and add support for v5.x, provided the following workaround:
-         */
-        const em = orm.em.fork({ clear: true, useContext: true }, true);
-        ctx.set(em.name, em);
-        const runInTransaction = () => this.executeInTransaction(options.contextName, next);
-        return this.context.run(ctx, () => { var _a; return (options.retry ? (_a = this.retryStrategy) === null || _a === void 0 ? void 0 : _a.acquire(runInTransaction) : runInTransaction()); });
+        return this.context.run([orm.em], () => this.runWithinCtx(next, options));
     }
     extractContextName(context) {
-        var _a;
-        const options = context.options || {};
+        const options = (context.options || {});
+        let isolationLevel;
+        let disabled;
         let contextName;
+        let flushMode;
         let retry;
         if (typeof options === "string") {
             contextName = options;
         }
         else if (options) {
-            contextName = (_a = options.contextName) !== null && _a !== void 0 ? _a : options.connectionName;
+            contextName = options.contextName;
+            isolationLevel = options.isolationLevel;
             retry = options.retry;
+            disabled = options.disabled;
+            flushMode = options.flushMode;
         }
-        if (!contextName) {
-            contextName = "default";
+        return {
+            flushMode,
+            retry: retry ?? false,
+            disabled: disabled ?? false,
+            contextName: contextName ?? "default",
+            isolationLevel: isolationLevel ?? core_1.IsolationLevel.READ_COMMITTED
+        };
+    }
+    async executeInTransaction(next, options) {
+        const manager = this.context.get(options.contextName);
+        if (!manager) {
+            throw new Error(`No such context: ${options.contextName}. Please check if the async context is lost in one of the asynchronous operations.`);
         }
-        if (!retry) {
-            retry = false;
+        if (options.disabled) {
+            return next();
         }
-        return { contextName, retry };
-    }
-    async executeInTransaction(contextName, next) {
-        const em = this.context.get(contextName);
-        const result = await next();
-        await (em === null || em === void 0 ? void 0 : em.flush());
-        return result;
+        return manager.transactional(() => next(), {
+            flushMode: options.flushMode,
+            isolationLevel: options.isolationLevel
+        });
     }
 };
 TransactionalInterceptor = tslib_1.__decorate([
@@ -87,7 +86,7 @@ TransactionalInterceptor = tslib_1.__decorate([
     tslib_1.__param(2, (0, di_1.Inject)()),
     tslib_1.__param(3, (0, di_1.Inject)(RetryStrategy_1.RetryStrategy)),
     tslib_1.__metadata("design:paramtypes", [MikroOrmRegistry_1.MikroOrmRegistry,
-        DBContext_1.DBContext,
+        MikroOrmContext_1.MikroOrmContext,
         logger_1.Logger, Object])
 ], TransactionalInterceptor);
 exports.TransactionalInterceptor = TransactionalInterceptor;

package/lib/cjs/interceptors/TransactionalInterceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionalInterceptor.js","sourceRoot":"","sources":["../../../src/interceptors/TransactionalInterceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {Logger} from \"@tsed/logger\";\nimport {MikroOrmRegistry} from \"../services/MikroOrmRegistry\";\nimport {DBContext} from \"../services/DBContext\";\nimport {RetryStrategy} from \"../services/RetryStrategy\";\n\nexport interface TransactionOptions {\n  retry?: boolean;\n  contextName?: string;\n}\n\n@Interceptor()\nexport class TransactionalInterceptor implements InterceptorMethods {\n  constructor(\n    @Inject() private readonly registry: MikroOrmRegistry,\n    @Inject() private readonly context: DBContext,\n    @Inject() private readonly logger: Logger,\n    @Inject(RetryStrategy)\n    private readonly retryStrategy?: RetryStrategy\n  ) {}\n\n  public async intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown> {\n    const options = this.extractContextName(context);\n\n    if (options.retry && !this.retryStrategy) {\n      this.logger.warn(`To retry a transaction you have to implement a \"${RetryStrategy.description}\" interface`);\n    }\n\n    const ctx = this.context.entries();\n\n    if (!ctx) {\n      return this.runWithinNewCtx(next, options);\n    }\n\n    if (ctx.has(options.contextName!)) {\n      return next();\n    }\n\n    return this.runUnderCtx(next, ctx, options);\n  }\n\n  private runWithinNewCtx(next: InterceptorNext, options: TransactionOptions): Promise<unknown> | unknown {\n    const ctx = new Map<string, EntityManager>();\n\n    return this.runUnderCtx(next, ctx, options);\n  }\n\n  private runUnderCtx(next: InterceptorNext, ctx: Map<string, EntityManager>, options: TransactionOptions): Promise<unknown> | unknown {\n    const orm = this.registry.get(options.contextName);\n\n    if (!orm) {\n      throw new Error(\n        `No such context: ${options.contextName}. Please register a corresponding MikroOrm instance using '@Configuration()' decorator.`\n      );\n    }\n\n    /**\n     * The fork method signature has been changed since v5.x,\n     * which might lead to unexpected behavior while using the @Transactional() decorator.\n     *\n     * ```diff\n     * - fork(clear = true, useContext = false): D[typeof EntityManagerType]\n     * + fork(options: ForkOptions = {}): D[typeof EntityManagerType] {\n     * ```\n     *\n     * To ensure backward compatibility with v4.x and add support for v5.x, provided the following workaround:\n     */\n    const em = (\n      orm.em.fork as (clearOrForkOptions?: boolean | {clear?: boolean; useContext?: boolean}, useContext?: boolean) => EntityManager\n    )({clear: true, useContext: true}, true);\n\n    ctx.set(em.name, em);\n\n    const runInTransaction = () => this.executeInTransaction(options.contextName!, next);\n\n    return this.context.run(ctx, () => (options.retry ? this.retryStrategy?.acquire(runInTransaction) : runInTransaction()));\n  }\n\n  private extractContextName(context: InterceptorContext<unknown>): TransactionOptions {\n    const options = context.options || ({} as Partial<TransactionOptions> | string);\n\n    let contextName: string | undefined;\n    let retry: boolean | undefined;\n\n    if (typeof options === \"string\") {\n      contextName = options;\n    } else if (options) {\n      contextName = options.contextName ?? options.connectionName;\n      retry = options.retry;\n    }\n\n    if (!contextName) {\n      contextName = \"default\";\n    }\n\n    if (!retry) {\n      retry = false;\n    }\n\n    return {contextName, retry};\n  }\n\n  private async executeInTransaction(contextName: string, next: InterceptorNext): Promise<unknown> {\n    const em = this.context.get(contextName);\n\n    const result = await next();\n\n    await em?.flush();\n\n    return result;\n  }\n}\n"]}
+{"version":3,"file":"TransactionalInterceptor.js","sourceRoot":"","sources":["../../../src/interceptors/TransactionalInterceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {Logger} from \"@tsed/logger\";\nimport {RetryStrategy} from \"../services/RetryStrategy\";\nimport {MikroOrmContext} from \"../services/MikroOrmContext\";\nimport {MikroOrmRegistry} from \"../services/MikroOrmRegistry\";\nimport {FlushMode, IsolationLevel} from \"@mikro-orm/core\";\n\nexport interface TransactionOptions {\n  retry?: boolean;\n  disabled?: boolean;\n  isolationLevel?: IsolationLevel;\n  flushMode?: FlushMode;\n  contextName?: string;\n}\n\ntype TransactionSettings = Required<Omit<TransactionOptions, \"connectionName\" | \"flushMode\">> & {flushMode?: FlushMode};\n\n@Interceptor()\nexport class TransactionalInterceptor implements InterceptorMethods {\n  constructor(\n    @Inject() private readonly registry: MikroOrmRegistry,\n    @Inject() private readonly context: MikroOrmContext,\n    @Inject() private readonly logger: Logger,\n    @Inject(RetryStrategy)\n    private readonly retryStrategy?: RetryStrategy\n  ) {}\n\n  public async intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown> {\n    const options = this.extractContextName(context);\n\n    if (options.retry && !this.retryStrategy) {\n      this.logger.warn(`To retry a transaction you have to implement a \"${RetryStrategy.description}\" interface`);\n    }\n\n    if (this.context.has(options.contextName)) {\n      return this.runWithinCtx(next, options);\n    }\n\n    return this.runWithinNewCtx(next, options);\n  }\n\n  private runWithinCtx(next: InterceptorNext, options: TransactionSettings): Promise<unknown> | unknown {\n    const callback = () => this.executeInTransaction(next, options);\n\n    return options.retry && this.retryStrategy ? this.retryStrategy.acquire(callback) : callback();\n  }\n\n  private runWithinNewCtx(next: InterceptorNext, options: TransactionSettings): Promise<unknown> | unknown {\n    const orm = this.registry.get(options.contextName);\n\n    if (!orm) {\n      throw new Error(\n        `No such context: ${options.contextName}. Please register a corresponding MikroOrm instance using '@Configuration()' decorator.`\n      );\n    }\n\n    return this.context.run([orm.em], () => this.runWithinCtx(next, options));\n  }\n\n  private extractContextName(context: InterceptorContext<unknown>): TransactionSettings {\n    const options = (context.options || {}) as TransactionOptions | string;\n\n    let isolationLevel: IsolationLevel | undefined;\n    let disabled: boolean | undefined;\n    let contextName: string | undefined;\n    let flushMode: FlushMode | undefined;\n    let retry: boolean | undefined;\n\n    if (typeof options === \"string\") {\n      contextName = options;\n    } else if (options) {\n      contextName = options.contextName;\n      isolationLevel = options.isolationLevel;\n      retry = options.retry;\n      disabled = options.disabled;\n      flushMode = options.flushMode;\n    }\n\n    return {\n      flushMode,\n      retry: retry ?? false,\n      disabled: disabled ?? false,\n      contextName: contextName ?? \"default\",\n      isolationLevel: isolationLevel ?? IsolationLevel.READ_COMMITTED\n    };\n  }\n\n  private async executeInTransaction(next: InterceptorNext, options: TransactionSettings): Promise<unknown> {\n    const manager = this.context.get(options.contextName);\n\n    if (!manager) {\n      throw new Error(\n        `No such context: ${options.contextName}. Please check if the async context is lost in one of the asynchronous operations.`\n      );\n    }\n\n    if (options.disabled) {\n      return next();\n    }\n\n    return manager.transactional(() => next(), {\n      flushMode: options.flushMode,\n      isolationLevel: options.isolationLevel\n    });\n  }\n}\n"]}

package/lib/cjs/services/MikroOrmContext.d.ts

@@ -0,0 +1,9 @@
+import { EntityManager } from "@mikro-orm/core";
+/**
+ * @internal Since 2022-06-20.
+ */
+export declare class MikroOrmContext {
+    run(managers: EntityManager[], task: (...args: unknown[]) => unknown): Promise<unknown>;
+    get(contextName?: string): EntityManager | undefined;
+    has(contextName?: string): boolean;
+}

package/lib/cjs/services/MikroOrmContext.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MikroOrmContext = void 0;
+const tslib_1 = require("tslib");
+const di_1 = require("@tsed/di");
+const core_1 = require("@mikro-orm/core");
+/**
+ * @internal Since 2022-06-20.
+ */
+let MikroOrmContext = class MikroOrmContext {
+    run(managers, task) {
+        return core_1.RequestContext.createAsync(managers, task);
+    }
+    get(contextName) {
+        return core_1.RequestContext.getEntityManager(contextName);
+    }
+    has(contextName) {
+        const manager = this.get(contextName);
+        return !!manager;
+    }
+};
+MikroOrmContext = tslib_1.__decorate([
+    (0, di_1.Injectable)()
+], MikroOrmContext);
+exports.MikroOrmContext = MikroOrmContext;
+//# sourceMappingURL=MikroOrmContext.js.map

package/lib/cjs/services/MikroOrmContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MikroOrmContext.js","sourceRoot":"","sources":["../../../src/services/MikroOrmContext.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AACpC,0CAA8D;AAE9D;;GAEG;AAEH,IAAa,eAAe,GAA5B,MAAa,eAAe;IACnB,GAAG,CAAC,QAAyB,EAAE,IAAqC;QACzE,OAAO,qBAAc,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAW,CAAC,CAAC;IAC3D,CAAC;IAEM,GAAG,CAAC,WAAoB;QAC7B,OAAO,qBAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAEM,GAAG,CAAC,WAAoB;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEtC,OAAO,CAAC,CAAC,OAAO,CAAC;IACnB,CAAC;CACF,CAAA;AAdY,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CAc3B;AAdY,0CAAe","sourcesContent":["import {Injectable} from \"@tsed/di\";\nimport {EntityManager, RequestContext} from \"@mikro-orm/core\";\n\n/**\n * @internal Since 2022-06-20.\n */\n@Injectable()\nexport class MikroOrmContext {\n  public run(managers: EntityManager[], task: (...args: unknown[]) => unknown): Promise<unknown> {\n    return RequestContext.createAsync(managers, task as any);\n  }\n\n  public get(contextName?: string): EntityManager | undefined {\n    return RequestContext.getEntityManager(contextName);\n  }\n\n  public has(contextName?: string): boolean {\n    const manager = this.get(contextName);\n\n    return !!manager;\n  }\n}\n"]}

package/lib/cjs/services/MikroOrmFactory.d.ts

@@ -1,5 +1,7 @@
 import { MikroORM, Options } from "@mikro-orm/core";
+import { MikroOrmContext } from "./MikroOrmContext";
 export declare class MikroOrmFactory {
-    private readonly dbContext;
+    private readonly context;
+    constructor(context: MikroOrmContext);
     create(options: Options): Promise<MikroORM>;
 }

package/lib/cjs/services/MikroOrmFactory.js

@@ -2,23 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MikroOrmFactory = void 0;
 const tslib_1 = require("tslib");
-const DBContext_1 = require("./DBContext");
 const core_1 = require("@mikro-orm/core");
 const di_1 = require("@tsed/di");
+const MikroOrmContext_1 = require("./MikroOrmContext");
 let MikroOrmFactory = class MikroOrmFactory {
+    context;
+    constructor(context) {
+        this.context = context;
+    }
     create(options) {
         return core_1.MikroORM.init({
             ...options,
-            context: (name) => this.dbContext.get(name)
+            context: (name) => this.context.get(name)
         });
     }
 };
-tslib_1.__decorate([
-    (0, di_1.Inject)(),
-    tslib_1.__metadata("design:type", DBContext_1.DBContext)
-], MikroOrmFactory.prototype, "dbContext", void 0);
 MikroOrmFactory = tslib_1.__decorate([
-    (0, di_1.Injectable)()
+    (0, di_1.Injectable)(),
+    tslib_1.__param(0, (0, di_1.Inject)()),
+    tslib_1.__metadata("design:paramtypes", [MikroOrmContext_1.MikroOrmContext])
 ], MikroOrmFactory);
 exports.MikroOrmFactory = MikroOrmFactory;
 //# sourceMappingURL=MikroOrmFactory.js.map

package/lib/cjs/services/MikroOrmFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmFactory.js","sourceRoot":"","sources":["../../../src/services/MikroOrmFactory.ts"],"names":[],"mappings":";;;;AAAA,2CAAsC;AACtC,0CAAkD;AAClD,iCAA4C;AAG5C,IAAa,eAAe,GAA5B,MAAa,eAAe;IAInB,MAAM,CAAC,OAAgB;QAC5B,OAAO,eAAQ,CAAC,IAAI,CAAC;YACnB,GAAG,OAAO;YACV,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AARC;IADC,IAAA,WAAM,GAAE;sCACoB,qBAAS;kDAAC;AAF5B,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CAU3B;AAVY,0CAAe","sourcesContent":["import {DBContext} from \"./DBContext\";\nimport {MikroORM, Options} from \"@mikro-orm/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\n\n@Injectable()\nexport class MikroOrmFactory {\n  @Inject()\n  private readonly dbContext!: DBContext;\n\n  public create(options: Options): Promise<MikroORM> {\n    return MikroORM.init({\n      ...options,\n      context: (name: string) => this.dbContext.get(name)\n    });\n  }\n}\n"]}
+{"version":3,"file":"MikroOrmFactory.js","sourceRoot":"","sources":["../../../src/services/MikroOrmFactory.ts"],"names":[],"mappings":";;;;AAAA,0CAAkD;AAClD,iCAA4C;AAC5C,uDAAkD;AAGlD,IAAa,eAAe,GAA5B,MAAa,eAAe;IACa;IAAvC,YAAuC,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAE5D,MAAM,CAAC,OAAgB;QAC5B,OAAO,eAAQ,CAAC,IAAI,CAAC;YACnB,GAAG,OAAO;YACV,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AATY,eAAe;IAD3B,IAAA,eAAU,GAAE;IAEE,mBAAA,IAAA,WAAM,GAAE,CAAA;6CAA2B,iCAAe;GADpD,eAAe,CAS3B;AATY,0CAAe","sourcesContent":["import {MikroORM, Options} from \"@mikro-orm/core\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {MikroOrmContext} from \"./MikroOrmContext\";\n\n@Injectable()\nexport class MikroOrmFactory {\n  constructor(@Inject() private readonly context: MikroOrmContext) {}\n\n  public create(options: Options): Promise<MikroORM> {\n    return MikroORM.init({\n      ...options,\n      context: (name: string) => this.context.get(name)\n    });\n  }\n}\n"]}

package/lib/cjs/services/MikroOrmRegistry.d.ts

@@ -4,11 +4,13 @@ import { Logger } from "@tsed/logger";
 export declare class MikroOrmRegistry {
     private readonly logger;
     private readonly mikroOrmFactory;
+    private readonly DEFAULT_CONTEXT_NAME;
     private readonly instances;
     constructor(logger: Logger, mikroOrmFactory: MikroOrmFactory);
     register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM>;
     get(contextName?: string): MikroORM | undefined;
     has(contextName?: string): boolean;
+    values(): IterableIterator<MikroORM>;
     clear(): Promise<void>;
     private dispose;
 }

package/lib/cjs/services/MikroOrmRegistry.js

@@ -7,13 +7,16 @@ const di_1 = require("@tsed/di");
 const core_1 = require("@tsed/core");
 const logger_1 = require("@tsed/logger");
 let MikroOrmRegistry = class MikroOrmRegistry {
+    logger;
+    mikroOrmFactory;
+    DEFAULT_CONTEXT_NAME = "default";
+    instances = new Map();
     constructor(logger, mikroOrmFactory) {
         this.logger = logger;
         this.mikroOrmFactory = mikroOrmFactory;
-        this.instances = new Map();
     }
     async register(options) {
-        const contextName = (0, core_1.getValue)(options, "contextName", "default");
+        const contextName = (0, core_1.getValue)(options, "contextName", this.DEFAULT_CONTEXT_NAME);
         if (this.has(contextName)) {
             return this.get(contextName);
         }
@@ -24,11 +27,14 @@ let MikroOrmRegistry = class MikroOrmRegistry {
         this.logger.info(`Connected with MikroOrm to database: %s`, contextName);
         return instance;
     }
-    get(contextName = "default") {
-        return this.instances.get(contextName);
+    get(contextName) {
+        return this.instances.get(contextName ?? this.DEFAULT_CONTEXT_NAME);
     }
-    has(contextName = "default") {
-        return this.instances.has(contextName);
+    has(contextName) {
+        return this.instances.has(contextName ?? this.DEFAULT_CONTEXT_NAME);
+    }
+    values() {
+        return this.instances.values();
     }
     async clear() {
         const instances = [...this.instances.values()];

package/lib/cjs/services/MikroOrmRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmRegistry.js","sourceRoot":"","sources":["../../../src/services/MikroOrmRegistry.ts"],"names":[],"mappings":";;;;AAAA,uDAAkD;AAClD,iCAA4C;AAE5C,qCAAqD;AACrD,yCAAoC;AAGpC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,YAAuC,MAAc,EAA6B,eAAgC;QAA3E,WAAM,GAAN,MAAM,CAAQ;QAA6B,oBAAe,GAAf,eAAe,CAAiB;QAFjG,cAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE4D,CAAC;IAE/G,KAAK,CAAC,QAAQ,CAA2B,OAAmB;QACjE,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAS,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAExE,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;SAC/B;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,WAAW,CAAC,CAAC;QAEzE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,GAAG,CAAC,cAAsB,SAAS;QACxC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAEM,GAAG,CAAC,cAAsB,SAAS;QACxC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/C,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,IAAI,MAAM,QAAQ,CAAC,WAAW,EAAE,EAAE;YAChC,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC7B;IACH,CAAC;CACF,CAAA;AA7CY,gBAAgB;IAD5B,IAAA,eAAU,GAAE;IAIE,mBAAA,IAAA,WAAM,GAAE,CAAA;IAAmC,mBAAA,IAAA,WAAM,GAAE,CAAA;6CAAjB,eAAM,EAA8C,iCAAe;GAHvG,gBAAgB,CA6C5B;AA7CY,4CAAgB","sourcesContent":["import {MikroOrmFactory} from \"./MikroOrmFactory\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {IDatabaseDriver as DatabaseDriver, MikroORM, Options} from \"@mikro-orm/core\";\nimport {catchAsyncError, getValue} from \"@tsed/core\";\nimport {Logger} from \"@tsed/logger\";\n\n@Injectable()\nexport class MikroOrmRegistry {\n  private readonly instances = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly logger: Logger, @Inject() private readonly mikroOrmFactory: MikroOrmFactory) {}\n\n  public async register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM> {\n    const contextName = getValue<string>(options, \"contextName\", \"default\");\n\n    if (this.has(contextName)) {\n      return this.get(contextName)!;\n    }\n\n    this.logger.info(`Create connection with MikroOrm to database: %s`, contextName);\n    this.logger.debug(`options: %j`, options);\n\n    const instance = await this.mikroOrmFactory.create(options);\n\n    this.instances.set(contextName, instance);\n\n    this.logger.info(`Connected with MikroOrm to database: %s`, contextName);\n\n    return instance;\n  }\n\n  public get(contextName: string = \"default\"): MikroORM | undefined {\n    return this.instances.get(contextName);\n  }\n\n  public has(contextName: string = \"default\"): boolean {\n    return this.instances.has(contextName);\n  }\n\n  public async clear(): Promise<void> {\n    const instances = [...this.instances.values()];\n\n    await Promise.all(instances.map((instance: MikroORM) => catchAsyncError(() => this.dispose(instance))));\n\n    this.instances.clear();\n  }\n\n  private async dispose(instance: MikroORM): Promise<void> {\n    if (await instance.isConnected()) {\n      await instance.close(false);\n    }\n  }\n}\n"]}
+{"version":3,"file":"MikroOrmRegistry.js","sourceRoot":"","sources":["../../../src/services/MikroOrmRegistry.ts"],"names":[],"mappings":";;;;AAAA,uDAAkD;AAClD,iCAA4C;AAE5C,qCAAqD;AACrD,yCAAoC;AAGpC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAIY;IAA2C;IAHjE,oBAAoB,GAAG,SAAS,CAAC;IACjC,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEzD,YAAuC,MAAc,EAA6B,eAAgC;QAA3E,WAAM,GAAN,MAAM,CAAQ;QAA6B,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAE/G,KAAK,CAAC,QAAQ,CAA2B,OAAmB;QACjE,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAS,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAExF,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAE,CAAC;SAC/B;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAE1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAE1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,WAAW,CAAC,CAAC;QAEzE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,GAAG,CAAC,WAAoB;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACtE,CAAC;IAEM,GAAG,CAAC,WAAoB;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,IAAI,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACtE,CAAC;IAEM,MAAM;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/C,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,QAAkB;QACtC,IAAI,MAAM,QAAQ,CAAC,WAAW,EAAE,EAAE;YAChC,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC7B;IACH,CAAC;CACF,CAAA;AAlDY,gBAAgB;IAD5B,IAAA,eAAU,GAAE;IAKE,mBAAA,IAAA,WAAM,GAAE,CAAA;IAAmC,mBAAA,IAAA,WAAM,GAAE,CAAA;6CAAjB,eAAM,EAA8C,iCAAe;GAJvG,gBAAgB,CAkD5B;AAlDY,4CAAgB","sourcesContent":["import {MikroOrmFactory} from \"./MikroOrmFactory\";\nimport {Inject, Injectable} from \"@tsed/di\";\nimport {IDatabaseDriver as DatabaseDriver, MikroORM, Options} from \"@mikro-orm/core\";\nimport {catchAsyncError, getValue} from \"@tsed/core\";\nimport {Logger} from \"@tsed/logger\";\n\n@Injectable()\nexport class MikroOrmRegistry {\n  private readonly DEFAULT_CONTEXT_NAME = \"default\";\n  private readonly instances = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly logger: Logger, @Inject() private readonly mikroOrmFactory: MikroOrmFactory) {}\n\n  public async register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM> {\n    const contextName = getValue<string>(options, \"contextName\", this.DEFAULT_CONTEXT_NAME);\n\n    if (this.has(contextName)) {\n      return this.get(contextName)!;\n    }\n\n    this.logger.info(`Create connection with MikroOrm to database: %s`, contextName);\n    this.logger.debug(`options: %j`, options);\n\n    const instance = await this.mikroOrmFactory.create(options);\n\n    this.instances.set(contextName, instance);\n\n    this.logger.info(`Connected with MikroOrm to database: %s`, contextName);\n\n    return instance;\n  }\n\n  public get(contextName?: string): MikroORM | undefined {\n    return this.instances.get(contextName ?? this.DEFAULT_CONTEXT_NAME);\n  }\n\n  public has(contextName?: string): boolean {\n    return this.instances.has(contextName ?? this.DEFAULT_CONTEXT_NAME);\n  }\n\n  public values(): IterableIterator<MikroORM> {\n    return this.instances.values();\n  }\n\n  public async clear(): Promise<void> {\n    const instances = [...this.instances.values()];\n\n    await Promise.all(instances.map((instance: MikroORM) => catchAsyncError(() => this.dispose(instance))));\n\n    this.instances.clear();\n  }\n\n  private async dispose(instance: MikroORM): Promise<void> {\n    if (await instance.isConnected()) {\n      await instance.close(false);\n    }\n  }\n}\n"]}

package/lib/esm/MikroOrmModule.js

@@ -1,15 +1,28 @@
 import { __decorate, __metadata } from "tslib";
-import { Configuration, Constant, Inject, Module, registerProvider } from "@tsed/di";
+import "./services/MikroOrmFactory.js";
+import { Constant, Inject, Module, registerProvider } from "@tsed/di";
 import { MikroOrmRegistry } from "./services/MikroOrmRegistry.js";
-import { DBContext } from "./services/DBContext.js";
 import { RetryStrategy } from "./services/RetryStrategy.js";
+import { OptimisticLockErrorFilter } from "./filters/OptimisticLockErrorFilter.js";
+import { MikroOrmContext } from "./services/MikroOrmContext.js";
 let MikroOrmModule = class MikroOrmModule {
+    settings;
+    registry;
+    context;
     async $onInit() {
-        const promises = this.settings.map((opts) => this.mikroOrmRegistry.register(opts));
+        const promises = this.settings.map((opts) => this.registry.register(opts));
         await Promise.all(promises);
     }
     $onDestroy() {
-        return this.mikroOrmRegistry.clear();
+        return this.registry.clear();
+    }
+    $alterRunInContext(next) {
+        return () => this.createContext(next);
+    }
+    createContext(next) {
+        const instances = [...this.registry.values()];
+        const managers = instances.map((orm) => orm.em);
+        return this.context.run(managers, next);
     }
 };
 __decorate([
@@ -19,11 +32,14 @@ __decorate([
 __decorate([
     Inject(),
     __metadata("design:type", MikroOrmRegistry)
-], MikroOrmModule.prototype, "mikroOrmRegistry", void 0);
+], MikroOrmModule.prototype, "registry", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", MikroOrmContext)
+], MikroOrmModule.prototype, "context", void 0);
 MikroOrmModule = __decorate([
     Module({
-        imports: [DBContext, MikroOrmRegistry],
-        deps: [Configuration, MikroOrmRegistry]
+        responseFilters: [OptimisticLockErrorFilter]
     })
 ], MikroOrmModule);
 export { MikroOrmModule };