fix(di): make injector really a singleton

tsedio · Nov 25, 2024 · db7b2ca · db7b2ca
1 parent 319ff69
commit db7b2ca
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 46 deletions.
diff --git a/packages/di/src/common/decorators/inject.spec.ts b/packages/di/src/common/decorators/inject.spec.ts
@@ -40,8 +40,6 @@ describe("@Inject()", () => {
       expect(instance.test).toBeInstanceOf(InjectorService);
     });
     it("should inject service and async factory", async () => {
-      //      const inj = injector({rebuild: true});
-
       // GIVEN
       class Test {
         constructor(public type: string) {}

diff --git a/packages/di/src/common/decorators/lazyInject.spec.ts b/packages/di/src/common/decorators/lazyInject.spec.ts
@@ -1,5 +1,6 @@
 import {catchAsyncError, classOf, nameOf} from "@tsed/core";
 
+import {inject} from "../fn/inject.js";
 import {injector} from "../fn/injector.js";
 import type {MyLazyModule} from "./__mock__/lazy.module.js";
 import {Injectable} from "./injectable.js";
@@ -13,14 +14,13 @@ describe("LazyInject", () => {
       lazy: Promise<MyLazyModule>;
     }
 
-    const inj = injector({rebuild: true});
-    const service = await inj.invoke<MyInjectable>(MyInjectable);
-    const nbProviders = inj.getProviders().length;
+    const service = inject<MyInjectable>(MyInjectable);
+    const nbProviders = injector().getProviders().length;
 
     const lazyService = await service.lazy;
 
     expect(nameOf(classOf(lazyService))).toEqual("MyLazyModule");
-    expect(nbProviders).not.toEqual(inj.getProviders().length);
+    expect(nbProviders).not.toEqual(injector().getProviders().length);
   });
 
   it("should throw an error when the module doesn't exists", async () => {
@@ -31,8 +31,7 @@ describe("LazyInject", () => {
       lazy?: Promise<MyLazyModule>;
     }
 
-    const inj = injector({rebuild: true});
-    const service = await inj.invoke<MyInjectable>(MyInjectable);
+    const service = inject<MyInjectable>(MyInjectable);
     const error = await catchAsyncError(() => service.lazy);
 
     expect(error?.message).toContain("Failed to load url lazy-module");
@@ -46,8 +45,7 @@ describe("LazyInject", () => {
       lazy?: Promise<MyLazyModule>;
     }
 
-    const inj = injector({rebuild: true});
-    const service = await inj.invoke<MyInjectable>(MyInjectable);
+    const service = inject(MyInjectable);
     const lazyService = await service.lazy;
 
     expect(lazyService).toEqual(undefined);

diff --git a/packages/di/src/common/fn/injector.ts b/packages/di/src/common/fn/injector.ts
@@ -1,10 +1,9 @@
 import {InjectorService} from "../services/InjectorService.js";
 
-let globalInjector: InjectorService | undefined;
+let globalInjector: InjectorService = new InjectorService();
 
-type InjectorFnOpts = {rebuild?: boolean; logger?: any; settings?: Partial<TsED.Configuration>};
 /**
- * Create or return the existing injector service.
+ * Return the existing injector service.
  *
  * Example:
  *
@@ -17,27 +16,11 @@ type InjectorFnOpts = {rebuild?: boolean; logger?: any; settings?: Partial<TsED.
  * }
  * ```
  */
-export function injector(opts?: InjectorFnOpts): InjectorService {
-  if (!globalInjector || opts?.rebuild) {
-    globalInjector = new InjectorService();
-
-    if (opts && opts.logger) {
-      globalInjector.logger = opts.logger;
-    }
-
-    if (opts?.settings) {
-      globalInjector.settings.set(opts.settings);
-    }
-  }
-
+export function injector(): InjectorService {
   return globalInjector;
 }
 
-export function hasInjector() {
-  return !!globalInjector;
-}
-
 export async function destroyInjector() {
-  await globalInjector?.destroy();
-  globalInjector = undefined;
+  await globalInjector.destroy();
+  globalInjector = new InjectorService();
 }
diff --git a/packages/di/src/common/utils/providerBuilder.ts b/packages/di/src/common/utils/providerBuilder.ts
@@ -3,7 +3,7 @@ import "../registries/ProviderRegistry.js";
 import {Store, type Type} from "@tsed/core";
 
 import {ProviderType} from "../domain/ProviderType.js";
-import {hasInjector, injector} from "../fn/injector.js";
+import {injector} from "../fn/injector.js";
 import type {ProviderOpts} from "../interfaces/ProviderOpts.js";
 import type {TokenProvider} from "../interfaces/TokenProvider.js";
 import {GlobalProviders} from "../registries/GlobalProviders.js";
@@ -26,7 +26,7 @@ export function providerBuilder<Provider, Picked extends keyof Provider>(props:
     options: Partial<ProviderOpts<Type>> = {}
   ): ProviderBuilder<Token, Provider, Pick<Provider, Picked>> => {
     const merged = {
-      global: !hasInjector() || injector().isLoaded(),
+      global: !injector().isLoaded(),
       ...options,
       ...baseOpts,
       provide: token

diff --git a/packages/di/src/node/services/DITest.ts b/packages/di/src/node/services/DITest.ts
@@ -6,7 +6,6 @@ import {
   createContainer,
   destroyInjector,
   DI_INJECTABLE_PROPS,
-  hasInjector,
   inject,
   injector,
   InjectorService,
@@ -39,11 +38,9 @@ export class DITest {
    * Create a new injector with the right default services
    */
   static createInjector(settings: any = {}): InjectorService {
-    const inj = injector({
-      rebuild: true,
-      logger: $log,
-      settings: DITest.configure(settings)
-    });
+    const inj = injector();
+    injector().logger = $log;
+    inj.settings.set(DITest.configure(settings));
 
     setLoggerConfiguration();
 
@@ -54,10 +51,8 @@ export class DITest {
    * Resets the test injector of the test context, so it won't pollute your next test. Call this in your `tearDown` logic.
    */
   static async reset() {
-    if (hasInjector()) {
-      await destroyInjector();
-      cleanAllLocalsContainer();
-    }
+    await destroyInjector();
+    cleanAllLocalsContainer();
   }
 
   /**

diff --git a/packages/di/vitest.config.mts b/packages/di/vitest.config.mts
@@ -11,11 +11,11 @@ export default defineConfig(
         ...presets.test.coverage,
         thresholds: {
           statements: 98.69,
-          branches: 97.2,
+          branches: 97.18,
           functions: 97.02,
           lines: 98.69
         }
       }
     }
   }
-);
+);