@stemy/ngx-utils 17.4.4 → 17.5.1

package/fesm2022/stemy-ngx-utils.mjs

@@ -2237,6 +2237,11 @@ class SetUtils {
             return;
         items.forEach(i => set.add(i));
     }
+    static merge(set, other) {
+        if (!ObjectUtils.isSet(set) || !ObjectUtils.isSet(other))
+            return;
+        other.forEach(i => set.add(i));
+    }
 }
 
 class UniqueUtils {
@@ -3264,19 +3269,28 @@ class EventsService {
     get isSticky() {
         return this.sticky;
     }
+    get isAuthenticated() {
+        return !!this.user;
+    }
     constructor() {
-        this.eventForwarded = new EventEmitter();
-        this.stickyUpdated = new EventEmitter();
-        this.languageChanged = new EventEmitter();
-        this.editLanguageChanged = new EventEmitter();
+        this.eventForwarded = new Subject();
+        this.stickyUpdated = new Subject();
+        this.languageChanged = new Subject();
+        this.editLanguageChanged = new Subject();
+        this.translationsEnabled = new Subject();
+        this.userChanged = new Subject();
         this.sticky = false;
+        this.user = null;
+        this.userChanged.subscribe(user => {
+            this.user = user;
+        });
     }
     event(e) {
-        this.eventForwarded.emit(e);
+        this.eventForwarded.next(e);
     }
     updateSticky(sticky) {
         this.sticky = sticky;
-        this.stickyUpdated.emit(sticky);
+        this.stickyUpdated.next(sticky);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: EventsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: EventsService }); }
@@ -3387,16 +3401,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
             type: Injectable
         }], ctorParameters: () => [] });
 
-const emptyDict = {};
+const EMPTY_DICT = {};
 class StaticLanguageService {
     get defaultLanguage() {
         return this.configs.getQueryParameter("lang") || this.storage.get("language", this.getDefaultLanguage());
     }
     get dictionary() {
-        return this.mergedTranslations[this.currentLanguage] || emptyDict;
+        return this.mergedTranslations[this.currentLanguage] || EMPTY_DICT;
     }
     set dictionary(value) {
-        this.translations[this.currentLanguage] = value;
+        this.setDictionary(this.currentLang, value);
         this.mergeTranslations();
     }
     get languages() {
@@ -3407,21 +3421,27 @@ class StaticLanguageService {
     }
     set currentLanguage(lang) {
         this.currentLang = lang;
-        this.events.languageChanged.emit(lang);
+        this.events.languageChanged.next(lang);
     }
     get editLanguage() {
         return this.editLang || this.currentLanguage;
     }
     set editLanguage(lang) {
         this.editLang = lang || this.currentLanguage;
-        this.events.editLanguageChanged.emit(this.editLang);
+        this.events.editLanguageChanged.next(this.editLang);
+    }
+    get enableTranslations() {
+        return this.enableTrans;
+    }
+    set enableTranslations(value) {
+        this.enableTrans = value;
+        this.events.translationsEnabled.next(value);
     }
     get disableTranslations() {
-        return this.disableTrans;
+        return !this.enableTranslations;
     }
     set disableTranslations(value) {
-        this.disableTrans = value;
-        this.events.languageChanged.emit(this.currentLang);
+        this.enableTranslations = !value;
     }
     get httpClient() {
         return this.client;
@@ -3440,7 +3460,7 @@ class StaticLanguageService {
         this.client = client;
         this.editLang = null;
         this.currentLang = null;
-        this.disableTrans = false;
+        this.enableTrans = true;
         this.languageList = [];
         this.translations = {
             none: {}
@@ -3457,7 +3477,7 @@ class StaticLanguageService {
         languages = Array.isArray(languages) && languages.length > 0 ? languages : this.languageList;
         this.languageList = Array.from(new Set(languages));
         this.languageList.forEach(lang => {
-            this.translations[lang] = this.translations[lang] || emptyDict;
+            this.translations[lang] = this.translations[lang] || EMPTY_DICT;
         });
     }
     addLanguages(languages) {
@@ -3475,12 +3495,24 @@ class StaticLanguageService {
         this.mergedTranslations = this.translations;
     }
     getTranslationSync(key, params = null) {
-        key = String(key || "");
-        const lowerKey = key.toLocaleLowerCase();
-        const translation = !key ? "" : this.dictionary[lowerKey] || key;
-        return this.interpolate(translation, params);
+        key = String(key ?? "");
+        if (!key)
+            return "";
+        try {
+            const lowerKey = key.toLocaleLowerCase();
+            const dict = this.dictionary;
+            if (lowerKey in dict && this.enableTranslations) {
+                return this.interpolate(dict[lowerKey], params);
+            }
+            return this.interpolate(key, params);
+        }
+        catch (reason) {
+            console.warn("ERROR IN TRANSLATIONS", reason);
+            return key;
+        }
     }
-    async getTranslation(key, params) {
+    async getTranslation(key, params = null) {
+        await this.loadDictionary();
         return this.getTranslationSync(key, params);
     }
     getTranslations(...keys) {
@@ -3502,9 +3534,20 @@ class StaticLanguageService {
         const translation = translations ? translations.find(t => t.lang == lang) : null;
         return this.interpolate(translation ? translation.translation : "", params);
     }
+    async loadDictionary() {
+        return this.dictionary;
+    }
+    setDictionary(lang, dictionary) {
+        this.translations[lang] = Object.keys(dictionary || {}).reduce((res, key) => {
+            res[key.toLocaleLowerCase()] = dictionary[key];
+            return res;
+        }, {});
+        return this.translations[lang];
+    }
     interpolate(expr, params) {
         if (typeof expr === "string") {
-            return this.interpolateString(expr, params);
+            // Force single spaces to be empty strings, for labeling in forms.
+            return expr === " " ? "" : this.interpolateString(expr, params);
         }
         if (typeof expr === "function") {
             return expr(params);
@@ -3515,7 +3558,7 @@ class StaticLanguageService {
         if (!expr || !params)
             return expr;
         return expr.replace(/{{\s?([^{}\s]*)\s?}}/g, (substring, b) => {
-            const r = ObjectUtils.getValue(params, b);
+            const r = ObjectUtils.getValue(params, b, "");
             return ObjectUtils.isDefined(r) ? r : substring;
         });
     }
@@ -3541,8 +3584,8 @@ class StaticLanguageService {
         ]);
         this.mergedTranslations = Array.from(languages).reduce((merged, language) => {
             merged[language] = {
-                ...(this.translations[language] || emptyDict),
-                ...(this.overrideTranslations[language] || emptyDict),
+                ...(this.translations[language] || EMPTY_DICT),
+                ...(this.overrideTranslations[language] || EMPTY_DICT),
             };
             return merged;
         }, {});
@@ -3575,7 +3618,7 @@ class LanguageService extends StaticLanguageService {
     }
     set currentLanguage(lang) {
         this.useLanguage(lang).then(() => {
-            this.events.languageChanged.emit(lang);
+            this.events.languageChanged.next(lang);
         });
     }
     get settings() {
@@ -3589,7 +3632,8 @@ class LanguageService extends StaticLanguageService {
         }));
     }
     initService() {
-        this.client.setExtraRequestParam("language", "de");
+        super.initService();
+        this.client.setExtraRequestParam("language", "en");
         this.translationRequests = {};
         this.languageSettings = new BehaviorSubject(null);
         if (this.universal.isServer)
@@ -3617,32 +3661,32 @@ class LanguageService extends StaticLanguageService {
         if (this.languageList.length === 0) {
             this.languageList = [defaultLanguage];
         }
-        const lang = this.languages.indexOf(defaultLanguage) < 0 ? settings.defaultLanguage || this.languageList[0] : defaultLanguage;
+        const lang = this.selectLanguage(this.currentLang)
+            ?? this.selectLanguage(defaultLanguage)
+            ?? this.selectLanguage(settings.defaultLanguage || this.languageList[0]);
         await this.useLanguage(lang);
-        this.events.languageChanged.emit(lang);
+        this.events.languageChanged.next(lang);
     }
-    async getTranslation(key, params = null) {
-        try {
-            await this.getDictionary();
-            return super.getTranslationSync(key, params);
-        }
-        catch (reason) {
-            console.log("ERROR IN TRANSLATIONS", reason);
-            return key;
-        }
+    selectLanguage(lang) {
+        if (!lang)
+            return null;
+        return this.languageList.length === 0 || this.languageList.includes(lang)
+            ? lang : null;
     }
     async useLanguage(lang) {
-        lang = this.languages.indexOf(lang) < 0 ? this.languages[0] : lang;
+        lang = this.selectLanguage(lang);
         this.client.setExtraRequestParam("language", lang);
-        if (lang == this.currentLang)
+        if (lang === this.currentLang)
             return this.dictionary;
         this.storage.set("language", lang);
         this.currentLang = lang;
-        return this.getDictionary();
+        return this.loadDictionary();
     }
-    getDictionary(lang) {
-        lang = this.languages.includes(lang) ? lang : this.currentLanguage;
-        this.translationRequests[lang] = this.translationRequests[lang] || firstValueFrom(this.client.get(`${this.config.translationUrl}${lang}`))
+    async getDictionary(lang) {
+        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) => {
@@ -3654,12 +3698,16 @@ class LanguageService extends StaticLanguageService {
             return dictionary;
         }).catch(error => {
             console.warn("Translation dictionary problem:", error);
-            return {};
+            return EMPTY_DICT;
         });
         return this.translationRequests[lang];
     }
+    async loadDictionary() {
+        return this.getDictionary(this.currentLang);
+    }
     loadSettings() {
-        this.settingsPromise = this.settingsPromise || firstValueFrom(this.client.get(`${this.config.translationUrl}languageSettings`))
+        const ext = this.config.translationExt || ``;
+        this.settingsPromise = this.settingsPromise || firstValueFrom(this.client.get(`${this.config.translationUrl}languageSettings${ext}`))
             .catch(error => {
             console.warn("Translation settings problem:", error);
             return {
@@ -6317,12 +6365,12 @@ class Wasi {
             wasi_snapshot_preview1: this.wasi,
             env: this.wasi
         }).then(module => {
-            const exports = module.instance.exports;
+            const exports$1 = module.instance.exports;
             this.wasm = {
-                ...exports,
+                ...exports$1,
                 writeArrayToMemory: (array) => {
                     const bytes = array.length * array.BYTES_PER_ELEMENT;
-                    const pointer = exports.malloc(bytes);
+                    const pointer = exports$1.malloc(bytes);
                     const ctr = array.constructor;
                     const heapArray = new ctr(this.wasm.memory.buffer, pointer, array.length);
                     heapArray.set(array);