@next-core/brick-kit 2.89.2 → 2.90.0

package/dist/index.esm.js

@@ -5,10 +5,10 @@ import _asyncToGenerator$4 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$2 from '@babel/runtime/helpers/defineProperty';
 import * as React from 'react';
 import React__default, { useState, useEffect, forwardRef, useRef, useImperativeHandle, useMemo, useContext, createContext } from 'react';
-import lodash, { set, get, difference, cloneDeep, isNil, sortBy, merge, clamp, uniqueId, orderBy, omit, isEmpty } from 'lodash';
+import lodash, { set, get, difference, identity, cloneDeep, isNil, sortBy, merge, clamp, uniqueId, orderBy, omit, isEmpty } from 'lodash';
 import { toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, scanPermissionActionsInStoryboard, precookFunction, cook, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, scanRouteAliasInStoryboard, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, getDllAndDepsByResource, resolveContextConcurrently, matchPath, asyncProcessBrick, restoreDynamicTemplates, mapCustomApisToNameAndNamespace, scanCustomApisInStoryboard } from '@next-core/brick-utils';
 import { http, HttpResponseError, HttpFetchError } from '@next-core/brick-http';
-import i18next from 'i18next';
+import i18next, { getFixedT } from 'i18next';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
 import { userAnalytics, apiAnalyzer } from '@next-core/easyops-analytics';
@@ -668,12 +668,12 @@ function getUrlBySegueFactory(app, segues) {
   };
 }
 
-function imagesFactory(app) {
+function imagesFactory(appId, isBuildPush) {
   return {
     get(name) {
       var _window$PUBLIC_ROOT;
 
-      return app.isBuildPush ? "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/".concat(name) : "".concat((_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "", "micro-apps/").concat(app.id, "/images/").concat(name);
+      return isBuildPush ? "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/".concat(name) : "".concat((_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "", "micro-apps/").concat(appId, "/images/").concat(name);
     }
 
   };
@@ -1372,11 +1372,55 @@ function i18nText(data) {
   }
 }
 
+var locale$7 = {
+  [K.REQUEST_FAILED]: "Request Failed",
+  [K.MODAL_OK]: "Ok",
+  [K.MODAL_CANCEL]: "Cancel",
+  [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
+  [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
+  [K.NETWORK_ERROR]: "Network error, please check your network."
+};
+var en = locale$7;
+
+var locale$6 = {
+  [K.REQUEST_FAILED]: "请求失败",
+  [K.MODAL_OK]: "确认",
+  [K.MODAL_CANCEL]: "取消",
+  [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
+  [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
+  [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
+};
+var zh = locale$6;
+
+/** @internal */
+
+var initI18n = () => {
+  i18next.addResourceBundle("en", NS_BRICK_KIT, en);
+  i18next.addResourceBundle("zh", NS_BRICK_KIT, zh);
+};
+/** @internal */
+
+function getI18nNamespace(type, id) {
+  return "$".concat(type, "-").concat(id);
+}
+
+function registerWidgetI18n(widgetId, i18n) {
+  var ns = getI18nNamespace("widget", widgetId);
+  Object.entries(i18n).forEach(_ref => {
+    var [lang, resources] = _ref;
+    i18next.addResourceBundle(lang, ns, resources);
+  });
+}
+function widgetI18nFactory(widgetId) {
+  return getFixedT(null, getI18nNamespace("widget", widgetId));
+}
+
 /** @internal */
 
 /** @internal */
 function StoryboardFunctionRegistryFactory() {
   var {
+    widgetId,
     collectCoverage
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var registeredFunctions = new Map(); // Use `Proxy` with a frozen target, to make a readonly function registry.
@@ -1388,7 +1432,30 @@ function StoryboardFunctionRegistryFactory() {
 
   });
 
-  function registerStoryboardFunctions(functions) {
+  var builtinSupply = _objectSpread({
+    // Functions can call other functions.
+    FN: storyboardFunctions
+  }, collectCoverage ? {
+    // Fake builtin methods for tests.
+    I18N: identity,
+    I18N_TEXT: fakeI18nText,
+    IMG: fakeImageFactory()
+  } : widgetId ? {
+    I18N: widgetI18nFactory(widgetId),
+    I18N_TEXT: i18nText,
+    IMG: widgetImagesFactory(widgetId)
+  } : {
+    I18N_TEXT: i18nText
+  });
+
+  function registerStoryboardFunctions(functions, app) {
+    if (app) {
+      Object.assign(builtinSupply, {
+        I18N: getFixedT(null, getI18nNamespace("app", app.id)),
+        IMG: imagesFactory(app.id, app.isBuildPush)
+      });
+    }
+
     registeredFunctions.clear();
 
     if (Array.isArray(functions)) {
@@ -1428,10 +1495,7 @@ function StoryboardFunctionRegistryFactory() {
       rules: {
         noVar: true
       },
-      globalVariables: supply(precooked.attemptToVisitGlobals, {
-        // Functions can call other functions.
-        FN: storyboardFunctions
-      }),
+      globalVariables: supply(precooked.attemptToVisitGlobals, builtinSupply),
       hooks: collector && {
         beforeEvaluate: collector.beforeEvaluate,
         beforeCall: collector.beforeCall,
@@ -1456,6 +1520,19 @@ function StoryboardFunctionRegistryFactory() {
   };
 }
 
+function fakeI18nText(data) {
+  return data === null || data === void 0 ? void 0 : data.en;
+}
+
+function fakeImageFactory() {
+  return {
+    get(name) {
+      return "mock/images/".concat(name);
+    }
+
+  };
+}
+
 var {
   storyboardFunctions,
   registerStoryboardFunctions
@@ -1477,7 +1554,9 @@ function registerWidgetFunctions(widgetId, functions) {
   var {
     storyboardFunctions,
     registerStoryboardFunctions
-  } = StoryboardFunctionRegistryFactory();
+  } = StoryboardFunctionRegistryFactory({
+    widgetId
+  });
   widgetFunctionRegistry.set(widgetId, storyboardFunctions);
   registerStoryboardFunctions(functions);
 }
@@ -1648,7 +1727,7 @@ function evaluate(raw) {
   }
 
   if (attemptToVisitGlobals.has("IMG")) {
-    globalVariables.IMG = imagesFactory(app);
+    globalVariables.IMG = imagesFactory(app.id, app.isBuildPush);
   }
 
   if (attemptToVisitGlobals.has("__WIDGET_IMG__")) {
@@ -1656,7 +1735,11 @@ function evaluate(raw) {
   }
 
   if (attemptToVisitGlobals.has("I18N")) {
-    globalVariables.I18N = i18next.getFixedT(null, "$app-".concat(app.id));
+    globalVariables.I18N = i18next.getFixedT(null, getI18nNamespace("app", app.id));
+  }
+
+  if (attemptToVisitGlobals.has("__WIDGET_I18N__")) {
+    globalVariables.__WIDGET_I18N__ = widgetI18nFactory;
   }
 
   if (attemptToVisitGlobals.has("I18N_TEXT")) {
@@ -2448,6 +2531,8 @@ class Runtime {
 
     _defineProperty$2(this, "registerWidgetFunctions", registerWidgetFunctions);
 
+    _defineProperty$2(this, "registerWidgetI18n", registerWidgetI18n);
+
     _defineProperty$2(this, "getBasePath", getBasePath);
 
     _defineProperty$2(this, "getCurrentTheme", getCurrentTheme);
@@ -6309,7 +6394,7 @@ class Kernel {
 
       if ((_storyboard$meta = storyboard.meta) !== null && _storyboard$meta !== void 0 && _storyboard$meta.i18n) {
         // Prefix to avoid conflict between brick package's i18n namespace.
-        var i18nNamespace = "$app-".concat(storyboard.app.id); // Support any language in `meta.i18n`.
+        var i18nNamespace = getI18nNamespace("app", storyboard.app.id); // Support any language in `meta.i18n`.
 
         Object.entries(storyboard.meta.i18n).forEach(_ref => {
           var [lang, resources] = _ref;
@@ -8959,12 +9044,13 @@ class Resolver {
       } else {
         var actualArgs = args ? ref ? args // `args` are already computed for `defineResolves`
         : context ? computeRealValue(args, context, true) : args : providerBrick.args || [];
+        promise = _asyncToGenerator$4(function* () {
+          if (useProvider) {
+            actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
+          }
 
-        if (useProvider) {
-          actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
-        }
-
-        promise = providerBrick[method](...actualArgs);
+          return providerBrick[method](...actualArgs);
+        })();
 
         _this2.cache.set(cacheKey, promise);
       }
@@ -9032,7 +9118,7 @@ class Resolver {
 
     var _loop = function (providerBrick, interval) {
       var request = /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator$4(function* () {
+        var _ref2 = _asyncToGenerator$4(function* () {
           yield providerBrick.$refresh({
             ignoreErrors: interval.ignoreErrors,
             throwErrors: true,
@@ -9046,7 +9132,7 @@ class Resolver {
         });
 
         return function request() {
-          return _ref.apply(this, arguments);
+          return _ref2.apply(this, arguments);
         };
       }();
 
@@ -9288,7 +9374,7 @@ class Router {
 
         _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
 
-        registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions);
+        registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions, storyboard.app);
       }
 
       var {
@@ -9614,33 +9700,6 @@ function getRuntime() {
   return runtime;
 }
 
-var locale$7 = {
-  [K.REQUEST_FAILED]: "Request Failed",
-  [K.MODAL_OK]: "Ok",
-  [K.MODAL_CANCEL]: "Cancel",
-  [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
-  [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
-  [K.NETWORK_ERROR]: "Network error, please check your network."
-};
-var en = locale$7;
-
-var locale$6 = {
-  [K.REQUEST_FAILED]: "请求失败",
-  [K.MODAL_OK]: "确认",
-  [K.MODAL_CANCEL]: "取消",
-  [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
-  [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
-  [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
-};
-var zh = locale$6;
-
-/** @internal */
-
-var initI18n = () => {
-  i18next.addResourceBundle("en", NS_BRICK_KIT, en);
-  i18next.addResourceBundle("zh", NS_BRICK_KIT, zh);
-};
-
 // Ref https://reactjs.org/docs/error-boundaries.html
 class LegacyErrorBoundary extends React__default.Component {
   constructor(props) {