@eui/core 19.0.2 → 19.0.3-snapshot-1737728205029

package/fesm2022/eui-core.mjs

@@ -2,13 +2,12 @@ import * as i1 from '@eui/base';
 import { LogLevel, ConsoleAppender, initialAppState, initialUserState, initialNotificationsState, initialI18nState, initialLocaleState, Logger, LoggerMock, initialCoreState, xhr, mergeAll, getI18nLoaderConfig, EuiLazyService, getI18nServiceConfigFromBase, getBrowserDefaultLanguage, EuiEuLanguages, EuiService, getUserState, getLocaleServiceConfigFromBase, transformToUxHttpResponse } from '@eui/base';
 export * from '@eui/base';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, PLATFORM_ID, Injectable, Inject, Injector, NgModule, signal, computed, runInInjectionContext, Optional, SkipSelf, provideAppInitializer, ErrorHandler, LOCALE_ID } from '@angular/core';
+import { InjectionToken, inject, PLATFORM_ID, Injectable, Inject, Injector, NgModule, Optional, SkipSelf, provideAppInitializer, ErrorHandler, LOCALE_ID } from '@angular/core';
 import * as extendProxy from 'extend';
 import { isPlatformBrowser, LOCATION_INITIALIZED, DOCUMENT, isPlatformServer, getLocaleId, registerLocaleData } from '@angular/common';
-import { filter, debounceTime, distinctUntilChanged, tap, take, map, switchMap, catchError, concatMap, takeUntil } from 'rxjs/operators';
-import { toObservable } from '@angular/core/rxjs-interop';
+import { BehaviorSubject, of, forkJoin, from, Subject, defer, firstValueFrom } from 'rxjs';
+import { filter, debounceTime, distinctUntilChanged, map, tap, take, switchMap, catchError, concatMap, takeUntil } from 'rxjs/operators';
 import { isEqual, get } from 'lodash-es';
-import { of, forkJoin, from, Subject, BehaviorSubject, defer, firstValueFrom } from 'rxjs';
 import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import * as i1$2 from '@angular/common/http';
@@ -18,6 +17,7 @@ import { NavigationEnd } from '@angular/router';
 import { createSelector } from 'reselect';
 import * as i1$3 from '@ngx-translate/core';
 import { TranslateLoader } from '@ngx-translate/core';
+import { toSignal } from '@angular/core/rxjs-interop';
 import { By } from '@angular/platform-browser';
 import { FormGroup, FormArray } from '@angular/forms';
 import { DomPortalOutlet, ComponentPortal, PortalInjector } from '@angular/cdk/portal';
@@ -795,13 +795,14 @@ class StoreService {
          */
         this._autoSaveHandlers = {};
         this.isHandlingAutoSave = false;
-        this.injector = inject(Injector);
         if (isPlatformBrowser(this.platformId)) {
             this._storage = localStorage;
         }
-        this.state = signal({}, { equal: isEqual });
-        toObservable(this.state)
-            .pipe(filter(() => this.isHandlingAutoSave), debounceTime(1000), distinctUntilChanged())
+        const initialState = {};
+        this.state = new BehaviorSubject(initialState);
+        // Subscribe to signal changes for auto-save
+        this.state.asObservable()
+            .pipe(filter(() => this.isHandlingAutoSave), debounceTime(1000), distinctUntilChanged((prev, curr) => isEqual(prev, curr)))
             .subscribe((state) => {
             this.saveState(state);
         });
@@ -816,7 +817,8 @@ class StoreService {
             // load the state from the localStorage
             let localState = loadState(this._storage);
             localState = { ...localState, app: { ...localState?.app, version } };
-            this.updateState(this.deepMerge(localState, { ...initialCoreState }));
+            const mergedState = this.deepMerge(localState, { ...initialCoreState });
+            this.updateState(mergedState);
         }
     }
     /**
@@ -841,45 +843,33 @@ class StoreService {
         console.warn('eUI does not PROXY to NGRX store.dispatch() anymore');
     }
     updateState(state, reducer) {
+        const currentState = this.state.getValue();
+        let newState;
         if (reducer) {
-            this.state.update(currentState => {
-                const newState = reducer(currentState, state);
-                return {
-                    ...newState,
-                };
-            });
+            newState = reducer(currentState, { ...state });
         }
         else {
-            this.state.update(currentState => this.deepMerge(currentState, { ...state }));
+            newState = this.deepMerge(currentState, { ...state });
         }
+        this.state.next(newState);
     }
     select(keyOrMapFn) {
-        let computedState = computed(() => this.state());
-        if (keyOrMapFn) {
-            switch (typeof keyOrMapFn) {
-                case 'function':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        return keyOrMapFn(state);
-                    });
-                    break;
-                case 'string':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        if (!keyOrMapFn) {
-                            return state;
-                        }
-                        const keys = keyOrMapFn.split('.');
-                        // Traverse the object based on the dot notation
-                        return keys.reduce((acc, currKey) => {
-                            return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
-                        }, state);
-                    });
-                    break;
-            }
+        const baseObservable = this.state.asObservable();
+        if (!keyOrMapFn) {
+            return baseObservable;
         }
-        // Use `runInInjectionContext` to ensure `toObservable` is within Angular injection context
-        return runInInjectionContext(this.injector, () => toObservable(computedState).pipe(distinctUntilChanged((x, y) => isEqual(x, y))));
+        if (typeof keyOrMapFn === 'function') {
+            return baseObservable.pipe(map(state => keyOrMapFn(state)), distinctUntilChanged((x, y) => isEqual(x, y)));
+        }
+        return baseObservable.pipe(map(state => {
+            if (!keyOrMapFn) {
+                return state;
+            }
+            const keys = keyOrMapFn.split('.');
+            return keys.reduce((acc, currKey) => {
+                return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
+            }, state);
+        }), distinctUntilChanged((x, y) => isEqual(x, y)));
     }
     /**
      * filters and save the state with the Browser storage
@@ -2002,18 +1992,22 @@ const getLastAddedModule = (state) => state.app.loadedConfigModules.lastAddedMod
 class I18nService extends EuiLazyService {
     static { this.DEFAULT_STATE = { activeLang: 'en' }; }
     constructor(baseGlobalConfig, translateService, logService, store, document) {
-        super({ activeLang: 'en' });
+        super(I18nService.DEFAULT_STATE);
         this.baseGlobalConfig = baseGlobalConfig;
         this.translateService = translateService;
         this.logService = logService;
         this.store = store;
         this.document = document;
-        /**
-         * a single signal holding the state - initial state is null
-         */
-        this.state = signal(I18nService.DEFAULT_STATE, { equal: isEqual });
-        this.injector = inject(Injector);
         this.subNotifier = new Subject();
+        // Create a BehaviorSubject with the initial state
+        this.stateSubject = new BehaviorSubject(this.stateInstance);
+        // Initialize signal with base state
+        this.state = toSignal(this.stateSubject, { equal: isEqual });
+        // Subscribe to base class state changes
+        this.onStateChange.subscribe((newState) => {
+            // const clonedState = structuredClone(newState as T);
+            this.stateSubject.next(newState);
+        });
         this.config = getI18nServiceConfigFromBase(this.baseGlobalConfig);
         this.onModuleLoad = new BehaviorSubject({ ready: false, name: null });
     }
@@ -2022,44 +2016,33 @@ class I18nService extends EuiLazyService {
         this.subNotifier.complete();
     }
     getState(keyOrMapFn) {
-        let computedState = computed(() => this.state());
-        if (keyOrMapFn) {
-            switch (typeof keyOrMapFn) {
-                case 'function':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        return keyOrMapFn(state);
-                    });
-                    break;
-                case 'string':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        if (!keyOrMapFn) {
-                            return state;
-                        }
-                        const keys = keyOrMapFn.split('.');
-                        // Traverse the object based on the dot notation
-                        return keys.reduce((acc, currKey) => {
-                            return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
-                        }, state);
-                    });
-                    break;
-            }
+        if (!keyOrMapFn) {
+            return this.stateSubject.asObservable().pipe(takeUntil(this.subNotifier), distinctUntilChanged((x, y) => isEqual(x, y)));
+        }
+        if (typeof keyOrMapFn === 'function') {
+            return this.stateSubject.asObservable().pipe(takeUntil(this.subNotifier), map(state => keyOrMapFn(state)), distinctUntilChanged((x, y) => isEqual(x, y)));
         }
-        // Use `runInInjectionContext` to ensure `toObservable` is within Angular injection context
-        return runInInjectionContext(this.injector, () => toObservable(computedState).pipe(takeUntil(this.subNotifier), distinctUntilChanged((x, y) => isEqual(x, y))));
+        return this.stateSubject.asObservable().pipe(takeUntil(this.subNotifier), map(state => {
+            const keys = keyOrMapFn.split('.');
+            // Traverse the object based on the dot notation
+            return keys.reduce((acc, currKey) => {
+                return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
+            }, state);
+        }), distinctUntilChanged((x, y) => isEqual(x, y)));
     }
     updateState(state, reducer) {
         if (state.activeLang) {
             this.updateHTMLDOMLang(state.activeLang);
         }
-        this.state.update(currentState => super.deepMerge(currentState, { ...state }));
+        this.stateInstance = super.deepMerge(this.stateInstance, { ...state });
+        // Emit state change
+        this.onStateChange.next(this.stateInstance);
     }
     /**
      * This method is used to get the state as readonly signal.
      */
     getSignal() {
-        return this.state.asReadonly();
+        return this.state;
     }
     init(langState) {
         const initLang = langState && langState.activeLang ? langState.activeLang : this.preparedDefaultLanguage();
@@ -4652,7 +4635,7 @@ const LOCALE_ID_MAPPER = new InjectionToken('localeIdMapper');
 class LocaleService extends EuiService {
     static { this.DEFAULT_STATE = { id: 'en-US' }; }
     constructor(store, baseGlobalConfig, locale_id, localeMapper, i18n, log) {
-        super({ id: locale_id || Intl.DateTimeFormat().resolvedOptions().locale });
+        super({ id: locale_id || Intl.DateTimeFormat().resolvedOptions().locale || LocaleService.DEFAULT_STATE.id });
         this.store = store;
         this.baseGlobalConfig = baseGlobalConfig;
         this.locale_id = locale_id;
@@ -4660,18 +4643,24 @@ class LocaleService extends EuiService {
         this.i18n = i18n;
         this.log = log;
         this.subNotifier = new Subject();
-        /**
-         * a single signal holding the state - initial state is null
-         */
-        this.state = signal(LocaleService.DEFAULT_STATE, { equal: isEqual });
-        this.injector = inject(Injector);
         if (log) {
             this.logger = log.getLogger('core.LocaleService');
         }
+        // Create a BehaviorSubject with the initial state
+        this.stateSubject = new BehaviorSubject(this.stateInstance);
+        // Initialize signal with base state
+        this.state = toSignal(this.stateSubject, { equal: isEqual });
+        // Subscribe to base class state changes
+        this.onStateChange.subscribe((newState) => {
+            // const clonedState = structuredClone(newState as T);
+            this.stateSubject.next(newState);
+        });
         this.config = getLocaleServiceConfigFromBase(this.baseGlobalConfig);
         // in case no localeMapper provided, set the angular getLocaleId as default
         if (!this.localeMapper) {
             this.localeMapper = getLocaleId;
+            // TODO: replace deprecated method with new one
+            // this.localeMapper = (locale: string) => new Intl.Locale(locale).baseName;
         }
     }
     ngOnDestroy() {
@@ -4687,32 +4676,19 @@ class LocaleService extends EuiService {
      * @param keyOrMapFn
      */
     getState(keyOrMapFn) {
-        let computedState = computed(() => this.state());
-        if (keyOrMapFn) {
-            switch (typeof keyOrMapFn) {
-                case 'function':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        return keyOrMapFn(state);
-                    });
-                    break;
-                case 'string':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        if (!keyOrMapFn) {
-                            return state;
-                        }
-                        const keys = keyOrMapFn.split('.');
-                        // Traverse the object based on the dot notation
-                        return keys.reduce((acc, currKey) => {
-                            return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
-                        }, state);
-                    });
-                    break;
-            }
+        if (!keyOrMapFn) {
+            return this.stateSubject.asObservable().pipe(distinctUntilChanged((x, y) => isEqual(x, y)));
+        }
+        if (typeof keyOrMapFn === 'function') {
+            return this.stateSubject.asObservable().pipe(map(state => keyOrMapFn(state)), distinctUntilChanged((x, y) => isEqual(x, y)));
         }
-        // Use `runInInjectionContext` to ensure `toObservable` is within Angular injection context
-        return runInInjectionContext(this.injector, () => toObservable(computedState).pipe(distinctUntilChanged((x, y) => isEqual(x, y))));
+        return this.stateSubject.asObservable().pipe(map(state => {
+            const keys = keyOrMapFn.split('.');
+            // Traverse the object based on the dot notation
+            return keys.reduce((acc, currKey) => {
+                return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
+            }, state);
+        }), distinctUntilChanged((x, y) => isEqual(x, y)));
     }
     /**
      * Initializes the LocaleService with necessary configurations and state.
@@ -4739,11 +4715,12 @@ class LocaleService extends EuiService {
      * @throws Will throw an error if the locale for the given state id is not available.
      */
     updateState(state) {
+        const prevState = structuredClone(this.stateInstance);
         if (state?.id) {
             // check if locale is available otherwise throw error
             try {
                 const id = this.localeMapper(state.id);
-                this.state.update(currentState => super.deepMerge(currentState, { ...state, id }));
+                this.stateInstance = super.deepMerge(this.stateInstance, { ...state, id });
             }
             catch (e) {
                 const message = `Locale for '${state.id}' is not available.\n` +
@@ -4755,14 +4732,18 @@ class LocaleService extends EuiService {
             }
         }
         else {
-            this.state.update(currentState => this.deepMerge(currentState, { ...state }));
+            this.stateInstance = super.deepMerge(this.stateInstance, { ...state });
         }
+        // Emit state change
+        this.onStateChange.next(this.stateInstance);
+        // set previous state of service
+        this.prevStateInstance = prevState;
     }
     /**
      * This method is used to get the state as readonly signal.
      */
     getSignal() {
-        return this.state.asReadonly();
+        return this.state;
     }
     /**
      * Retrieves the previous locale used in the application.
@@ -4838,10 +4819,10 @@ class LocaleServiceMock extends LocaleService {
         super(null, { locale: {} }, locale_id, null, null, null);
         this.locale_id = locale_id;
         this.DEFAULT_LOCALE = 'en';
-        this.stateSubject = new BehaviorSubject({ id: this.DEFAULT_LOCALE });
+        this.stateSub = new BehaviorSubject({ id: this.DEFAULT_LOCALE });
     }
     getState() {
-        return this.stateSubject.asObservable();
+        return this.stateSub.asObservable();
     }
     updateState(state) {
         this.DEFAULT_LOCALE = state.id || 'en';
@@ -4851,7 +4832,7 @@ class LocaleServiceMock extends LocaleService {
         else if (state.id === 'el') {
             registerLocaleData(localeEl, 'fr');
         }
-        this.stateSubject.next(state);
+        this.stateSub.next(state);
     }
     init(state) {
         this.DEFAULT_LOCALE = state.id || 'en';
@@ -5169,63 +5150,55 @@ class UserService extends EuiService {
     constructor(store) {
         super(UserService.DEFAULT_STATE);
         this.store = store;
-        /**
-         * a single signal holding the state - initial state is null
-         */
-        this.state = signal(UserService.DEFAULT_STATE, { equal: isEqual });
-        this.injector = inject(Injector);
+        // Create a BehaviorSubject with the initial state
+        this.stateSubject = new BehaviorSubject(this.stateInstance);
+        // Initialize signal with base state
+        this.state = toSignal(this.stateSubject, { equal: isEqual });
+        // Subscribe to base class state changes
+        this.onStateChange.subscribe((newState) => {
+            const clonedState = structuredClone(newState);
+            this.stateSubject.next(clonedState);
+        });
     }
     init(state) {
         super.initEuiService();
         if (Object.prototype.hasOwnProperty.call(state, 'userId')) {
+            // Let base class handle state update
             this.updateState(state);
             return of$1({ success: true });
         }
         return of$1({ success: false, error: 'Init object should be instance of BaseUserState' });
     }
     getState(keyOrMapFn) {
-        let computedState = computed(() => this.state());
-        if (keyOrMapFn) {
-            switch (typeof keyOrMapFn) {
-                case 'function':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        return keyOrMapFn(state);
-                    });
-                    break;
-                case 'string':
-                    computedState = computed(() => {
-                        const state = this.state();
-                        const keys = keyOrMapFn.split('.');
-                        // Traverse the object based on the dot notation
-                        return keys.reduce((acc, currKey) => {
-                            return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
-                        }, state);
-                    });
-                    break;
-            }
+        if (!keyOrMapFn) {
+            return this.stateSubject.asObservable().pipe(distinctUntilChanged((x, y) => isEqual(x, y)));
+        }
+        if (typeof keyOrMapFn === 'function') {
+            return this.stateSubject.asObservable().pipe(map(state => keyOrMapFn(state)), distinctUntilChanged((x, y) => isEqual(x, y)));
         }
-        // Use `runInInjectionContext` to ensure `toObservable` is within Angular injection context
-        return runInInjectionContext(this.injector, () => toObservable(computedState).pipe(distinctUntilChanged((x, y) => isEqual(x, y))));
+        return this.stateSubject.asObservable().pipe(map(state => {
+            const keys = keyOrMapFn.split('.');
+            // Traverse the object based on the dot notation
+            return keys.reduce((acc, currKey) => {
+                return acc && acc[currKey] !== undefined ? acc[currKey] : undefined;
+            }, state);
+        }), distinctUntilChanged((x, y) => isEqual(x, y)));
     }
     updateState(state, reducer) {
         if (reducer) {
-            this.state.update(currentState => {
-                const newState = reducer(currentState, state);
-                return {
-                    ...newState,
-                };
-            });
+            this.stateInstance = reducer(this.stateInstance, state);
         }
         else {
-            this.state.update(currentState => this.deepMerge(currentState, { ...state }));
+            this.stateInstance = super.deepMerge(this.stateInstance, state);
         }
+        // Emit state change
+        this.onStateChange.next(this.stateInstance);
     }
     /**
      * This method is used to get the signal of the service.
      */
     getSignal() {
-        return this.state.asReadonly();
+        return this.state;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.0.5", ngImport: i0, type: UserService, deps: [{ token: StoreService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.0.5", ngImport: i0, type: UserService, providedIn: 'root' }); }