@next-core/brick-kit 2.152.1 → 2.153.0

package/dist/index.esm.js

@@ -14835,7 +14835,8 @@ var useProviderArgsDefaults = {
     transform: (oldData, newData) => newData,
     data: undefined,
     loading: false,
-    suspense: false
+    suspense: false,
+    cache: true
   },
   dependencies: undefined
 };
@@ -14908,7 +14909,7 @@ function useProviderArgs(providerOrParamsOrGlobalOptions, gloabalOptionsOrDeps,
   };
 }
 
-var cache$1 = new Map();
+var cache = new Map();
 function fetchProviderArgs(_x, _x2) {
   return _fetchProviderArgs.apply(this, arguments);
 }
@@ -14924,33 +14925,57 @@ function _fetchProviderArgs() {
       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$3(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$3(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$3(function* () {
         if (!isCustomApiProvider(provider)) {
@@ -14966,7 +14991,7 @@ function _fetch() {
 
         return CustomApi(...args);
       })();
-      cache.set(cacheKey, promise);
+      cache && cacheMap.set(cacheKey, promise);
     }
 
     return promise;
@@ -14974,7 +14999,7 @@ function _fetch() {
   return _fetch.apply(this, arguments);
 }
 
-var _excluded = ["onError", "transform", "suspense"];
+var _excluded = ["onError", "transform", "suspense", "cache"];
 function useProvider() {
   var {
     provider,
@@ -14986,7 +15011,8 @@ function useProvider() {
   var {
     onError,
     transform,
-    suspense
+    suspense,
+    cache
   } = customOptions,
       defaults = _objectWithoutProperties(customOptions, _excluded);
 
@@ -15008,11 +15034,12 @@ function useProvider() {
           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);
@@ -15023,7 +15050,7 @@ function useProvider() {
     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 = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator$3(function* (providerOrBody, args) {
       var providerStr = provider;