@next-core/brick-kit 2.134.2 → 2.135.0

package/dist/index.esm.js

@@ -1993,23 +1993,38 @@ class StoryboardContextWrapper {
 
     if (item.type !== "free-variable") {
       // eslint-disable-next-line no-console
-      console.error("Conflict storyboard context \"".concat(name, "\", expected \"free-variable\", received \"").concat(item.type, "\"."));
+      console.error("Unexpected storyboard context \"".concat(name, "\", expected \"free-variable\", received \"").concat(item.type, "\"."));
       return;
-    }
+    } // Todo(steve): support callback for refresh/load.
+
 
-    if (method === "refresh") {
-      if (!item.refresh) {
-        throw new Error("You can not refresh the storyboard context \"".concat(name, "\" which has no resolve."));
+    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."));
       }
 
-      item.refresh().then(val => {
+      if ((item.loaded || item.loading) && method === "load") {
+        // Do not load again.
+        return;
+      }
+
+      item.loading = true; // Defaults to ignore cache when refreshing.
+
+      item.load(_objectSpread({
+        cache: method === "load" ? "default" : "reload"
+      }, value)).then(val => {
         var _item$eventTarget;
 
+        item.loading = false;
+        item.loaded = true;
         item.value = val;
         (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
           detail: item.value
         }));
-      }, handleHttpError);
+      }, err => {
+        item.loading = false;
+        handleHttpError(err);
+      });
       return;
     }
 
@@ -2108,23 +2123,23 @@ function _resolveNormalStoryboardContext() {
 
     var isTemplateState = !!storyboardContextWrapper.tplContextId;
     var value = getDefinedTemplateState(isTemplateState, contextConf, brick);
-    var refresh = null;
+    var load = null;
     var isLazyResolve = false;
 
     if (value === undefined) {
       if (contextConf.resolve) {
         if (looseCheckIf(contextConf.resolve, mergedContext)) {
-          refresh = /*#__PURE__*/function () {
-            var _ref = _asyncToGenerator$3(function* () {
+          load = /*#__PURE__*/function () {
+            var _ref = _asyncToGenerator$3(function* (options) {
               var valueConf = {};
               yield _internalApiGetResolver().resolveOne("reference", _objectSpread({
                 transform: "value",
                 transformMapArray: false
-              }, contextConf.resolve), valueConf, null, mergedContext);
+              }, contextConf.resolve), valueConf, null, mergedContext, options);
               return valueConf.value;
             });
 
-            return function refresh() {
+            return function load(_x9) {
               return _ref.apply(this, arguments);
             };
           }();
@@ -2132,14 +2147,14 @@ function _resolveNormalStoryboardContext() {
           isLazyResolve = contextConf.resolve.lazy;
 
           if (!isLazyResolve) {
-            value = yield refresh();
+            value = yield load();
           }
         } else if (!hasOwnProperty(contextConf, "value")) {
           return false;
         }
       }
 
-      if ((!refresh || isLazyResolve) && contextConf.value !== undefined) {
+      if ((!load || isLazyResolve) && contextConf.value !== undefined) {
         // 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);
@@ -2147,15 +2162,17 @@ function _resolveNormalStoryboardContext() {
 
       if (contextConf.track) {
         // Track its dependencies and auto update when each of them changed.
-        var deps = (isTemplateState ? trackUsedState : trackUsedContext)(refresh ? contextConf.resolve : contextConf.value);
+        var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
 
         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(isTemplateState ? "state.change" : "context.change", () => {
-            if (refresh) {
-              storyboardContextWrapper.updateValue(contextConf.name, undefined, "refresh");
+            if (load) {
+              storyboardContextWrapper.updateValue(contextConf.name, {
+                cache: "default"
+              }, "refresh");
             } else {
               storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
             }
@@ -2164,7 +2181,7 @@ function _resolveNormalStoryboardContext() {
       }
     }
 
-    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, refresh);
+    resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
     return true;
   });
   return _resolveNormalStoryboardContext.apply(this, arguments);
@@ -2195,13 +2212,14 @@ function getDefinedTemplateState(isTemplateState, contextConf, brick) {
   }
 }
 
-function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, refresh) {
+function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, loaded) {
   var newContext = {
     type: "free-variable",
     value,
     // This is required for tracking context, even if no `onChange` is specified.
     eventTarget: new EventTarget$1(),
-    refresh
+    load,
+    loaded
   };
 
   if (contextConf.onChange) {
@@ -6292,10 +6310,12 @@ function listenerFactory(handler, context, runtimeBrick) {
       case "context.assign":
       case "context.replace":
       case "context.refresh":
+      case "context.load":
         return builtinContextListenerFactory(method, handler.args, handler, context);
 
       case "state.update":
       case "state.refresh":
+      case "state.load":
         return builtinStateListenerFactory(method, handler.args, handler, context);
 
       case "tpl.dispatchEvent":
@@ -6450,7 +6470,7 @@ function builtinStateListenerFactory(method, args, ifContainer, context) {
 
     var tplContext = getTplContext(context.tplContextId);
     var [name, value] = argsFactory(args, context, event);
-    tplContext.state.updateValue(name, value, method === "refresh" ? method : "replace");
+    tplContext.state.updateValue(name, value, method === "update" ? "replace" : method);
   };
 }
 
@@ -11265,7 +11285,7 @@ class Resolver {
     })();
   }
 
-  resolveOne(type, resolveConf, conf, brick, context) {
+  resolveOne(type, resolveConf, conf, brick, context, options) {
     var _this2 = this;
 
     return _asyncToGenerator$3(function* () {
@@ -11370,7 +11390,7 @@ class Resolver {
 
       var promise;
 
-      if (_this2.cache.has(cacheKey)) {
+      if ((options === null || options === void 0 ? void 0 : options.cache) !== "reload" && _this2.cache.has(cacheKey)) {
         promise = _this2.cache.get(cacheKey);
       } else {
         promise = _asyncToGenerator$3(function* () {