@next-core/brick-kit 2.135.0 → 2.136.1

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)) {
@@ -1995,36 +1995,58 @@ class StoryboardContextWrapper {
       // eslint-disable-next-line no-console
       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" || method === "load") {
       if (!item.load) {
         throw new Error("You can not ".concat(method, " the storyboard context \"").concat(name, "\" which has no resolve."));
       }
 
-      if ((item.loaded || item.loading) && method === "load") {
-        // Do not load again.
-        return;
+      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;
+        }
       }
 
-      item.loading = true; // Defaults to ignore cache when refreshing.
+      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.
 
-      item.load(_objectSpread({
-        cache: method === "load" ? "default" : "reload"
-      }, value)).then(val => {
-        var _item$eventTarget;
+        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, null);
+        promise.then(val => {
+          callbackFactory("success")({
+            value: val
+          });
+          callbackFactory("finally")();
+        }, err => {
+          callbackFactory("error")(err);
+          callbackFactory("finally")();
+        });
+      }
 
-        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
-        }));
-      }, err => {
-        item.loading = false;
-        handleHttpError(err);
-      });
       return;
     }
 
@@ -6311,12 +6333,12 @@ function listenerFactory(handler, context, runtimeBrick) {
       case "context.replace":
       case "context.refresh":
       case "context.load":
-        return builtinContextListenerFactory(method, handler.args, handler, context);
+        return builtinContextListenerFactory(method, handler.args, handler, handler.callback, context);
 
       case "state.update":
       case "state.refresh":
       case "state.load":
-        return builtinStateListenerFactory(method, handler.args, handler, context);
+        return builtinStateListenerFactory(method, handler.args, handler, handler.callback, context);
 
       case "tpl.dispatchEvent":
         return builtinTplDispatchEventFactory(handler.args, handler, context);
@@ -6445,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
@@ -6456,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
@@ -6470,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 === "update" ? "replace" : method);
+    tplContext.state.updateValue(name, value, method === "update" ? "replace" : method, callback);
   };
 }
 
@@ -6671,13 +6693,39 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
   };
 }
 
+function eventCallbackFactory(callback, getContext, runtimeBrick) {
+  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, 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 (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
@@ -6704,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, runtimeBrick);
     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;