@next-core/brick-kit 2.135.0 → 2.136.1

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.136.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.0...@next-core/brick-kit@2.136.1) (2022-09-05)
+
+
+### Bug Fixes
+
+* fix missing runtime brick in event callback ([a5b70be](https://github.com/easyops-cn/next-core/commit/a5b70be68bc6a856b78992320518d0a0e6a41128))
+
+
+
+
+
+# [2.136.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.135.1...@next-core/brick-kit@2.136.0) (2022-09-05)
+
+
+### Features
+
+* support context/state load/refresh callback ([4dfdd8b](https://github.com/easyops-cn/next-core/commit/4dfdd8bc8e91430a99857154237bae290c685329))
+
+
+
+
+
+## [2.135.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.135.0...@next-core/brick-kit@2.135.1) (2022-09-02)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 # [2.135.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.134.2...@next-core/brick-kit@2.135.0) (2022-09-02)
 
 

package/dist/index.bundle.js

@@ -1971,7 +1971,7 @@
       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)) {
@@ -1994,36 +1994,58 @@
         // 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__default["default"]({
+            cache: method === "load" ? "default" : "reload"
+          }, value)); // Do not use the chained promise, since the callbacks need the original promise.
 
-        item.load(_objectSpread__default["default"]({
-          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;
       }
 
@@ -6310,12 +6332,12 @@
         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);
@@ -6444,7 +6466,7 @@
     };
   }
 
-  function builtinContextListenerFactory(method, args, ifContainer, context) {
+  function builtinContextListenerFactory(method, args, ifContainer, callback, context) {
     return function (event) {
       if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6455,11 +6477,11 @@
       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__default["default"](_objectSpread__default["default"]({}, context), {}, {
         event
@@ -6469,7 +6491,7 @@
 
       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);
     };
   }
 
@@ -6670,13 +6692,39 @@
     };
   }
 
+  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__default["default"](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
@@ -6703,45 +6751,17 @@
         };
       }();
 
-      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;