refactor(service): avoid directly using loaders

Author: rbalet

projects/ngx-translate/src/lib/translate.service.ts

@@ -227,7 +227,7 @@ export class TranslateService implements ITranslateService, OnDestroy {
     }
 
     constructor() {
-        this._loaderIndex = this.store.addLoader();
+        this._loaderIndex = this.store.addLoader(inject(TranslateLoader));
 
         const config: TranslateServiceConfig = {
             extend: false,
@@ -349,8 +349,13 @@ export class TranslateService implements ITranslateService, OnDestroy {
     ): Observable<InterpolatableTranslationObject> {
         this.pending = true;
 
-        const loaders = Array.from(this.store.loaders.values());
-        const requests = loaders.map((loader) => loader.getTranslation(lang).pipe(take(1)));
+        const loaders = this.store.getLoaders();
+        if (loaders.size === 0) return of({} as InterpolatableTranslationObject);
+
+        const requests: Observable<TranslationObject>[] = [];
+        loaders.forEach((loader) => {
+            requests.push(loader.getTranslation(lang).pipe(take(1)));
+        });
 
         // Merge all translation objects
         const loadingTranslations = (

projects/ngx-translate/src/lib/translate.store.ts

@@ -1,4 +1,4 @@
-import { inject, Injectable } from "@angular/core";
+import { Injectable } from "@angular/core";
 import { Observable, Subject } from "rxjs";
 import { TranslateLoader } from "./translate.loader";
 import {
@@ -35,12 +35,12 @@ export class TranslateStore {
      * Adds a new loader to the store
      * @returns the index of the newly added loader
      */
-    addLoader() {
+    addLoader(loader: TranslateLoader) {
         let loaderIndex = 0;
         while (this.loaders.has(loaderIndex)) {
             loaderIndex++;
         }
-        this.loaders.set(loaderIndex, inject(TranslateLoader));
+        this.loaders.set(loaderIndex, loader);
         return loaderIndex;
     }
 
@@ -52,10 +52,6 @@ export class TranslateStore {
         return this.loaders;
     }
 
-    getLoader(loaderIndex: number) {
-        return this.loaders.get(loaderIndex);
-    }
-
     public getTranslations(language: Language): DeepReadonly<InterpolatableTranslationObject> {
         return this.translations[language];
     }