@next-core/brick-kit 2.108.0 → 2.109.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.109.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.108.0...@next-core/brick-kit@2.109.0) (2022-03-22)
+
+
+### Features
+
+* React组件支持调用skd生成的provider ([aced8ff](https://github.com/easyops-cn/next-core/commit/aced8ffc0d05f5f700169ee06525c5a56e309fe3))
+
+
+
+
+
 # [2.108.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.107.4...@next-core/brick-kit@2.108.0) (2022-03-18)
 
 

package/dist/index.bundle.js

@@ -13194,7 +13194,7 @@
     });
   }, {});
 
-  var _excluded$1 = ["body"];
+  var _excluded$1 = ["args"];
   function useProviderArgs(providerOrParamsOrGlobalOptions, gloabalOptionsOrDeps, deps) {
     var provider = React.useMemo(() => {
       if (typeof providerOrParamsOrGlobalOptions === "string") {
@@ -13222,13 +13222,13 @@
         return acc;
       }, {}),
           {
-        body = null
+        args = null
       } = _reduce,
           restOptions = _objectWithoutProperties__default["default"](_reduce, _excluded$1);
 
       return {
         options: _objectSpread__default["default"]({}, restOptions),
-        body
+        args
       };
     }, [options]);
     var dependencies = React.useMemo(() => {
@@ -13255,29 +13255,72 @@
     };
   }
 
-  var cache = new Map();
-  function fetchProviderArgs(_x) {
+  var cache$1 = new Map();
+  function fetchProviderArgs(_x, _x2) {
     return _fetchProviderArgs.apply(this, arguments);
   }
 
   function _fetchProviderArgs() {
-    _fetchProviderArgs = _asyncToGenerator__default["default"](function* (provider) {
-      for (var _len = arguments.length, originalArgs = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        originalArgs[_key - 1] = arguments[_key];
+    _fetchProviderArgs = _asyncToGenerator__default["default"](function* (provider, args) {
+      for (var _len = arguments.length, originalArgs = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+        originalArgs[_key - 2] = arguments[_key];
       }
 
       var cacheKey = JSON.stringify({
         provider,
+        args,
         originalArgs
       });
-      if (cache.has(cacheKey)) return cache.get(cacheKey);
-      var args = yield getArgsOfCustomApi(provider, originalArgs);
-      cache.set(cacheKey, args);
-      return args;
+      if (cache$1.has(cacheKey)) return cache$1.get(cacheKey);
+      var actualArgs = yield getArgsOfCustomApi(provider, [...args, ...originalArgs]);
+      cache$1.set(cacheKey, actualArgs);
+      return actualArgs;
     });
     return _fetchProviderArgs.apply(this, arguments);
   }
 
+  var cache = new Map();
+  function fetch(_x) {
+    return _fetch.apply(this, arguments);
+  }
+
+  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];
+      }
+
+      var cacheKey = JSON.stringify({
+        provider,
+        args
+      });
+      var promise;
+
+      if (cache.has(cacheKey)) {
+        promise = cache.get(cacheKey);
+      } else {
+        promise = _asyncToGenerator__default["default"](function* () {
+          if (!isCustomApiProvider(provider)) {
+            var providerBrick = yield _internalApiGetProviderBrick(provider);
+            var providerTagName = providerBrick.tagName.toLowerCase();
+
+            if (!customElements.get(providerTagName)) {
+              throw new Error("Provider not defined: \"".concat(providerTagName, "\", please make sure the related package is installed."));
+            }
+
+            return providerBrick["resolve"](...args);
+          }
+
+          return CustomApi(...args);
+        })();
+        cache.set(cacheKey, promise);
+      }
+
+      return promise;
+    });
+    return _fetch.apply(this, arguments);
+  }
+
   var _excluded = ["onError", "transform", "suspense"];
   function useProvider() {
     var {
@@ -13306,7 +13349,12 @@
       try {
         error.current = undefined;
         if (!suspense) setLoading(true);
-        var newRes = yield CustomApi(...arguments);
+
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
+        }
+
+        var newRes = yield fetch(provider, ...args);
         response.current = newRes;
         data.current = transform(data.current, newRes);
       } catch (e) {
@@ -13318,25 +13366,25 @@
       return data.current;
     }), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
     var makeFetch = React.useCallback( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator__default["default"](function* (providerOrBody, body) {
+      var _ref2 = _asyncToGenerator__default["default"](function* (providerOrBody, args) {
         var providerStr = provider;
-        var data = {};
+        var providerArgs = [];
 
         if (lodash.isString(providerOrBody)) {
           providerStr = providerOrBody;
         }
 
         if (lodash.isObject(providerOrBody)) {
-          data = providerOrBody;
-        } else if (lodash.isObject(body)) {
-          data = body;
+          providerArgs = providerOrBody;
+        } else if (lodash.isObject(args)) {
+          providerArgs = args;
         }
 
-        var args = yield fetchProviderArgs(providerStr, data, requestInit.options);
+        var actualArgs = yield fetchProviderArgs(providerStr, providerArgs, requestInit.options);
 
         if (suspense) {
           return _asyncToGenerator__default["default"](function* () {
-            suspender.current = doFetch(...args).then(newData => {
+            suspender.current = doFetch(...actualArgs).then(newData => {
               suspenseStatus.current = "success";
               return newData;
             }, error => {
@@ -13349,7 +13397,7 @@
           })();
         }
 
-        return doFetch(...args);
+        return doFetch(...actualArgs);
       });
 
       return function (_x, _x2) {
@@ -13383,7 +13431,7 @@
       mounted.current = true;
 
       if (Array.isArray(dependencies) && provider) {
-        request.query(provider, requestInit.body);
+        request.query(provider, requestInit.args);
       }
 
       return () => mounted.current = false;