@tsed/mikro-orm 6.96.2 → 7.0.0-beta.1

package/jest.config.js

@@ -5,10 +5,10 @@ module.exports = {
   ...require("@tsed/jest-config")(__dirname, "mikro-orm"),
   coverageThreshold: {
     global: {
-      branches: 85.29,
+      branches: 90.91,
       functions: 100,
-      lines: 98.95,
-      statements: 99.15
+      lines: 99.06,
+      statements: 99.21
     }
   }
 };

package/lib/cjs/MikroOrmModule.js

@@ -28,4 +28,6 @@ MikroOrmModule = (0, tslib_1.__decorate)([
     })
 ], MikroOrmModule);
 exports.MikroOrmModule = MikroOrmModule;
+// TODO: the IoC container should provide null or undefined by default until tsedio/tsed#1694 is closed
+(0, di_1.registerProvider)({ provide: services_1.RetryStrategy, useValue: null });
 //# sourceMappingURL=MikroOrmModule.js.map

package/lib/cjs/MikroOrmModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"MikroOrmModule.js","sourceRoot":"","sources":["../../src/MikroOrmModule.ts"],"names":[],"mappings":";;;;AAAA,yCAAuD;AACvD,iCAAoF;AAoBpF,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","sourcesContent":["import {DBContext, MikroOrmRegistry} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit} 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"]}
+{"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"]}

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

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

package/lib/cjs/decorators/entityManager.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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
+ * @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; });
+exports.EntityManager = EntityManager;
+/**
+ * Get the entity manager for the given connection name.
+ * @param connectionName
+ * @decorator
+ * @mikroOrm
+ */
+exports.Em = exports.EntityManager;
+//# sourceMappingURL=entityManager.js.map

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

@@ -0,0 +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"]}

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

@@ -1,2 +1,3 @@
 export * from "./transactional";
 export * from "./connection";
+export * from "./entityManager";

package/lib/cjs/decorators/index.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 (0, tslib_1.__exportStar)(require("./transactional"), exports);
 (0, tslib_1.__exportStar)(require("./connection"), exports);
+(0, tslib_1.__exportStar)(require("./entityManager"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,+DAAgC;AAChC,4DAA6B","sourcesContent":["export * from \"./transactional\";\nexport * from \"./connection\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,+DAAgC;AAChC,4DAA6B;AAC7B,+DAAgC","sourcesContent":["export * from \"./transactional\";\nexport * from \"./connection\";\nexport * from \"./entityManager\";\n"]}

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

@@ -1,13 +1,16 @@
 import { DBContext, MikroOrmRegistry, RetryStrategy } from "../services";
 import { InterceptorContext, InterceptorMethods, InterceptorNext } from "@tsed/di";
+import { Logger } from "@tsed/logger";
 export interface TransactionOptions {
     connectionName?: string;
-    retryStrategy?: RetryStrategy;
+    retry?: boolean;
 }
 export declare class TransactionalInterceptor implements InterceptorMethods {
     private readonly registry;
     private readonly context;
-    constructor(registry: MikroOrmRegistry, context: DBContext);
+    private readonly logger;
+    private readonly retryStrategy?;
+    constructor(registry: MikroOrmRegistry, context: DBContext, logger: Logger, retryStrategy?: RetryStrategy | undefined);
     intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown>;
     private runWithinNewCtx;
     private runUnderCtx;

package/lib/cjs/interceptors/TransactionalInterceptor.js

@@ -4,13 +4,19 @@ exports.TransactionalInterceptor = void 0;
 const tslib_1 = require("tslib");
 const services_1 = require("../services");
 const di_1 = require("@tsed/di");
+const logger_1 = require("@tsed/logger");
 let TransactionalInterceptor = class TransactionalInterceptor {
-    constructor(registry, context) {
+    constructor(registry, context, logger, retryStrategy) {
         this.registry = registry;
         this.context = context;
+        this.logger = logger;
+        this.retryStrategy = retryStrategy;
     }
     async intercept(context, next) {
         const options = this.extractContextName(context);
+        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();
         if (!ctx) {
             return this.runWithinNewCtx(next, options);
@@ -29,23 +35,26 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         const em = orm.em.fork(true, true);
         ctx.set(em.name, em);
         const runInTransaction = () => this.executeInTransaction(options.connectionName, next);
-        return this.context.run(ctx, () => (options.retryStrategy ? options.retryStrategy.acquire(runInTransaction) : runInTransaction()));
+        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) {
         const options = context.options || {};
         let connectionName;
-        let retryStrategy;
+        let retry;
         if (typeof options === "string") {
             connectionName = options;
         }
         else if (options) {
             connectionName = options.connectionName;
-            retryStrategy = options.retryStrategy;
+            retry = options.retry;
         }
         if (!connectionName) {
             connectionName = "default";
         }
-        return { connectionName, retryStrategy };
+        if (!retry) {
+            retry = false;
+        }
+        return { connectionName, retry };
     }
     async executeInTransaction(connectionName, next) {
         const em = this.context.get(connectionName);
@@ -58,7 +67,11 @@ TransactionalInterceptor = (0, tslib_1.__decorate)([
     (0, di_1.Interceptor)(),
     (0, tslib_1.__param)(0, (0, di_1.Inject)()),
     (0, tslib_1.__param)(1, (0, di_1.Inject)()),
-    (0, tslib_1.__metadata)("design:paramtypes", [services_1.MikroOrmRegistry, services_1.DBContext])
+    (0, tslib_1.__param)(2, (0, di_1.Inject)()),
+    (0, tslib_1.__param)(3, (0, di_1.Inject)(services_1.RetryStrategy)),
+    (0, tslib_1.__metadata)("design:paramtypes", [services_1.MikroOrmRegistry,
+        services_1.DBContext,
+        logger_1.Logger, Object])
 ], TransactionalInterceptor);
 exports.TransactionalInterceptor = TransactionalInterceptor;
 //# sourceMappingURL=TransactionalInterceptor.js.map

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\";\n\nexport interface TransactionOptions {\n  connectionName?: string;\n  retryStrategy?: RetryStrategy;\n}\n\n@Interceptor()\nexport class TransactionalInterceptor implements InterceptorMethods {\n  constructor(@Inject() private readonly registry: MikroOrmRegistry, @Inject() private readonly context: DBContext) {}\n\n  public async intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown> {\n    const options = this.extractContextName(context);\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.retryStrategy ? options.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 retryStrategy: RetryStrategy | undefined;\n\n    if (typeof options === \"string\") {\n      connectionName = options;\n    } else if (options) {\n      connectionName = options.connectionName;\n      retryStrategy = options.retryStrategy;\n    }\n\n    if (!connectionName) {\n      connectionName = \"default\";\n    }\n\n    return {connectionName, retryStrategy};\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  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"]}

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

@@ -1,11 +1,11 @@
 import { MikroOrmFactory } from "./MikroOrmFactory";
-import { InjectorService } from "@tsed/di";
 import { IDatabaseDriver as DatabaseDriver, MikroORM, Options } from "@mikro-orm/core";
+import { Logger } from "@tsed/logger";
 export declare class MikroOrmRegistry {
-    private readonly injector;
+    private readonly logger;
     private readonly mikroOrmFactory;
     private readonly connections;
-    constructor(injector: InjectorService, mikroOrmFactory: MikroOrmFactory);
+    constructor(logger: Logger, mikroOrmFactory: MikroOrmFactory);
     createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM>;
     get(id?: string): MikroORM;
     has(id?: string): boolean;

package/lib/cjs/services/MikroOrmRegistry.js

@@ -5,9 +5,10 @@ const tslib_1 = require("tslib");
 const MikroOrmFactory_1 = require("./MikroOrmFactory");
 const di_1 = require("@tsed/di");
 const core_1 = require("@tsed/core");
+const logger_1 = require("@tsed/logger");
 let MikroOrmRegistry = class MikroOrmRegistry {
-    constructor(injector, mikroOrmFactory) {
-        this.injector = injector;
+    constructor(logger, mikroOrmFactory) {
+        this.logger = logger;
         this.mikroOrmFactory = mikroOrmFactory;
         this.connections = new Map();
     }
@@ -16,11 +17,11 @@ let MikroOrmRegistry = class MikroOrmRegistry {
         if (this.has(connectionName)) {
             return this.get(connectionName);
         }
-        this.injector.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);
-        this.injector.logger.debug(`options: %j`, connectionOptions);
+        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.injector.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
+        this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
         return connection;
     }
     get(id = "default") {
@@ -45,7 +46,7 @@ MikroOrmRegistry = (0, tslib_1.__decorate)([
     (0, di_1.Injectable)(),
     (0, tslib_1.__param)(0, (0, di_1.Inject)()),
     (0, tslib_1.__param)(1, (0, di_1.Inject)()),
-    (0, tslib_1.__metadata)("design:paramtypes", [di_1.InjectorService, MikroOrmFactory_1.MikroOrmFactory])
+    (0, tslib_1.__metadata)("design:paramtypes", [logger_1.Logger, MikroOrmFactory_1.MikroOrmFactory])
 ], MikroOrmRegistry);
 exports.MikroOrmRegistry = MikroOrmRegistry;
 //# sourceMappingURL=MikroOrmRegistry.js.map

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,iCAA6D;AAE7D,qCAAqD;AAGrD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,YAAuC,QAAyB,EAA6B,eAAgC;QAAtF,aAAQ,GAAR,QAAQ,CAAiB;QAA6B,oBAAe,GAAf,eAAe,CAAiB;QAF5G,gBAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEqE,CAAC;IAE1H,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,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QAE7D,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,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,cAAc,CAAC,CAAC;QAErF,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;IAA8C,wBAAA,IAAA,WAAM,GAAE,CAAA;kDAA1B,oBAAe,EAA8C,iCAAe;GAHlH,gBAAgB,CA8C5B;AA9CY,4CAAgB","sourcesContent":["import {MikroOrmFactory} from \"./MikroOrmFactory\";\nimport {Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {IDatabaseDriver as DatabaseDriver, MikroORM, Options} from \"@mikro-orm/core\";\nimport {catchAsyncError, getValue} from \"@tsed/core\";\n\n@Injectable()\nexport class MikroOrmRegistry {\n  private readonly connections = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly injector: InjectorService, @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.injector.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);\n    this.injector.logger.debug(`options: %j`, connectionOptions);\n\n    const connection = await this.mikroOrmFactory.create(connectionOptions);\n\n    this.connections.set(connectionName, connection);\n\n    this.injector.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,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"]}

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

@@ -1,3 +1,4 @@
 export interface RetryStrategy {
     acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;
 }
+export declare const RetryStrategy: unique symbol;

package/lib/cjs/services/RetryStrategy.js

@@ -1,3 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RetryStrategy = void 0;
+exports.RetryStrategy = Symbol("RetryStrategy");
 //# sourceMappingURL=RetryStrategy.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RetryStrategy.js","sourceRoot":"","sources":["../../../src/services/RetryStrategy.ts"],"names":[],"mappings":"","sourcesContent":["export interface RetryStrategy {\n  acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;\n}\n"]}
+{"version":3,"file":"RetryStrategy.js","sourceRoot":"","sources":["../../../src/services/RetryStrategy.ts"],"names":[],"mappings":";;;AAIa,QAAA,aAAa,GAAkB,MAAM,CAAC,eAAe,CAAC,CAAC","sourcesContent":["export interface RetryStrategy {\n  acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;\n}\n\nexport const RetryStrategy: unique symbol = Symbol(\"RetryStrategy\");\n"]}

package/lib/esm/MikroOrmModule.js

@@ -1,6 +1,6 @@
 import { __decorate, __metadata } from "tslib";
-import { DBContext, MikroOrmRegistry } from "./services";
-import { Configuration, Constant, Inject, Module } from "@tsed/di";
+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));
@@ -25,4 +25,6 @@ MikroOrmModule = __decorate([
     })
 ], MikroOrmModule);
 export { MikroOrmModule };
+// TODO: the IoC container should provide null or undefined by default until tsedio/tsed#1694 is closed
+registerProvider({ provide: RetryStrategy, useValue: null });
 //# sourceMappingURL=MikroOrmModule.js.map

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,EAAC,MAAM,YAAY,CAAC;AACvD,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,UAAU,CAAC;AAoBpF,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","sourcesContent":["import {DBContext, MikroOrmRegistry} from \"./services\";\nimport {Configuration, Constant, Inject, Module, OnDestroy, OnInit} 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"]}
+{"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"]}

package/lib/esm/decorators/entityManager.js

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

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

@@ -0,0 +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"]}

package/lib/esm/decorators/index.js

@@ -1,3 +1,4 @@
 export * from "./transactional";
 export * from "./connection";
+export * from "./entityManager";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC","sourcesContent":["export * from \"./transactional\";\nexport * from \"./connection\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC","sourcesContent":["export * from \"./transactional\";\nexport * from \"./connection\";\nexport * from \"./entityManager\";\n"]}

package/lib/esm/interceptors/TransactionalInterceptor.js

@@ -1,13 +1,19 @@
 import { __decorate, __metadata, __param } from "tslib";
-import { DBContext, MikroOrmRegistry } from "../services";
+import { DBContext, MikroOrmRegistry, RetryStrategy } from "../services";
 import { Inject, Interceptor } from "@tsed/di";
+import { Logger } from "@tsed/logger";
 let TransactionalInterceptor = class TransactionalInterceptor {
-    constructor(registry, context) {
+    constructor(registry, context, logger, retryStrategy) {
         this.registry = registry;
         this.context = context;
+        this.logger = logger;
+        this.retryStrategy = retryStrategy;
     }
     async intercept(context, next) {
         const options = this.extractContextName(context);
+        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();
         if (!ctx) {
             return this.runWithinNewCtx(next, options);
@@ -26,23 +32,26 @@ let TransactionalInterceptor = class TransactionalInterceptor {
         const em = orm.em.fork(true, true);
         ctx.set(em.name, em);
         const runInTransaction = () => this.executeInTransaction(options.connectionName, next);
-        return this.context.run(ctx, () => (options.retryStrategy ? options.retryStrategy.acquire(runInTransaction) : runInTransaction()));
+        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) {
         const options = context.options || {};
         let connectionName;
-        let retryStrategy;
+        let retry;
         if (typeof options === "string") {
             connectionName = options;
         }
         else if (options) {
             connectionName = options.connectionName;
-            retryStrategy = options.retryStrategy;
+            retry = options.retry;
         }
         if (!connectionName) {
             connectionName = "default";
         }
-        return { connectionName, retryStrategy };
+        if (!retry) {
+            retry = false;
+        }
+        return { connectionName, retry };
     }
     async executeInTransaction(connectionName, next) {
         const em = this.context.get(connectionName);
@@ -55,7 +64,11 @@ TransactionalInterceptor = __decorate([
     Interceptor(),
     __param(0, Inject()),
     __param(1, Inject()),
-    __metadata("design:paramtypes", [MikroOrmRegistry, DBContext])
+    __param(2, Inject()),
+    __param(3, Inject(RetryStrategy)),
+    __metadata("design:paramtypes", [MikroOrmRegistry,
+        DBContext,
+        Logger, Object])
 ], TransactionalInterceptor);
 export { TransactionalInterceptor };
 //# sourceMappingURL=TransactionalInterceptor.js.map

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\";\n\nexport interface TransactionOptions {\n  connectionName?: string;\n  retryStrategy?: RetryStrategy;\n}\n\n@Interceptor()\nexport class TransactionalInterceptor implements InterceptorMethods {\n  constructor(@Inject() private readonly registry: MikroOrmRegistry, @Inject() private readonly context: DBContext) {}\n\n  public async intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown> {\n    const options = this.extractContextName(context);\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.retryStrategy ? options.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 retryStrategy: RetryStrategy | undefined;\n\n    if (typeof options === \"string\") {\n      connectionName = options;\n    } else if (options) {\n      connectionName = options.connectionName;\n      retryStrategy = options.retryStrategy;\n    }\n\n    if (!connectionName) {\n      connectionName = \"default\";\n    }\n\n    return {connectionName, retryStrategy};\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  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"]}

package/lib/esm/services/MikroOrmRegistry.js

@@ -1,10 +1,11 @@
 import { __decorate, __metadata, __param } from "tslib";
 import { MikroOrmFactory } from "./MikroOrmFactory";
-import { Inject, Injectable, InjectorService } from "@tsed/di";
+import { Inject, Injectable } from "@tsed/di";
 import { catchAsyncError, getValue } from "@tsed/core";
+import { Logger } from "@tsed/logger";
 let MikroOrmRegistry = class MikroOrmRegistry {
-    constructor(injector, mikroOrmFactory) {
-        this.injector = injector;
+    constructor(logger, mikroOrmFactory) {
+        this.logger = logger;
         this.mikroOrmFactory = mikroOrmFactory;
         this.connections = new Map();
     }
@@ -13,11 +14,11 @@ let MikroOrmRegistry = class MikroOrmRegistry {
         if (this.has(connectionName)) {
             return this.get(connectionName);
         }
-        this.injector.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);
-        this.injector.logger.debug(`options: %j`, connectionOptions);
+        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.injector.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
+        this.logger.info(`Connected with MikroOrm to database: %s`, connectionName);
         return connection;
     }
     get(id = "default") {
@@ -42,7 +43,7 @@ MikroOrmRegistry = __decorate([
     Injectable(),
     __param(0, Inject()),
     __param(1, Inject()),
-    __metadata("design:paramtypes", [InjectorService, MikroOrmFactory])
+    __metadata("design:paramtypes", [Logger, MikroOrmFactory])
 ], MikroOrmRegistry);
 export { MikroOrmRegistry };
 //# sourceMappingURL=MikroOrmRegistry.js.map

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,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAC,eAAe,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGrD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAG3B,YAAuC,QAAyB,EAA6B,eAAgC;QAAtF,aAAQ,GAAR,QAAQ,CAAiB;QAA6B,oBAAe,GAAf,eAAe,CAAiB;QAF5G,gBAAW,GAAG,IAAI,GAAG,EAAoB,CAAC;IAEqE,CAAC;IAE1H,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,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;QAE7D,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,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,cAAc,CAAC,CAAC;QAErF,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;IAA8C,WAAA,MAAM,EAAE,CAAA;qCAA1B,eAAe,EAA8C,eAAe;GAHlH,gBAAgB,CA8C5B;SA9CY,gBAAgB","sourcesContent":["import {MikroOrmFactory} from \"./MikroOrmFactory\";\nimport {Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {IDatabaseDriver as DatabaseDriver, MikroORM, Options} from \"@mikro-orm/core\";\nimport {catchAsyncError, getValue} from \"@tsed/core\";\n\n@Injectable()\nexport class MikroOrmRegistry {\n  private readonly connections = new Map<string, MikroORM>();\n\n  constructor(@Inject() private readonly injector: InjectorService, @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.injector.logger.info(`Create connection with MikroOrm to database: %s`, connectionName);\n    this.injector.logger.debug(`options: %j`, connectionOptions);\n\n    const connection = await this.mikroOrmFactory.create(connectionOptions);\n\n    this.connections.set(connectionName, connection);\n\n    this.injector.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,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"]}

package/lib/esm/services/RetryStrategy.js

@@ -1,2 +1,2 @@
-export {};
+export const RetryStrategy = Symbol("RetryStrategy");
 //# sourceMappingURL=RetryStrategy.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"RetryStrategy.js","sourceRoot":"","sources":["../../../src/services/RetryStrategy.ts"],"names":[],"mappings":"","sourcesContent":["export interface RetryStrategy {\n  acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;\n}\n"]}
+{"version":3,"file":"RetryStrategy.js","sourceRoot":"","sources":["../../../src/services/RetryStrategy.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,aAAa,GAAkB,MAAM,CAAC,eAAe,CAAC,CAAC","sourcesContent":["export interface RetryStrategy {\n  acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;\n}\n\nexport const RetryStrategy: unique symbol = Symbol(\"RetryStrategy\");\n"]}

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

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

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

@@ -1,2 +1,3 @@
 export * from "./transactional";
 export * from "./connection";
+export * from "./entityManager";

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

@@ -1,13 +1,16 @@
 import { DBContext, MikroOrmRegistry, RetryStrategy } from "../services";
 import { InterceptorContext, InterceptorMethods, InterceptorNext } from "@tsed/di";
+import { Logger } from "@tsed/logger";
 export interface TransactionOptions {
     connectionName?: string;
-    retryStrategy?: RetryStrategy;
+    retry?: boolean;
 }
 export declare class TransactionalInterceptor implements InterceptorMethods {
     private readonly registry;
     private readonly context;
-    constructor(registry: MikroOrmRegistry, context: DBContext);
+    private readonly logger;
+    private readonly retryStrategy?;
+    constructor(registry: MikroOrmRegistry, context: DBContext, logger: Logger, retryStrategy?: RetryStrategy | undefined);
     intercept(context: InterceptorContext<unknown>, next: InterceptorNext): Promise<unknown>;
     private runWithinNewCtx;
     private runUnderCtx;

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

@@ -1,11 +1,11 @@
 import { MikroOrmFactory } from "./MikroOrmFactory";
-import { InjectorService } from "@tsed/di";
 import { IDatabaseDriver as DatabaseDriver, MikroORM, Options } from "@mikro-orm/core";
+import { Logger } from "@tsed/logger";
 export declare class MikroOrmRegistry {
-    private readonly injector;
+    private readonly logger;
     private readonly mikroOrmFactory;
     private readonly connections;
-    constructor(injector: InjectorService, mikroOrmFactory: MikroOrmFactory);
+    constructor(logger: Logger, mikroOrmFactory: MikroOrmFactory);
     createConnection<T extends DatabaseDriver>(connectionOptions: Options<T>): Promise<MikroORM>;
     get(id?: string): MikroORM;
     has(id?: string): boolean;

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

@@ -1,3 +1,4 @@
 export interface RetryStrategy {
     acquire<T extends (...args: unknown[]) => unknown>(task: T): Promise<ReturnType<T>>;
 }
+export declare const RetryStrategy: unique symbol;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/mikro-orm",
-  "version": "6.96.2",
+  "version": "7.0.0-beta.1",
   "description": "MikroORM package for Ts.ED framework",
   "private": false,
   "source": "./src/index.ts",
@@ -24,26 +24,27 @@
   "devDependencies": {
     "@mikro-orm/core": "^4.5.9",
     "@mikro-orm/mongodb": "^4.5.9",
-    "@tsed/common": "6.96.2",
-    "@tsed/core": "6.96.2",
-    "@tsed/di": "6.96.2",
-    "@tsed/json-mapper": "6.96.2",
-    "@tsed/schema": "6.96.2",
+    "@tsed/common": "7.0.0-beta.1",
+    "@tsed/core": "7.0.0-beta.1",
+    "@tsed/di": "7.0.0-beta.1",
+    "@tsed/json-mapper": "7.0.0-beta.1",
+    "@tsed/logger": "^6.0.0",
+    "@tsed/schema": "7.0.0-beta.1",
+    "@tsed/testing-mongoose": "7.0.0-beta.1",
     "ts-mockito": "^2.6.1"
   },
   "peerDependencies": {
     "@mikro-orm/core": ">=4.5.9",
-    "@tsed/common": "^6.96.2",
-    "@tsed/core": "^6.96.2",
-    "@tsed/di": "^6.96.2",
-    "@tsed/json-mapper": "^6.96.2",
-    "@tsed/schema": "^6.96.2"
+    "@tsed/common": "^7.0.0-beta.1",
+    "@tsed/core": "^7.0.0-beta.1",
+    "@tsed/di": "^7.0.0-beta.1",
+    "@tsed/logger": "^6.0.0"
   },
   "repository": "https://github.com/tsedio/tsed",
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/production/packages/orm/mikro-orm",
+  "homepage": "https://github.com/tsedio/tsed/tree/alpha/packages/orm/mikro-orm",
   "author": "Romain Lenzotti",
   "license": "MIT"
 }

package/readme.md

@@ -3,7 +3,7 @@
 </p>
 
 <div align="center">
-   <h1>MikroORM</h1>
+   <h1>MikroOrm</h1>
 
 [![Build & Release](https://github.com/tsedio/tsed/workflows/Build%20&%20Release/badge.svg)](https://github.com/tsedio/tsed/actions?query=workflow%3A%22Build+%26+Release%22)
 [![PR Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/tsedio/tsed/blob/master/CONTRIBUTING.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 `@ServerSettings` configuration. All databases will be initialized
+- Configure one or more MikroOrm connections 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.
 
@@ -41,15 +41,35 @@ Currently, `@tsed/mikro-orm` allows you:
 
 To begin, install the MikroOrm module for TS.ED:
 
+<Tabs class="-code">
+  <Tab label="NPM">
+
+```bash
+npm install @mikro-orm/core @tsed/mikro-orm @mikro-orm/mongodb     # for mongo
+npm install @mikro-orm/core @tsed/mikro-orm @mikro-orm/mysql       # for mysql/mariadb
+npm install @mikro-orm/core @tsed/mikro-orm @mikro-orm/mariadb     # for mysql/mariadb
+npm install @mikro-orm/core @tsed/mikro-orm @mikro-orm/postgresql  # for postgresql
+npm install @mikro-orm/core @tsed/mikro-orm @mikro-orm/sqlite      # for sqlite
+```
+
+  </Tab>
+  <Tab label="Yarn">
+
 ```bash
-npm install --save @tsed/mikro-orm
-npm install --save @mikro-orm/core
+yarn add @mikro-orm/core @tsed/mikro-orm @mikro-orm/mongodb     # for mongo
+yarn add @mikro-orm/core @tsed/mikro-orm @mikro-orm/mysql       # for mysql/mariadb
+yarn add @mikro-orm/core @tsed/mikro-orm @mikro-orm/mariadb     # for mysql/mariadb
+yarn add @mikro-orm/core @tsed/mikro-orm @mikro-orm/postgresql  # for postgresql
+yarn add @mikro-orm/core @tsed/mikro-orm @mikro-orm/sqlite      # for sqlite
 ```
 
-Then import `@tsed/mikro-orm` in your Server:
+  </Tab>
+</Tabs>
+
+Once the installation process is completed, we can import the `MikroOrmModule` into the `Server` configuration:
 
 ```typescript
-import {Configuration} from "@tsed/common";
+import {Configuration} from "@tsed/di";
 import {MikroOrmModule} from "@tsed/mikro-orm";
 
 @Configuration({
@@ -71,16 +91,14 @@ import {MikroOrmModule} from "@tsed/mikro-orm";
     }
   ]
 })
-export class Server {
-
-}
+export class Server {}
 ```
 
-For more information about MikroOrm look his documentation [here](https://mikro-orm.io/docs);
+The `mikroOrm` options accepts the same configuration object as `init()` from the MikroORM package. Check [this page](https://mikro-orm.io/docs/configuration) for the complete configuration documentation.
 
 ## Obtain a connection
 
-`Connection` decorator lets you retrieve an instance of MikroOrm Connection.
+`@Connection` decorator lets you retrieve an instance of MikroOrm Connection.
 
 ```typescript
 import {Injectable, AfterRoutesInit} from "@tsed/common";
@@ -93,7 +111,6 @@ export class UsersService {
   private readonly connection!: MikroORM;
 
   async create(user: User): Promise<User> {
-
     // do something
     // ...
     // Then save
@@ -112,6 +129,62 @@ export class UsersService {
 }
 ```
 
+It's also possible to inject a connection by his name:
+
+```ts
+import {Injectable} from "@tsed/di";
+
+@Injectable()
+export class MyService {
+  @Connection("mongo")
+  private readonly connection!: MikroORM;
+}
+```
+
+## Obtain EntityManager
+
+`@EntityManager` and `@Em` decorators lets you retrieve an instance of EntityManager.
+
+```typescript
+import {Injectable, AfterRoutesInit} from "@tsed/common";
+import {Em} from "@tsed/mikro-orm";
+import {EntityManager} from '@mikro-orm/mysql'; // Import EntityManager from your driver package or `@mikro-orm/knex`
+
+@Injectable()
+export class UsersService {
+  @Em()
+  private readonly em!: EntityManager;
+
+  async create(user: User): Promise<User> {
+    await this.em.persistAndFlush(user);
+    console.log("Saved a new user with id: " + user.id);
+
+    return user;
+  }
+}
+```
+
+It's also possible to inject Entity manager by his connection name:
+
+```typescript
+import {Injectable, AfterRoutesInit} from "@tsed/common";
+import {Em} from "@tsed/mikro-orm";
+import {EntityManager} from '@mikro-orm/mysql'; // Import EntityManager from your driver package or `@mikro-orm/knex`
+
+@Injectable()
+export class UsersService {
+  @Em("connectionName")
+  private readonly em!: EntityManager;
+
+  async create(user: User): Promise<User> {
+    await this.em.persistAndFlush(user);
+    console.log("Saved a new user with id: " + user.id);
+
+    return user;
+  }
+}
+```
+
 ## Use Entity with Controller
 
 To begin, we need to define an Entity MikroOrm like this and use Ts.ED Decorator to define the JSON Schema.
@@ -200,6 +273,93 @@ export class UsersCtrl {
 }
 ```
 
+By default, the automatic retry policy is disabled. You can implement your own to match the business requirements and the nature of the failure. For some noncritical operations, it is better to fail as soon as possible rather than retry a coupe of times. For example, in an interactive web application, it is better to fail right after a smaller number of retries with only a short delay between retry attempts, and display a message to the user (for example, "please try again later").
+
+The `@Transactional()` decorator allows you to enable a retry policy for the particular resources. You just need to implement the `RetryStrategy` interface and use `registerProvider()` or `@OverrideProvider()` to register it in the IoC container. Below you can find an example to handle occurred optimistic locks based on [an exponential backoff retry strategy](https://en.wikipedia.org/wiki/Exponential_backoff).
+
+```ts
+import { OptimisticLockError } from '@mikro-orm/core';
+import { RetryStrategy } from '@tsed/mikro-orm';
+
+export interface ExponentialBackoffOptions {
+  maxDepth: number;
+}
+
+export class ExponentialBackoff implements RetryStrategy {
+  private depth = 0;
+
+  constructor(private readonly options: ExponentialBackoffOptions) {}
+
+  public async acquire<T extends (...args: unknown[]) => unknown>(
+    task: T
+  ): Promise<ReturnType<T>> {
+    try {
+      return (await task()) as ReturnType<T>;
+    } catch (e) {
+      if (
+        this.shouldRetry(e as Error) &&
+        this.depth < this.options.maxDepth
+      ) {
+        return this.retry(task);
+      }
+
+      throw e;
+    }
+  }
+
+  private shouldRetry(error: Error): boolean {
+    return error instanceof OptimisticLockError;
+  }
+
+  private async retry<T extends (...args: unknown[]) => unknown>(
+    task: T
+  ): Promise<ReturnType<T>> {
+    await this.sleep(2 ** this.depth * 50);
+
+    this.depth += 1;
+
+    return this.acquire(task);
+  }
+
+  private sleep(milliseconds: number): Promise<void> {
+    return new Promise(resolve => setTimeout(resolve, milliseconds));
+  }
+}
+
+registerProvider({
+  provide: RetryStrategy,
+  useFactory(): ExponentialBackoff {
+    return new ExponentialBackoff({maxDepth: 3})
+  }
+});
+```
+
+`ExponentialBackoff` invokes passed function recursively is contained in a try/catch block. The method returns control to the interceptor if the call to the `task` function succeeds without throwing an exception. If the `task` method fails, the catch block examines the reason for the failure. If it's optimistic locking the code waits for a short delay before retrying the operation.
+
+Once a retry strategy is implemented, you can enable an automatic retry mechanism using the `@Transactional` decorator like that:
+
+```typescript
+import {Controller, Post, BodyParams, Inject, Get} from "@tsed/common";
+import {Transactional} from "@tsed/mikro-orm";
+
+@Controller("/users")
+export class UsersCtrl {
+  @Inject()
+  private usersService: UsersService;
+
+  @Post("/")
+  @Transactional({retry: true})
+  create(@BodyParams() user: User): Promise<User> {
+    return this.usersService.create(user);
+  }
+
+  @Get("/")
+  getList(): Promise<User[]> {
+    return this.usersService.find();
+  }
+}
+```
+
 ## Contributors
 
 Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html)