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

package/bundles/ngxs-store.umd.js

@@ -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
@@ -1864,8 +1859,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 +1870,6 @@
             else if (defaults === undefined) {
                 value = {};
             }
-            else {
-                value = defaults;
-            }
             return value;
         };
         StateFactory.prototype.ngOnDestroy = function () {
@@ -1890,7 +1882,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 +1903,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 +1912,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 +2058,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 +2593,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) {