@stemy/ngx-utils 19.9.18 → 19.9.19

package/fesm2022/stemy-ngx-utils.mjs

@@ -3998,12 +3998,12 @@ class ConfigService {
         }
         const configUrl = this.configUrl;
         try {
-            const config5 = await this.http.get(isDevMode() ? `${configUrl}5` : configUrl, { responseType: "text" }).toPromise();
+            const config5 = await firstValueFrom(this.http.get(isDevMode() ? `${configUrl}5` : configUrl, { responseType: "text" }));
             return JSON5.parse(config5);
         }
         catch (e) {
             try {
-                const config = await this.http.get(configUrl).toPromise();
+                const config = await firstValueFrom(this.http.get(configUrl));
                 console.log(`Can't parse json5 config: ${e}`);
                 return config;
             }
@@ -4012,8 +4012,14 @@ class ConfigService {
             }
         }
     }
-    prepareConfig(config) {
-        return Promise.resolve(config);
+    async prepareConfig(config) {
+        config.apiUrl = this.prepareUrl(config.apiUrl, "/");
+        config.translationUrl = this.prepareUrl(config.translationUrl, "/");
+        config.translationUrls = config.translationUrls || {};
+        Object.entries(config.translationUrls).forEach(([key, value]) => {
+            config.translationUrls[key] = this.prepareUrl(value, "/");
+        });
+        return config;
     }
     cloneRootElem() {
         if (this.rootElement instanceof HTMLElement) {
@@ -4666,22 +4672,38 @@ class LanguageService extends StaticLanguageService {
         if (!lang)
             return EMPTY_DICT;
         const ext = this.config.translationExt || ``;
-        this.translationRequests[lang] = this.translationRequests[lang] || firstValueFrom(this.client.get(`${this.config.translationUrl}${lang}${ext}`))
-            .then(response => {
-            response = response || {};
-            const dictionary = Object.keys(response).reduce((result, key) => {
-                result[key.toLocaleLowerCase()] = response[key];
-                return result;
-            }, {});
+        this.translationRequests[lang] = this.translationRequests[lang] || this.getMergedDictionary(lang, ext)
+            .then(dictionary => {
             this.translations[lang] = dictionary;
             this.mergeTranslations();
-            return dictionary;
+            return this.mergedTranslations[lang];
         }).catch(error => {
             console.warn("Translation dictionary problem:", error);
             return EMPTY_DICT;
         });
         return this.translationRequests[lang];
     }
+    async getMergedDictionary(lang, ext) {
+        const urls = [...Object.values(this.config.translationUrls || {}), this.config.translationUrl]
+            .filter(ObjectUtils.isStringWithValue)
+            .map(url => `${url}${lang}${ext}`);
+        const translations = await Promise.all(urls.map(async (url) => {
+            try {
+                return await firstValueFrom(this.client.get(url));
+            }
+            catch (error) {
+                console.warn(`Translation dictionary problem: '${url}'`, error);
+                return EMPTY_DICT;
+            }
+        }));
+        const result = {};
+        translations.forEach(dict => {
+            Object.entries(dict).forEach(([key, value]) => {
+                result[key.toLocaleLowerCase()] = value;
+            });
+        });
+        return result;
+    }
     async loadDictionary() {
         return this.getDictionary(this.currentLang);
     }