@tsed/mikro-orm 6.99.0 → 6.100.0

package/jest.config.js

@@ -5,10 +5,10 @@ module.exports = {
   ...require("@tsed/jest-config")(__dirname, "mikro-orm"),
   coverageThreshold: {
     global: {
-      branches: 90.91,
-      functions: 96.97,
-      lines: 99.06,
-      statements: 98.54
+      branches: 90.38,
+      functions: 91.43,
+      lines: 96.52,
+      statements: 97.1
     }
   }
 };

package/lib/cjs/MikroOrmModule.js

@@ -6,11 +6,11 @@ const services_1 = require("./services");
 const di_1 = require("@tsed/di");
 let MikroOrmModule = class MikroOrmModule {
     async $onInit() {
-        const promises = this.settings.map((opts) => this.mikroOrmRegistry.createConnection(opts));
+        const promises = this.settings.map((opts) => this.mikroOrmRegistry.register(opts));
         await Promise.all(promises);
     }
     $onDestroy() {
-        return this.mikroOrmRegistry.closeConnections();
+        return this.mikroOrmRegistry.clear();
     }
 };
 (0, tslib_1.__decorate)([

package/lib/cjs/MikroOrmModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmModule.js","sourceRoot":"","sources":["../../src/MikroOrmModule.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AACtE,iCAAsG;AAoBtG,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,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3F,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;CACF,CAAA;AAdC;IADC,IAAA,aAAQ,EAAC,UAAU,EAAE,EAAE,CAAC;;gDACa;AAGtC;IADC,IAAA,WAAM,GAAE;2CAC2B,2BAAgB;wDAAC;AAL1C,cAAc;IAJ1B,IAAA,WAAM,EAAC;QACN,OAAO,EAAE,CAAC,oBAAS,EAAE,2BAAgB,CAAC;QACtC,IAAI,EAAE,CAAC,kBAAa,EAAE,2BAAgB,CAAC;KACxC,CAAC;GACW,cAAc,CAgB1B;AAhBY,wCAAc;AAkB3B,uGAAuG;AACvG,IAAA,qBAAgB,EAAC,EAAC,OAAO,EAAE,wBAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import {DBContext, MikroOrmRegistry, RetryStrategy} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\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.createConnection(opts));\n\n    await Promise.all(promises);\n  }\n\n  public $onDestroy(): Promise<void> {\n    return this.mikroOrmRegistry.closeConnections();\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,yCAAsE;AACtE,iCAAsG;AAoBtG,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;2CAC2B,2BAAgB;wDAAC;AAL1C,cAAc;IAJ1B,IAAA,WAAM,EAAC;QACN,OAAO,EAAE,CAAC,oBAAS,EAAE,2BAAgB,CAAC;QACtC,IAAI,EAAE,CAAC,kBAAa,EAAE,2BAAgB,CAAC;KACxC,CAAC;GACW,cAAc,CAgB1B;AAhBY,wCAAc;AAkB3B,uGAAuG;AACvG,IAAA,qBAAgB,EAAC,EAAC,OAAO,EAAE,wBAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import {DBContext, MikroOrmRegistry, RetryStrategy} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\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"]}

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

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

package/lib/cjs/decorators/entityManager.js

@@ -4,16 +4,16 @@ exports.Em = exports.EntityManager = void 0;
 const di_1 = require("@tsed/di");
 const services_1 = require("../services");
 /**
- * Get the entity manager for the given connection name.
- * @param connectionName
+ * Get the entity manager for the given context name.
+ * @param {String} contextName
  * @decorator
  * @mikroOrm
  */
-const EntityManager = (connectionName) => (0, di_1.Inject)(services_1.MikroOrmRegistry, (registry) => { var _a; return (_a = registry.get(connectionName)) === null || _a === void 0 ? void 0 : _a.em; });
+const EntityManager = (contextName) => (0, di_1.Inject)(services_1.MikroOrmRegistry, (registry) => { var _a; return (_a = registry.get(contextName)) === null || _a === void 0 ? void 0 : _a.em; });
 exports.EntityManager = EntityManager;
 /**
- * Get the entity manager for the given connection name.
- * @param connectionName
+ * Get the entity manager for the given context name.
+ * @param {String} connectionName
  * @decorator
  * @mikroOrm
  */

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,0CAA6C;AAE7C;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAAC,cAAuB,EAAqB,EAAE,CAC1E,IAAA,WAAM,EAAC,2BAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,0CAAE,EAAE,CAAA,EAAA,CAAsB,CAAC;AADrG,QAAA,aAAa,iBACwF;AAElH;;;;;GAKG;AACU,QAAA,EAAE,GAAG,qBAAa,CAAC","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {MikroOrmRegistry} from \"../services\";\n\n/**\n * Get the entity manager for the given connection name.\n * @param connectionName\n * @decorator\n * @mikroOrm\n */\nexport const EntityManager = (connectionName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(connectionName)?.em) as PropertyDecorator;\n\n/**\n * Get the entity manager for the given connection name.\n * @param 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,0CAA6C;AAE7C;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAqB,EAAE,CACvE,IAAA,WAAM,EAAC,2BAAgB,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\";\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

@@ -1,5 +1,11 @@
 /**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
+ */
+export declare const Orm: (contextName?: string | undefined) => PropertyDecorator;
+/**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
  * @deprecated Since 2022-02-01. Use {@link Orm} instead
  */
 export declare const Connection: (contextName?: string | undefined) => PropertyDecorator;
-export declare const Orm: (contextName?: string | undefined) => PropertyDecorator;

package/lib/cjs/decorators/orm.js

@@ -1,13 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Orm = exports.Connection = void 0;
+exports.Connection = exports.Orm = void 0;
 const services_1 = require("../services");
 const di_1 = require("@tsed/di");
 /**
- * @deprecated Since 2022-02-01. Use {@link Orm} instead
+ * Get the ORM for the given context name.
+ * @param {String} contextName
  */
-const Connection = (contextName) => (0, exports.Orm)(contextName);
-exports.Connection = Connection;
 const Orm = (contextName) => (0, di_1.Inject)(services_1.MikroOrmRegistry, (registry) => registry.get(contextName));
 exports.Orm = Orm;
+/**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
+ * @deprecated Since 2022-02-01. Use {@link Orm} instead
+ */
+exports.Connection = exports.Orm;
 //# sourceMappingURL=orm.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"orm.js","sourceRoot":"","sources":["../../../src/decorators/orm.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAC7C,iCAAgC;AAEhC;;GAEG;AACI,MAAM,UAAU,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAAC,IAAA,WAAG,EAAC,WAAW,CAAC,CAAC;AAA3E,QAAA,UAAU,cAAiE;AAEjF,MAAM,GAAG,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAC7D,IAAA,WAAM,EAAC,2BAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAsB,CAAC;AAD9F,QAAA,GAAG,OAC2F","sourcesContent":["import {MikroOrmRegistry} from \"../services\";\nimport {Inject} from \"@tsed/di\";\n\n/**\n * @deprecated Since 2022-02-01. Use {@link Orm} instead\n */\nexport const Connection = (contextName?: string): PropertyDecorator => Orm(contextName);\n\nexport const Orm = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)) as PropertyDecorator;\n"]}
+{"version":3,"file":"orm.js","sourceRoot":"","sources":["../../../src/decorators/orm.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAC7C,iCAAgC;AAEhC;;;GAGG;AACI,MAAM,GAAG,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAC7D,IAAA,WAAM,EAAC,2BAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAsB,CAAC;AAD9F,QAAA,GAAG,OAC2F;AAE3G;;;;GAIG;AACU,QAAA,UAAU,GAAG,WAAG,CAAC","sourcesContent":["import {MikroOrmRegistry} from \"../services\";\nimport {Inject} from \"@tsed/di\";\n\n/**\n * Get the ORM for the given context name.\n * @param {String} contextName\n */\nexport const Orm = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)) as PropertyDecorator;\n\n/**\n * Get the ORM for the given context name.\n * @param {String} contextName\n * @deprecated Since 2022-02-01. Use {@link Orm} instead\n */\nexport const Connection = Orm;\n"]}

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

@@ -1,2 +1,6 @@
 import { TransactionOptions } from "../interceptors";
-export declare const Transactional: (connectionOrOptions?: string | TransactionOptions | undefined) => MethodDecorator;
+/**
+ * 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;

package/lib/cjs/decorators/transactional.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Transactional = void 0;
 const interceptors_1 = require("../interceptors");
 const di_1 = require("@tsed/di");
-const Transactional = (connectionOrOptions) => (0, di_1.Intercept)(interceptors_1.TransactionalInterceptor, connectionOrOptions);
+/**
+ * Register a new request context for your method and execute it inside the context.
+ * @param {String | TransactionOptions} contextNameOrOptions
+ */
+const Transactional = (contextNameOrOptions) => (0, di_1.Intercept)(interceptors_1.TransactionalInterceptor, contextNameOrOptions);
 exports.Transactional = Transactional;
 //# sourceMappingURL=transactional.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/decorators/transactional.ts"],"names":[],"mappings":";;;AAAA,kDAA6E;AAC7E,iCAAmC;AAE5B,MAAM,aAAa,GAAG,CAAC,mBAAiD,EAAmB,EAAE,CAClG,IAAA,cAAS,EAAC,uCAAwB,EAAE,mBAAmB,CAAC,CAAC;AAD9C,QAAA,aAAa,iBACiC","sourcesContent":["import {TransactionalInterceptor, TransactionOptions} from \"../interceptors\";\nimport {Intercept} from \"@tsed/di\";\n\nexport const Transactional = (connectionOrOptions?: string | TransactionOptions): MethodDecorator =>\n  Intercept(TransactionalInterceptor, connectionOrOptions);\n"]}
+{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/decorators/transactional.ts"],"names":[],"mappings":";;;AAAA,kDAA6E;AAC7E,iCAAmC;AAEnC;;;GAGG;AACI,MAAM,aAAa,GAAG,CAAC,oBAAkD,EAAmB,EAAE,CACnG,IAAA,cAAS,EAAC,uCAAwB,EAAE,oBAAoB,CAAC,CAAC;AAD/C,QAAA,aAAa,iBACkC","sourcesContent":["import {TransactionalInterceptor, TransactionOptions} from \"../interceptors\";\nimport {Intercept} from \"@tsed/di\";\n\n/**\n * Register a new request context for your method and execute it inside the context.\n * @param {String | TransactionOptions} contextNameOrOptions\n */\nexport const Transactional = (contextNameOrOptions?: string | TransactionOptions): MethodDecorator =>\n  Intercept(TransactionalInterceptor, contextNameOrOptions);\n"]}

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

@@ -2,8 +2,12 @@ import { DBContext, MikroOrmRegistry, RetryStrategy } from "../services";
 import { InterceptorContext, InterceptorMethods, InterceptorNext } from "@tsed/di";
 import { Logger } from "@tsed/logger";
 export interface TransactionOptions {
-    connectionName?: string;
     retry?: boolean;
+    contextName?: string;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link contextName} instead
+     */
+    connectionName?: string;
 }
 export declare class TransactionalInterceptor implements InterceptorMethods {
     private readonly registry;

package/lib/cjs/interceptors/TransactionalInterceptor.js

@@ -17,11 +17,11 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         if (options.retry && !this.retryStrategy) {
             this.logger.warn(`To retry a transaction you have to implement a "${services_1.RetryStrategy.description}" interface`);
         }
-        const ctx = this.context.getContext();
+        const ctx = this.context.entries();
         if (!ctx) {
             return this.runWithinNewCtx(next, options);
         }
-        if (ctx.has(options.connectionName)) {
+        if (ctx.has(options.contextName)) {
             return next();
         }
         return this.runUnderCtx(next, ctx, options);
@@ -31,33 +31,48 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         return this.runUnderCtx(next, ctx, options);
     }
     runUnderCtx(next, ctx, options) {
-        const orm = this.registry.get(options.connectionName);
-        const em = orm.em.fork(true, true);
+        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.connectionName, next);
+        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()); });
     }
     extractContextName(context) {
+        var _a;
         const options = context.options || {};
-        let connectionName;
+        let contextName;
         let retry;
         if (typeof options === "string") {
-            connectionName = options;
+            contextName = options;
         }
         else if (options) {
-            connectionName = options.connectionName;
+            contextName = (_a = options.contextName) !== null && _a !== void 0 ? _a : options.connectionName;
             retry = options.retry;
         }
-        if (!connectionName) {
-            connectionName = "default";
+        if (!contextName) {
+            contextName = "default";
         }
         if (!retry) {
             retry = false;
         }
-        return { connectionName, retry };
+        return { contextName, retry };
     }
-    async executeInTransaction(connectionName, next) {
-        const em = this.context.get(connectionName);
+    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;

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 {DBContext, MikroOrmRegistry, RetryStrategy} from \"../services\";\nimport {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {Logger} from \"@tsed/logger\";\n\nexport interface TransactionOptions {\n  connectionName?: string;\n  retry?: boolean;\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.getContext();\n\n    if (!ctx) {\n      return this.runWithinNewCtx(next, options);\n    }\n\n    if (ctx.has(options.connectionName!)) {\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.connectionName);\n    const em = orm.em.fork(true, true);\n\n    ctx.set(em.name, em);\n\n    const runInTransaction = () => this.executeInTransaction(options.connectionName!, 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 connectionName: string | undefined;\n    let retry: boolean | undefined;\n\n    if (typeof options === \"string\") {\n      connectionName = options;\n    } else if (options) {\n      connectionName = options.connectionName;\n      retry = options.retry;\n    }\n\n    if (!connectionName) {\n      connectionName = \"default\";\n    }\n\n    if (!retry) {\n      retry = false;\n    }\n\n    return {connectionName, retry};\n  }\n\n  private async executeInTransaction(connectionName: string, next: InterceptorNext): Promise<unknown> {\n    const em = this.context.get(connectionName);\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 {DBContext, MikroOrmRegistry, RetryStrategy} from \"../services\";\nimport {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {Logger} from \"@tsed/logger\";\n\nexport interface TransactionOptions {\n  retry?: boolean;\n  contextName?: string;\n  /**\n   * @deprecated Since 2022-02-01. Use {@link contextName} instead\n   */\n  connectionName?: 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 = (orm.em.fork as (\n      clearOrForkOptions?: boolean | {clear?: boolean; useContext?: boolean},\n      useContext?: boolean\n    ) => EntityManager)({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"]}

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

@@ -3,6 +3,10 @@ export declare class DBContext {
     private readonly storage;
     constructor();
     run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R;
+    entries(): Map<string, EntityManager> | undefined;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link entries} instead
+     */
     getContext(): Map<string, EntityManager> | undefined;
     get(contextName: string): EntityManager | undefined;
     has(contextName: string): boolean;

package/lib/cjs/services/DBContext.js

@@ -17,15 +17,21 @@ let DBContext = class DBContext {
     run(ctx, callback) {
         return this.storage.run(ctx, callback);
     }
-    getContext() {
+    entries() {
         return this.storage.getStore();
     }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link entries} instead
+     */
+    getContext() {
+        return this.entries();
+    }
     get(contextName) {
-        const context = this.getContext();
+        const context = this.entries();
         return context === null || context === void 0 ? void 0 : context.get(contextName);
     }
     has(contextName) {
-        const context = this.getContext();
+        const context = this.entries();
         return !!(context === null || context === void 0 ? void 0 : context.has(contextName));
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"DBContext.js","sourceRoot":"","sources":["../../../src/services/DBContext.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAEpC,6CAA8C;AAG9C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAGpB;QAFiB,YAAO,GAAG,IAAI,+BAAiB,EAA8B,CAAC;QAG7E,IAAI,+BAAiB,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,+BAAiB,EAAE,CAAC;SACxC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;SAC5G;IACH,CAAC;IAEM,GAAG,CAAI,GAA+B,EAAE,QAA+B;QAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAA,CAAC;IACrC,CAAC;CACF,CAAA;AA9BY,SAAS;IADrB,IAAA,eAAU,GAAE;;GACA,SAAS,CA8BrB;AA9BY,8BAAS","sourcesContent":["import {Injectable} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {AsyncLocalStorage} from \"async_hooks\";\n\n@Injectable()\nexport class DBContext {\n  private readonly storage = new AsyncLocalStorage<Map<string, EntityManager>>();\n\n  constructor() {\n    if (AsyncLocalStorage) {\n      this.storage = new AsyncLocalStorage();\n    } else {\n      throw new Error(`AsyncLocalStorage is not available for your Node.js version (${process.versions.node}).`);\n    }\n  }\n\n  public run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R {\n    return this.storage.run(ctx, callback);\n  }\n\n  public getContext(): Map<string, EntityManager> | undefined {\n    return this.storage.getStore();\n  }\n\n  public get(contextName: string): EntityManager | undefined {\n    const context = this.getContext();\n\n    return context?.get(contextName);\n  }\n\n  public has(contextName: string): boolean {\n    const context = this.getContext();\n\n    return !!context?.has(contextName);\n  }\n}\n"]}
+{"version":3,"file":"DBContext.js","sourceRoot":"","sources":["../../../src/services/DBContext.ts"],"names":[],"mappings":";;;;AAAA,iCAAoC;AAEpC,6CAA8C;AAG9C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAGpB;QAFiB,YAAO,GAAG,IAAI,+BAAiB,EAA8B,CAAC;QAG7E,IAAI,+BAAiB,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,+BAAiB,EAAE,CAAC;SACxC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;SAC5G;IACH,CAAC;IAEM,GAAG,CAAI,GAA+B,EAAE,QAA+B;QAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED;;OAEG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE/B,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE/B,OAAO,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAA,CAAC;IACrC,CAAC;CACF,CAAA;AArCY,SAAS;IADrB,IAAA,eAAU,GAAE;;GACA,SAAS,CAqCrB;AArCY,8BAAS","sourcesContent":["import {Injectable} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {AsyncLocalStorage} from \"async_hooks\";\n\n@Injectable()\nexport class DBContext {\n  private readonly storage = new AsyncLocalStorage<Map<string, EntityManager>>();\n\n  constructor() {\n    if (AsyncLocalStorage) {\n      this.storage = new AsyncLocalStorage();\n    } else {\n      throw new Error(`AsyncLocalStorage is not available for your Node.js version (${process.versions.node}).`);\n    }\n  }\n\n  public run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R {\n    return this.storage.run(ctx, callback);\n  }\n\n  public entries(): Map<string, EntityManager> | undefined {\n    return this.storage.getStore();\n  }\n\n  /**\n   * @deprecated Since 2022-02-01. Use {@link entries} instead\n   */\n  public getContext(): Map<string, EntityManager> | undefined {\n    return this.entries();\n  }\n\n  public get(contextName: string): EntityManager | undefined {\n    const context = this.entries();\n\n    return context?.get(contextName);\n  }\n\n  public has(contextName: string): boolean {\n    const context = this.entries();\n\n    return !!context?.has(contextName);\n  }\n}\n"]}

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

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

package/lib/cjs/services/MikroOrmFactory.js

@@ -6,9 +6,9 @@ const DBContext_1 = require("./DBContext");
 const core_1 = require("@mikro-orm/core");
 const di_1 = require("@tsed/di");
 let MikroOrmFactory = class MikroOrmFactory {
-    create(connectionOptions) {
+    create(options) {
         return core_1.MikroORM.init({
-            ...connectionOptions,
+            ...options,
             context: (name) => this.dbContext.get(name)
         });
     }

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,iBAA0B;QACtC,OAAO,eAAQ,CAAC,IAAI,CAAC;YACnB,GAAG,iBAAiB;YACpB,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;2CACoB,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(connectionOptions: Options): Promise<MikroORM> {\n    return MikroORM.init({\n      ...connectionOptions,\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,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;2CACoB,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"]}

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

@@ -4,11 +4,19 @@ import { Logger } from "@tsed/logger";
 export declare class MikroOrmRegistry {
     private readonly logger;
     private readonly mikroOrmFactory;
-    private readonly connections;
+    private readonly instances;
     constructor(logger: Logger, mikroOrmFactory: MikroOrmFactory);
-    createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM>;
-    get(id?: string): MikroORM;
-    has(id?: string): boolean;
+    register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM>;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link register} instead
+     */
+    createConnection<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM>;
+    get(contextName?: string): MikroORM | undefined;
+    has(contextName?: string): boolean;
+    clear(): Promise<void>;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link clear} instead
+     */
     closeConnections(): Promise<void>;
     private dispose;
 }

package/lib/cjs/services/MikroOrmRegistry.js

@@ -10,35 +10,46 @@ let MikroOrmRegistry = class MikroOrmRegistry {
     constructor(logger, mikroOrmFactory) {
         this.logger = logger;
         this.mikroOrmFactory = mikroOrmFactory;
-        this.connections = new Map();
+        this.instances = new Map();
     }
-    async createConnection(connectionOptions) {
-        const connectionName = (0, core_1.getValue)(connectionOptions, "contextName", "default");
-        if (this.has(connectionName)) {
-            return this.get(connectionName);
+    async register(options) {
+        const contextName = (0, core_1.getValue)(options, "contextName", "default");
+        if (this.has(contextName)) {
+            return this.get(contextName);
         }
-        this.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);
-        this.logger.debug(`options: %j`, connectionOptions);
-        const connection = await this.mikroOrmFactory.create(connectionOptions);
-        this.connections.set(connectionName, connection);
-        this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
-        return connection;
-    }
-    get(id = "default") {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this.connections.get(id);
-    }
-    has(id = "default") {
-        return this.connections.has(id);
-    }
-    async closeConnections() {
-        const connections = [...this.connections.values()];
-        await Promise.all(connections.map((connection) => (0, core_1.catchAsyncError)(() => this.dispose(connection))));
-        this.connections.clear();
-    }
-    async dispose(connection) {
-        if (await connection.isConnected()) {
-            await connection.close(false);
+        this.logger.info(`Create connection with MikroOrm to database: %s`, contextName);
+        this.logger.debug(`options: %j`, options);
+        const instance = await this.mikroOrmFactory.create(options);
+        this.instances.set(contextName, instance);
+        this.logger.info(`Connected with MikroOrm to database: %s`, contextName);
+        return instance;
+    }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link register} instead
+     */
+    createConnection(options) {
+        return this.register(options);
+    }
+    get(contextName = "default") {
+        return this.instances.get(contextName);
+    }
+    has(contextName = "default") {
+        return this.instances.has(contextName);
+    }
+    async clear() {
+        const instances = [...this.instances.values()];
+        await Promise.all(instances.map((instance) => (0, core_1.catchAsyncError)(() => this.dispose(instance))));
+        this.instances.clear();
+    }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link clear} instead
+     */
+    closeConnections() {
+        return this.clear();
+    }
+    async dispose(instance) {
+        if (await instance.isConnected()) {
+            await instance.close(false);
         }
     }
 };

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,gBAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE0D,CAAC;IAE/G,KAAK,CAAC,gBAAgB,CAA2B,iBAA6B;QACnF,MAAM,cAAc,GAAG,IAAA,eAAQ,EAAS,iBAAiB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAErF,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,cAAc,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAExE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,cAAc,CAAC,CAAC;QAE5E,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,GAAG,CAAC,KAAa,SAAS;QAC/B,oEAAoE;QACpE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,KAAa,SAAS;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnD,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAoB,EAAE,EAAE,CAAC,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,UAAoB;QACxC,IAAI,MAAM,UAAU,CAAC,WAAW,EAAE,EAAE;YAClC,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC/B;IACH,CAAC;CACF,CAAA;AA9CY,gBAAgB;IAD5B,IAAA,eAAU,GAAE;IAIE,wBAAA,IAAA,WAAM,GAAE,CAAA;IAAmC,wBAAA,IAAA,WAAM,GAAE,CAAA;kDAAjB,eAAM,EAA8C,iCAAe;GAHvG,gBAAgB,CA8C5B;AA9CY,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 connections = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly logger: Logger, @Inject() private readonly mikroOrmFactory: MikroOrmFactory) {}\n\n  public async createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM> {\n    const connectionName = getValue<string>(connectionOptions, \"contextName\", \"default\");\n\n    if (this.has(connectionName)) {\n      return this.get(connectionName);\n    }\n\n    this.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);\n    this.logger.debug(`options: %j`, connectionOptions);\n\n    const connection = await this.mikroOrmFactory.create(connectionOptions);\n\n    this.connections.set(connectionName, connection);\n\n    this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);\n\n    return connection;\n  }\n\n  public get(id: string = \"default\"): MikroORM {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    return this.connections.get(id)!;\n  }\n\n  public has(id: string = \"default\"): boolean {\n    return this.connections.has(id);\n  }\n\n  public async closeConnections(): Promise<void> {\n    const connections = [...this.connections.values()];\n\n    await Promise.all(connections.map((connection: MikroORM) => catchAsyncError(() => this.dispose(connection))));\n\n    this.connections.clear();\n  }\n\n  private async dispose(connection: MikroORM): Promise<void> {\n    if (await connection.isConnected()) {\n      await connection.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;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;IAED;;OAEG;IACI,gBAAgB,CAA2B,OAAmB;QACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChC,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;IAED;;OAEG;IACI,gBAAgB;QACrB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,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;AA3DY,gBAAgB;IAD5B,IAAA,eAAU,GAAE;IAIE,wBAAA,IAAA,WAAM,GAAE,CAAA;IAAmC,wBAAA,IAAA,WAAM,GAAE,CAAA;kDAAjB,eAAM,EAA8C,iCAAe;GAHvG,gBAAgB,CA2D5B;AA3DY,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  /**\n   * @deprecated Since 2022-02-01. Use {@link register} instead\n   */\n  public createConnection<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM> {\n    return this.register(options);\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  /**\n   * @deprecated Since 2022-02-01. Use {@link clear} instead\n   */\n  public closeConnections(): Promise<void> {\n    return this.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

@@ -3,11 +3,11 @@ import { DBContext, MikroOrmRegistry, RetryStrategy } from "./services";
 import { Configuration, Constant, Inject, Module, registerProvider } from "@tsed/di";
 let MikroOrmModule = class MikroOrmModule {
     async $onInit() {
-        const promises = this.settings.map((opts) => this.mikroOrmRegistry.createConnection(opts));
+        const promises = this.settings.map((opts) => this.mikroOrmRegistry.register(opts));
         await Promise.all(promises);
     }
     $onDestroy() {
-        return this.mikroOrmRegistry.closeConnections();
+        return this.mikroOrmRegistry.clear();
     }
 };
 __decorate([

package/lib/esm/MikroOrmModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmModule.js","sourceRoot":"","sources":["../../src/MikroOrmModule.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACtE,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAqB,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAoBtG,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,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;QAE3F,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC9B,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAClD,CAAC;CACF,CAAA;AAdC;IADC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;;gDACa;AAGtC;IADC,MAAM,EAAE;8BAC2B,gBAAgB;wDAAC;AAL1C,cAAc;IAJ1B,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;QACtC,IAAI,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC;KACxC,CAAC;GACW,cAAc,CAgB1B;SAhBY,cAAc;AAkB3B,uGAAuG;AACvG,gBAAgB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import {DBContext, MikroOrmRegistry, RetryStrategy} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\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.createConnection(opts));\n\n    await Promise.all(promises);\n  }\n\n  public $onDestroy(): Promise<void> {\n    return this.mikroOrmRegistry.closeConnections();\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,OAAO,EAAC,SAAS,EAAE,gBAAgB,EAAE,aAAa,EAAC,MAAM,YAAY,CAAC;AACtE,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAqB,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAoBtG,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,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;;gDACa;AAGtC;IADC,MAAM,EAAE;8BAC2B,gBAAgB;wDAAC;AAL1C,cAAc;IAJ1B,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;QACtC,IAAI,EAAE,CAAC,aAAa,EAAE,gBAAgB,CAAC;KACxC,CAAC;GACW,cAAc,CAgB1B;SAhBY,cAAc;AAkB3B,uGAAuG;AACvG,gBAAgB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC","sourcesContent":["import {DBContext, MikroOrmRegistry, RetryStrategy} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit, registerProvider} from \"@tsed/di\";\nimport {Options} from \"@mikro-orm/core\";\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"]}

package/lib/esm/decorators/entityManager.js

@@ -1,15 +1,15 @@
 import { Inject } from "@tsed/di";
 import { MikroOrmRegistry } from "../services";
 /**
- * Get the entity manager for the given connection name.
- * @param connectionName
+ * Get the entity manager for the given context name.
+ * @param {String} contextName
  * @decorator
  * @mikroOrm
  */
-export const EntityManager = (connectionName) => Inject(MikroOrmRegistry, (registry) => { var _a; return (_a = registry.get(connectionName)) === null || _a === void 0 ? void 0 : _a.em; });
+export const EntityManager = (contextName) => Inject(MikroOrmRegistry, (registry) => { var _a; return (_a = registry.get(contextName)) === null || _a === void 0 ? void 0 : _a.em; });
 /**
- * Get the entity manager for the given connection name.
- * @param connectionName
+ * Get the entity manager for the given context name.
+ * @param {String} connectionName
  * @decorator
  * @mikroOrm
  */

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

@@ -1 +1 @@
-{"version":3,"file":"entityManager.js","sourceRoot":"","sources":["../../../src/decorators/entityManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,cAAuB,EAAqB,EAAE,CAC1E,MAAM,CAAC,gBAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,0CAAE,EAAE,CAAA,EAAA,CAAsB,CAAC;AAElH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,aAAa,CAAC","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {MikroOrmRegistry} from \"../services\";\n\n/**\n * Get the entity manager for the given connection name.\n * @param connectionName\n * @decorator\n * @mikroOrm\n */\nexport const EntityManager = (connectionName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(connectionName)?.em) as PropertyDecorator;\n\n/**\n * Get the entity manager for the given connection name.\n * @param 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,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,WAAoB,EAAqB,EAAE,CACvE,MAAM,CAAC,gBAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,0CAAE,EAAE,CAAA,EAAA,CAAsB,CAAC;AAE/G;;;;;GAKG;AACH,MAAM,CAAC,MAAM,EAAE,GAAG,aAAa,CAAC","sourcesContent":["import {Inject} from \"@tsed/di\";\nimport {MikroOrmRegistry} from \"../services\";\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/esm/decorators/orm.js

@@ -1,8 +1,14 @@
 import { MikroOrmRegistry } from "../services";
 import { Inject } from "@tsed/di";
 /**
- * @deprecated Since 2022-02-01. Use {@link Orm} instead
+ * Get the ORM for the given context name.
+ * @param {String} contextName
  */
-export const Connection = (contextName) => Orm(contextName);
 export const Orm = (contextName) => Inject(MikroOrmRegistry, (registry) => registry.get(contextName));
+/**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
+ * @deprecated Since 2022-02-01. Use {@link Orm} instead
+ */
+export const Connection = Orm;
 //# sourceMappingURL=orm.js.map

package/lib/esm/decorators/orm.js.map

@@ -1 +1 @@
-{"version":3,"file":"orm.js","sourceRoot":"","sources":["../../../src/decorators/orm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAExF,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAC7D,MAAM,CAAC,gBAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAsB,CAAC","sourcesContent":["import {MikroOrmRegistry} from \"../services\";\nimport {Inject} from \"@tsed/di\";\n\n/**\n * @deprecated Since 2022-02-01. Use {@link Orm} instead\n */\nexport const Connection = (contextName?: string): PropertyDecorator => Orm(contextName);\n\nexport const Orm = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)) as PropertyDecorator;\n"]}
+{"version":3,"file":"orm.js","sourceRoot":"","sources":["../../../src/decorators/orm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC;;;GAGG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,WAAoB,EAAqB,EAAE,CAC7D,MAAM,CAAC,gBAAgB,EAAE,CAAC,QAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAsB,CAAC;AAE3G;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,CAAC","sourcesContent":["import {MikroOrmRegistry} from \"../services\";\nimport {Inject} from \"@tsed/di\";\n\n/**\n * Get the ORM for the given context name.\n * @param {String} contextName\n */\nexport const Orm = (contextName?: string): PropertyDecorator =>\n  Inject(MikroOrmRegistry, (registry: MikroOrmRegistry) => registry.get(contextName)) as PropertyDecorator;\n\n/**\n * Get the ORM for the given context name.\n * @param {String} contextName\n * @deprecated Since 2022-02-01. Use {@link Orm} instead\n */\nexport const Connection = Orm;\n"]}

package/lib/esm/decorators/transactional.js

@@ -1,4 +1,8 @@
 import { TransactionalInterceptor } from "../interceptors";
 import { Intercept } from "@tsed/di";
-export const Transactional = (connectionOrOptions) => Intercept(TransactionalInterceptor, connectionOrOptions);
+/**
+ * Register a new request context for your method and execute it inside the context.
+ * @param {String | TransactionOptions} contextNameOrOptions
+ */
+export const Transactional = (contextNameOrOptions) => Intercept(TransactionalInterceptor, contextNameOrOptions);
 //# sourceMappingURL=transactional.js.map

package/lib/esm/decorators/transactional.js.map

@@ -1 +1 @@
-{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/decorators/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAqB,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,mBAAiD,EAAmB,EAAE,CAClG,SAAS,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAAC","sourcesContent":["import {TransactionalInterceptor, TransactionOptions} from \"../interceptors\";\nimport {Intercept} from \"@tsed/di\";\n\nexport const Transactional = (connectionOrOptions?: string | TransactionOptions): MethodDecorator =>\n  Intercept(TransactionalInterceptor, connectionOrOptions);\n"]}
+{"version":3,"file":"transactional.js","sourceRoot":"","sources":["../../../src/decorators/transactional.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,wBAAwB,EAAqB,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AAEnC;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,oBAAkD,EAAmB,EAAE,CACnG,SAAS,CAAC,wBAAwB,EAAE,oBAAoB,CAAC,CAAC","sourcesContent":["import {TransactionalInterceptor, TransactionOptions} from \"../interceptors\";\nimport {Intercept} from \"@tsed/di\";\n\n/**\n * Register a new request context for your method and execute it inside the context.\n * @param {String | TransactionOptions} contextNameOrOptions\n */\nexport const Transactional = (contextNameOrOptions?: string | TransactionOptions): MethodDecorator =>\n  Intercept(TransactionalInterceptor, contextNameOrOptions);\n"]}

package/lib/esm/interceptors/TransactionalInterceptor.js

@@ -14,11 +14,11 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         if (options.retry && !this.retryStrategy) {
             this.logger.warn(`To retry a transaction you have to implement a "${RetryStrategy.description}" interface`);
         }
-        const ctx = this.context.getContext();
+        const ctx = this.context.entries();
         if (!ctx) {
             return this.runWithinNewCtx(next, options);
         }
-        if (ctx.has(options.connectionName)) {
+        if (ctx.has(options.contextName)) {
             return next();
         }
         return this.runUnderCtx(next, ctx, options);
@@ -28,33 +28,48 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         return this.runUnderCtx(next, ctx, options);
     }
     runUnderCtx(next, ctx, options) {
-        const orm = this.registry.get(options.connectionName);
-        const em = orm.em.fork(true, true);
+        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.connectionName, next);
+        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()); });
     }
     extractContextName(context) {
+        var _a;
         const options = context.options || {};
-        let connectionName;
+        let contextName;
         let retry;
         if (typeof options === "string") {
-            connectionName = options;
+            contextName = options;
         }
         else if (options) {
-            connectionName = options.connectionName;
+            contextName = (_a = options.contextName) !== null && _a !== void 0 ? _a : options.connectionName;
             retry = options.retry;
         }
-        if (!connectionName) {
-            connectionName = "default";
+        if (!contextName) {
+            contextName = "default";
         }
         if (!retry) {
             retry = false;
         }
-        return { connectionName, retry };
+        return { contextName, retry };
     }
-    async executeInTransaction(connectionName, next) {
-        const em = this.context.get(connectionName);
+    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;

package/lib/esm/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 {DBContext, MikroOrmRegistry, RetryStrategy} from \"../services\";\nimport {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {Logger} from \"@tsed/logger\";\n\nexport interface TransactionOptions {\n  connectionName?: string;\n  retry?: boolean;\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.getContext();\n\n    if (!ctx) {\n      return this.runWithinNewCtx(next, options);\n    }\n\n    if (ctx.has(options.connectionName!)) {\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.connectionName);\n    const em = orm.em.fork(true, true);\n\n    ctx.set(em.name, em);\n\n    const runInTransaction = () => this.executeInTransaction(options.connectionName!, 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 connectionName: string | undefined;\n    let retry: boolean | undefined;\n\n    if (typeof options === \"string\") {\n      connectionName = options;\n    } else if (options) {\n      connectionName = options.connectionName;\n      retry = options.retry;\n    }\n\n    if (!connectionName) {\n      connectionName = \"default\";\n    }\n\n    if (!retry) {\n      retry = false;\n    }\n\n    return {connectionName, retry};\n  }\n\n  private async executeInTransaction(connectionName: string, next: InterceptorNext): Promise<unknown> {\n    const em = this.context.get(connectionName);\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 {DBContext, MikroOrmRegistry, RetryStrategy} from \"../services\";\nimport {Inject, Interceptor, InterceptorContext, InterceptorMethods, InterceptorNext} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {Logger} from \"@tsed/logger\";\n\nexport interface TransactionOptions {\n  retry?: boolean;\n  contextName?: string;\n  /**\n   * @deprecated Since 2022-02-01. Use {@link contextName} instead\n   */\n  connectionName?: 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 = (orm.em.fork as (\n      clearOrForkOptions?: boolean | {clear?: boolean; useContext?: boolean},\n      useContext?: boolean\n    ) => EntityManager)({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"]}

package/lib/esm/services/DBContext.js

@@ -14,15 +14,21 @@ let DBContext = class DBContext {
     run(ctx, callback) {
         return this.storage.run(ctx, callback);
     }
-    getContext() {
+    entries() {
         return this.storage.getStore();
     }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link entries} instead
+     */
+    getContext() {
+        return this.entries();
+    }
     get(contextName) {
-        const context = this.getContext();
+        const context = this.entries();
         return context === null || context === void 0 ? void 0 : context.get(contextName);
     }
     has(contextName) {
-        const context = this.getContext();
+        const context = this.entries();
         return !!(context === null || context === void 0 ? void 0 : context.has(contextName));
     }
 };

package/lib/esm/services/DBContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"DBContext.js","sourceRoot":"","sources":["../../../src/services/DBContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAG9C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAGpB;QAFiB,YAAO,GAAG,IAAI,iBAAiB,EAA8B,CAAC;QAG7E,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC;SACxC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;SAC5G;IACH,CAAC;IAEM,GAAG,CAAI,GAA+B,EAAE,QAA+B;QAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAElC,OAAO,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAA,CAAC;IACrC,CAAC;CACF,CAAA;AA9BY,SAAS;IADrB,UAAU,EAAE;;GACA,SAAS,CA8BrB;SA9BY,SAAS","sourcesContent":["import {Injectable} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {AsyncLocalStorage} from \"async_hooks\";\n\n@Injectable()\nexport class DBContext {\n  private readonly storage = new AsyncLocalStorage<Map<string, EntityManager>>();\n\n  constructor() {\n    if (AsyncLocalStorage) {\n      this.storage = new AsyncLocalStorage();\n    } else {\n      throw new Error(`AsyncLocalStorage is not available for your Node.js version (${process.versions.node}).`);\n    }\n  }\n\n  public run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R {\n    return this.storage.run(ctx, callback);\n  }\n\n  public getContext(): Map<string, EntityManager> | undefined {\n    return this.storage.getStore();\n  }\n\n  public get(contextName: string): EntityManager | undefined {\n    const context = this.getContext();\n\n    return context?.get(contextName);\n  }\n\n  public has(contextName: string): boolean {\n    const context = this.getContext();\n\n    return !!context?.has(contextName);\n  }\n}\n"]}
+{"version":3,"file":"DBContext.js","sourceRoot":"","sources":["../../../src/services/DBContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAG9C,IAAa,SAAS,GAAtB,MAAa,SAAS;IAGpB;QAFiB,YAAO,GAAG,IAAI,iBAAiB,EAA8B,CAAC;QAG7E,IAAI,iBAAiB,EAAE;YACrB,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAC;SACxC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC;SAC5G;IACH,CAAC;IAEM,GAAG,CAAI,GAA+B,EAAE,QAA+B;QAC5E,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAEM,OAAO;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;IAED;;OAEG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE/B,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,WAAmB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE/B,OAAO,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,WAAW,CAAC,CAAA,CAAC;IACrC,CAAC;CACF,CAAA;AArCY,SAAS;IADrB,UAAU,EAAE;;GACA,SAAS,CAqCrB;SArCY,SAAS","sourcesContent":["import {Injectable} from \"@tsed/di\";\nimport {EntityManager} from \"@mikro-orm/core\";\nimport {AsyncLocalStorage} from \"async_hooks\";\n\n@Injectable()\nexport class DBContext {\n  private readonly storage = new AsyncLocalStorage<Map<string, EntityManager>>();\n\n  constructor() {\n    if (AsyncLocalStorage) {\n      this.storage = new AsyncLocalStorage();\n    } else {\n      throw new Error(`AsyncLocalStorage is not available for your Node.js version (${process.versions.node}).`);\n    }\n  }\n\n  public run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R {\n    return this.storage.run(ctx, callback);\n  }\n\n  public entries(): Map<string, EntityManager> | undefined {\n    return this.storage.getStore();\n  }\n\n  /**\n   * @deprecated Since 2022-02-01. Use {@link entries} instead\n   */\n  public getContext(): Map<string, EntityManager> | undefined {\n    return this.entries();\n  }\n\n  public get(contextName: string): EntityManager | undefined {\n    const context = this.entries();\n\n    return context?.get(contextName);\n  }\n\n  public has(contextName: string): boolean {\n    const context = this.entries();\n\n    return !!context?.has(contextName);\n  }\n}\n"]}

package/lib/esm/services/MikroOrmFactory.js

@@ -3,9 +3,9 @@ import { DBContext } from "./DBContext";
 import { MikroORM } from "@mikro-orm/core";
 import { Inject, Injectable } from "@tsed/di";
 let MikroOrmFactory = class MikroOrmFactory {
-    create(connectionOptions) {
+    create(options) {
         return MikroORM.init({
-            ...connectionOptions,
+            ...options,
             context: (name) => this.dbContext.get(name)
         });
     }

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

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmFactory.js","sourceRoot":"","sources":["../../../src/services/MikroOrmFactory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAG5C,IAAa,eAAe,GAA5B,MAAa,eAAe;IAInB,MAAM,CAAC,iBAA0B;QACtC,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,GAAG,iBAAiB;YACpB,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC;SACpD,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AARC;IADC,MAAM,EAAE;8BACoB,SAAS;kDAAC;AAF5B,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CAU3B;SAVY,eAAe","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(connectionOptions: Options): Promise<MikroORM> {\n    return MikroORM.init({\n      ...connectionOptions,\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,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAU,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAG5C,IAAa,eAAe,GAA5B,MAAa,eAAe;IAInB,MAAM,CAAC,OAAgB;QAC5B,OAAO,QAAQ,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,MAAM,EAAE;8BACoB,SAAS;kDAAC;AAF5B,eAAe;IAD3B,UAAU,EAAE;GACA,eAAe,CAU3B;SAVY,eAAe","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"]}

package/lib/esm/services/MikroOrmRegistry.js

@@ -7,35 +7,46 @@ let MikroOrmRegistry = class MikroOrmRegistry {
     constructor(logger, mikroOrmFactory) {
         this.logger = logger;
         this.mikroOrmFactory = mikroOrmFactory;
-        this.connections = new Map();
+        this.instances = new Map();
     }
-    async createConnection(connectionOptions) {
-        const connectionName = getValue(connectionOptions, "contextName", "default");
-        if (this.has(connectionName)) {
-            return this.get(connectionName);
+    async register(options) {
+        const contextName = getValue(options, "contextName", "default");
+        if (this.has(contextName)) {
+            return this.get(contextName);
         }
-        this.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);
-        this.logger.debug(`options: %j`, connectionOptions);
-        const connection = await this.mikroOrmFactory.create(connectionOptions);
-        this.connections.set(connectionName, connection);
-        this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
-        return connection;
-    }
-    get(id = "default") {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this.connections.get(id);
-    }
-    has(id = "default") {
-        return this.connections.has(id);
-    }
-    async closeConnections() {
-        const connections = [...this.connections.values()];
-        await Promise.all(connections.map((connection) => catchAsyncError(() => this.dispose(connection))));
-        this.connections.clear();
-    }
-    async dispose(connection) {
-        if (await connection.isConnected()) {
-            await connection.close(false);
+        this.logger.info(`Create connection with MikroOrm to database: %s`, contextName);
+        this.logger.debug(`options: %j`, options);
+        const instance = await this.mikroOrmFactory.create(options);
+        this.instances.set(contextName, instance);
+        this.logger.info(`Connected with MikroOrm to database: %s`, contextName);
+        return instance;
+    }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link register} instead
+     */
+    createConnection(options) {
+        return this.register(options);
+    }
+    get(contextName = "default") {
+        return this.instances.get(contextName);
+    }
+    has(contextName = "default") {
+        return this.instances.has(contextName);
+    }
+    async clear() {
+        const instances = [...this.instances.values()];
+        await Promise.all(instances.map((instance) => catchAsyncError(() => this.dispose(instance))));
+        this.instances.clear();
+    }
+    /**
+     * @deprecated Since 2022-02-01. Use {@link clear} instead
+     */
+    closeConnections() {
+        return this.clear();
+    }
+    async dispose(instance) {
+        if (await instance.isConnected()) {
+            await instance.close(false);
         }
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmRegistry.js","sourceRoot":"","sources":["../../../src/services/MikroOrmRegistry.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAGpC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,YAAuC,MAAc,EAA6B,eAAgC;QAA3E,WAAM,GAAN,MAAM,CAAQ;QAA6B,oBAAe,GAAf,eAAe,CAAiB;QAFjG,gBAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE0D,CAAC;IAE/G,KAAK,CAAC,gBAAgB,CAA2B,iBAA6B;QACnF,MAAM,cAAc,GAAG,QAAQ,CAAS,iBAAiB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAErF,IAAI,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SACjC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,cAAc,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QAEpD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAExE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,cAAc,CAAC,CAAC;QAE5E,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,GAAG,CAAC,KAAa,SAAS;QAC/B,oEAAoE;QACpE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAE,CAAC;IACnC,CAAC;IAEM,GAAG,CAAC,KAAa,SAAS;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,gBAAgB;QAC3B,MAAM,WAAW,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAEnD,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAoB,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9G,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,UAAoB;QACxC,IAAI,MAAM,UAAU,CAAC,WAAW,EAAE,EAAE;YAClC,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC/B;IACH,CAAC;CACF,CAAA;AA9CY,gBAAgB;IAD5B,UAAU,EAAE;IAIE,WAAA,MAAM,EAAE,CAAA;IAAmC,WAAA,MAAM,EAAE,CAAA;qCAAjB,MAAM,EAA8C,eAAe;GAHvG,gBAAgB,CA8C5B;SA9CY,gBAAgB","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 connections = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly logger: Logger, @Inject() private readonly mikroOrmFactory: MikroOrmFactory) {}\n\n  public async createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM> {\n    const connectionName = getValue<string>(connectionOptions, \"contextName\", \"default\");\n\n    if (this.has(connectionName)) {\n      return this.get(connectionName);\n    }\n\n    this.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);\n    this.logger.debug(`options: %j`, connectionOptions);\n\n    const connection = await this.mikroOrmFactory.create(connectionOptions);\n\n    this.connections.set(connectionName, connection);\n\n    this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);\n\n    return connection;\n  }\n\n  public get(id: string = \"default\"): MikroORM {\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    return this.connections.get(id)!;\n  }\n\n  public has(id: string = \"default\"): boolean {\n    return this.connections.has(id);\n  }\n\n  public async closeConnections(): Promise<void> {\n    const connections = [...this.connections.values()];\n\n    await Promise.all(connections.map((connection: MikroORM) => catchAsyncError(() => this.dispose(connection))));\n\n    this.connections.clear();\n  }\n\n  private async dispose(connection: MikroORM): Promise<void> {\n    if (await connection.isConnected()) {\n      await connection.close(false);\n    }\n  }\n}\n"]}
+{"version":3,"file":"MikroOrmRegistry.js","sourceRoot":"","sources":["../../../src/services/MikroOrmRegistry.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;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,QAAQ,CAAS,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;IAED;;OAEG;IACI,gBAAgB,CAA2B,OAAmB;QACnE,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAChC,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,eAAe,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,gBAAgB;QACrB,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,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;AA3DY,gBAAgB;IAD5B,UAAU,EAAE;IAIE,WAAA,MAAM,EAAE,CAAA;IAAmC,WAAA,MAAM,EAAE,CAAA;qCAAjB,MAAM,EAA8C,eAAe;GAHvG,gBAAgB,CA2D5B;SA3DY,gBAAgB","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  /**\n   * @deprecated Since 2022-02-01. Use {@link register} instead\n   */\n  public createConnection<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM> {\n    return this.register(options);\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  /**\n   * @deprecated Since 2022-02-01. Use {@link clear} instead\n   */\n  public closeConnections(): Promise<void> {\n    return this.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/types/decorators/entityManager.d.ts

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

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

@@ -1,5 +1,11 @@
 /**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
+ */
+export declare const Orm: (contextName?: string | undefined) => PropertyDecorator;
+/**
+ * Get the ORM for the given context name.
+ * @param {String} contextName
  * @deprecated Since 2022-02-01. Use {@link Orm} instead
  */
 export declare const Connection: (contextName?: string | undefined) => PropertyDecorator;
-export declare const Orm: (contextName?: string | undefined) => PropertyDecorator;

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

@@ -1,2 +1,6 @@
 import { TransactionOptions } from "../interceptors";
-export declare const Transactional: (connectionOrOptions?: string | TransactionOptions | undefined) => MethodDecorator;
+/**
+ * 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;

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

@@ -2,8 +2,12 @@ import { DBContext, MikroOrmRegistry, RetryStrategy } from "../services";
 import { InterceptorContext, InterceptorMethods, InterceptorNext } from "@tsed/di";
 import { Logger } from "@tsed/logger";
 export interface TransactionOptions {
-    connectionName?: string;
     retry?: boolean;
+    contextName?: string;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link contextName} instead
+     */
+    connectionName?: string;
 }
 export declare class TransactionalInterceptor implements InterceptorMethods {
     private readonly registry;

package/lib/types/services/DBContext.d.ts

@@ -3,6 +3,10 @@ export declare class DBContext {
     private readonly storage;
     constructor();
     run<R>(ctx: Map<string, EntityManager>, callback: (...args: any[]) => R): R;
+    entries(): Map<string, EntityManager> | undefined;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link entries} instead
+     */
     getContext(): Map<string, EntityManager> | undefined;
     get(contextName: string): EntityManager | undefined;
     has(contextName: string): boolean;

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

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

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

@@ -4,11 +4,19 @@ import { Logger } from "@tsed/logger";
 export declare class MikroOrmRegistry {
     private readonly logger;
     private readonly mikroOrmFactory;
-    private readonly connections;
+    private readonly instances;
     constructor(logger: Logger, mikroOrmFactory: MikroOrmFactory);
-    createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM>;
-    get(id?: string): MikroORM;
-    has(id?: string): boolean;
+    register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM>;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link register} instead
+     */
+    createConnection<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM>;
+    get(contextName?: string): MikroORM | undefined;
+    has(contextName?: string): boolean;
+    clear(): Promise<void>;
+    /**
+     * @deprecated Since 2022-02-01. Use {@link clear} instead
+     */
     closeConnections(): Promise<void>;
     private dispose;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/mikro-orm",
-  "version": "6.99.0",
+  "version": "6.100.0",
   "description": "MikroORM package for Ts.ED framework",
   "private": false,
   "source": "./src/index.ts",
@@ -24,20 +24,20 @@
   "devDependencies": {
     "@mikro-orm/core": "^4.5.9",
     "@mikro-orm/mongodb": "^4.5.9",
-    "@tsed/common": "6.99.0",
-    "@tsed/core": "6.99.0",
-    "@tsed/di": "6.99.0",
-    "@tsed/json-mapper": "6.99.0",
+    "@tsed/common": "6.100.0",
+    "@tsed/core": "6.100.0",
+    "@tsed/di": "6.100.0",
+    "@tsed/json-mapper": "6.100.0",
     "@tsed/logger": "^6.0.0",
-    "@tsed/schema": "6.99.0",
-    "@tsed/testing-mongoose": "6.99.0",
+    "@tsed/schema": "6.100.0",
+    "@tsed/testing-mongoose": "6.100.0",
     "ts-mockito": "^2.6.1"
   },
   "peerDependencies": {
     "@mikro-orm/core": ">=4.5.9",
-    "@tsed/common": "^6.99.0",
-    "@tsed/core": "^6.99.0",
-    "@tsed/di": "^6.99.0",
+    "@tsed/common": "^6.100.0",
+    "@tsed/core": "^6.100.0",
+    "@tsed/di": "^6.100.0",
     "@tsed/logger": "^6.0.0"
   },
   "repository": "https://github.com/tsedio/tsed",

package/readme.md

@@ -33,7 +33,7 @@ A package of Ts.ED framework. See website: https://tsed.io/tutorials/mikro-orm
 
 Currently, `@tsed/mikro-orm` allows you:
 
-- Configure one or more MikroOrm connections via the `@Configuration` decorator. All databases will be initialized
+- Configure one or more MikroOrm instances via the `@Configuration` decorator. All databases will be initialized
   when the server starts during the server's `OnInit` phase.
 - Use the Entity MikroOrm as Model for Controllers, AJV Validation and Swagger.
 
@@ -129,7 +129,7 @@ export class UsersService {
 }
 ```
 
-It's also possible to inject an ORM by a connection name:
+It's also possible to inject an ORM by its context name:
 
 ```ts
 import {Injectable} from "@tsed/di";
@@ -164,7 +164,7 @@ export class UsersService {
 }
 ```
 
-It's also possible to inject Entity manager by his connection name:
+It's also possible to inject Entity manager by his context name:
 
 ```typescript
 import {Injectable, AfterRoutesInit} from "@tsed/common";
@@ -173,7 +173,7 @@ import {EntityManager} from '@mikro-orm/mysql'; // Import EntityManager from you
 
 @Injectable()
 export class UsersService {
-  @Em("connectionName")
+  @Em("contextName")
   private readonly em!: EntityManager;
 
   async create(user: User): Promise<User> {