@next-core/brick-kit 2.201.0 → 2.203.0

package/dist/index.bundle.js

@@ -1446,11 +1446,22 @@
         for (var fn of functions) {
           registeredFunctions.set(fn.name, {
             source: fn.source,
-            typescript: fn.typescript
+            typescript: fn.typescript,
+            transformed: fn.transformed
           });
         }
       }
     }
+    function getGlobalVariables(globals) {
+      return supply(globals, getGeneralGlobals(globals, {
+        collectCoverage,
+        widgetId,
+        widgetVersion,
+        app: currentApp,
+        storyboardFunctions,
+        isStoryboardFunction: true
+      }), !!collectCoverage);
+    }
     function getStoryboardFunction(name) {
       var fn = registeredFunctions.get(name);
       if (!fn) {
@@ -1463,35 +1474,39 @@
       if (collectCoverage) {
         collector = collectCoverage.createCollector(name);
       }
-      var precooked = brickUtils.precookFunction(fn.source, {
-        cacheKey: fn,
-        typescript: fn.typescript,
-        hooks: collector && {
-          beforeVisit: collector.beforeVisit
-        }
-      });
-      fn.cooked = brickUtils.cook(precooked.function, fn.source, {
-        rules: {
-          noVar: true
-        },
-        globalVariables: supply(precooked.attemptToVisitGlobals, getGeneralGlobals(precooked.attemptToVisitGlobals, {
-          collectCoverage,
-          widgetId,
-          widgetVersion,
-          app: currentApp,
-          storyboardFunctions,
-          isStoryboardFunction: true
-        }), !!collectCoverage),
-        hooks: _objectSpread__default["default"]({
-          perfCall: needPerf ? duration => {
-            perf(name, fn.source, duration);
-          } : undefined
-        }, collector ? {
-          beforeEvaluate: collector.beforeEvaluate,
-          beforeCall: collector.beforeCall,
-          beforeBranch: collector.beforeBranch
-        } : null)
-      });
+
+      // Do not use transformed functions when collecting coverage.
+      var transformed = !collector && fn.transformed;
+      if (transformed) {
+        var globalVariables = getGlobalVariables(transformed.globals);
+        // Spread globals as params to prevent accessing forbidden globals.
+        // NOTE: in native mode, forbidden globals are declared as `undefined`,
+        // thus accessing them will not throw a ReferenceError.
+        fn.cooked = new Function(...transformed.globals, "\"use strict\";return (".concat(transformed.source, ")"))(...transformed.globals.map(key => brickUtils.hasOwnProperty(globalVariables, key) ? globalVariables[key] : undefined));
+      } else {
+        var precooked = brickUtils.precookFunction(fn.source, {
+          cacheKey: fn,
+          typescript: fn.typescript,
+          hooks: collector && {
+            beforeVisit: collector.beforeVisit
+          }
+        });
+        fn.cooked = brickUtils.cook(precooked.function, fn.source, {
+          rules: {
+            noVar: true
+          },
+          globalVariables: getGlobalVariables(precooked.attemptToVisitGlobals),
+          hooks: _objectSpread__default["default"]({
+            perfCall: needPerf ? duration => {
+              perf(name, fn.source, duration);
+            } : undefined
+          }, collector ? {
+            beforeEvaluate: collector.beforeEvaluate,
+            beforeCall: collector.beforeCall,
+            beforeBranch: collector.beforeBranch
+          } : null)
+        });
+      }
       fn.processed = true;
       return fn.cooked;
     }
@@ -1501,7 +1516,8 @@
       updateStoryboardFunction(name, data) {
         registeredFunctions.set(name, {
           source: data.source,
-          typescript: data.typescript
+          typescript: data.typescript,
+          transformed: data.transformed
         });
       }
     };
@@ -3238,7 +3254,7 @@
     }, computedBaseValue);
   }
 
-  function setupTemplateProxy(proxyContext, ref, slots) {
+  function setupTemplateProxy(proxyContext, ref, slots, slotted) {
     var computedPropsFromProxy = {};
     var refForProxy;
     var {
@@ -3284,6 +3300,9 @@
       // Every quasi (indexed by `refPosition`) can be slotted with multiple bricks.
       var quasisMap = new Map();
       if (reversedProxies.slots.has(ref)) {
+        if (slotted) {
+          throw new Error("Can not have proxied slot ref when the ref target has a slot element child, check your template \"".concat(proxyBrick.type, "\" and ref \"").concat(ref, "\""));
+        }
         for (var item of reversedProxies.slots.get(ref)) {
           var _item$refPosition, _externalSlots$item$$, _externalSlots$item$$2;
           if (!quasisMap.has(item.refSlot)) {
@@ -8435,6 +8454,38 @@
     }
   }
 
+  function isEvaluable(raw) {
+    return /^\s*<%[~=]?\s/.test(raw) && /\s%>\s*$/.test(raw);
+  }
+
+  function replaceSlotWithSlottedBricks(brickConf, proxyContext, expand) {
+    var _brickConf$properties, _brickConf$properties2, _slots$$bricks, _slots, _slots$;
+    // Currently, no support for `if` in a slot.
+    if (brickConf.if != null && !brickConf.if || typeof brickConf.if === "string") {
+      throw new Error("Can not use \"if\" in a slot currently, check your template \"".concat(proxyContext.proxyBrick.type, "\""));
+    }
+    var slot = String((_brickConf$properties = (_brickConf$properties2 = brickConf.properties) === null || _brickConf$properties2 === void 0 ? void 0 : _brickConf$properties2.name) !== null && _brickConf$properties !== void 0 ? _brickConf$properties : "");
+
+    // Currently, no support for expression as slot name.
+    if (isEvaluable(slot)) {
+      throw new Error("Can not use an expression as slot name \"".concat(slot, "\" currently, check your template \"").concat(proxyContext.proxyBrick.type, "\""));
+    }
+
+    // Do not repeat the same slot name in a template.
+    if (proxyContext.usedSlots.has(slot)) {
+      throw new Error("Can not have multiple slots with the same name \"".concat(slot, "\", check your template \"").concat(proxyContext.proxyBrick.type, "\""));
+    }
+    proxyContext.usedSlots.add(slot);
+    if (proxyContext.externalSlots && brickUtils.hasOwnProperty(proxyContext.externalSlots, slot)) {
+      var _proxyContext$externa;
+      var insertBricks = (_proxyContext$externa = proxyContext.externalSlots[slot].bricks) !== null && _proxyContext$externa !== void 0 ? _proxyContext$externa : [];
+      if (insertBricks.length > 0) {
+        return insertBricks;
+      }
+    }
+    return ((_slots$$bricks = (_slots = brickConf.slots) === null || _slots === void 0 ? void 0 : (_slots$ = _slots[""]) === null || _slots$ === void 0 ? void 0 : _slots$.bricks) !== null && _slots$$bricks !== void 0 ? _slots$$bricks : []).flatMap(item => expand(item, proxyContext));
+  }
+
   var _excluded$4 = ["properties", "slots"],
     _excluded2 = ["ref", "slots"];
   function expandCustomTemplate(brickConf, proxyBrick, context) {
@@ -8563,38 +8614,48 @@
       templateProperties,
       externalSlots: externalSlots,
       templateContextId: tplContext.id,
-      proxyBrick
+      proxyBrick,
+      usedSlots: new Set()
     };
     newBrickConf.slots = {
       "": {
         type: "bricks",
-        bricks: bricks.map(item => expandBrickInTemplate(item, proxyContext))
+        bricks: bricks.flatMap(item => expandBrickInTemplate(item, proxyContext))
       }
     };
     return newBrickConf;
   }
-  function expandBrickInTemplate(brickConfInTemplate, proxyContext) {
+  function expandBrickInTemplate(brickConfInTemplate, proxyContext, markSlotted) {
     // Ignore `if: null` to make `looseCheckIf` working.
     if (brickConfInTemplate.if === null) {
       delete brickConfInTemplate.if;
     }
-    var {
+    if (brickConfInTemplate.brick === "slot") {
+      markSlotted === null || markSlotted === void 0 ? void 0 : markSlotted();
+      return replaceSlotWithSlottedBricks(brickConfInTemplate, proxyContext, expandBrickInTemplate);
+    }
+    var _ref = brickConfInTemplate,
+      {
         ref,
         slots: slotsInTemplate
-      } = brickConfInTemplate,
-      restBrickConfInTemplate = _objectWithoutProperties__default["default"](brickConfInTemplate, _excluded2);
-    var slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref => {
+      } = _ref,
+      restBrickConfInTemplate = _objectWithoutProperties__default["default"](_ref, _excluded2);
+    var slotted = false;
+    var markChild = () => {
+      slotted = true;
+    };
+    var slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref2 => {
       var _slotConf$bricks;
-      var [slotName, slotConf] = _ref;
+      var [slotName, slotConf] = _ref2;
       return [slotName, {
         type: "bricks",
-        bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).map(item => expandBrickInTemplate(item, proxyContext))
+        bricks: ((_slotConf$bricks = slotConf.bricks) !== null && _slotConf$bricks !== void 0 ? _slotConf$bricks : []).flatMap(item => expandBrickInTemplate(item, proxyContext, markChild))
       }];
     }));
     return _objectSpread__default["default"](_objectSpread__default["default"]({}, restBrickConfInTemplate), {}, {
       properties: setupUseBrickInTemplate(brickConfInTemplate.properties, proxyContext),
       slots
-    }, setupTemplateProxy(proxyContext, ref, slots));
+    }, setupTemplateProxy(proxyContext, ref, slots, slotted));
   }
 
   // If it's a custom template, return the tag name of the template.