@next-core/brick-kit 2.166.1 → 2.167.1

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, merge, sortBy, orderBy, isObject as isObject$1, uniq, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript as loadScript$1, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import React, { useState, useEffect, useRef, useMemo, useCallback, forwardRef, useImperativeHandle, useContext, createContext, useReducer } from 'react';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import { Modal, message, Empty, ConfigProvider } from 'antd';
@@ -2621,12 +2621,12 @@ function setupTemplateProxy(proxyContext, ref, slots) {
 var _excluded$7 = ["properties", "slots"];
 function setupUseBrickInTemplate(props, proxyContext) {
   function walk(props) {
-    if (!isObject(props)) {
-      return props;
-    }
     if (Array.isArray(props)) {
       return props.map(walk);
     }
+    if (!isObject(props) || !isPlainObject(props)) {
+      return props;
+    }
     return Object.fromEntries(Object.entries(props).map(_ref => {
       var [key, value] = _ref;
       return isObject(value) && key === "useBrick" ? Array.isArray(value) ? [key, value.map(setup)] : [key, setup(value)] : [key, walk(value)];
@@ -2653,6 +2653,9 @@ function setupUseBrickInTemplate(props, proxyContext) {
   }
   return walk(props);
 }
+function isPlainObject(object) {
+  return Object.prototype.toString.call(object) === "[object Object]";
+}
 
 var computeRealValue = (value, context, injectDeep, internalOptions) => {
   var preEvaluated = isPreEvaluated(value);
@@ -6552,6 +6555,267 @@ var UserAdminApi_searchAllUsersInfo = /*#__PURE__*/function () {
   };
 }();
 
+var cache$1 = new Map();
+function loadScript(src, prefix) {
+  if (Array.isArray(src)) {
+    return Promise.all(src.map(item => loadScript(item, prefix)));
+  }
+  var fixedSrc = prefix ? "".concat(prefix).concat(src) : src;
+  var cachedPromise = cache$1.get(fixedSrc);
+  if (cachedPromise) {
+    return cachedPromise;
+  }
+  var promise = new Promise((resolve, reject) => {
+    var end = () => {
+      window.dispatchEvent(new Event("request.end"));
+    };
+    var script = document.createElement("script");
+    script.src = fixedSrc;
+    script.type = "text/javascript";
+    script.async = true;
+    script.onload = () => {
+      resolve(fixedSrc);
+      end();
+    };
+    script.onerror = e => {
+      reject(e);
+      end();
+    };
+    var firstScript = document.currentScript || document.getElementsByTagName("script")[0];
+    firstScript.parentNode.insertBefore(script, firstScript);
+    window.dispatchEvent(new Event("request.start"));
+  });
+  cache$1.set(fixedSrc, promise);
+  return promise;
+}
+
+// https://github.com/module-federation/module-federation-examples/blob/eda9493f3991a423479fd834cfb1d7b241d9d1f0/advanced-api/dynamic-remotes/app1/src/App.js
+function loadSharedModule(_x, _x2) {
+  return _loadSharedModule.apply(this, arguments);
+}
+function _loadSharedModule() {
+  _loadSharedModule = _asyncToGenerator$3(function* (scope, module) {
+    // Initializes the share scope. This fills it with known provided modules from this build and all remotes
+    yield __webpack_init_sharing__("default");
+    var container = window[scope]; // or get the container somewhere else
+    // Initialize the container, it may provide shared modules
+    yield container.init(__webpack_share_scopes__.default);
+    var factory = yield container.get(module);
+    return factory();
+  });
+  return _loadSharedModule.apply(this, arguments);
+}
+
+var resolveBasicPkg;
+var basicPkgWillBeResolved = false;
+var waitBasicPkg = new Promise(resolve => {
+  resolveBasicPkg = resolve;
+});
+function flushStableLoadBricks() {
+  if (!basicPkgWillBeResolved) {
+    resolveBasicPkg();
+  }
+}
+function loadBricksImperatively(_x, _x2) {
+  return _loadBricksImperatively.apply(this, arguments);
+}
+function _loadBricksImperatively() {
+  _loadBricksImperatively = _asyncToGenerator$3(function* (bricks, brickPackages) {
+    var promise = enqueueStableLoad("bricks", bricks, brickPackages);
+    flushStableLoadBricks();
+    return dispatchRequestStatus(promise);
+  });
+  return _loadBricksImperatively.apply(this, arguments);
+}
+function loadProcessorsImperatively(processors, brickPackages) {
+  var promise = enqueueStableLoad("processors", processors, brickPackages);
+  flushStableLoadBricks();
+  return dispatchRequestStatus(promise);
+}
+var v2AdapterPromise;
+var V2_ADAPTER_LOAD_BRICKS = "v2-adapter.load-bricks";
+
+// Get brick/processor items including their dependencies
+function getItemsByPkg(type, list, brickPackagesMap) {
+  var itemsByPkg = new Map();
+  var listToLoad = new Set();
+  var add = item => {
+    var _pkg$dependencies;
+    if (listToLoad.has(item)) {
+      return;
+    }
+    listToLoad.add(item);
+    var pkg;
+    var namespace;
+    var itemName;
+    if (type === "processors" || item.includes(".")) {
+      [namespace, itemName] = item.split(".");
+      var pkgId = "bricks/".concat(type === "processors" ? getProcessorPackageName(namespace) : namespace);
+      pkg = brickPackagesMap.get(pkgId);
+    } else {
+      itemName = item;
+      for (var p of brickPackagesMap.values()) {
+        var _p$elements;
+        if ((_p$elements = p.elements) !== null && _p$elements !== void 0 && _p$elements.some(e => e === itemName)) {
+          pkg = p;
+          break;
+        }
+      }
+    }
+    if (!pkg) {
+      throw new Error("Package for ".concat(item, " not found."));
+    }
+    var groupItems = itemsByPkg.get(pkg);
+    if (!groupItems) {
+      groupItems = [];
+      itemsByPkg.set(pkg, groupItems);
+    }
+    groupItems.push(itemName);
+
+    // Load their dependencies too
+    var deps = (_pkg$dependencies = pkg.dependencies) === null || _pkg$dependencies === void 0 ? void 0 : _pkg$dependencies[item];
+    if (deps) {
+      for (var dep of deps) {
+        add(dep);
+      }
+    }
+  };
+  for (var item of list) {
+    add(item);
+  }
+  return itemsByPkg;
+}
+function loadBrickModule(_x3, _x4, _x5) {
+  return _loadBrickModule.apply(this, arguments);
+}
+function _loadBrickModule() {
+  _loadBrickModule = _asyncToGenerator$3(function* (type, pkgId, itemName) {
+    var moduleName = "".concat(type === "processors" ? "./processors/" : "./").concat(itemName);
+    try {
+      yield loadSharedModule(pkgId, moduleName);
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(error);
+      throw new Error("Load ".concat(type, " of \"").concat(pkgId.split("/").pop(), ".").concat(moduleName.split("/").pop(), "\" failed"));
+    }
+  });
+  return _loadBrickModule.apply(this, arguments);
+}
+function loadRestBricks(type, pkgs, itemsMap) {
+  return pkgs.map( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator$3(function* (pkg) {
+      var _window$PUBLIC_ROOT;
+      yield loadScript(pkg.filePath, (_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "");
+      yield waitBasicPkg;
+      return Promise.all(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      itemsMap.get(pkg).map(itemName => loadBrickModule(type, pkg.id, itemName)));
+    });
+    return function (_x6) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+}
+function enqueueStableLoad(_x7, _x8, _x9) {
+  return _enqueueStableLoad.apply(this, arguments);
+}
+function _enqueueStableLoad() {
+  _enqueueStableLoad = _asyncToGenerator$3(function* (type, list, brickPackages) {
+    var brickPackagesMap = new Map();
+    for (var pkg of brickPackages) {
+      var _pkg$id;
+      var pkgId = (_pkg$id = pkg.id) !== null && _pkg$id !== void 0 ? _pkg$id : getPkgIdByFilePath(pkg.filePath);
+      brickPackagesMap.set(pkgId, pkg);
+    }
+    var itemsByPkg = getItemsByPkg(type, list, brickPackagesMap);
+    var foundBasicPkg;
+    var v2Packages = [];
+    var v3PackagesOtherThanBasic = [];
+    var maybeV2Adapter;
+    for (var _pkg of itemsByPkg.keys()) {
+      if (_pkg.id) {
+        if (_pkg.id === "bricks/basic") {
+          foundBasicPkg = _pkg;
+        } else {
+          v3PackagesOtherThanBasic.push(_pkg);
+        }
+      } else {
+        // Brick packages of v2 has no `id`
+        v2Packages.push(_pkg);
+        maybeV2Adapter = brickPackagesMap.get("bricks/v2-adapter");
+        if (!maybeV2Adapter) {
+          // eslint-disable-next-line no-console
+          console.error("Using v2 bricks, but v2-adapter not found");
+        }
+      }
+    }
+    var v2Adapter = maybeV2Adapter;
+    var basicPkgPromise;
+    var basicPkg = foundBasicPkg;
+    if (basicPkg) {
+      var _window$PUBLIC_ROOT2;
+      var tempPromise = loadScript(basicPkg.filePath, (_window$PUBLIC_ROOT2 = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT2 !== void 0 ? _window$PUBLIC_ROOT2 : "");
+      // Packages other than BASIC will wait for an extra micro-task tick.
+      if (!basicPkgWillBeResolved) {
+        basicPkgWillBeResolved = true;
+        tempPromise.then(() => Promise.resolve()).then(resolveBasicPkg);
+      }
+      basicPkgPromise = tempPromise.then(() => Promise.all(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      itemsByPkg.get(basicPkg).map(itemName => loadBrickModule(type, basicPkg.id, itemName))));
+    }
+    var pkgPromises = [basicPkgPromise].concat(loadRestBricks(type, v3PackagesOtherThanBasic, itemsByPkg));
+    if (v2Adapter && v2Packages.length > 0) {
+      if (!v2AdapterPromise) {
+        // Load `v2-adapter.load-bricks` and its dependencies
+        var v2AdapterItemsByPkg = getItemsByPkg("bricks", [V2_ADAPTER_LOAD_BRICKS], brickPackagesMap);
+        var v2AdapterPackages = [...v2AdapterItemsByPkg.keys()];
+        var loadV2Adapter = /*#__PURE__*/function () {
+          var _ref2 = _asyncToGenerator$3(function* () {
+            yield Promise.all(loadRestBricks("bricks", v2AdapterPackages, v2AdapterItemsByPkg));
+            return document.createElement(V2_ADAPTER_LOAD_BRICKS);
+          });
+          return function loadV2Adapter() {
+            return _ref2.apply(this, arguments);
+          };
+        }();
+        v2AdapterPromise = loadV2Adapter();
+      }
+      pkgPromises.push(v2AdapterPromise.then(adapter => Promise.all(v2Packages.map(pkg => {
+        var pkgId = getPkgIdByFilePath(pkg.filePath);
+        var pkgNamespace = pkgId.split("/")[1];
+        return adapter.resolve(v2Adapter.filePath, pkg.filePath, type === "bricks" ?
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        itemsByPkg.get(pkg).map(itemName => "".concat(pkgNamespace, ".").concat(itemName)) : [], pkg.dll,
+        // Todo: remove `brickPackages` as an argument
+        brickPackages);
+      }))));
+    }
+    yield Promise.all(pkgPromises);
+  });
+  return _enqueueStableLoad.apply(this, arguments);
+}
+function dispatchRequestStatus(_x10) {
+  return _dispatchRequestStatus.apply(this, arguments);
+}
+function _dispatchRequestStatus() {
+  _dispatchRequestStatus = _asyncToGenerator$3(function* (promise) {
+    window.dispatchEvent(new Event("request.start"));
+    try {
+      yield promise;
+    } finally {
+      window.dispatchEvent(new Event("request.end"));
+    }
+  });
+  return _dispatchRequestStatus.apply(this, arguments);
+}
+function getProcessorPackageName(camelPackageName) {
+  return camelPackageName.replace(/[A-Z]/g, match => "-".concat(match[0].toLocaleLowerCase())).replace(/_[0-9]/g, match => "-".concat(match[1]));
+}
+function getPkgIdByFilePath(filePath) {
+  return filePath.split("/").slice(0, 2).join("/");
+}
+
 /**
  * Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
  *
@@ -8319,6 +8583,7 @@ class Kernel {
             pendingTask: Promise.resolve()
           };
         } else {
+          var _eager$v3Bricks;
           // 先加载模板
           var templateDeps = getTemplateDepsOfStoryboard(storyboard, templatePackages);
           yield loadScriptOfBricksOrTemplates(templateDeps);
@@ -8327,6 +8592,8 @@ class Kernel {
             dll,
             deps,
             bricks,
+            v3Bricks,
+            v3Processors,
             eager
           } = getDllAndDepsOfStoryboard(yield asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
             ignoreBricksInUnusedCustomTemplates: true
@@ -8334,10 +8601,15 @@ class Kernel {
           // 需要先阻塞加载 Custom Processors 和 widgets。
           yield loadScriptOfDll(eager.dll);
           yield loadScriptOfBricksOrTemplates(eager.deps);
+          if ((_eager$v3Bricks = eager.v3Bricks) !== null && _eager$v3Bricks !== void 0 && _eager$v3Bricks.length) {
+            yield loadBricksImperatively(eager.v3Bricks, brickPackages);
+          }
           // 加载构件资源时，不再阻塞后续业务数据的加载，在挂载构件时再等待该任务完成。
           // 挂载构件可能包括：Provider 构件实时挂载、路由准备完成后的统一挂载等。
           return {
-            pendingTask: loadScriptOfDll(dll).then(() => loadScriptOfBricksOrTemplates(deps)).then(() => loadLazyBricks(bricks))
+            pendingTask: loadScriptOfDll(dll).then(() => loadScriptOfBricksOrTemplates(deps)).then( /*#__PURE__*/_asyncToGenerator$3(function* () {
+              yield Promise.all([loadLazyBricks(bricks), (v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loadProcessorsImperatively(v3Processors, brickPackages)]);
+            }))
           };
         }
       });
@@ -8346,28 +8618,33 @@ class Kernel {
       };
     }());
     _defineProperty$1(this, "_loadDynamicBricks", /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator$3(function* (bricks, processors) {
+      var _ref3 = _asyncToGenerator$3(function* (bricks, processors) {
         var filteredBricks = bricks.filter(
         // Only try to load undefined custom elements.
         item => !customElements.get(item));
+        var {
+          brickPackages
+        } = _this.bootstrapData;
         // Try to load deps for dynamic added bricks.
         var {
           dll,
-          deps
+          deps,
+          v3Bricks,
+          v3Processors
         } = getDllAndDepsByResource({
           bricks: filteredBricks,
           processors
         }, _this.bootstrapData.brickPackages);
         yield loadScriptOfDll(dll);
         yield loadScriptOfBricksOrTemplates(deps);
-        yield loadLazyBricks(filteredBricks);
+        yield Promise.all([loadLazyBricks(filteredBricks), (v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loadProcessorsImperatively(v3Processors, brickPackages)]);
       });
       return function (_x2, _x3) {
-        return _ref2.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }());
     _defineProperty$1(this, "_loadEditorBricks", /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator$3(function* (editorBricks) {
+      var _ref4 = _asyncToGenerator$3(function* (editorBricks) {
         var {
           dll,
           deps
@@ -8380,7 +8657,7 @@ class Kernel {
         yield loadScriptOfBricksOrTemplates(deps);
       });
       return function (_x4) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }());
   }
@@ -8564,8 +8841,8 @@ class Kernel {
       // Prefix to avoid conflict between brick package's i18n namespace.
       var i18nNamespace = getI18nNamespace("app", storyboard.app.id);
       // Support any language in `meta.i18n`.
-      Object.entries(storyboard.meta.i18n).forEach(_ref4 => {
-        var [lang, resources] = _ref4;
+      Object.entries(storyboard.meta.i18n).forEach(_ref5 => {
+        var [lang, resources] = _ref5;
         i18next.addResourceBundle(lang, i18nNamespace, resources);
       });
     }
@@ -8987,8 +9264,8 @@ class Kernel {
         });
       });
       if (!filterMenus.length) {
-        var _ref5, _yield$InstanceApi_po;
-        filterMenus = (_ref5 = (_yield$InstanceApi_po = yield InstanceApi_postSearch("STANDALONE_MENU@EASYOPS", {
+        var _ref6, _yield$InstanceApi_po;
+        filterMenus = (_ref6 = (_yield$InstanceApi_po = yield InstanceApi_postSearch("STANDALONE_MENU@EASYOPS", {
           page: 1,
           page_size: 200,
           fields: {
@@ -9017,7 +9294,7 @@ class Kernel {
               $eq: true
             }
           }
-        })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref5 !== void 0 ? _ref5 : [];
+        })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref6 !== void 0 ? _ref6 : [];
       }
       return filterMenus;
     })();
@@ -9060,15 +9337,15 @@ function _loadScriptOfDll() {
   _loadScriptOfDll = _asyncToGenerator$3(function* (dlls) {
     if (dlls.some(dll => dll.startsWith("dll-of-editor-bricks-helper."))) {
       var dllPath = window.DLL_PATH || {};
-      yield loadScript(dllPath["react-dnd"], window.CORE_ROOT);
+      yield loadScript$1(dllPath["react-dnd"], window.CORE_ROOT);
     }
     // `loadScript` is auto cached, no need to filter out `react-dnd`.
-    yield loadScript(dlls, window.CORE_ROOT);
+    yield loadScript$1(dlls, window.CORE_ROOT);
   });
   return _loadScriptOfDll.apply(this, arguments);
 }
 function loadScriptOfBricksOrTemplates(src) {
-  return loadScript(src, window.PUBLIC_ROOT);
+  return loadScript$1(src, window.PUBLIC_ROOT);
 }
 function generateColorTheme(theme) {
   if (!theme) {