@ngxs/store 3.7.3-dev.master-6bd0acb → 3.7.3-dev.master-89968a0

package/fesm2015/ngxs-store.js

@@ -1,5 +1,5 @@
 import { NgZone, Injectable, Inject, PLATFORM_ID, InjectionToken, Optional, SkipSelf, ErrorHandler, Injector, defineInjectable, inject, ɵivyEnabled, NgModule, APP_BOOTSTRAP_LISTENER } from '@angular/core';
-import { memoize, INITIAL_STATE_TOKEN, NgxsBootstrapper, NGXS_STATE_CONTEXT_FACTORY, NGXS_STATE_FACTORY, InitialState, localInject, ensureLocalInjectorCaptured } from '@ngxs/store/internals';
+import { memoize, INITIAL_STATE_TOKEN, NgxsBootstrapper, NGXS_STATE_CONTEXT_FACTORY, NGXS_STATE_FACTORY, InitialState, ensureInjectorNotifierIsCaptured, localInject, ensureLocalInjectorCaptured } from '@ngxs/store/internals';
 import { isPlatformServer } from '@angular/common';
 import { Observable, Subject, BehaviorSubject, of, forkJoin, throwError, EMPTY, from } from 'rxjs';
 import { filter, map, shareReplay, take, exhaustMap, mergeMap, defaultIfEmpty, catchError, takeUntil, tap, distinctUntilChanged } from 'rxjs/operators';
@@ -3719,6 +3719,11 @@ function Select(rawSelector, ...paths) {
         const selectorId = `__${name}__selector`;
         /** @type {?} */
         let selector = null;
+        /** @type {?} */
+        let injectorNotifier$ = null;
+        if (ɵivyEnabled) {
+            injectorNotifier$ = ensureInjectorNotifierIsCaptured(target);
+        }
         Object.defineProperties(target, {
             [selectorId]: {
                 writable: true,
@@ -3732,14 +3737,29 @@ function Select(rawSelector, ...paths) {
                  * @return {?}
                  */
                 get() {
+                    if (this[selectorId]) {
+                        return this[selectorId];
+                    }
                     // The `localInject` will be tree-shaken away in apps that
                     // still use the View Engine.
-                    /** @type {?} */
-                    const store = ɵivyEnabled ? localInject(this, Store) : null;
-                    /** @type {?} */
-                    const config = ɵivyEnabled ? localInject(this, NgxsConfig) : null;
-                    selector = selector || createSelectorFn(config, name, rawSelector, paths);
-                    return (this[selectorId] || (this[selectorId] = createSelectObservable(selector, store)));
+                    if (ɵivyEnabled) {
+                        this[selectorId] = (/** @type {?} */ (injectorNotifier$)).pipe(mergeMap((/**
+                         * @return {?}
+                         */
+                        () => {
+                            /** @type {?} */
+                            const store = localInject(this, Store);
+                            /** @type {?} */
+                            const config = localInject(this, NgxsConfig);
+                            selector = selector || createSelectorFn(config, name, rawSelector, paths);
+                            return createSelectObservable(selector, store);
+                        })));
+                    }
+                    else {
+                        selector = selector || createSelectorFn(null, name, rawSelector, paths);
+                        this[selectorId] = createSelectObservable(selector, null);
+                    }
+                    return this[selectorId];
                 }
             }
         });