@next-core/brick-kit 2.165.6 → 2.166.0

package/dist/index.bundle.js

@@ -644,10 +644,25 @@
     };
   }
 
-  function imagesFactory(appId, isBuildPush) {
+  function imagesFactory(appId, isBuildPush, version) {
     return {
       get(name) {
-        return isBuildPush ? "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/".concat(name) : "".concat(window.APP_ROOT ? "".concat(window.APP_ROOT, "-/") : "", "micro-apps/").concat(appId, "/images/").concat(name);
+        var getSuffix = () => {
+          var suffix = window.APP_ROOT ? "".concat(window.APP_ROOT, "-/") : "";
+          if (!suffix.startsWith("/")) {
+            suffix = getBasePath() + suffix;
+          }
+          if (window.APP_ID && window.APP_ID !== appId) {
+            return suffix.replace(new RegExp("/(".concat(window.APP_ID, "|\\d+.\\d+.\\d+)/"), "g"), (_, p1) => {
+              if (p1 === window.APP_ID) {
+                return "/".concat(appId, "/");
+              }
+              return "/".concat(version, "/");
+            });
+          }
+          return suffix;
+        };
+        return isBuildPush ? "".concat(getBasePath(), "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/").concat(name) : "".concat(getSuffix(), "micro-apps/").concat(appId, "/images/").concat(name);
       }
     };
   }
@@ -1402,7 +1417,7 @@
       case "FN":
         return storyboardFunctions;
       case "IMG":
-        return collectCoverage ? fakeImageFactory() : widgetId ? widgetImagesFactory(widgetId, widgetVersion) : imagesFactory(app.id, app.isBuildPush);
+        return collectCoverage ? fakeImageFactory() : widgetId ? widgetImagesFactory(widgetId, widgetVersion) : imagesFactory(app.id, app.isBuildPush, app.currentVersion);
       case "I18N":
         return collectCoverage ? _.identity : widgetId ? widgetI18nFactory(widgetId) : i18next.getFixedT(null, [appendI18nNamespace, getI18nNamespace("app", app.id)].filter(Boolean));
       case "I18N_TEXT":
@@ -2415,232 +2430,6 @@
     }
   }
 
-  function isBasicProperty(propRef) {
-    return !!propRef.refProperty;
-  }
-  function isTransformableProperty(propRef) {
-    return !!propRef.refTransform;
-  }
-  function isMergeableProperty(propRef) {
-    return !!propRef.mergeProperty;
-  }
-  function isRefProperty(propRef) {
-    return !!propRef.ref;
-  }
-  function isVariableProperty(propRef) {
-    return !!propRef.asVariable;
-  }
-
-  var customTemplateRegistry = new Map();
-  var appRegistered = new Set();
-  var symbolForComputedPropsFromProxy = Symbol.for("tpl.computedPropsFromProxy");
-  var symbolForRefForProxy = Symbol.for("tpl.refForProxy");
-  var symbolForTplContextId = Symbol.for("tpl.contextId");
-
-  function propertyMerge(conf, value, object) {
-    return propertyMergeAll(conf.$$mergeBase, Object.fromEntries(conf.$$mergeBase.proxies.map(proxy => [proxy.$$reversedRef, proxy === conf ? value : object[proxy.$$reversedRef]])));
-  }
-  function propertyMergeAll(mergeBase, object) {
-    if (mergeBase.mergeType === "array") {
-      return propertyMergeAllOfArray(mergeBase, object);
-    }
-    if (mergeBase.mergeType === "object") {
-      return propertyMergeAllOfObject(mergeBase, object);
-    }
-    // istanbul ignore next: should never reach
-    throw new TypeError("unsupported mergeType: \"".concat(mergeBase.mergeType, "\""));
-  }
-  function propertyMergeAllOfArray(_ref, object) {
-    var _$1, _proxy$mergeArgs;
-    var {
-      baseValue,
-      context,
-      proxies
-    } = _ref;
-    // Use an approach like template-literal's quasis:
-    // `quasi0${0}quais1${1}quasi2...`
-    // Every quasi can be merged with multiple items.
-    var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true, {
-      $$lazyForUseBrick: true
-    }) : [];
-    var quasis = [];
-    var size = computedBaseValue.length + 1;
-    for (var i = 0; i < size; i += 1) {
-      quasis.push([]);
-    }
-    for (var proxy of proxies) {
-      var position = void 0;
-      switch (proxy.mergeMethod) {
-        case "append":
-          position = computedBaseValue.length;
-          break;
-        case "prepend":
-          position = 0;
-          break;
-        case "insertAt":
-          // Defaults to `-1`.
-          position = (_$1 = (_proxy$mergeArgs = proxy.mergeArgs) === null || _proxy$mergeArgs === void 0 ? void 0 : _proxy$mergeArgs[0]) !== null && _$1 !== void 0 ? _$1 : -1;
-          if (position < 0) {
-            // It's counted from the end if position is negative.
-            position += quasis.length;
-          }
-          position = _.clamp(position, 0, computedBaseValue.length);
-          break;
-        // istanbul ignore next: should never reach
-        default:
-          throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
-      }
-      var patchValue = object[proxy.$$reversedRef];
-      if (!Array.isArray(patchValue)) {
-        patchValue = [];
-      }
-      quasis[position].push(...patchValue);
-    }
-    return quasis.flatMap((item, index) => index < computedBaseValue.length ? item.concat(computedBaseValue[index]) : item);
-  }
-  function propertyMergeAllOfObject(_ref2, object) {
-    var {
-      baseValue,
-      proxies,
-      context
-    } = _ref2;
-    var computedBaseValue = brickUtils.isObject(baseValue) ? computeRealValue(baseValue, context, true) : {};
-    return proxies.reduce((acc, proxy) => {
-      switch (proxy.mergeMethod) {
-        case "extend":
-          return _objectSpread__default["default"](_objectSpread__default["default"]({}, acc), object[proxy.$$reversedRef]);
-        // istanbul ignore next: should never reach
-        default:
-          throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
-      }
-    }, computedBaseValue);
-  }
-
-  function setupTemplateProxy(proxyContext, ref, slots) {
-    var computedPropsFromProxy = {};
-    var refForProxy;
-    var {
-      reversedProxies,
-      templateProperties,
-      externalSlots,
-      templateContextId,
-      proxyBrick
-    } = proxyContext;
-    if (ref && reversedProxies) {
-      refForProxy = {};
-      proxyBrick.proxyRefs.set(ref, refForProxy);
-
-      // Reversed proxies are used for expand storyboard before rendering page.
-      if (reversedProxies.properties.has(ref)) {
-        Object.assign(computedPropsFromProxy, Object.fromEntries(reversedProxies.properties.get(ref).flatMap(propRef => {
-          // `propValue` is computed.
-          var propValue = templateProperties === null || templateProperties === void 0 ? void 0 : templateProperties[propRef.$$reversedRef];
-          if (isTransformableProperty(propRef)) {
-            return Object.entries(preprocessTransformProperties({
-              [propRef.$$reversedRef]: propValue
-            }, propRef.refTransform));
-          }
-          if (isBasicProperty(propRef)) {
-            return [[propRef.refProperty, propValue]];
-          }
-          // Ignore Variable properties.
-          // And mergeable properties are processed later.
-          return [];
-        }).filter(propRef => propRef[1] !== undefined)));
-
-        // Brick properties can be merged multiple times.
-        if (reversedProxies.mergeBases.has(ref)) {
-          Object.assign(computedPropsFromProxy, Object.fromEntries(Array.from(reversedProxies.mergeBases.get(ref).entries()).map(_ref => {
-            var [mergeProperty, mergeBase] = _ref;
-            return [mergeProperty, propertyMergeAll(mergeBase, templateProperties !== null && templateProperties !== void 0 ? templateProperties : {})];
-          }).filter(item => item[1] !== undefined)));
-        }
-      }
-
-      // Use an approach like template-literal's quasis:
-      // `quasi0${0}quais1${1}quasi2...`
-      // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.
-      var quasisMap = new Map();
-      if (reversedProxies.slots.has(ref)) {
-        for (var item of reversedProxies.slots.get(ref)) {
-          var _item$refPosition, _externalSlots$item$$, _externalSlots$item$$2;
-          if (!quasisMap.has(item.refSlot)) {
-            var quasis = [];
-            // The size of quasis should be the existed slotted bricks' size plus one.
-            var size = brickUtils.hasOwnProperty(slots, item.refSlot) ? slots[item.refSlot].bricks.length + 1 : 1;
-            for (var i = 0; i < size; i += 1) {
-              quasis.push([]);
-            }
-            quasisMap.set(item.refSlot, quasis);
-          }
-          var expandableSlot = quasisMap.get(item.refSlot);
-          var refPosition = (_item$refPosition = item.refPosition) !== null && _item$refPosition !== void 0 ? _item$refPosition : -1;
-          expandableSlot[_.clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...((_externalSlots$item$$ = externalSlots === null || externalSlots === void 0 ? void 0 : (_externalSlots$item$$2 = externalSlots[item.$$reversedRef]) === null || _externalSlots$item$$2 === void 0 ? void 0 : _externalSlots$item$$2.bricks) !== null && _externalSlots$item$$ !== void 0 ? _externalSlots$item$$ : []));
-        }
-      }
-      var _loop = function (slotName, _quasis) {
-        if (!brickUtils.hasOwnProperty(slots, slotName)) {
-          slots[slotName] = {
-            type: "bricks",
-            bricks: []
-          };
-        }
-        var slotConf = slots[slotName];
-        slotConf.bricks = _quasis.flatMap((bricks, index) => index < slotConf.bricks.length ? bricks.concat(slotConf.bricks[index]) : bricks);
-        if (slotConf.bricks.length === 0) {
-          delete slots[slotName];
-        }
-      };
-      for (var [slotName, _quasis] of quasisMap.entries()) {
-        _loop(slotName, _quasis);
-      }
-    }
-    return {
-      [symbolForComputedPropsFromProxy]: computedPropsFromProxy,
-      [symbolForRefForProxy]: refForProxy,
-      [symbolForTplContextId]: templateContextId
-    };
-  }
-
-  function setupUseBrickInTemplate(props, proxyContext) {
-    function walk(props) {
-      if (!props) {
-        return;
-      }
-      for (var [key, value] of Object.entries(props)) {
-        if (brickUtils.isObject(value)) {
-          if (key === "useBrick") {
-            if (Array.isArray(value)) {
-              value.forEach(setup);
-            } else {
-              setup(value);
-            }
-          } else {
-            walk(value);
-          }
-        }
-      }
-    }
-    function setup(item) {
-      var {
-        ref,
-        slots: slotsInTemplate
-      } = item;
-      item.slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref => {
-        var _slotConf$bricks;
-        var [slotName, slotConf] = _ref;
-        return [slotName, {
-          type: "bricks",
-          bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(setup)
-        }];
-      }));
-      Object.assign(item, setupTemplateProxy(proxyContext, ref, item.slots));
-      walk(item.properties);
-      return item;
-    }
-    walk(props);
-  }
-
   var computeRealValue = (value, context, injectDeep, internalOptions) => {
     var preEvaluated = isPreEvaluated(value);
     if (preEvaluated || typeof value === "string") {
@@ -2692,11 +2481,6 @@
   };
   function setProperties(bricks, properties, context, injectDeep) {
     var realProps = computeRealProperties(properties, context, injectDeep);
-    if (context.tplContextId) {
-      setupUseBrickInTemplate(realProps, {
-        templateContextId: context.tplContextId
-      });
-    }
     if (!Array.isArray(bricks)) {
       bricks = [bricks];
     }
@@ -2764,7 +2548,7 @@
     }) : internalOptions;
   }
 
-  var _excluded$6 = ["children"],
+  var _excluded$7 = ["children"],
     _excluded2$2 = ["children"],
     _excluded3 = ["items", "app"];
   var symbolAppId = Symbol("appId");
@@ -3027,7 +2811,7 @@
         var {
             children
           } = _ref,
-          rest = _objectWithoutProperties__default["default"](_ref, _excluded$6);
+          rest = _objectWithoutProperties__default["default"](_ref, _excluded$7);
         var overrideAppId = rest[symbolAppId];
         if (!rest[symbolMenuI18nNamespace] && overrideAppId !== contextAppId && !appIds.has(overrideAppId) && attemptToVisit(rest, ["I18N"])) {
           appIds.add(overrideAppId);
@@ -3138,7 +2922,7 @@
   function _computeRealValueWithOverrideApp() {
     _computeRealValueWithOverrideApp = _asyncToGenerator__default["default"](function* (data, overrideAppId, context, kernel) {
       var newContext = context;
-      if (overrideAppId !== context.app.id && attemptToVisit(data, ["APP", "I18N"])) {
+      if (overrideAppId !== context.app.id && attemptToVisit(data, ["APP", "I18N", "IMG"])) {
         if (window.STANDALONE_MICRO_APPS) {
           if (data[symbolOverrideApp]) {
             data[symbolOverrideApp].config = brickUtils.deepFreeze(_.merge({}, data[symbolOverrideApp].defaultConfig, data[symbolOverrideApp].userConfig));
@@ -3649,7 +3433,7 @@
     return kernel.loadDynamicBricksInBrickConf(brickConf);
   }
 
-  var _excluded$5 = ["extraQuery", "clear", "keepHash"];
+  var _excluded$6 = ["extraQuery", "clear", "keepHash"];
   var blocked = false;
   function getUserConfirmation(message, callback) {
     blocked = !confirm(message);
@@ -3679,7 +3463,7 @@
             clear,
             keepHash
           } = options,
-          state = _objectWithoutProperties__default["default"](options, _excluded$5);
+          state = _objectWithoutProperties__default["default"](options, _excluded$6);
         var urlSearchParams = new URLSearchParams(clear ? "" : browserHistory.location.search);
         var params = {};
         Object.assign(params, query, extraQuery);
@@ -6750,7 +6534,7 @@
     };
   }();
 
-  var _excluded$4 = ["feature_flags"],
+  var _excluded$5 = ["feature_flags"],
     _excluded2$1 = ["featureFlags", "misc"];
   function standaloneBootstrap() {
     return _standaloneBootstrap.apply(this, arguments);
@@ -6796,7 +6580,7 @@
           var {
               feature_flags: featureFlags
             } = sys_settings,
-            rest = _objectWithoutProperties__default["default"](sys_settings, _excluded$4);
+            rest = _objectWithoutProperties__default["default"](sys_settings, _excluded$5);
           settings = _objectSpread__default["default"]({
             featureFlags
           }, rest);
@@ -7754,6 +7538,28 @@
   var filterProperties = ["instanceId", "brick", "slots", "properties", "events", "if", "context", "bricks", "mountPoint"];
   var symbolForFormContextId = Symbol.for("form.contextId");
 
+  var customTemplateRegistry = new Map();
+  var appRegistered = new Set();
+  var symbolForComputedPropsFromProxy = Symbol.for("tpl.computedPropsFromProxy");
+  var symbolForRefForProxy = Symbol.for("tpl.refForProxy");
+  var symbolForTplContextId = Symbol.for("tpl.contextId");
+
+  function isBasicProperty(propRef) {
+    return !!propRef.refProperty;
+  }
+  function isTransformableProperty(propRef) {
+    return !!propRef.refTransform;
+  }
+  function isMergeableProperty(propRef) {
+    return !!propRef.mergeProperty;
+  }
+  function isRefProperty(propRef) {
+    return !!propRef.ref;
+  }
+  function isVariableProperty(propRef) {
+    return !!propRef.asVariable;
+  }
+
   function collectRefsInTemplate(template) {
     var refMap = new Map();
     collectRefsInBrickConfs(template.bricks, refMap);
@@ -7809,6 +7615,207 @@
     }
   }
 
+  function propertyMerge(conf, value, object) {
+    return propertyMergeAll(conf.$$mergeBase, Object.fromEntries(conf.$$mergeBase.proxies.map(proxy => [proxy.$$reversedRef, proxy === conf ? value : object[proxy.$$reversedRef]])));
+  }
+  function propertyMergeAll(mergeBase, object) {
+    if (mergeBase.mergeType === "array") {
+      return propertyMergeAllOfArray(mergeBase, object);
+    }
+    if (mergeBase.mergeType === "object") {
+      return propertyMergeAllOfObject(mergeBase, object);
+    }
+    // istanbul ignore next: should never reach
+    throw new TypeError("unsupported mergeType: \"".concat(mergeBase.mergeType, "\""));
+  }
+  function propertyMergeAllOfArray(_ref, object) {
+    var _$1, _proxy$mergeArgs;
+    var {
+      baseValue,
+      context,
+      proxies
+    } = _ref;
+    // Use an approach like template-literal's quasis:
+    // `quasi0${0}quais1${1}quasi2...`
+    // Every quasi can be merged with multiple items.
+    var computedBaseValue = Array.isArray(baseValue) ? computeRealValue(baseValue, context, true, {
+      $$lazyForUseBrick: true
+    }) : [];
+    var quasis = [];
+    var size = computedBaseValue.length + 1;
+    for (var i = 0; i < size; i += 1) {
+      quasis.push([]);
+    }
+    for (var proxy of proxies) {
+      var position = void 0;
+      switch (proxy.mergeMethod) {
+        case "append":
+          position = computedBaseValue.length;
+          break;
+        case "prepend":
+          position = 0;
+          break;
+        case "insertAt":
+          // Defaults to `-1`.
+          position = (_$1 = (_proxy$mergeArgs = proxy.mergeArgs) === null || _proxy$mergeArgs === void 0 ? void 0 : _proxy$mergeArgs[0]) !== null && _$1 !== void 0 ? _$1 : -1;
+          if (position < 0) {
+            // It's counted from the end if position is negative.
+            position += quasis.length;
+          }
+          position = _.clamp(position, 0, computedBaseValue.length);
+          break;
+        // istanbul ignore next: should never reach
+        default:
+          throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
+      }
+      var patchValue = object[proxy.$$reversedRef];
+      if (!Array.isArray(patchValue)) {
+        patchValue = [];
+      }
+      quasis[position].push(...patchValue);
+    }
+    return quasis.flatMap((item, index) => index < computedBaseValue.length ? item.concat(computedBaseValue[index]) : item);
+  }
+  function propertyMergeAllOfObject(_ref2, object) {
+    var {
+      baseValue,
+      proxies,
+      context
+    } = _ref2;
+    var computedBaseValue = brickUtils.isObject(baseValue) ? computeRealValue(baseValue, context, true) : {};
+    return proxies.reduce((acc, proxy) => {
+      switch (proxy.mergeMethod) {
+        case "extend":
+          return _objectSpread__default["default"](_objectSpread__default["default"]({}, acc), object[proxy.$$reversedRef]);
+        // istanbul ignore next: should never reach
+        default:
+          throw new TypeError("unsupported mergeMethod: \"".concat(proxy.mergeMethod, "\" for mergeType \"").concat(proxy.mergeType, "\""));
+      }
+    }, computedBaseValue);
+  }
+
+  function setupTemplateProxy(proxyContext, ref, slots) {
+    var computedPropsFromProxy = {};
+    var refForProxy;
+    var {
+      reversedProxies,
+      templateProperties,
+      externalSlots,
+      templateContextId,
+      proxyBrick
+    } = proxyContext;
+    if (ref && reversedProxies) {
+      refForProxy = {};
+      proxyBrick.proxyRefs.set(ref, refForProxy);
+
+      // Reversed proxies are used for expand storyboard before rendering page.
+      if (reversedProxies.properties.has(ref)) {
+        Object.assign(computedPropsFromProxy, Object.fromEntries(reversedProxies.properties.get(ref).flatMap(propRef => {
+          // `propValue` is computed.
+          var propValue = templateProperties === null || templateProperties === void 0 ? void 0 : templateProperties[propRef.$$reversedRef];
+          if (isTransformableProperty(propRef)) {
+            return Object.entries(preprocessTransformProperties({
+              [propRef.$$reversedRef]: propValue
+            }, propRef.refTransform));
+          }
+          if (isBasicProperty(propRef)) {
+            return [[propRef.refProperty, propValue]];
+          }
+          // Ignore Variable properties.
+          // And mergeable properties are processed later.
+          return [];
+        }).filter(propRef => propRef[1] !== undefined)));
+
+        // Brick properties can be merged multiple times.
+        if (reversedProxies.mergeBases.has(ref)) {
+          Object.assign(computedPropsFromProxy, Object.fromEntries(Array.from(reversedProxies.mergeBases.get(ref).entries()).map(_ref => {
+            var [mergeProperty, mergeBase] = _ref;
+            return [mergeProperty, propertyMergeAll(mergeBase, templateProperties !== null && templateProperties !== void 0 ? templateProperties : {})];
+          }).filter(item => item[1] !== undefined)));
+        }
+      }
+
+      // Use an approach like template-literal's quasis:
+      // `quasi0${0}quais1${1}quasi2...`
+      // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.
+      var quasisMap = new Map();
+      if (reversedProxies.slots.has(ref)) {
+        for (var item of reversedProxies.slots.get(ref)) {
+          var _item$refPosition, _externalSlots$item$$, _externalSlots$item$$2;
+          if (!quasisMap.has(item.refSlot)) {
+            var quasis = [];
+            // The size of quasis should be the existed slotted bricks' size plus one.
+            var size = brickUtils.hasOwnProperty(slots, item.refSlot) ? slots[item.refSlot].bricks.length + 1 : 1;
+            for (var i = 0; i < size; i += 1) {
+              quasis.push([]);
+            }
+            quasisMap.set(item.refSlot, quasis);
+          }
+          var expandableSlot = quasisMap.get(item.refSlot);
+          var refPosition = (_item$refPosition = item.refPosition) !== null && _item$refPosition !== void 0 ? _item$refPosition : -1;
+          expandableSlot[_.clamp(refPosition < 0 ? expandableSlot.length + refPosition : refPosition, 0, expandableSlot.length - 1)].push(...((_externalSlots$item$$ = externalSlots === null || externalSlots === void 0 ? void 0 : (_externalSlots$item$$2 = externalSlots[item.$$reversedRef]) === null || _externalSlots$item$$2 === void 0 ? void 0 : _externalSlots$item$$2.bricks) !== null && _externalSlots$item$$ !== void 0 ? _externalSlots$item$$ : []));
+        }
+      }
+      var _loop = function (slotName, _quasis) {
+        if (!brickUtils.hasOwnProperty(slots, slotName)) {
+          slots[slotName] = {
+            type: "bricks",
+            bricks: []
+          };
+        }
+        var slotConf = slots[slotName];
+        slotConf.bricks = _quasis.flatMap((bricks, index) => index < slotConf.bricks.length ? bricks.concat(slotConf.bricks[index]) : bricks);
+        if (slotConf.bricks.length === 0) {
+          delete slots[slotName];
+        }
+      };
+      for (var [slotName, _quasis] of quasisMap.entries()) {
+        _loop(slotName, _quasis);
+      }
+    }
+    return {
+      [symbolForComputedPropsFromProxy]: computedPropsFromProxy,
+      [symbolForRefForProxy]: refForProxy,
+      [symbolForTplContextId]: templateContextId
+    };
+  }
+
+  var _excluded$4 = ["properties", "slots"];
+  function setupUseBrickInTemplate(props, proxyContext) {
+    function walk(props) {
+      if (!brickUtils.isObject(props)) {
+        return props;
+      }
+      if (Array.isArray(props)) {
+        return props.map(walk);
+      }
+      return Object.fromEntries(Object.entries(props).map(_ref => {
+        var [key, value] = _ref;
+        return brickUtils.isObject(value) && key === "useBrick" ? Array.isArray(value) ? [key, value.map(setup)] : [key, setup(value)] : [key, walk(value)];
+      }).concat(Object.getOwnPropertySymbols(props).map(k => [k, props[k]])));
+    }
+    function setup(item) {
+      var {
+          properties,
+          slots: originalSlots
+        } = item,
+        restConf = _objectWithoutProperties__default["default"](item, _excluded$4);
+      var slots = Object.fromEntries(Object.entries(originalSlots !== null && originalSlots !== void 0 ? originalSlots : {}).map(_ref2 => {
+        var _slotConf$bricks;
+        var [slotName, slotConf] = _ref2;
+        return [slotName, {
+          type: "bricks",
+          bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(setup)
+        }];
+      }));
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, restConf), {}, {
+        properties: walk(properties),
+        slots
+      }, setupTemplateProxy(proxyContext, restConf.ref, slots));
+    }
+    return walk(props);
+  }
+
   var _excluded$3 = ["properties", "slots"],
     _excluded2 = ["ref", "slots"];
   function expandCustomTemplate(brickConf, proxyBrick, context) {
@@ -7965,8 +7972,8 @@
         bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(item => expandBrickInTemplate(item, proxyContext))
       }];
     }));
-    setupUseBrickInTemplate(brickConfInTemplate.properties, proxyContext);
     return _objectSpread__default["default"](_objectSpread__default["default"]({}, restBrickConfInTemplate), {}, {
+      properties: setupUseBrickInTemplate(brickConfInTemplate.properties, proxyContext),
       slots
     }, setupTemplateProxy(proxyContext, ref, slots));
   }