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

package/bundles/ngxs-store.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@ngxs/store/internals'), require('@angular/common'), require('rxjs'), require('rxjs/operators')) :
-    typeof define === 'function' && define.amd ? define('@ngxs/store', ['exports', '@angular/core', '@ngxs/store/internals', '@angular/common', 'rxjs', 'rxjs/operators'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.ngxs = global.ngxs || {}, global.ngxs.store = {}), global.ng.core, global.ngxs.store.internals, global.ng.common, global.rxjs, global.rxjs.operators));
-})(this, (function (exports, i0, i5, common, rxjs, operators) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@ngxs/store/internals'), require('@angular/common'), require('rxjs'), require('rxjs/operators'), require('@ngxs/store/operators')) :
+    typeof define === 'function' && define.amd ? define('@ngxs/store', ['exports', '@angular/core', '@ngxs/store/internals', '@angular/common', 'rxjs', 'rxjs/operators', '@ngxs/store/operators'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.ngxs = global.ngxs || {}, global.ngxs.store = {}), global.ng.core, global.ngxs.store.internals, global.ng.common, global.rxjs, global.rxjs.operators, global.ngxs.store.operators));
+})(this, (function (exports, i0, i5, common, rxjs, operators, operators$1) { 'use strict';
 
     function _interopNamespace(e) {
         if (e && e.__esModule) return e;
@@ -1010,33 +1010,28 @@
         }, {});
     }
 
-    var StoreValidators = /** @class */ (function () {
-        function StoreValidators() {
+    var stateNameRegex = new RegExp('^[a-zA-Z0-9_]+$');
+    function ensureStateNameIsValid(name) {
+        if (!name) {
+            throwStateNamePropertyError();
         }
-        StoreValidators.checkThatStateIsNamedCorrectly = function (name) {
-            if (!name) {
-                throwStateNamePropertyError();
-            }
-            else if (!this.stateNameRegex.test(name)) {
-                throwStateNameError(name);
-            }
-        };
-        StoreValidators.checkThatStateNameIsUnique = function (stateName, state, statesByName) {
-            var existingState = statesByName[stateName];
-            if (existingState && existingState !== state) {
-                throwStateUniqueError(stateName, state.name, existingState.name);
+        else if (!stateNameRegex.test(name)) {
+            throwStateNameError(name);
+        }
+    }
+    function ensureStateNameIsUnique(stateName, state, statesByName) {
+        var existingState = statesByName[stateName];
+        if (existingState && existingState !== state) {
+            throwStateUniqueError(stateName, state.name, existingState.name);
+        }
+    }
+    function ensureStatesAreDecorated(stateClasses) {
+        stateClasses.forEach(function (stateClass) {
+            if (!getStoreMetadata$1(stateClass)) {
+                throwStateDecoratorError(stateClass.name);
             }
-        };
-        StoreValidators.checkThatStateClassesHaveBeenDecorated = function (stateClasses) {
-            stateClasses.forEach(function (stateClass) {
-                if (!getStoreMetadata$1(stateClass)) {
-                    throwStateDecoratorError(stateClass.name);
-                }
-            });
-        };
-        return StoreValidators;
-    }());
-    StoreValidators.stateNameRegex = new RegExp('^[a-zA-Z0-9_]+$');
+        });
+    }
 
     /**
      * All provided or injected tokens must have `@Injectable` decorator
@@ -1728,43 +1723,21 @@
          */
         StateContextFactory.prototype.createStateContext = function (mappedStore) {
             var root = this._internalStateOperations.getRootStateOperations();
-            function getState(currentAppState) {
-                return getValue(currentAppState, mappedStore.path);
-            }
-            function setStateValue(currentAppState, newValue) {
-                var 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) {
-                var local = getState(currentAppState);
-                var newValue = stateOperator(local);
-                return setStateValue(currentAppState, newValue);
-            }
-            function isStateOperator(value) {
-                return typeof value === 'function';
-            }
             return {
                 getState: function () {
                     var currentAppState = root.getState();
-                    return getState(currentAppState);
+                    return getState(currentAppState, mappedStore.path);
                 },
                 patchState: function (val) {
                     var currentAppState = root.getState();
                     var patchOperator = simplePatch(val);
-                    return setStateFromOperator(currentAppState, patchOperator);
+                    return setStateFromOperator(root, currentAppState, patchOperator, mappedStore.path);
                 },
                 setState: function (val) {
                     var currentAppState = root.getState();
-                    return isStateOperator(val)
-                        ? setStateFromOperator(currentAppState, val)
-                        : setStateValue(currentAppState, val);
+                    return operators$1.isStateOperator(val)
+                        ? setStateFromOperator(root, currentAppState, val, mappedStore.path)
+                        : setStateValue(root, currentAppState, val, mappedStore.path);
                 },
                 dispatch: function (actions) {
                     return root.dispatch(actions);
@@ -1779,6 +1752,25 @@
                 type: i0.Injectable,
                 args: [{ providedIn: 'root' }]
             }], ctorParameters: function () { return [{ type: InternalStateOperations }]; } });
+    function setStateValue(root, currentAppState, newValue, path) {
+        var 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) {
+        var local = getState(currentAppState, path);
+        var newValue = stateOperator(local);
+        return setStateValue(root, currentAppState, newValue, path);
+    }
+    function getState(currentAppState, path) {
+        return getValue(currentAppState, path);
+    }
 
     var NG_DEV_MODE = typeof ngDevMode === 'undefined' || ngDevMode;
     /**
@@ -1864,8 +1856,8 @@
             enumerable: false,
             configurable: true
         });
-        StateFactory.cloneDefaults = function (defaults) {
-            var value = {};
+        StateFactory._cloneDefaults = function (defaults) {
+            var value = defaults;
             if (Array.isArray(defaults)) {
                 value = defaults.slice();
             }
@@ -1875,9 +1867,6 @@
             else if (defaults === undefined) {
                 value = {};
             }
-            else {
-                value = defaults;
-            }
             return value;
         };
         StateFactory.prototype.ngOnDestroy = function () {
@@ -1890,7 +1879,7 @@
         StateFactory.prototype.add = function (stateClasses) {
             var e_1, _b;
             if (NG_DEV_MODE) {
-                StoreValidators.checkThatStateClassesHaveBeenDecorated(stateClasses);
+                ensureStatesAreDecorated(stateClasses);
             }
             var newStates = this.addToStatesMap(stateClasses).newStates;
             if (!newStates.length)
@@ -1911,7 +1900,7 @@
                     // `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);
                     }
                     var stateMap = {
@@ -1920,7 +1909,7 @@
                         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
@@ -2066,7 +2055,7 @@
                     var stateClass = stateClasses_1_1.value;
                     var stateName = getStoreMetadata$1(stateClass).name;
                     if (NG_DEV_MODE) {
-                        StoreValidators.checkThatStateNameIsUnique(stateName, stateClass, statesMap);
+                        ensureStateNameIsUnique(stateName, stateClass, statesMap);
                     }
                     var unmountedState = !statesMap[stateName];
                     if (unmountedState) {
@@ -2601,36 +2590,34 @@
      * Decorates a class with ngxs state information.
      */
     function State(options) {
-        function getStateOptions(inheritedStateClass) {
-            var inheritanceOptions = inheritedStateClass[META_OPTIONS_KEY] || {};
-            return Object.assign(Object.assign({}, inheritanceOptions), options);
-        }
-        function mutateMetaData(params) {
-            var meta = params.meta, inheritedStateClass = params.inheritedStateClass, optionsWithInheritance = params.optionsWithInheritance;
-            var children = optionsWithInheritance.children, defaults = optionsWithInheritance.defaults, name = optionsWithInheritance.name;
-            var 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)) {
-                var inheritedMeta = inheritedStateClass[META_KEY] || {};
-                meta.actions = Object.assign(Object.assign({}, meta.actions), inheritedMeta.actions);
-            }
-            meta.children = children;
-            meta.defaults = defaults;
-            meta.name = stateName;
-        }
         return function (target) {
             var stateClass = target;
             var meta = ensureStoreMetadata$1(stateClass);
             var inheritedStateClass = Object.getPrototypeOf(stateClass);
-            var optionsWithInheritance = getStateOptions(inheritedStateClass);
+            var optionsWithInheritance = getStateOptions(inheritedStateClass, options);
             mutateMetaData({ meta: meta, inheritedStateClass: inheritedStateClass, optionsWithInheritance: optionsWithInheritance });
             stateClass[META_OPTIONS_KEY] = optionsWithInheritance;
         };
     }
+    function getStateOptions(inheritedStateClass, options) {
+        var inheritanceOptions = inheritedStateClass[META_OPTIONS_KEY] || {};
+        return Object.assign(Object.assign({}, inheritanceOptions), options);
+    }
+    function mutateMetaData(params) {
+        var meta = params.meta, inheritedStateClass = params.inheritedStateClass, optionsWithInheritance = params.optionsWithInheritance;
+        var children = optionsWithInheritance.children, defaults = optionsWithInheritance.defaults, name = optionsWithInheritance.name;
+        var stateName = typeof name === 'string' ? name : (name && name.getName()) || null;
+        if (typeof ngDevMode === 'undefined' || ngDevMode) {
+            ensureStateNameIsValid(stateName);
+        }
+        if (inheritedStateClass.hasOwnProperty(META_KEY)) {
+            var inheritedMeta = inheritedStateClass[META_KEY] || {};
+            meta.actions = Object.assign(Object.assign({}, meta.actions), inheritedMeta.actions);
+        }
+        meta.children = children;
+        meta.defaults = defaults;
+        meta.name = stateName;
+    }
 
     var DOLLAR_CHAR_CODE = 36;
     function createSelectObservable(selector) {