@ngxs/store 3.7.6-dev.master-f234866 → 3.7.6-dev.master-daef739

package/bundles/ngxs-store.umd.js

@@ -2084,41 +2084,8 @@
                         }] }];
         } });
 
-    var SELECTOR_OPTIONS_META_KEY = 'NGXS_SELECTOR_OPTIONS_META';
-    var selectorOptionsMetaAccessor = {
-        getOptions: function (target) {
-            return (target && target[SELECTOR_OPTIONS_META_KEY]) || {};
-        },
-        defineOptions: function (target, options) {
-            if (!target)
-                return;
-            target[SELECTOR_OPTIONS_META_KEY] = options;
-        }
-    };
-    /**
-     * Function for creating a selector
-     * @param selectors The selectors to use to create the arguments of this function
-     * @param originalFn The original function being made into a selector
-     * @param creationMetadata
-     */
-    function createSelector(selectors, originalFn, creationMetadata) {
-        var containerClass = creationMetadata && creationMetadata.containerClass;
-        var wrappedFn = function wrappedSelectorFn() {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            var returnValue = originalFn.apply(containerClass, args);
-            if (returnValue instanceof Function) {
-                var innerMemoizedFn = i5.memoize.apply(null, [returnValue]);
-                return innerMemoizedFn;
-            }
-            return returnValue;
-        };
-        var memoizedFn = i5.memoize(wrappedFn);
-        Object.setPrototypeOf(memoizedFn, originalFn);
-        var selectorMetaData = setupSelectorMetadata(originalFn, creationMetadata);
-        var makeRootSelector = function (context) {
+    function createRootSelectorFactory(selectorMetaData, selectors, memoizedSelectorFn) {
+        return function (context) {
             var _a = getRuntimeSelectorInfo(context, selectorMetaData, selectors), argumentSelectorFunctions = _a.argumentSelectorFunctions, selectorOptions = _a.selectorOptions;
             return function selectFromRoot(rootState) {
                 // Determine arguments from the app state using the selectors
@@ -2127,7 +2094,7 @@
                 // state that doesn't exist, it will throw a TypeError.
                 // since this is quite usual behaviour, we simply return undefined if so.
                 try {
-                    return memoizedFn.apply(void 0, __spreadArray([], __read(results)));
+                    return memoizedSelectorFn.apply(void 0, __spreadArray([], __read(results)));
                 }
                 catch (ex) {
                     if (ex instanceof TypeError && selectorOptions.suppressErrors) {
@@ -2137,22 +2104,24 @@
                 }
             };
         };
-        selectorMetaData.makeRootSelector = makeRootSelector;
-        return memoizedFn;
     }
-    function setupSelectorMetadata(originalFn, creationMetadata) {
-        var selectorMetaData = ensureSelectorMetadata$1(originalFn);
-        selectorMetaData.originalFn = originalFn;
-        var getExplicitSelectorOptions = function () { return ({}); };
-        if (creationMetadata) {
-            selectorMetaData.containerClass = creationMetadata.containerClass;
-            selectorMetaData.selectorName = creationMetadata.selectorName;
-            getExplicitSelectorOptions =
-                creationMetadata.getSelectorOptions || getExplicitSelectorOptions;
-        }
-        var selectorMetaDataClone = Object.assign({}, selectorMetaData);
-        selectorMetaData.getSelectorOptions = function () { return getLocalSelectorOptions(selectorMetaDataClone, getExplicitSelectorOptions()); };
-        return selectorMetaData;
+    function createMemoizedSelectorFn(originalFn, creationMetadata) {
+        var containerClass = creationMetadata && creationMetadata.containerClass;
+        var wrappedFn = function wrappedSelectorFn() {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var returnValue = originalFn.apply(containerClass, args);
+            if (returnValue instanceof Function) {
+                var innerMemoizedFn = i5.memoize.apply(null, [returnValue]);
+                return innerMemoizedFn;
+            }
+            return returnValue;
+        };
+        var memoizedFn = i5.memoize(wrappedFn);
+        Object.setPrototypeOf(memoizedFn, originalFn);
+        return memoizedFn;
     }
     function getRuntimeSelectorInfo(context, selectorMetaData, selectors) {
         if (selectors === void 0) { selectors = []; }
@@ -2165,12 +2134,9 @@
         });
         return {
             selectorOptions: selectorOptions,
-            argumentSelectorFunctions: argumentSelectorFunctions
+            argumentSelectorFunctions: argumentSelectorFunctions,
         };
     }
-    function getLocalSelectorOptions(selectorMetaData, explicitOptions) {
-        return Object.assign(Object.assign(Object.assign(Object.assign({}, (selectorOptionsMetaAccessor.getOptions(selectorMetaData.containerClass) || {})), (selectorOptionsMetaAccessor.getOptions(selectorMetaData.originalFn) || {})), (selectorMetaData.getSelectorOptions() || {})), explicitOptions);
-    }
     function getSelectorsToApply(selectors, selectorOptions, containerClass) {
         if (selectors === void 0) { selectors = []; }
         var selectorsToApply = [];
@@ -2714,6 +2680,35 @@
         };
     }
 
+    var SELECTOR_OPTIONS_META_KEY = 'NGXS_SELECTOR_OPTIONS_META';
+    var selectorOptionsMetaAccessor = {
+        getOptions: function (target) {
+            return (target && target[SELECTOR_OPTIONS_META_KEY]) || {};
+        },
+        defineOptions: function (target, options) {
+            if (!target)
+                return;
+            target[SELECTOR_OPTIONS_META_KEY] = options;
+        },
+    };
+    function setupSelectorMetadata(originalFn, creationMetadata) {
+        var selectorMetaData = ensureSelectorMetadata$1(originalFn);
+        selectorMetaData.originalFn = originalFn;
+        var getExplicitSelectorOptions = function () { return ({}); };
+        if (creationMetadata) {
+            selectorMetaData.containerClass = creationMetadata.containerClass;
+            selectorMetaData.selectorName = creationMetadata.selectorName || null;
+            getExplicitSelectorOptions =
+                creationMetadata.getSelectorOptions || getExplicitSelectorOptions;
+        }
+        var selectorMetaDataClone = Object.assign({}, selectorMetaData);
+        selectorMetaData.getSelectorOptions = function () { return getLocalSelectorOptions(selectorMetaDataClone, getExplicitSelectorOptions()); };
+        return selectorMetaData;
+    }
+    function getLocalSelectorOptions(selectorMetaData, explicitOptions) {
+        return Object.assign(Object.assign(Object.assign(Object.assign({}, (selectorOptionsMetaAccessor.getOptions(selectorMetaData.containerClass) || {})), (selectorOptionsMetaAccessor.getOptions(selectorMetaData.originalFn) || {})), (selectorMetaData.getSelectorOptions() || {})), explicitOptions);
+    }
+
     /**
      * Decorator for setting selector options at a method or class level.
      */
@@ -2747,9 +2742,13 @@
         return getSelectorMetadata$1(target);
     }
 
-    /**
-     * Decorator for memoizing a state selector.
-     */
+    function createSelector(selectors, projector, creationMetadata) {
+        var memoizedFn = createMemoizedSelectorFn(projector, creationMetadata);
+        var selectorMetaData = setupSelectorMetadata(projector, creationMetadata);
+        selectorMetaData.makeRootSelector = createRootSelectorFactory(selectorMetaData, selectors, memoizedFn);
+        return memoizedFn;
+    }
+
     function Selector(selectors) {
         return function (target, key, descriptor) {
             descriptor || (descriptor = Object.getOwnPropertyDescriptor(target, key));