@tsed/mikro-orm 8.11.1 → 8.11.2-rc.1

package/src/services/MikroOrmContext.ts

@@ -1,29 +0,0 @@
-import {EntityManager, RequestContext} from "@mikro-orm/core";
-import {isFunction} from "@tsed/core";
-import {Injectable} from "@tsed/di";
-
-/**
- * @internal Since 2022-06-20.
- */
-@Injectable()
-export class MikroOrmContext {
-  public run(managers: EntityManager[], task: (...args: unknown[]) => unknown): Promise<unknown> {
-    // @ts-expect-error `RequestContext.createAsync` has been removed in favour of `RequestContext.create` since mikro-orm v6.0.0
-    if (isFunction(RequestContext.createAsync)) {
-      // @ts-expect-error see above
-      return RequestContext.createAsync(managers, task);
-    } else {
-      return RequestContext.create(managers, task) as Promise<unknown>;
-    }
-  }
-
-  public get(contextName?: string): EntityManager | undefined {
-    return RequestContext.getEntityManager(contextName);
-  }
-
-  public has(contextName?: string): boolean {
-    const manager = this.get(contextName);
-
-    return !!manager;
-  }
-}

package/src/services/MikroOrmFactory.ts

@@ -1,16 +0,0 @@
-import {MikroORM, Options} from "@mikro-orm/core";
-import {Inject, Injectable} from "@tsed/di";
-
-import {MikroOrmContext} from "./MikroOrmContext.js";
-
-@Injectable()
-export class MikroOrmFactory {
-  constructor(@Inject() private readonly context: MikroOrmContext) {}
-
-  public create(options: Options): Promise<MikroORM> {
-    return MikroORM.init({
-      ...options,
-      context: (name: string) => this.context.get(name)
-    });
-  }
-}

package/src/services/MikroOrmRegistry.spec.ts

@@ -1,121 +0,0 @@
-import {MikroORM, Options} from "@mikro-orm/core";
-import {Logger} from "@tsed/logger";
-import {anything, instance, mock, reset, verify, when} from "ts-mockito";
-
-import {MikroOrmFactory} from "./MikroOrmFactory.js";
-import {MikroOrmRegistry} from "./MikroOrmRegistry.js";
-
-const fixtures: {mydb2: Options; none: Options; mydb: Options} = {
-  mydb: {
-    contextName: "mydb",
-    type: "postgresql",
-    clientUrl: "postgresql://localhost:5432"
-  },
-  none: {
-    type: "postgresql",
-    clientUrl: "postgresql://localhost:5432"
-  },
-  mydb2: {
-    contextName: "mydb2",
-    type: "postgresql",
-    clientUrl: "postgresql://localhost:5432"
-  }
-} as never;
-
-describe("MikroOrmRegistry", () => {
-  const loggerMock = mock<Logger>();
-  const mikroOrmFactoryMock = mock<MikroOrmFactory>();
-  const mikroOrm = mock(MikroORM);
-
-  Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-
-  let mikroOrmRegistry!: MikroOrmRegistry;
-
-  beforeEach(() => {
-    mikroOrmRegistry = new MikroOrmRegistry(instance(loggerMock), instance(mikroOrmFactoryMock));
-  });
-
-  afterEach(() => reset<MikroORM | MikroOrmFactory>(mikroOrmFactoryMock, mikroOrm));
-
-  describe("register", () => {
-    it("should register instances", async () => {
-      // arrange
-      Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-
-      // act
-      const result1 = await mikroOrmRegistry.register(fixtures.mydb);
-      const result2 = await mikroOrmRegistry.register(fixtures.mydb);
-      const result3 = await mikroOrmRegistry.register(fixtures.none);
-      const result4 = await mikroOrmRegistry.register(fixtures.mydb2);
-
-      // assert
-      expect(result1).toEqual(mikroOrmRegistry.get("mydb"));
-      expect(result2).toEqual(mikroOrmRegistry.get("mydb"));
-      expect(result3).toEqual(mikroOrmRegistry.get("default"));
-      expect(result4).toEqual(mikroOrmRegistry.get("mydb2"));
-      verify(mikroOrmFactoryMock.create(anything())).thrice();
-    });
-  });
-
-  describe("clear", () => {
-    it("should dispose all instances", async () => {
-      // arrange
-      when(mikroOrm.isConnected()).thenResolve(true);
-      Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-      await mikroOrmRegistry.register(fixtures.none);
-      await mikroOrmRegistry.register(fixtures.mydb2);
-
-      // act
-      await mikroOrmRegistry.clear();
-
-      // assert
-      verify(mikroOrm.close(anything())).twice();
-    });
-  });
-
-  describe("get", () => {
-    it("should return corresponded instances", async () => {
-      // arrange
-      Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-      const none = await mikroOrmRegistry.register(fixtures.none);
-      const mydb = await mikroOrmRegistry.register(fixtures.mydb);
-
-      // act
-      const result1 = mikroOrmRegistry.get();
-      const result2 = mikroOrmRegistry.get("default");
-      const result3 = mikroOrmRegistry.get("mydb");
-
-      // assert
-      expect(result1).toEqual(none);
-      expect(result2).toEqual(none);
-      expect(result3).toEqual(mydb);
-    });
-  });
-
-  describe("has", () => {
-    it("should return corresponded instances existence", async () => {
-      // arrange
-      Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-      await mikroOrmRegistry.register(fixtures.none);
-      await mikroOrmRegistry.register(fixtures.mydb);
-
-      // act & assert
-      expect(mikroOrmRegistry.has()).toBeTruthy();
-      expect(mikroOrmRegistry.has("mydb")).toBeTruthy();
-      expect(mikroOrmRegistry.has("default")).toBeTruthy();
-      expect(mikroOrmRegistry.has("mydb10")).toBeFalsy();
-    });
-  });
-
-  describe("values", () => {
-    it("should return corresponded instances", async () => {
-      // arrange
-      Object.values(fixtures).forEach((options: Options) => when(mikroOrmFactoryMock.create(options)).thenResolve(instance(mikroOrm)));
-      await mikroOrmRegistry.register(fixtures.none);
-      await mikroOrmRegistry.register(fixtures.mydb);
-
-      // act & assert
-      expect([...mikroOrmRegistry.values()]).toMatchObject([instance(mikroOrm), instance(mikroOrm)]);
-    });
-  });
-});

package/src/services/MikroOrmRegistry.ts

@@ -1,62 +0,0 @@
-import {IDatabaseDriver as DatabaseDriver, MikroORM, Options} from "@mikro-orm/core";
-import {catchAsyncError, getValue} from "@tsed/core";
-import {Inject, Injectable} from "@tsed/di";
-import {Logger} from "@tsed/logger";
-
-import {MikroOrmFactory} from "./MikroOrmFactory.js";
-
-@Injectable()
-export class MikroOrmRegistry {
-  private readonly DEFAULT_CONTEXT_NAME = "default";
-  private readonly instances = new Map<string, MikroORM>();
-
-  constructor(
-    @Inject() private readonly logger: Logger,
-    @Inject() private readonly mikroOrmFactory: MikroOrmFactory
-  ) {}
-
-  public async register<T extends DatabaseDriver>(options: Options<T>): Promise<MikroORM> {
-    const contextName = getValue<string>(options, "contextName", this.DEFAULT_CONTEXT_NAME);
-
-    if (this.has(contextName)) {
-      return this.get(contextName)!;
-    }
-
-    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;
-  }
-
-  public get(contextName?: string): MikroORM | undefined {
-    return this.instances.get(contextName ?? this.DEFAULT_CONTEXT_NAME);
-  }
-
-  public has(contextName?: string): boolean {
-    return this.instances.has(contextName ?? this.DEFAULT_CONTEXT_NAME);
-  }
-
-  public values(): IterableIterator<MikroORM> {
-    return this.instances.values();
-  }
-
-  public async clear(): Promise<void> {
-    const instances = [...this.instances.values()];
-
-    await Promise.all(instances.map((instance: MikroORM) => catchAsyncError(() => this.dispose(instance))));
-
-    this.instances.clear();
-  }
-
-  private async dispose(instance: MikroORM): Promise<void> {
-    if (await instance.isConnected()) {
-      await instance.close(false);
-    }
-  }
-}

package/vitest.config.mts

@@ -1,25 +0,0 @@
-// @ts-ignore
-import {presets} from "@tsed/vitest/presets";
-import {defineConfig} from "vitest/config";
-
-export default defineConfig(
-  {
-    ...presets,
-    test: {
-      ...presets.test,
-      // @ts-ignore
-      globalSetup: [
-        "../testcontainers-mongo/src/setup/vi.setup.ts"
-      ],
-      coverage: {
-        ...presets.test.coverage,
-        thresholds: {
-          statements: 0,
-          branches: 0,
-          functions: 0,
-          lines: 0
-        }
-      }
-    }
-  }
-);