@next-core/brick-kit 2.179.1 → 2.179.2

package/dist/index.esm.js

@@ -1800,7 +1800,7 @@ function _checkIf(rawIf, ctx, fn) {
 }
 
 class StoryboardContextWrapper {
-  constructor(tplContextId, formContextId) {
+  constructor(tplContextId, formContextId, renderId) {
     _defineProperty$1(this, "data", new Map());
     _defineProperty$1(this, "batchUpdate", false);
     _defineProperty$1(this, "batchUpdateContextsNames", []);
@@ -1809,9 +1809,11 @@ class StoryboardContextWrapper {
     _defineProperty$1(this, "formContextId", void 0);
     _defineProperty$1(this, "eventName", void 0);
     _defineProperty$1(this, "pendingStack", []);
+    _defineProperty$1(this, "renderId", void 0);
     this.tplContextId = tplContextId;
     this.formContextId = formContextId;
     this.eventName = this.formContextId ? "formstate.change" : this.tplContextId ? "state.change" : "context.change";
+    this.renderId = renderId;
   }
   set(name, item) {
     if (this.data.has(name)) {
@@ -1911,6 +1913,13 @@ class StoryboardContextWrapper {
           promise = item.loading;
         }
       }
+      var shouldDismiss = error => {
+        // If render twice immediately, flow API contracts maybe cleared before
+        // the second rendering, while the page load handlers of the first
+        // rendering can't be cancelled, which throws `FlowApiNotFoundError`.
+        // So we ignore error reporting for this case.
+        return (error === null || error === void 0 ? void 0 : error.name) === "FlowApiNotFoundError" && this.renderId && this.renderId !== _internalApiGetRouterRenderId();
+      };
       if (!promise) {
         promise = item.loading = item.load(_objectSpread({
           cache: method === "load" ? "default" : "reload"
@@ -1925,7 +1934,7 @@ class StoryboardContextWrapper {
           }));
         }, err => {
           // Let users to override error handling.
-          if (!(callback !== null && callback !== void 0 && callback.error)) {
+          if (!shouldDismiss(err) && !(callback !== null && callback !== void 0 && callback.error)) {
             handleHttpError(err);
           }
         });
@@ -1938,7 +1947,9 @@ class StoryboardContextWrapper {
           });
           callbackFactory("finally")();
         }, err => {
-          callbackFactory("error")(err);
+          if (!shouldDismiss(err) && callback.error) {
+            callbackFactory("error")(err);
+          }
           callbackFactory("finally")();
         });
       }
@@ -2223,13 +2234,13 @@ function batchAddListener(listener, contextConf, storyboardContextWrapper) {
 
 var tplContextMap = new Map();
 class CustomTemplateContext {
-  constructor(brick) {
+  constructor(brick, renderId) {
     _defineProperty$1(this, "variables", void 0);
     _defineProperty$1(this, "state", void 0);
     _defineProperty$1(this, "id", uniqueId("tpl-ctx-"));
     this.brick = brick;
     tplContextMap.set(this.id, this);
-    this.state = new StoryboardContextWrapper(this.id);
+    this.state = new StoryboardContextWrapper(this.id, undefined, renderId);
     brick.tplContextId = this.id;
   }
   setVariables(variables) {
@@ -2301,11 +2312,11 @@ var getMedia = () => MEDIA;
 
 var FormContextMap = new Map();
 class CustomFormContext {
-  constructor() {
+  constructor(renderId) {
     _defineProperty$1(this, "formState", void 0);
     _defineProperty$1(this, "id", uniqueId("form-ctx-"));
     FormContextMap.set(this.id, this);
-    this.formState = new StoryboardContextWrapper(undefined, this.id);
+    this.formState = new StoryboardContextWrapper(undefined, this.id, renderId);
   }
 }
 function getCustomFormContext(formContextId) {
@@ -5893,7 +5904,7 @@ function getContract(name) {
   return contractsMap.get(name) || widgetContractMap.get(name);
 }
 
-var flowApiDefinitionPromiseMap = new Map();
+var remoteContractCache = new Map();
 
 // Legacy Custom API: `${namespace}@${name}`
 // Flow API: `${namespace}@${name}:${version}`
@@ -5911,7 +5922,7 @@ function _getArgsOfCustomApi() {
     var isFlowApi = provider.includes(":");
     var apiDefinition = isFlowApi ? yield fetchFlowApiDefinition(provider) : (yield _internalApiGetMicroAppApiOrchestrationMap()).get(provider);
     if (!apiDefinition) {
-      throw new Error("".concat(isFlowApi ? "Flow" : "Legacy Custom", " API not found: \"").concat(provider, "\""));
+      throw new FlowApiNotFoundError("".concat(isFlowApi ? "Flow" : "Legacy Custom", " API not found: \"").concat(provider, "\""));
     }
     var apiProfile = getApiProfileFromApiDefinition(provider, apiDefinition);
     return getApiArgsFromApiProfile(apiProfile, originalArgs, method);
@@ -5987,23 +5998,18 @@ function getApiProfileFromApiDefinition(provider, api) {
     request: contract.request
   };
 }
-function fetchFlowApiDefinition(provider) {
-  var promise = flowApiDefinitionPromiseMap.get(provider);
-  if (!promise) {
-    promise = _fetchFlowApiDefinition(provider);
-    flowApiDefinitionPromiseMap.set(provider, promise);
-  }
-  return promise;
-}
-function _fetchFlowApiDefinition(_x4) {
-  return _fetchFlowApiDefinition2.apply(this, arguments);
+function fetchFlowApiDefinition(_x4) {
+  return _fetchFlowApiDefinition.apply(this, arguments);
 }
-function _fetchFlowApiDefinition2() {
-  _fetchFlowApiDefinition2 = _asyncToGenerator$3(function* (provider) {
+function _fetchFlowApiDefinition() {
+  _fetchFlowApiDefinition = _asyncToGenerator$3(function* (provider) {
     var [namespaceName, nameWithVersion] = provider.split("@");
     var [name, version] = nameWithVersion.split(":");
-    var contract;
-    if (contract = getContract("".concat(namespaceName, ".").concat(name))) {
+
+    // Do not cache the result of `geContract`, which will lead to no contract
+    // will be found when render twice immediately.
+    var contract = getContract("".concat(namespaceName, ".").concat(name));
+    if (contract) {
       return {
         name: contract.name,
         namespace: contract.namespaceId,
@@ -6015,32 +6021,56 @@ function _fetchFlowApiDefinition2() {
           request: contract.request
         }
       };
-    } else {
-      var {
-        contractData
-      } = yield ContractApi_searchSingleContract({
-        contractName: "".concat(namespaceName, ".").concat(name),
-        version
-      });
-
-      // return undefined if don't found contract
-      if (contractData) {
-        var _contractData$namespa, _contractData$namespa2;
-        return {
-          name: contractData.name,
-          namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
-          serviceName: contractData.serviceName,
-          version: contractData.version,
-          contract: {
-            endpoint: contractData.endpoint,
-            response: contractData.response,
-            request: contractData.request
-          }
-        };
-      }
     }
+    var promise = remoteContractCache.get(provider);
+    if (!promise) {
+      promise = fetchFlowApiDefinitionFromRemote(namespaceName, name, version);
+      remoteContractCache.set(provider, promise);
+    }
+    return promise;
+  });
+  return _fetchFlowApiDefinition.apply(this, arguments);
+}
+function fetchFlowApiDefinitionFromRemote(_x5, _x6, _x7) {
+  return _fetchFlowApiDefinitionFromRemote.apply(this, arguments);
+}
+function _fetchFlowApiDefinitionFromRemote() {
+  _fetchFlowApiDefinitionFromRemote = _asyncToGenerator$3(function* (namespace, name, version) {
+    var _contractData$namespa, _contractData$namespa2;
+    var {
+      contractData
+    } = yield ContractApi_searchSingleContract({
+      contractName: "".concat(namespace, ".").concat(name),
+      version
+    });
+
+    // return null if didn't find contract
+    return contractData ? {
+      name: contractData.name,
+      namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
+      serviceName: contractData.serviceName,
+      version: contractData.version,
+      contract: {
+        endpoint: contractData.endpoint,
+        response: contractData.response,
+        request: contractData.request
+      }
+    } : null;
   });
-  return _fetchFlowApiDefinition2.apply(this, arguments);
+  return _fetchFlowApiDefinitionFromRemote.apply(this, arguments);
+}
+class FlowApiNotFoundError extends Error {
+  constructor(message) {
+    // Pass remaining arguments (including vendor specific ones) to parent constructor
+    super(message);
+    this.name = "FlowApiNotFoundError";
+
+    // Maintains proper stack trace for where our error was thrown (only available on V8)
+    // istanbul ignore else
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, FlowApiNotFoundError);
+    }
+  }
 }
 
 function bindListeners(brick, eventsMap, context) {
@@ -8191,7 +8221,7 @@ function asyncExpandCustomTemplate(_x, _x2, _x3, _x4) {
 }
 function _asyncExpandCustomTemplate() {
   _asyncExpandCustomTemplate = _asyncToGenerator$3(function* (brickConf, proxyBrick, context, locationContext) {
-    var tplContext = new CustomTemplateContext(proxyBrick);
+    var tplContext = new CustomTemplateContext(proxyBrick, locationContext === null || locationContext === void 0 ? void 0 : locationContext.renderId);
     var template = customTemplateRegistry.get(brickConf.brick);
     if (template.contracts) {
       collectWidgetContract(template.contracts);
@@ -9812,7 +9842,7 @@ function AsyncExpandCustomForm(_x, _x2, _x3, _x4, _x5) {
 }
 function _AsyncExpandCustomForm() {
   _AsyncExpandCustomForm = _asyncToGenerator$3(function* (formData, brickConf, isPreview, context, locationContext) {
-    var formContext = new CustomFormContext();
+    var formContext = new CustomFormContext(locationContext === null || locationContext === void 0 ? void 0 : locationContext.renderId);
     formData = initFormContext(formData, brickConf, isPreview);
     if (Array.isArray(formData.context)) {
       if (locationContext) {
@@ -10194,7 +10224,7 @@ function getFinalStoryBoard(formData, brickConf, isPreview, formContext) {
 }
 
 class LocationContext {
-  constructor(kernel, location) {
+  constructor(kernel, location, renderId) {
     _defineProperty$1(this, "query", void 0);
     _defineProperty$1(this, "resolver", void 0);
     _defineProperty$1(this, "messageDispatcher", void 0);
@@ -10212,11 +10242,14 @@ class LocationContext {
     _defineProperty$1(this, "currentMatch", void 0);
     _defineProperty$1(this, "storyboardContextWrapper", new StoryboardContextWrapper());
     _defineProperty$1(this, "observersList", []);
+    _defineProperty$1(this, "renderId", void 0);
     this.kernel = kernel;
     this.location = location;
     this.resolver = new Resolver(kernel, this);
     this.query = new URLSearchParams(location.search);
     this.messageDispatcher = getMessageDispatcher();
+    this.storyboardContextWrapper = new StoryboardContextWrapper(undefined, undefined, renderId);
+    this.renderId = renderId;
   }
   getContext(_ref) {
     var {
@@ -11661,7 +11694,7 @@ class Router {
     return _asyncToGenerator$3(function* () {
       var _apiAnalyzer$getInsta, _currentApp$config, _currentApp$config$_e, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme;
       _this3.state = "initial";
-      _this3.renderId = uniqueId("render-id-");
+      var renderId = _this3.renderId = uniqueId("render-id-");
       resetAllInjected();
       clearPollTimeout();
       clearCollectWidgetContract();
@@ -11675,7 +11708,7 @@ class Router {
       // Create the page tracker before page load.
       // And the API Analyzer maybe disabled.
       var tracePageEnd = (_apiAnalyzer$getInsta = apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.tracePage();
-      var locationContext = _this3.locationContext = new LocationContext(_this3.kernel, location);
+      var locationContext = _this3.locationContext = new LocationContext(_this3.kernel, location, renderId);
       if (window.DEVELOPER_PREVIEW) {
         return;
       }