@next-core/brick-kit 2.108.0 → 2.111.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.111.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.110.0...@next-core/brick-kit@2.111.0) (2022-03-24)
+
+
+### Features
+
+* support APP.getMenu ([#1651](https://github.com/easyops-cn/next-core/issues/1651)) ([5b9f53a](https://github.com/easyops-cn/next-core/commit/5b9f53a3367087a062f415dd68070f15b98bf966))
+
+
+
+
+
+# [2.110.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.109.0...@next-core/brick-kit@2.110.0) (2022-03-23)
+
+
+### Features
+
+* support console in storyboard functions ([db24b0b](https://github.com/easyops-cn/next-core/commit/db24b0b1e6545a64974ab2ec1ffb1d8a2220d726))
+
+
+
+
+
+# [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

@@ -1510,6 +1510,39 @@
     permissionMap.clear();
   }
 
+  var THROW = () => {
+    throw new Error("Can't modify read-only proxy object");
+  };
+
+  var readOnlyHandler = {
+    set: THROW,
+    defineProperty: THROW,
+    deleteProperty: THROW,
+    setPrototypeOf: THROW
+  };
+  function getReadOnlyProxy(object) {
+    return new Proxy(object, readOnlyHandler);
+  } // First, we want to make accessing property of globals lazy,
+  // So we use *Proxy* to make a dynamic accessor for each of these globals.
+  // But we also want to keep them working in devtools.
+
+  function getDynamicReadOnlyProxy(_ref) {
+    var {
+      get,
+      ownKeys
+    } = _ref;
+
+    if (getDevHook()) {
+      // In devtools, we extract them at beginning.
+      var target = Object.fromEntries(ownKeys(null).map(key => [key, get(null, key, null)]));
+      return getReadOnlyProxy(target);
+    }
+
+    return new Proxy(Object.freeze({}), {
+      get
+    });
+  }
+
   // `GeneralGlobals` are globals which are page-state-agnostic,
   // thus they can be used both in storyboard expressions and functions.
   function getGeneralGlobals(attemptToVisitGlobals, options) {
@@ -1531,7 +1564,8 @@
       collectCoverage,
       widgetId,
       app,
-      storyboardFunctions
+      storyboardFunctions,
+      isStoryboardFunction
     } = _ref;
 
     switch (variableName) {
@@ -1559,6 +1593,9 @@
         return {
           getTheme: collectCoverage ? () => "light" : getTheme
         };
+
+      case "console":
+        return isStoryboardFunction ? getReadOnlyProxy(console) : undefined;
     }
   }
 
@@ -1645,7 +1682,8 @@
           collectCoverage,
           widgetId,
           app: currentApp,
-          storyboardFunctions
+          storyboardFunctions,
+          isStoryboardFunction: true
         })),
         hooks: collector && {
           beforeEvaluate: collector.beforeEvaluate,
@@ -1699,39 +1737,6 @@
     registerStoryboardFunctions(functions);
   }
 
-  var THROW = () => {
-    throw new Error("Can't modify read-only proxy object");
-  };
-
-  var readOnlyHandler = {
-    set: THROW,
-    defineProperty: THROW,
-    deleteProperty: THROW,
-    setPrototypeOf: THROW
-  };
-  function getReadOnlyProxy(object) {
-    return new Proxy(object, readOnlyHandler);
-  } // First, we want to make accessing property of globals lazy,
-  // So we use *Proxy* to make a dynamic accessor for each of these globals.
-  // But we also want to keep them working in devtools.
-
-  function getDynamicReadOnlyProxy(_ref) {
-    var {
-      get,
-      ownKeys
-    } = _ref;
-
-    if (getDevHook()) {
-      // In devtools, we extract them at beginning.
-      var target = Object.fromEntries(ownKeys(null).map(key => [key, get(null, key, null)]));
-      return getReadOnlyProxy(target);
-    }
-
-    return new Proxy(Object.freeze({}), {
-      get
-    });
-  }
-
   /*! (c) Andrea Giammarchi - ISC */
   var self = {};
 
@@ -2326,7 +2331,9 @@
           return hash ? hash.substr(1) : null;
 
         case "APP":
-          return lodash.cloneDeep(app);
+          return _objectSpread__default["default"](_objectSpread__default["default"]({}, lodash.cloneDeep(app)), {}, {
+            getMenu
+          });
 
         case "CTX":
           return getDynamicReadOnlyProxy({
@@ -2683,7 +2690,19 @@
     return _constructMenu.apply(this, arguments);
   }
 
-  function fetchMenuById(_x4, _x5) {
+  function constructMenuByMenusList(_x4, _x5, _x6) {
+    return _constructMenuByMenusList.apply(this, arguments);
+  }
+
+  function _constructMenuByMenusList() {
+    _constructMenuByMenusList = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
+      yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel)));
+    });
+    return _constructMenuByMenusList.apply(this, arguments);
+  }
+
+  var getMenu = menuId => menuCache.get(menuId);
+  function fetchMenuById(_x7, _x8) {
     return _fetchMenuById.apply(this, arguments);
   }
 
@@ -2789,7 +2808,7 @@
     });
   }
 
-  function loadDynamicMenuItems(_x6) {
+  function loadDynamicMenuItems(_x9) {
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
@@ -2807,7 +2826,7 @@
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
-  function processMenu(_x7, _x8, _x9, _x10) {
+  function processMenu(_x10, _x11, _x12, _x13) {
     return _processMenu.apply(this, arguments);
   }
 
@@ -2866,13 +2885,13 @@
         });
       });
 
-      return function (_x11) {
+      return function (_x14) {
         return _ref2.apply(this, arguments);
       };
     }()));
   }
 
-  function processMenuTitle(_x12) {
+  function processMenuTitle(_x15) {
     return _processMenuTitle.apply(this, arguments);
   }
 
@@ -2967,7 +2986,7 @@
     return false;
   }
 
-  function computeRealValueWithOverrideApp(_x13, _x14, _x15, _x16) {
+  function computeRealValueWithOverrideApp(_x16, _x17, _x18, _x19) {
     return _computeRealValueWithOverrideApp.apply(this, arguments);
   }
 
@@ -8739,6 +8758,12 @@
             if (isRouteConfOfRoutes(route) && Array.isArray(route.routes)) {
               yield _this.mountRoutes(route.routes, slotId, mountRoutesResult);
             } else if (isRouteConfOfBricks(route) && Array.isArray(route.bricks)) {
+              var useMenus = brickUtils.scanAppGetMenuInAny(route);
+
+              if (useMenus.length) {
+                yield constructMenuByMenusList(useMenus, _this.getCurrentContext(), _this.kernel);
+              }
+
               yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult); // analytics data (page_view event)
 
               if (route.analyticsData) {
@@ -13194,7 +13219,7 @@
     });
   }, {});
 
-  var _excluded$1 = ["body"];
+  var _excluded$1 = ["args"];
   function useProviderArgs(providerOrParamsOrGlobalOptions, gloabalOptionsOrDeps, deps) {
     var provider = React.useMemo(() => {
       if (typeof providerOrParamsOrGlobalOptions === "string") {
@@ -13222,13 +13247,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 +13280,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 +13374,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 +13391,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 +13422,7 @@
           })();
         }
 
-        return doFetch(...args);
+        return doFetch(...actualArgs);
       });
 
       return function (_x, _x2) {
@@ -13383,7 +13456,7 @@
       mounted.current = true;
 
       if (Array.isArray(dependencies) && provider) {
-        request.query(provider, requestInit.body);
+        request.query(provider, requestInit.args);
       }
 
       return () => mounted.current = false;