@next-core/brick-kit 2.181.1 → 2.182.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");
@@ -2595,15 +2614,9 @@ function evaluate(raw) {
           }
         });
       case "QUERY":
-        {
-          var params = options.useRealTimeQuery ? new URLSearchParams(getHistory().location.search) : query;
-          return Object.fromEntries(Array.from(params.keys()).map(key => [key, params.get(key)]));
-        }
+        return Object.fromEntries(Array.from(query.keys()).map(key => [key, query.get(key)]));
       case "QUERY_ARRAY":
-        {
-          var _params = options.useRealTimeQuery ? new URLSearchParams(getHistory().location.search) : query;
-          return Object.fromEntries(Array.from(_params.keys()).map(key => [key, _params.getAll(key)]));
-        }
+        return Object.fromEntries(Array.from(query.keys()).map(key => [key, query.getAll(key)]));
       case "SEGUE":
         return {
           getUrl: getUrlBySegueFactory(app, segues)
@@ -14804,12 +14817,14 @@ function getRealValue(value) {
   var {
     useRealTimeQuery
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var compute = (data, ctx) => {
+  var ctx = _objectSpread({}, _internalApiGetCurrentContext());
+  if (useRealTimeQuery) {
+    ctx.query = new URLSearchParams(getHistory().location.search);
+  }
+  var compute = data => {
     if (typeof data === "string") {
       if (isEvaluable(data)) {
-        var result = evaluate(data, undefined, {
-          useRealTimeQuery
-        });
+        var result = evaluate(data, ctx);
         recursiveMarkAsInjected(result);
         return result;
       }
@@ -14819,14 +14834,14 @@ function getRealValue(value) {
       return data;
     }
     if (Array.isArray(data)) {
-      return data.map(v => compute(v, ctx));
+      return data.map(v => compute(v));
     }
     return Object.fromEntries(Object.entries(data).map(_ref => {
       var [k, v] = _ref;
-      return [compute(k, ctx), compute(v, ctx)];
+      return [compute(k), compute(v)];
     }));
   };
-  return compute(value, _internalApiGetCurrentContext());
+  return compute(value);
 }
 
 function constructEventListener(handler) {