@next-core/brick-kit 2.181.2 → 2.183.0

package/dist/index.esm.js

@@ -1934,7 +1934,7 @@ class StoryboardContextWrapper {
     return;
   }
   updateValue(name, value, method, callback) {
-    var _item$eventTarget2;
+    var _item$eventTarget;
     if (!this.data.has(name)) {
       if (this.tplContextId) {
         throw new Error("State not found: ".concat(name));
@@ -1955,8 +1955,8 @@ class StoryboardContextWrapper {
       return;
     }
     if (method === "refresh" || method === "load") {
-      if (!item.load) {
-        throw new Error("You can not ".concat(method, " the storyboard context \"").concat(name, "\" which has no resolve."));
+      if (!item.useResolve) {
+        throw new Error("You can not ".concat(method, " the storyboard context \"").concat(name, "\" which is not using resolve."));
       }
       var promise;
       if (method === "load") {
@@ -1980,12 +1980,7 @@ class StoryboardContextWrapper {
         }, value));
         // Do not use the chained promise, since the callbacks need the original promise.
         promise.then(val => {
-          var _item$eventTarget;
-          item.loaded = true;
-          item.value = val;
-          (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.eventName, {
-            detail: item.value
-          }));
+          this.finishLoad(item, val);
         }, err => {
           // Let users to override error handling.
           if (!shouldDismiss(err) && !(callback !== null && callback !== void 0 && callback.error)) {
@@ -2021,10 +2016,24 @@ class StoryboardContextWrapper {
       }
     }
     if (this.batchUpdate) return;
-    (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.eventName, {
+    (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.eventName, {
       detail: item.value
     }));
   }
+  finishLoad(item, value) {
+    var _item$eventTarget2;
+    if (!item.useResolve) {
+      // This happens when a tracked conditional resolve switches from
+      // resolve to fallback after an dep update triggered refresh but
+      // before it's been resolved.
+      return;
+    }
+    item.loaded = true;
+    item.value = value;
+    (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.eventName, {
+      detail: value
+    }));
+  }
   waitForUsedContext(data) {
     var _this = this;
     return _asyncToGenerator$3(function* () {
@@ -2067,11 +2076,7 @@ class StoryboardContextWrapper {
         // An async data always has `loading`
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         item.loading.then(value => {
-          item.loaded = true;
-          item.value = value;
-          item.eventTarget.dispatchEvent(new CustomEvent(this.eventName, {
-            detail: value
-          }));
+          this.finishLoad(item, value);
         });
       }
     });
@@ -2160,14 +2165,24 @@ function _resolveNormalStoryboardContext() {
       return false;
     }
     var isTemplateState = !!storyboardContextWrapper.tplContextId;
+    var isFormState = !!storyboardContextWrapper.formContextId;
     var value = getDefinedTemplateState(isTemplateState, contextConf, brick);
     var load = null;
     var loading;
-    var resolvePolicy = "eager";
+    var useResolve;
+    var trackConditionalResolve;
+    var resolvePolicy;
     if (value === undefined) {
       if (contextConf.resolve) {
+        var hasFallbackValue = hasOwnProperty(contextConf, "value");
+        // Track conditional resolve only if all matches:
+        //   - Track enabled
+        //   - Has fallback value
+        //   - Referencing other data in `resolve.if`
+        trackConditionalResolve = contextConf.track && hasFallbackValue && hasOwnProperty(contextConf.resolve, "if") && collectContextUsage(contextConf.resolve.if, isTemplateState ? "STATE" : isFormState ? "FORM_STATE" : "CTX").usedContexts.length > 0;
         yield storyboardContextWrapper.waitForUsedContext(contextConf.resolve.if);
-        if (looseCheckIf$1(contextConf.resolve, mergedContext)) {
+        useResolve = looseCheckIf$1(contextConf.resolve, mergedContext);
+        if (useResolve || trackConditionalResolve) {
           load = /*#__PURE__*/function () {
             var _ref = _asyncToGenerator$3(function* (options) {
               var valueConf = {};
@@ -2181,6 +2196,8 @@ function _resolveNormalStoryboardContext() {
               return _ref.apply(this, arguments);
             };
           }();
+        }
+        if (useResolve) {
           // `async` take precedence over `lazy`
           resolvePolicy = contextConf.resolve.async && !isTemplateState ? "async" : contextConf.resolve.lazy ? "lazy" : "eager";
           if (resolvePolicy === "eager") {
@@ -2202,18 +2219,18 @@ function _resolveNormalStoryboardContext() {
               console.error("unsupported lifecycle: \"".concat(lifecycleName, "\""));
             }
           }
-        } else if (!hasOwnProperty(contextConf, "value")) {
+        } else if (!hasFallbackValue) {
           return false;
         }
       }
-      if ((!load || resolvePolicy !== "eager") && contextConf.value !== undefined) {
+      if ((!useResolve || resolvePolicy !== "eager") && contextConf.value !== undefined) {
         yield storyboardContextWrapper.waitForUsedContext(contextConf.value);
         // If the context has no resolve, just use its `value`.
         // Or if the resolve is ignored or lazy, use its `value` as a fallback.
         value = computeRealValue(contextConf.value, mergedContext, true);
       }
     }
-    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, resolvePolicy === "eager", loading, resolvePolicy === "async");
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, resolvePolicy === "eager", loading, resolvePolicy === "async", useResolve, trackConditionalResolve);
     return true;
   });
   return _resolveNormalStoryboardContext.apply(this, arguments);
@@ -2237,12 +2254,13 @@ function getDefinedTemplateState(isTemplateState, contextConf, brick) {
     return brick.properties[contextConf.name];
   }
 }
-function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, loaded, loading, async) {
+function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, loaded, loading, async, useResolve, trackConditionalResolve) {
   var newContext = {
     type: "free-variable",
     value,
     // This is required for tracking context, even if no `onChange` is specified.
     eventTarget: new EventTarget$1(),
+    useResolve,
     load,
     loaded,
     loading,
@@ -2262,13 +2280,14 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
     var isTemplateState = !!storyboardContextWrapper.tplContextId;
     var isFormState = !!storyboardContextWrapper.formContextId;
     // Track its dependencies and auto update when each of them changed.
-    var deps = (isFormState ? trackUsedFormState : isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
+    var deps = (isFormState ? trackUsedFormState : isTemplateState ? trackUsedState : trackUsedContext)(trackConditionalResolve ? [contextConf.resolve, contextConf.value] : load ? contextConf.resolve : contextConf.value);
     !load && (newContext.deps = deps);
     for (var dep of deps) {
       var _eventTarget;
       var ctx = storyboardContextWrapper.get().get(dep);
       ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(eventName, batchAddListener(() => {
-        if (load) {
+        newContext.useResolve = trackConditionalResolve ? looseCheckIf$1(contextConf.resolve, mergedContext) : !!load;
+        if (newContext.useResolve) {
           storyboardContextWrapper.updateValue(contextConf.name, {
             cache: "default"
           }, "refresh");
@@ -7209,14 +7228,14 @@ function standaloneBootstrap() {
 }
 function _standaloneBootstrap() {
   _standaloneBootstrap = _asyncToGenerator$3(function* () {
-    var requests = [http.get(window.BOOTSTRAP_FILE), http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+    var requests = [window.BOOTSTRAP_UNION_FILE ? http.get(window.BOOTSTRAP_UNION_FILE) : http.get(window.BOOTSTRAP_FILE), window.BOOTSTRAP_UNION_FILE ? Promise.resolve("") : http.get("".concat(window.APP_ROOT, "conf.yaml"), {
       responseType: "text"
     }), BootstrapStandaloneApi_runtimeStandalone().catch(function (error) {
       // make it not crash when the backend service is not updated.
       // eslint-disable-next-line no-console
       console.warn("request runtime api from api-gateway failed: ", error, ", something might went wrong running standalone micro app");
       return;
-    })];
+    }), window.BOOTSTRAP_UNION_FILE ? http.get(window.BOOTSTRAP_FILE) : Promise.resolve(undefined)];
     if (!window.NO_AUTH_GUARD) {
       var matches;
       var appId = window.APP_ID || (window.APP_ROOT && (matches = window.APP_ROOT.match(/^(?:(?:\/next)?\/)?sa-static\/([^/]+)\/versions\//)) ? matches[1] : null);
@@ -7225,7 +7244,7 @@ function _standaloneBootstrap() {
         safeGetRuntimeMicroAppStandalone(appId);
       }
     }
-    var [bootstrapResult, confString, runtimeData] = yield Promise.all(requests);
+    var [bootstrapResult, confString, runtimeData, fullBootstrapDetail] = yield Promise.all(requests);
     var conf;
     try {
       conf = confString ? yaml.safeLoad(confString, {
@@ -7280,12 +7299,34 @@ function _standaloneBootstrap() {
         }
       }
     }
+    mergeFullBootstrapDetail(bootstrapResult, fullBootstrapDetail);
     return _objectSpread(_objectSpread({}, bootstrapResult), {}, {
       settings
     });
   });
   return _standaloneBootstrap.apply(this, arguments);
 }
+function mergeFullBootstrapDetail(bootstrapResult, fullBootstrapDetail) {
+  if (fullBootstrapDetail) {
+    var {
+      storyboards
+    } = fullBootstrapDetail;
+    var {
+      routes,
+      meta,
+      app
+    } = storyboards[0];
+    var matchedStoryboard = bootstrapResult.storyboards.find(item => item.app.id === app.id);
+    if (matchedStoryboard) {
+      Object.assign(matchedStoryboard, {
+        routes,
+        meta,
+        app: _objectSpread(_objectSpread({}, matchedStoryboard.app), app),
+        $$fullMerged: true
+      });
+    }
+  }
+}
 var appRuntimeDataMap = new Map();
 function safeGetRuntimeMicroAppStandalone(_x) {
   return _safeGetRuntimeMicroAppStandalone.apply(this, arguments);
@@ -8983,6 +9024,23 @@ class Kernel {
           $$fulfilled: true,
           $$fulfilling: null
         });
+        if (window.BOOTSTRAP_UNION_FILE && !storyboard.$$fullMerged) {
+          var fullBootstrapPath = "".concat(window.APP_ROOT, "-/").concat(storyboard.bootstrapFile);
+          var {
+            storyboards
+          } = yield http.get(fullBootstrapPath);
+          var {
+            routes,
+            meta,
+            app
+          } = storyboards[0];
+          Object.assign(storyboard, {
+            routes,
+            meta,
+            app: _objectSpread(_objectSpread({}, storyboard.app), app),
+            $$fullMerged: true
+          });
+        }
         if (!window.NO_AUTH_GUARD) {
           var appRuntimeData;
           try {
@@ -9005,14 +9063,14 @@ class Kernel {
         }
       } else {
         var {
-          routes,
-          meta,
-          app
+          routes: _routes,
+          meta: _meta,
+          app: _app
         } = yield BootstrapV2Api_getAppStoryboardV2(storyboard.app.id, {});
         Object.assign(storyboard, {
-          routes,
-          meta,
-          app: _objectSpread(_objectSpread({}, storyboard.app), app),
+          routes: _routes,
+          meta: _meta,
+          app: _objectSpread(_objectSpread({}, storyboard.app), _app),
           $$fulfilled: true,
           $$fulfilling: null
         });
@@ -11604,6 +11662,17 @@ function setUIVersion(version) {
   document.documentElement.dataset.ui = ui;
 }
 
+function setAppVariable(params) {
+  var {
+    appId,
+    version
+  } = params;
+  if (window.APP_ROOT_TPL) {
+    window.APP_ID = appId;
+    window.APP_ROOT = window.APP_ROOT_TPL.replace("{id}", appId).replace("{version}", version);
+  }
+}
+
 class Router {
   constructor(kernel) {
     _defineProperty$1(this, "defaultCollapsed", false);
@@ -11748,7 +11817,7 @@ class Router {
   render(location) {
     var _this3 = this;
     return _asyncToGenerator$3(function* () {
-      var _apiAnalyzer$getInsta, _currentApp$config, _currentApp$config$_e, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme;
+      var _apiAnalyzer$getInsta, _storyboard$app, _this3$kernel$previou, _currentApp$config, _currentApp$config$_e, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme;
       _this3.state = "initial";
       var renderId = _this3.renderId = uniqueId("render-id-");
       resetAllInjected();
@@ -11769,6 +11838,14 @@ class Router {
         return;
       }
       var storyboard = locationContext.matchStoryboard(_this3.kernel.bootstrapData.storyboards);
+      var currentAppId = storyboard === null || storyboard === void 0 ? void 0 : (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : _storyboard$app.id;
+      //  dynamically change the value of the APP variable, if it's union app
+      if (window.BOOTSTRAP_UNION_FILE && currentAppId && currentAppId !== ((_this3$kernel$previou = _this3.kernel.previousApp) === null || _this3$kernel$previou === void 0 ? void 0 : _this3$kernel$previou.id)) {
+        setAppVariable({
+          appId: currentAppId,
+          version: storyboard.app.currentVersion
+        });
+      }
 
       /** Pending task for loading bricks */
       var pendingTask;