@next-core/brick-kit 2.153.2 → 2.153.4

package/dist/index.esm.js

@@ -4,8 +4,8 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
-import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, orderBy, merge, isObject as isObject$1, pick, omit, findLastIndex, noop, isString } from 'lodash';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, orderBy, merge, isObject as isObject$1, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
@@ -8925,7 +8925,7 @@ function handleProxyOfCustomTemplate(brick) {
   }
 }
 
-function registerCustomTemplate(tplName, tplConstructor, appId) {
+function registerCustomTemplate(tplName, tplConstructor, appId, deadCOnditionsRemoved) {
   var tagName = tplName; // When a template is registered by an app, its namespace maybe missed.
 
   if (appId && !tplName.includes(".")) {
@@ -8949,6 +8949,13 @@ function registerCustomTemplate(tplName, tplConstructor, appId) {
       // eslint-disable-next-line no-console
       console.warn("Custom template of \"".concat(tagName, "\" already defined by customElements."));
     }
+  }
+
+  if (!deadCOnditionsRemoved && process.env.NODE_ENV !== "test") {
+    removeDeadConditionsInTpl(tplConstructor, {
+      constantFeatureFlags: true,
+      featureFlags: getRuntime().getFeatureFlags()
+    });
   } // Now we allow re-register custom template
 
 
@@ -9626,7 +9633,7 @@ class Kernel {
             bricks: tpl.bricks,
             proxy: tpl.proxy,
             state: tpl.state
-          }, (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : _storyboard$app.id);
+          }, (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : _storyboard$app.id, true);
         }
       } // 每个 storyboard 仅注册一次custom-template
 
@@ -12205,21 +12212,29 @@ class Router {
       if (storyboard) {
         var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
-        yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
+        yield _this3.kernel.fulfilStoryboard(storyboard);
+        removeDeadConditions(storyboard, {
+          constantFeatureFlags: true,
+          featureFlags: _this3.featureFlags
+        }); // 将动态解析后的模板还原，以便重新动态解析。
 
-        restoreDynamicTemplates(storyboard); // 预加载权限信息
+        restoreDynamicTemplates(storyboard);
+        var parallelRequests = []; // 预加载权限信息
 
         if (isLoggedIn() && !getAuth().isAdmin) {
-          yield preCheckPermissions(storyboard);
+          parallelRequests.push(preCheckPermissions(storyboard));
         } // Standalone App 需要额外读取 Installed App 信息
 
 
         if (window.STANDALONE_MICRO_APPS && !window.NO_AUTH_GUARD) {
           // TODO: get standalone apps when NO_AUTH_GUARD, maybe from conf.yaml
-          yield preFetchStandaloneInstalledApps(storyboard);
-          _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
-        } // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
+          parallelRequests.push(preFetchStandaloneInstalledApps(storyboard).then(() => {
+            _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
+          }));
+        } // `loadDepsOfStoryboard()` may requires these data.
+
 
+        yield Promise.all(parallelRequests); // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
 
         var subStoryboard = _this3.locationContext.getSubStoryboardByRoute(storyboard);
 
@@ -14950,13 +14965,21 @@ function isObj(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 
-function buildSortedCacheKey(provider, args) {
+function isString(v) {
+  return typeof v === "string";
+}
+
+function buildSortedCacheKey(provider) {
   var sortObj = obj => Object.keys(obj).sort().map(k => ({
     [k]: obj[k]
   }));
 
+  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+    args[_key - 1] = arguments[_key];
+  }
+
   try {
-    var sortedArgs = isObj(args) ? sortObj(args) : args.map(arg => sortObj(arg));
+    var sortedArgs = isObj(args) ? sortObj(args) : args.map(arg => isString(arg) ? arg : sortObj(arg));
     return JSON.stringify({
       provider,
       args: sortedArgs
@@ -14975,8 +14998,8 @@ function fetch(_x, _x2) {
 
 function _fetch() {
   _fetch = _asyncToGenerator$3(function* (provider, cache) {
-    for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-      args[_key - 2] = arguments[_key];
+    for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+      args[_key2 - 2] = arguments[_key2];
     }
 
     var promise; // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -15067,7 +15090,7 @@ function useProvider() {
       var providerStr = provider;
       var providerArgs = [];
 
-      if (isString(providerOrBody)) {
+      if (isString$1(providerOrBody)) {
         providerStr = providerOrBody;
       }