@next-core/brick-kit 2.134.2 → 2.136.0

package/dist/index.esm.js

@@ -1972,7 +1972,7 @@ class StoryboardContextWrapper {
     return (_this$data$get = this.data.get(name)) === null || _this$data$get === void 0 ? void 0 : _this$data$get.value;
   }
 
-  updateValue(name, value, method) {
+  updateValue(name, value, method, callback) {
     var _item$eventTarget2;
 
     if (!this.data.has(name)) {
@@ -1993,23 +1993,60 @@ 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;
     }
 
-    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 => {
-        var _item$eventTarget;
+      var promise;
+
+      if (method === "load") {
+        // Try to reuse previous request when calling `load`.
+        if (item.loaded) {
+          promise = Promise.resolve(item.value);
+        } else if (item.loading) {
+          promise = item.loading;
+        }
+      }
+
+      if (!promise) {
+        promise = item.loading = item.load(_objectSpread({
+          cache: method === "load" ? "default" : "reload"
+        }, 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.tplContextId ? "state.change" : "context.change", {
+            detail: item.value
+          }));
+        }, err => {
+          // Let users to override error handling.
+          if (!(callback !== null && callback !== void 0 && callback.error)) {
+            handleHttpError(err);
+          }
+        });
+      }
+
+      if (callback) {
+        var callbackFactory = eventCallbackFactory(callback, () => this.getResolveOptions(_internalApiGetCurrentContext()).mergedContext);
+        promise.then(val => {
+          callbackFactory("success")({
+            value: val
+          });
+          callbackFactory("finally")();
+        }, err => {
+          callbackFactory("error")(err);
+          callbackFactory("finally")();
+        });
+      }
 
-        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);
       return;
     }
 
@@ -2108,23 +2145,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 +2169,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 +2184,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 +2203,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 +2234,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,11 +6332,13 @@ function listenerFactory(handler, context, runtimeBrick) {
       case "context.assign":
       case "context.replace":
       case "context.refresh":
-        return builtinContextListenerFactory(method, handler.args, handler, context);
+      case "context.load":
+        return builtinContextListenerFactory(method, handler.args, handler, handler.callback, context);
 
       case "state.update":
       case "state.refresh":
-        return builtinStateListenerFactory(method, handler.args, handler, context);
+      case "state.load":
+        return builtinStateListenerFactory(method, handler.args, handler, handler.callback, context);
 
       case "tpl.dispatchEvent":
         return builtinTplDispatchEventFactory(handler.args, handler, context);
@@ -6425,7 +6467,7 @@ function builtinTplDispatchEventFactory(args, ifContainer, context) {
   };
 }
 
-function builtinContextListenerFactory(method, args, ifContainer, context) {
+function builtinContextListenerFactory(method, args, ifContainer, callback, context) {
   return function (event) {
     if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
       event
@@ -6436,11 +6478,11 @@ function builtinContextListenerFactory(method, args, ifContainer, context) {
     var storyboardContext = _internalApiGetStoryboardContextWrapper();
 
     var [name, value] = argsFactory(args, context, event);
-    storyboardContext.updateValue(name, value, method);
+    storyboardContext.updateValue(name, value, method, callback);
   };
 }
 
-function builtinStateListenerFactory(method, args, ifContainer, context) {
+function builtinStateListenerFactory(method, args, ifContainer, callback, context) {
   return function (event) {
     if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
       event
@@ -6450,7 +6492,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, callback);
   };
 }
 
@@ -6651,13 +6693,39 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
   };
 }
 
+function eventCallbackFactory(callback, getContext) {
+  return function callbackFactory(type) {
+    return function (result) {
+      if (callback !== null && callback !== void 0 && callback[type]) {
+        try {
+          var event = new CustomEvent("callback.".concat(type), {
+            detail: result
+          });
+          var context = getContext();
+          [].concat(callback[type]).forEach(eachHandler => {
+            listenerFactory(eachHandler, context, null)(event);
+          });
+        } catch (err) {
+          // Do not throw errors in `callback.success` or `callback.progress`,
+          // to avoid the following triggering of `callback.error`.
+          // eslint-disable-next-line
+          console.error(err);
+        }
+      } else if (type === "error") {
+        // eslint-disable-next-line
+        console.error("Unhandled callback error:", result);
+      }
+    };
+  };
+}
+
 function brickCallback(_x2, _x3, _x4, _x5, _x6, _x7, _x8) {
   return _brickCallback.apply(this, arguments);
 }
 
 function _brickCallback() {
   _brickCallback = _asyncToGenerator$3(function* (target, handler, method, context, runtimeBrick, event, options) {
-    var _handler$callback, _poll;
+    var _poll;
 
     if (typeof target[method] !== "function") {
       // eslint-disable-next-line no-console
@@ -6684,45 +6752,17 @@ function _brickCallback() {
       };
     }();
 
-    var {
-      success,
-      error,
-      finally: finallyHook,
-      progress
-    } = (_handler$callback = handler.callback) !== null && _handler$callback !== void 0 ? _handler$callback : {};
-
-    if (!(success || error || finallyHook || progress)) {
+    if (!handler.callback) {
       task();
       return;
     }
 
-    var callbackFactory = (eventType, specificHandler) => result => {
-      if (specificHandler) {
-        try {
-          var _event = new CustomEvent(eventType, {
-            detail: result
-          });
-
-          [].concat(specificHandler).forEach(eachHandler => {
-            listenerFactory(eachHandler, context, runtimeBrick)(_event);
-          });
-        } catch (err) {
-          // Do not throw errors in `callback.success` or `callback.progress`,
-          // to avoid the following triggering of `callback.error`.
-          // eslint-disable-next-line
-          console.error(err);
-        }
-      } else if (eventType === "callback.error") {
-        // eslint-disable-next-line
-        console.error("Unhandled callback error:", result);
-      }
-    };
-
+    var callbackFactory = eventCallbackFactory(handler.callback, () => context);
     var pollableCallback = {
-      progress: callbackFactory("callback.progress", progress),
-      success: callbackFactory("callback.success", success),
-      error: callbackFactory("callback.error", error),
-      finally: callbackFactory("callback.finally", finallyHook)
+      progress: callbackFactory("progress"),
+      success: callbackFactory("success"),
+      error: callbackFactory("error"),
+      finally: callbackFactory("finally")
     };
     var poll;
 
@@ -11265,7 +11305,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 +11410,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* () {