@next-core/brick-kit 2.132.2 → 2.133.2

package/dist/index.esm.js

@@ -1586,6 +1586,7 @@ function getIndividualGlobal(variableName, _ref) {
     collectCoverage,
     widgetId,
     app,
+    appendI18nNamespace,
     storyboardFunctions,
     isStoryboardFunction
   } = _ref;
@@ -1601,7 +1602,7 @@ function getIndividualGlobal(variableName, _ref) {
       return collectCoverage ? fakeImageFactory() : widgetId ? widgetImagesFactory(widgetId) : imagesFactory(app.id, app.isBuildPush);
 
     case "I18N":
-      return collectCoverage ? identity : widgetId ? widgetI18nFactory(widgetId) : getFixedT(null, getI18nNamespace("app", app.id));
+      return collectCoverage ? identity : widgetId ? widgetI18nFactory(widgetId) : getFixedT(null, [appendI18nNamespace, getI18nNamespace("app", app.id)].filter(Boolean));
 
     case "I18N_TEXT":
       return collectCoverage ? fakeI18nText : i18nText;
@@ -2581,7 +2582,8 @@ function evaluate(raw) {
 
   Object.assign(globalVariables, getGeneralGlobals(precooked.attemptToVisitGlobals, {
     storyboardFunctions,
-    app
+    app,
+    appendI18nNamespace: runtimeContext.appendI18nNamespace
   }));
 
   try {
@@ -2896,7 +2898,7 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
 
     if (preEvaluated || isEvaluable(value)) {
       var runtimeContext = {};
-      var keys = ["event", "tplContextId", "overrideApp"];
+      var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace"];
 
       for (var key of keys) {
         if (context !== null && context !== void 0 && context[key]) {
@@ -3018,6 +3020,7 @@ var _excluded$6 = ["children"],
     _excluded2$2 = ["children"],
     _excluded3 = ["items", "app"];
 var symbolAppId = Symbol("appId");
+var symbolMenuI18nNamespace = Symbol("menuI18nNamespace");
 // Caching menu requests to avoid flicker.
 var menuCache = new Map();
 var menuTitleCache = new Map();
@@ -3091,6 +3094,7 @@ function _fetchMenuById() {
         dynamicItems: true,
         itemsResolve: true,
         items: true,
+        i18n: true,
         "items.children": true,
         "app.appId": true
       },
@@ -3128,10 +3132,23 @@ function mergeMenu(menuList) {
 
   var validMenuList = [];
   var injectWithMenus = new Map();
+  var menuWithI18n = new WeakMap();
 
   for (var menu of menuList) {
     var _menu$items;
 
+    if (menu.i18n) {
+      (function () {
+        var menuI18nNamespace = getI18nNamespace("menu", "".concat(menu.menuId, "~").concat(menu.app[0].appId, "+").concat(menu.instanceId)); // Support any language in `meta.i18n`.
+
+        Object.entries(menu.i18n).forEach(_ref => {
+          var [lang, resources] = _ref;
+          i18next.addResourceBundle(lang, menuI18nNamespace, resources);
+        });
+        menuWithI18n.set(menu, menuI18nNamespace);
+      })();
+    }
+
     if (((_menu$items = menu.items) === null || _menu$items === void 0 ? void 0 : _menu$items.length) > 0) {
       if (menu.type === "inject" && menu.injectMenuGroupId) {
         var injectingMenus = injectWithMenus.get(menu.injectMenuGroupId);
@@ -3149,11 +3166,12 @@ function mergeMenu(menuList) {
   }
 
   return _objectSpread(_objectSpread({}, mainMenu), {}, {
-    items: validMenuList.flatMap(menu => processGroupInject(menu.items, menu, injectWithMenus))
+    items: validMenuList.flatMap(menu => processGroupInject(menu.items, menu, injectWithMenus, menuWithI18n)),
+    [symbolMenuI18nNamespace]: menuWithI18n.get(mainMenu)
   });
 }
 
-function processGroupInject(items, menu, injectWithMenus) {
+function processGroupInject(items, menu, injectWithMenus, menuWithI18n) {
   return items === null || items === void 0 ? void 0 : items.map(item => {
     var _processGroupInject;
 
@@ -3165,8 +3183,9 @@ function processGroupInject(items, menu, injectWithMenus) {
     }
 
     return _objectSpread(_objectSpread({}, item), {}, {
-      children: ((_processGroupInject = processGroupInject(item.children, menu, injectWithMenus)) !== null && _processGroupInject !== void 0 ? _processGroupInject : []).concat(foundInjectingMenus ? foundInjectingMenus.flatMap(injectingMenu => processGroupInject(injectingMenu.items, injectingMenu, injectWithMenus)) : []),
-      [symbolAppId]: menu.app[0].appId
+      children: ((_processGroupInject = processGroupInject(item.children, menu, injectWithMenus, menuWithI18n)) !== null && _processGroupInject !== void 0 ? _processGroupInject : []).concat(foundInjectingMenus ? foundInjectingMenus.flatMap(injectingMenu => processGroupInject(injectingMenu.items, injectingMenu, injectWithMenus, menuWithI18n)) : []),
+      [symbolAppId]: menu.app[0].appId,
+      [symbolMenuI18nNamespace]: menuWithI18n.get(menu)
     });
   });
 }
@@ -3202,10 +3221,17 @@ function _processMenu() {
     } = _yield$fetchMenuById,
         restMenuData = _objectWithoutProperties(_yield$fetchMenuById, _excluded3);
 
-    var appIds = collectOverrideApps(items, app[0].appId, context.app.id);
-    yield kernel.fulfilStoryboardI18n(appIds);
+    var appsRequireI18nFulfilled = new Set();
+    var rootAppId = app[0].appId;
+
+    if (rootAppId !== context.app.id && !restMenuData[symbolMenuI18nNamespace]) {
+      appsRequireI18nFulfilled.add(rootAppId);
+    }
+
+    collectAppsRequireI18nFulfilled(items, context.app.id, appsRequireI18nFulfilled);
+    yield kernel.fulfilStoryboardI18n([...appsRequireI18nFulfilled]);
 
-    var menuData = _objectSpread(_objectSpread({}, computeRealValueWithOverrideApp(restMenuData, app[0].appId, context, kernel)), {}, {
+    var menuData = _objectSpread(_objectSpread({}, computeRealValueWithOverrideApp(restMenuData, rootAppId, context, kernel)), {}, {
       items: computeMenuItemsWithOverrideApp(items, context, kernel)
     });
 
@@ -3238,23 +3264,17 @@ function _processMenu() {
   return _processMenu.apply(this, arguments);
 }
 
-function collectOverrideApps(items, rootAppId, contextAppId) {
-  var appIds = new Set();
-
-  if (rootAppId !== contextAppId) {
-    appIds.add(rootAppId);
-  }
-
+function collectAppsRequireI18nFulfilled(items, contextAppId, appIds) {
   function collect(items) {
-    for (var _ref of items) {
+    for (var _ref2 of items) {
       var {
         children
-      } = _ref,
-          rest = _objectWithoutProperties(_ref, _excluded$6);
+      } = _ref2,
+          rest = _objectWithoutProperties(_ref2, _excluded$6);
 
       var overrideAppId = rest[symbolAppId];
 
-      if (overrideAppId !== contextAppId && !appIds.has(overrideAppId) && requireOverrideApp(rest)) {
+      if (!rest[symbolMenuI18nNamespace] && overrideAppId !== contextAppId && !appIds.has(overrideAppId) && attemptToVisit(rest, ["I18N"])) {
         appIds.add(overrideAppId);
       }
 
@@ -3263,15 +3283,14 @@ function collectOverrideApps(items, rootAppId, contextAppId) {
   }
 
   collect(items);
-  return [...appIds];
 }
 
 function computeMenuItemsWithOverrideApp(items, context, kernel) {
-  return items.map(_ref2 => {
+  return items.map(_ref3 => {
     var {
       children
-    } = _ref2,
-        rest = _objectWithoutProperties(_ref2, _excluded2$2);
+    } = _ref3,
+        rest = _objectWithoutProperties(_ref3, _excluded2$2);
 
     return _objectSpread(_objectSpread({}, computeRealValueWithOverrideApp(rest, rest[symbolAppId], context, kernel)), {}, {
       children: children && computeMenuItemsWithOverrideApp(children, context, kernel)
@@ -3339,25 +3358,24 @@ function sortMenuItems(list) {
     return (_item$sort = item.sort) !== null && _item$sort !== void 0 ? _item$sort : -Infinity;
   });
 }
-
-var overriddenGlobals = ["APP", "I18N"];
 /**
  * If the menu contains evaluations which use `APP` or `I18N`,
  * we have to override app in context when computing real values.
  */
 
-function requireOverrideApp(data) {
-  var memo = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new WeakSet();
+
+function attemptToVisit(data, globals) {
+  var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
 
   if (typeof data === "string") {
     if (isEvaluable(data)) {
-      if (overriddenGlobals.some(key => data.includes(key))) {
+      if (globals.some(key => data.includes(key))) {
         var {
           attemptToVisitGlobals
         } = preevaluate(data);
-        return overriddenGlobals.some(key => attemptToVisitGlobals.has(key));
+        return globals.some(key => attemptToVisitGlobals.has(key));
       }
-    } else {
+    } else if (globals.includes("APP")) {
       return /\${\s*APP\s*\./.test(data);
     }
   } else if (isObject(data)) {
@@ -3368,7 +3386,7 @@ function requireOverrideApp(data) {
     }
 
     memo.add(data);
-    return (Array.isArray(data) ? data : Object.values(data)).some(item => requireOverrideApp(item, memo));
+    return (Array.isArray(data) ? data : Object.values(data)).some(item => attemptToVisit(item, globals, memo));
   }
 
   return false;
@@ -3377,13 +3395,18 @@ function requireOverrideApp(data) {
 function computeRealValueWithOverrideApp(data, overrideAppId, context, kernel) {
   var newContext = context;
 
-  if (overrideAppId !== context.app.id && requireOverrideApp(data)) {
+  if (overrideAppId !== context.app.id && attemptToVisit(data, ["APP", "I18N"])) {
     var storyboard = kernel.bootstrapData.storyboards.find(story => story.app.id === overrideAppId);
+    /* istanbul ignore else: non-productive case */
 
     if (storyboard) {
       newContext = _objectSpread(_objectSpread({}, context), {}, {
-        overrideApp: storyboard.app
+        overrideApp: storyboard.app,
+        appendI18nNamespace: data[symbolMenuI18nNamespace]
       });
+    } else {
+      // eslint-disable-next-line no-console
+      console.error("The app which injects menu was not found:", overrideAppId);
     }
   }