@next-core/brick-kit 2.152.1 → 2.153.0

package/dist/index.bundle.js

@@ -14834,7 +14834,8 @@
       transform: (oldData, newData) => newData,
       data: undefined,
       loading: false,
-      suspense: false
+      suspense: false,
+      cache: true
     },
     dependencies: undefined
   };
@@ -14907,7 +14908,7 @@
     };
   }
 
-  var cache$1 = new Map();
+  var cache = new Map();
   function fetchProviderArgs(_x, _x2) {
     return _fetchProviderArgs.apply(this, arguments);
   }
@@ -14923,33 +14924,57 @@
         args,
         originalArgs
       });
-      if (cache$1.has(cacheKey)) return cache$1.get(cacheKey);
+      if (cache.has(cacheKey)) return cache.get(cacheKey);
       var actualArgs = yield getArgsOfCustomApi(provider, [...args, ...originalArgs]);
-      cache$1.set(cacheKey, actualArgs);
+      cache.set(cacheKey, actualArgs);
       return actualArgs;
     });
     return _fetchProviderArgs.apply(this, arguments);
   }
 
-  var cache = new Map();
-  function fetch(_x) {
-    return _fetch.apply(this, arguments);
+  var cacheMap = new Map();
+
+  function isObj(v) {
+    return typeof v === "object" && v !== null && !Array.isArray(v);
   }
 
-  function _fetch() {
-    _fetch = _asyncToGenerator__default["default"](function* (provider) {
-      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
-      }
+  function buildSortedCacheKey(provider, args) {
+    var sortObj = obj => Object.keys(obj).sort().map(k => ({
+      [k]: obj[k]
+    }));
 
-      var cacheKey = JSON.stringify({
+    try {
+      var sortedArgs = isObj(args) ? sortObj(args) : args.map(arg => sortObj(arg));
+      return JSON.stringify({
+        provider,
+        args: sortedArgs
+      });
+    } catch (e) {
+      return JSON.stringify({
         provider,
         args
       });
-      var promise;
+    }
+  }
+
+  function fetch(_x, _x2) {
+    return _fetch.apply(this, arguments);
+  }
+
+  function _fetch() {
+    _fetch = _asyncToGenerator__default["default"](function* (provider, cache) {
+      for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+        args[_key - 2] = arguments[_key];
+      }
+
+      var promise; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+
+      var cacheKey = buildSortedCacheKey(provider, ...args);
+      !cache && cacheMap.has(cacheKey) && cacheMap.delete(cacheKey);
 
-      if (cache.has(cacheKey)) {
-        promise = cache.get(cacheKey);
+      if (cacheMap.has(cacheKey)) {
+        promise = cacheMap.get(cacheKey);
       } else {
         promise = _asyncToGenerator__default["default"](function* () {
           if (!isCustomApiProvider(provider)) {
@@ -14965,7 +14990,7 @@
 
           return CustomApi(...args);
         })();
-        cache.set(cacheKey, promise);
+        cache && cacheMap.set(cacheKey, promise);
       }
 
       return promise;
@@ -14973,7 +14998,7 @@
     return _fetch.apply(this, arguments);
   }
 
-  var _excluded = ["onError", "transform", "suspense"];
+  var _excluded = ["onError", "transform", "suspense", "cache"];
   function useProvider() {
     var {
       provider,
@@ -14985,7 +15010,8 @@
     var {
       onError,
       transform,
-      suspense
+      suspense,
+      cache
     } = customOptions,
         defaults = _objectWithoutProperties__default["default"](customOptions, _excluded);
 
@@ -15007,11 +15033,12 @@
             args[_key - 1] = arguments[_key];
           }
 
-          var newRes = yield fetch(provider, ...args);
+          var newRes = yield fetch(provider, cache, ...args);
           response.current = newRes;
           data.current = transform(data.current, newRes);
         } catch (e) {
           error.current = e;
+          data.current = undefined;
         }
 
         if (!suspense) setLoading(false);
@@ -15022,7 +15049,7 @@
       return function (_x) {
         return _ref.apply(this, arguments);
       };
-    }(), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
+    }(), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError, cache]);
     var makeFetch = React.useCallback( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator__default["default"](function* (providerOrBody, args) {
         var providerStr = provider;