@next-core/brick-kit 2.134.2 → 2.135.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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)
+
+
+### Bug Fixes
+
+* ignore cache when refresh context ([a7d5f86](https://github.com/easyops-cn/next-core/commit/a7d5f864475ebff6f6e7ebd1abbf09afb6a77473))
+
+
+### Features
+
+* support context.load ([bf09ab1](https://github.com/easyops-cn/next-core/commit/bf09ab1aa650a4cd80b83650ad8c2173d8941d14))
+* support context.load ([7056edd](https://github.com/easyops-cn/next-core/commit/7056eddb088e4fa3fd6aadafd8e027eaddcd63db))
+
+
+
+
+
 ## [2.134.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.134.1...@next-core/brick-kit@2.134.2) (2022-09-01)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -1992,23 +1992,38 @@
 
       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__default["default"]({
+          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;
       }
 
@@ -2107,23 +2122,23 @@
 
       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__default["default"](function* () {
+            load = /*#__PURE__*/function () {
+              var _ref = _asyncToGenerator__default["default"](function* (options) {
                 var valueConf = {};
                 yield _internalApiGetResolver().resolveOne("reference", _objectSpread__default["default"]({
                   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);
               };
             }();
@@ -2131,14 +2146,14 @@
             isLazyResolve = contextConf.resolve.lazy;
 
             if (!isLazyResolve) {
-              value = yield refresh();
+              value = yield load();
             }
           } else if (!brickUtils.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);
@@ -2146,15 +2161,17 @@
 
         if (contextConf.track) {
           // Track its dependencies and auto update when each of them changed.
-          var deps = (isTemplateState ? brickUtils.trackUsedState : brickUtils.trackUsedContext)(refresh ? contextConf.resolve : contextConf.value);
+          var deps = (isTemplateState ? brickUtils.trackUsedState : brickUtils.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");
               }
@@ -2163,7 +2180,7 @@
         }
       }
 
-      resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, refresh);
+      resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
       return true;
     });
     return _resolveNormalStoryboardContext.apply(this, arguments);
@@ -2194,13 +2211,14 @@
     }
   }
 
-  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) {
@@ -6291,10 +6309,12 @@
         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":
@@ -6449,7 +6469,7 @@
 
       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);
     };
   }
 
@@ -11264,7 +11284,7 @@
       })();
     }
 
-    resolveOne(type, resolveConf, conf, brick, context) {
+    resolveOne(type, resolveConf, conf, brick, context, options) {
       var _this2 = this;
 
       return _asyncToGenerator__default["default"](function* () {
@@ -11369,7 +11389,7 @@
 
         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__default["default"](function* () {