@next-core/brick-kit 2.116.1 → 2.117.2

package/CHANGELOG.md

@@ -3,6 +3,44 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.117.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.1...@next-core/brick-kit@2.117.2) (2022-04-07)
+
+
+### Bug Fixes
+
+* support service name ([63b8f0b](https://github.com/easyops-cn/next-core/commit/63b8f0be85d4d213e8fd308beec84d0bbdee210d))
+
+
+
+
+
+## [2.117.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.0...@next-core/brick-kit@2.117.1) (2022-04-07)
+
+
+### Bug Fixes
+
+* use an empty placeholder for template preview ([b24c623](https://github.com/easyops-cn/next-core/commit/b24c623f6d7f6405808f385297612e17afb362af))
+
+
+
+
+
+# [2.117.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.116.1...@next-core/brick-kit@2.117.0) (2022-04-06)
+
+
+### Bug Fixes
+
+* contract refactor ([a506766](https://github.com/easyops-cn/next-core/commit/a5067664253a51a007b8fea96ddf7efefd7da7d8))
+
+
+### Features
+
+* support previewing template by settings ([b1fa0f9](https://github.com/easyops-cn/next-core/commit/b1fa0f9e4d774a6b4162643348ca49402bde1479))
+
+
+
+
+
 ## [2.116.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.116.0...@next-core/brick-kit@2.116.1) (2022-04-06)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -3175,6 +3175,11 @@
   function _dev_only_updateStoryboard(appId, storyboardPatch) {
     kernel._dev_only_updateStoryboard(appId, storyboardPatch);
   }
+  /* istanbul ignore next */
+
+  function _dev_only_updateTemplatePreviewSettings(appId, templateId, settings) {
+    kernel._dev_only_updateTemplatePreviewSettings(appId, templateId, settings);
+  }
   class Runtime {
     constructor() {
       _defineProperty__default["default"](this, "registerBrickTemplate", registerBrickTemplate);
@@ -5590,6 +5595,16 @@
     return;
   };
 
+  var contractsMap = new Map();
+  function collectContract(contracts) {
+    contracts === null || contracts === void 0 ? void 0 : contracts.forEach(contract => {
+      contractsMap.set("".concat(contract.namespaceId, ".").concat(contract.name), contract);
+    });
+  }
+  function getContract(name) {
+    return contractsMap.get(name);
+  }
+
   var flowApiDefinitionPromiseMap = new Map(); // Legacy Custom API: `${namespace}@${name}`
   // Flow API: `${namespace}@${name}:${version}`
 
@@ -5623,8 +5638,10 @@
     var {
       uri,
       method,
+      ext_fields,
       name,
       namespace,
+      serviceName,
       responseWrapper,
       version,
       isFileType
@@ -5638,22 +5655,24 @@
     var {
       url,
       args
-    } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, version);
+    } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version);
     return isFileType ? [fileName, {
       url,
       method,
+      ext_fields,
       responseWrapper: false
     }, ...args, {
       responseType: "blob"
     }] : [{
       url,
       method,
+      ext_fields,
       responseWrapper
     }, ...args];
   }
 
-  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, version) {
-    var prefix = version ? "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
+  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version) {
+    var prefix = version ? serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
     var restArgs = originalArgs.slice();
     var transformedUri = uri.replace(/:([^/]+)/g, () => restArgs.shift());
     return {
@@ -5671,7 +5690,8 @@
     }) : api.contract;
     var {
       uri,
-      method = "GET"
+      method = "GET",
+      ext_fields
     } = (_contract$endpoint = contract === null || contract === void 0 ? void 0 : contract.endpoint) !== null && _contract$endpoint !== void 0 ? _contract$endpoint : {};
     var responseWrapper = contract !== null && contract !== void 0 && contract.response ? contract.response.wrapper !== false : false;
 
@@ -5682,8 +5702,10 @@
     return {
       uri,
       method: method.toLowerCase() === "list" ? "get" : method,
+      ext_fields,
       name: api.name,
       namespace: api.namespace,
+      serviceName: api.serviceName,
       version: api.version,
       isFileType: (contract === null || contract === void 0 ? void 0 : (_contract$response = contract.response) === null || _contract$response === void 0 ? void 0 : _contract$response.type) === "file",
       responseWrapper
@@ -5717,7 +5739,7 @@
         var {
           list
         } = yield InstanceApi_postSearchV3("FLOW_BUILDER_API_CONTRACT@EASYOPS", {
-          fields: ["name", "namespaceId", "endpoint", "response", "version"],
+          fields: ["name", "namespaceId", "endpoint", "response", "version", "serviceName"],
           query: {
             namespaceId: {
               $eq: namespaceName
@@ -5729,11 +5751,12 @@
         });
 
         if ((_list$ = list[0]) !== null && _list$ !== void 0 && _list$.instanceId) {
-          var _list$2;
+          var _list$2, _list$3;
 
           return {
             name: list[0].name,
             namespace: (_list$2 = list[0]) === null || _list$2 === void 0 ? void 0 : _list$2.namespaceId,
+            serviceName: (_list$3 = list[0]) === null || _list$3 === void 0 ? void 0 : _list$3.serviceName,
             version: list[0].version,
             contract: {
               endpoint: list[0].endpoint,
@@ -5742,25 +5765,41 @@
           };
         }
       } else {
-        var {
-          contractData
-        } = yield ContractApi_searchSingleContract({
-          contractName: "".concat(namespaceName, ".").concat(name),
-          version
-        }); // return undefined if don't found contract
-
-        if (contractData) {
-          var _contractData$namespa, _contractData$namespa2;
+        var contract;
 
+        if (contract = getContract("".concat(namespaceName, ".").concat(name))) {
           return {
-            name: contractData.name,
-            namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
-            version: contractData.version,
+            name: contract.name,
+            namespace: contract.namespaceId,
+            serviceName: contract.serviceName,
+            version: contract.version,
             contract: {
-              endpoint: contractData.endpoint,
-              response: contractData.response
+              endpoint: contract.endpoint,
+              response: contract.response
             }
           };
+        } else {
+          var {
+            contractData
+          } = yield ContractApi_searchSingleContract({
+            contractName: "".concat(namespaceName, ".").concat(name),
+            version
+          }); // return undefined if don't found contract
+
+          if (contractData) {
+            var _contractData$namespa, _contractData$namespa2;
+
+            return {
+              name: contractData.name,
+              namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
+              serviceName: contractData.serviceName,
+              version: contractData.version,
+              contract: {
+                endpoint: contractData.endpoint,
+                response: contractData.response
+              }
+            };
+          }
         }
       }
     });
@@ -6639,26 +6678,73 @@
   }
 
   var CUSTOM_API_PROVIDER = "brick-kit.provider-custom-api";
-  function CustomApi(_x, _x2, _x3) {
+  function processExtFields(ext_fields) {
+    var hasFields = type => {
+      return ext_fields.some(item => item.source === type);
+    };
+
+    var hasQueryParams = hasFields("query");
+    var HasBodyParams = hasFields("body");
+
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    if (hasQueryParams && HasBodyParams) {
+      var [_data, params, _options] = args;
+      return {
+        data: _data,
+        options: _objectSpread__default["default"]({
+          params: params
+        }, _options)
+      };
+    }
+
+    if (hasQueryParams) {
+      var [_params, _options2] = args;
+      return {
+        data: {},
+        options: _objectSpread__default["default"]({
+          params: _params
+        }, _options2)
+      };
+    } // only hasBodyParams or default
+
+
+    var [data, options] = args;
+    return {
+      data,
+      options
+    };
+  }
+  function CustomApi(_x) {
     return _CustomApi.apply(this, arguments);
   }
 
   function _CustomApi() {
-    _CustomApi = _asyncToGenerator__default["default"](function* (_ref, data, options) {
+    _CustomApi = _asyncToGenerator__default["default"](function* (_ref) {
       var {
         url,
         method = "GET",
-        responseWrapper = true
+        responseWrapper = true,
+        ext_fields = []
       } = _ref;
       var isSimpleRequest = ["get", "delete", "head"].includes(method.toLowerCase());
 
+      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        args[_key2 - 1] = arguments[_key2];
+      }
+
       if (isSimpleRequest) {
+        var [data, options] = args;
         var response = yield brickHttp.http.simpleRequest(method, url, _objectSpread__default["default"]({
           params: data
         }, options));
         return responseWrapper ? response.data : response;
       } else {
-        var _response = yield brickHttp.http.requestWithBody(method, url, data, options);
+        var result = processExtFields(ext_fields, ...args);
+
+        var _response = yield brickHttp.http.requestWithBody(method, url, result.data, result.options);
 
         return responseWrapper ? _response.data : _response;
       }
@@ -7910,6 +7996,26 @@
       this.postProcessStoryboard(storyboard);
     }
 
+    _dev_only_updateTemplatePreviewSettings(appId, templateId, settings) {
+      var {
+        routes
+      } = this.bootstrapData.storyboards.find(item => item.app.id === appId);
+      var previewPath = "${APP.homepage}/_dev_only_/template-preview/".concat(templateId);
+      var previewRouteIndex = routes.findIndex(route => route.path === previewPath);
+      var newPreviewRoute = {
+        path: previewPath,
+        bricks: [_objectSpread__default["default"]({
+          brick: templateId
+        }, lodash.pick(settings, "properties"))]
+      };
+
+      if (previewRouteIndex === -1) {
+        routes.push(newPreviewRoute);
+      } else {
+        routes.splice(previewRouteIndex, 1, newPreviewRoute);
+      }
+    }
+
     loadDepsOfStoryboard(storyboard) {
       var _this6 = this;
 
@@ -9984,7 +10090,7 @@
         var storyboard = locationContext.matchStoryboard(_this3.kernel.bootstrapData.storyboards);
 
         if (storyboard) {
-          var _storyboard$meta, _storyboard$meta2;
+          var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
           yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
 
@@ -10003,6 +10109,7 @@
 
           registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions, storyboard.app);
           registerMock((_storyboard$meta2 = storyboard.meta) === null || _storyboard$meta2 === void 0 ? void 0 : _storyboard$meta2.mocks);
+          collectContract((_storyboard$meta3 = storyboard.meta) === null || _storyboard$meta3 === void 0 ? void 0 : _storyboard$meta3.contracts);
         }
 
         var {
@@ -10055,7 +10162,13 @@
           };
 
           try {
-            yield locationContext.mountRoutes(storyboard.routes, undefined, mountRoutesResult);
+            yield locationContext.mountRoutes( // Concat with a placeholder when loading template preview settings.
+            storyboard.routes.concat({
+              path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
+              bricks: [{
+                brick: "span"
+              }]
+            }), undefined, mountRoutesResult);
           } catch (error) {
             // eslint-disable-next-line no-console
             console.error(error); // Redirect to login page if not logged in.
@@ -12968,7 +13081,8 @@
 
     /** @deprecated Keep it for backward-compatibility. */
     checkoutTplContext: lodash.noop,
-    updateStoryboard: _dev_only_updateStoryboard
+    updateStoryboard: _dev_only_updateStoryboard,
+    updateTemplatePreviewSettings: _dev_only_updateTemplatePreviewSettings
   };
 
   var _excluded$2 = ["type"];