@elderbyte/ngx-starter 21.8.0 → 21.8.1

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -9574,19 +9574,6 @@ const ELDER_LANGUAGE_OPTIONS = new InjectionToken('ELDER_LANGUAGE_OPTIONS');
 
 const LANGUAGE_STORAGE_KEY = 'language';
 class ElderLanguageService {
-    /***************************************************************************
-     *                                                                         *
-     * Legacy Compatiblity                                                     *
-     *                                                                         *
-     **************************************************************************/
-    get currentLanguage$() {
-        return toObservable(this.currentLang);
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
     constructor() {
         this.webStorage = inject(WebLocalStorage);
         this.config = inject(ELDER_LANGUAGE_OPTIONS);
@@ -9599,14 +9586,13 @@ class ElderLanguageService {
         this._langs = signal(null, ...(ngDevMode ? [{ debugName: "_langs" }] : /* istanbul ignore next */ []));
         this._defaultLang = signal(null, ...(ngDevMode ? [{ debugName: "_defaultLang" }] : /* istanbul ignore next */ []));
         this._currentLang = signal(null, ...(ngDevMode ? [{ debugName: "_currentLang" }] : /* istanbul ignore next */ []));
-        this._browserLang = getBrowserPreferredLang();
-        this._storedPreferredLang = this.getStoredPreferredLang();
         /***************************************************************************
          *                                                                         *
          * Computed                                                                *
          *                                                                         *
          **************************************************************************/
         this.currentLang = this._currentLang.asReadonly();
+        this.currentLanguage$ = toObservable(this.currentLang);
         this.defaultLang = this._defaultLang.asReadonly();
         this.langs = this._langs.asReadonly();
     }
@@ -9620,6 +9606,7 @@ class ElderLanguageService {
             this.logger.warn('cannot set lang', lang, 'since it is not in supported langs', this._langs());
             return;
         }
+        this.logger.debug('set current language and persist to storage: ', lang);
         this.webStorage.setItem(LANGUAGE_STORAGE_KEY, lang);
         this._currentLang.set(lang);
     }
@@ -9630,7 +9617,7 @@ class ElderLanguageService {
         }
         this.setLangs(this.config?.langs);
         this.setDefaultLang(this.config?.defaultLang);
-        this.setInitialLang();
+        this.resolveInitialLang();
     }
     /***************************************************************************
      *                                                                         *
@@ -9649,19 +9636,57 @@ class ElderLanguageService {
         }
         this._defaultLang.set(lang);
     }
-    setInitialLang() {
-        if (this._storedPreferredLang && this.isSupported(this._storedPreferredLang)) {
-            this._currentLang.set(this._storedPreferredLang);
+    resolveInitialLang() {
+        this.logger.debug('resolving initial language. available langs: ', this._langs());
+        if (this.trySetInitialLangFromStoredPreferredLang()) {
             return;
         }
-        if (this._browserLang && this.isSupported(this._browserLang)) {
-            this._currentLang.set(this._browserLang);
+        if (this.trySetInitialLangFromBrowserLang()) {
             return;
         }
-        this._currentLang.set(this._defaultLang());
+        this.setInitialLangFromDefaultLang();
+    }
+    trySetInitialLangFromStoredPreferredLang() {
+        const storedPreferredLang = this.getStoredPreferredLang();
+        if (!storedPreferredLang) {
+            this.logger.debug('no stored preferred lang found.');
+            return false;
+        }
+        if (!this.isSupported(storedPreferredLang)) {
+            this.logger.warn('stored preferred lang is not supported: ', storedPreferredLang);
+            return false;
+        }
+        this.logger.debug('set initial lang from stored preferred language: ', storedPreferredLang);
+        this.applyInitialLang(storedPreferredLang, { persist: false });
+        return true;
+    }
+    trySetInitialLangFromBrowserLang() {
+        const browserLang = getBrowserPreferredLang();
+        if (!browserLang) {
+            this.logger.debug('could not determine browser preferred language.');
+            return false;
+        }
+        if (!this.isSupported(browserLang)) {
+            this.logger.debug('preferred browser language is not supported: ', browserLang);
+            return false;
+        }
+        this.logger.debug('set initial language from preferred browser language: ', browserLang);
+        this.applyInitialLang(browserLang, { persist: true });
+        return true;
+    }
+    setInitialLangFromDefaultLang() {
+        this.logger.debug('set initial language from default language:  ', this._defaultLang());
+        this.applyInitialLang(this._defaultLang(), { persist: true });
+    }
+    applyInitialLang(lang, options) {
+        if (options.persist) {
+            this.setCurrentLang(lang);
+            return;
+        }
+        this._currentLang.set(lang);
     }
     isSupported(lang) {
-        return this._langs().includes(lang);
+        return this._langs()?.includes(lang) ?? false;
     }
     getStoredPreferredLang() {
         return this.webStorage.getItem(LANGUAGE_STORAGE_KEY);
@@ -9674,7 +9699,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.7", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 /***************************************************************************
  *                                                                         *
  * Helper Functions                                                        *