@ngxs/store 3.8.1-dev.master-3e21e23 → 3.8.1-dev.master-94c82c4

package/fesm2015/ngxs-store.js

@@ -5,6 +5,7 @@ import { memoize, INITIAL_STATE_TOKEN, NgxsBootstrapper, ɵNGXS_STATE_CONTEXT_FA
 import { isPlatformServer } from '@angular/common';
 import { Observable, Subject, BehaviorSubject, of, forkJoin, throwError, EMPTY, from, isObservable } from 'rxjs';
 import { filter, map, share, shareReplay, take, exhaustMap, mergeMap, defaultIfEmpty, catchError, takeUntil, distinctUntilChanged, tap, startWith, pairwise } from 'rxjs/operators';
+import { isStateOperator } from '@ngxs/store/operators';
 
 /**
  * Returns the type from an action instance/class.
@@ -1137,43 +1138,21 @@ class StateContextFactory {
      */
     createStateContext(mappedStore) {
         const root = this._internalStateOperations.getRootStateOperations();
-        function getState(currentAppState) {
-            return getValue(currentAppState, mappedStore.path);
-        }
-        function setStateValue(currentAppState, newValue) {
-            const newAppState = setValue(currentAppState, mappedStore.path, newValue);
-            root.setState(newAppState);
-            return newAppState;
-            // In doing this refactoring I noticed that there is a 'bug' where the
-            // application state is returned instead of this state slice.
-            // This has worked this way since the beginning see:
-            // https://github.com/ngxs/store/blame/324c667b4b7debd8eb979006c67ca0ae347d88cd/src/state-factory.ts
-            // This needs to be fixed, but is a 'breaking' change.
-            // I will do this fix in a subsequent PR and we can decide how to handle it.
-        }
-        function setStateFromOperator(currentAppState, stateOperator) {
-            const local = getState(currentAppState);
-            const newValue = stateOperator(local);
-            return setStateValue(currentAppState, newValue);
-        }
-        function isStateOperator(value) {
-            return typeof value === 'function';
-        }
         return {
             getState() {
                 const currentAppState = root.getState();
-                return getState(currentAppState);
+                return getState(currentAppState, mappedStore.path);
             },
             patchState(val) {
                 const currentAppState = root.getState();
                 const patchOperator = simplePatch(val);
-                return setStateFromOperator(currentAppState, patchOperator);
+                return setStateFromOperator(root, currentAppState, patchOperator, mappedStore.path);
             },
             setState(val) {
                 const currentAppState = root.getState();
                 return isStateOperator(val)
-                    ? setStateFromOperator(currentAppState, val)
-                    : setStateValue(currentAppState, val);
+                    ? setStateFromOperator(root, currentAppState, val, mappedStore.path)
+                    : setStateValue(root, currentAppState, val, mappedStore.path);
             },
             dispatch(actions) {
                 return root.dispatch(actions);
@@ -1187,31 +1166,48 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.17", ngImpo
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: InternalStateOperations }]; } });
+function setStateValue(root, currentAppState, newValue, path) {
+    const newAppState = setValue(currentAppState, path, newValue);
+    root.setState(newAppState);
+    return newAppState;
+    // In doing this refactoring I noticed that there is a 'bug' where the
+    // application state is returned instead of this state slice.
+    // This has worked this way since the beginning see:
+    // https://github.com/ngxs/store/blame/324c667b4b7debd8eb979006c67ca0ae347d88cd/src/state-factory.ts
+    // This needs to be fixed, but is a 'breaking' change.
+    // I will do this fix in a subsequent PR and we can decide how to handle it.
+}
+function setStateFromOperator(root, currentAppState, stateOperator, path) {
+    const local = getState(currentAppState, path);
+    const newValue = stateOperator(local);
+    return setStateValue(root, currentAppState, newValue, path);
+}
+function getState(currentAppState, path) {
+    return getValue(currentAppState, path);
+}
 
-class StoreValidators {
-    static checkThatStateIsNamedCorrectly(name) {
-        if (!name) {
-            throwStateNamePropertyError();
-        }
-        else if (!this.stateNameRegex.test(name)) {
-            throwStateNameError(name);
-        }
+const stateNameRegex = new RegExp('^[a-zA-Z0-9_]+$');
+function ensureStateNameIsValid(name) {
+    if (!name) {
+        throwStateNamePropertyError();
     }
-    static checkThatStateNameIsUnique(stateName, state, statesByName) {
-        const existingState = statesByName[stateName];
-        if (existingState && existingState !== state) {
-            throwStateUniqueError(stateName, state.name, existingState.name);
-        }
+    else if (!stateNameRegex.test(name)) {
+        throwStateNameError(name);
     }
-    static checkThatStateClassesHaveBeenDecorated(stateClasses) {
-        stateClasses.forEach((stateClass) => {
-            if (!getStoreMetadata$1(stateClass)) {
-                throwStateDecoratorError(stateClass.name);
-            }
-        });
+}
+function ensureStateNameIsUnique(stateName, state, statesByName) {
+    const existingState = statesByName[stateName];
+    if (existingState && existingState !== state) {
+        throwStateUniqueError(stateName, state.name, existingState.name);
     }
 }
-StoreValidators.stateNameRegex = new RegExp('^[a-zA-Z0-9_]+$');
+function ensureStatesAreDecorated(stateClasses) {
+    stateClasses.forEach((stateClass) => {
+        if (!getStoreMetadata$1(stateClass)) {
+            throwStateDecoratorError(stateClass.name);
+        }
+    });
+}
 
 /**
  * All provided or injected tokens must have `@Injectable` decorator
@@ -1372,8 +1368,8 @@ class StateFactory {
     get statePaths() {
         return this._parentFactory ? this._parentFactory.statePaths : this._statePaths;
     }
-    static cloneDefaults(defaults) {
-        let value = {};
+    static _cloneDefaults(defaults) {
+        let value = defaults;
         if (Array.isArray(defaults)) {
             value = defaults.slice();
         }
@@ -1383,9 +1379,6 @@ class StateFactory {
         else if (defaults === undefined) {
             value = {};
         }
-        else {
-            value = defaults;
-        }
         return value;
     }
     ngOnDestroy() {
@@ -1397,7 +1390,7 @@ class StateFactory {
      */
     add(stateClasses) {
         if (NG_DEV_MODE) {
-            StoreValidators.checkThatStateClassesHaveBeenDecorated(stateClasses);
+            ensureStatesAreDecorated(stateClasses);
         }
         const { newStates } = this.addToStatesMap(stateClasses);
         if (!newStates.length)
@@ -1416,7 +1409,7 @@ class StateFactory {
             // `State` decorator. This check is moved here because the `ɵprov` property
             // will not exist on the class in JIT mode (because it's set asynchronously
             // during JIT compilation through `Object.defineProperty`).
-            if (typeof ngDevMode === 'undefined' || ngDevMode) {
+            if (NG_DEV_MODE) {
                 ensureStateClassIsInjectable(stateClass);
             }
             const stateMap = {
@@ -1425,7 +1418,7 @@ class StateFactory {
                 isInitialised: false,
                 actions: meta.actions,
                 instance: this._injector.get(stateClass),
-                defaults: StateFactory.cloneDefaults(meta.defaults)
+                defaults: StateFactory._cloneDefaults(meta.defaults)
             };
             // ensure our store hasn't already been added
             // but don't throw since it could be lazy
@@ -1538,7 +1531,7 @@ class StateFactory {
         for (const stateClass of stateClasses) {
             const stateName = getStoreMetadata$1(stateClass).name;
             if (NG_DEV_MODE) {
-                StoreValidators.checkThatStateNameIsUnique(stateName, stateClass, statesMap);
+                ensureStateNameIsUnique(stateName, stateClass, statesMap);
             }
             const unmountedState = !statesMap[stateName];
             if (unmountedState) {
@@ -1998,36 +1991,34 @@ function Action(actions, options) {
  * Decorates a class with ngxs state information.
  */
 function State(options) {
-    function getStateOptions(inheritedStateClass) {
-        const inheritanceOptions = inheritedStateClass[META_OPTIONS_KEY] || {};
-        return Object.assign(Object.assign({}, inheritanceOptions), options);
-    }
-    function mutateMetaData(params) {
-        const { meta, inheritedStateClass, optionsWithInheritance } = params;
-        const { children, defaults, name } = optionsWithInheritance;
-        const stateName = typeof name === 'string' ? name : (name && name.getName()) || null;
-        // Caretaker note: we have still left the `typeof` condition in order to avoid
-        // creating a breaking change for projects that still use the View Engine.
-        if (typeof ngDevMode === 'undefined' || ngDevMode) {
-            StoreValidators.checkThatStateIsNamedCorrectly(stateName);
-        }
-        if (inheritedStateClass.hasOwnProperty(META_KEY)) {
-            const inheritedMeta = inheritedStateClass[META_KEY] || {};
-            meta.actions = Object.assign(Object.assign({}, meta.actions), inheritedMeta.actions);
-        }
-        meta.children = children;
-        meta.defaults = defaults;
-        meta.name = stateName;
-    }
     return (target) => {
         const stateClass = target;
         const meta = ensureStoreMetadata$1(stateClass);
         const inheritedStateClass = Object.getPrototypeOf(stateClass);
-        const optionsWithInheritance = getStateOptions(inheritedStateClass);
+        const optionsWithInheritance = getStateOptions(inheritedStateClass, options);
         mutateMetaData({ meta, inheritedStateClass, optionsWithInheritance });
         stateClass[META_OPTIONS_KEY] = optionsWithInheritance;
     };
 }
+function getStateOptions(inheritedStateClass, options) {
+    const inheritanceOptions = inheritedStateClass[META_OPTIONS_KEY] || {};
+    return Object.assign(Object.assign({}, inheritanceOptions), options);
+}
+function mutateMetaData(params) {
+    const { meta, inheritedStateClass, optionsWithInheritance } = params;
+    const { children, defaults, name } = optionsWithInheritance;
+    const stateName = typeof name === 'string' ? name : (name && name.getName()) || null;
+    if (typeof ngDevMode === 'undefined' || ngDevMode) {
+        ensureStateNameIsValid(stateName);
+    }
+    if (inheritedStateClass.hasOwnProperty(META_KEY)) {
+        const inheritedMeta = inheritedStateClass[META_KEY] || {};
+        meta.actions = Object.assign(Object.assign({}, meta.actions), inheritedMeta.actions);
+    }
+    meta.children = children;
+    meta.defaults = defaults;
+    meta.name = stateName;
+}
 
 const DOLLAR_CHAR_CODE = 36;
 function createSelectObservable(selector) {