@next-core/brick-kit 2.201.0 → 2.203.0

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _, { escapeRegExp, set, get, difference, identity, uniqueId, isNil, isEmpty, merge, sortBy, cloneDeep, clamp, orderBy, pick, isObject as isObject$1, uniq, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
-import { toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, isTrackAll, trackAll, trackContext, trackState, trackFormState, transformAndInject, transform, JsonStorage, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, scanPermissionActionsInAny, deepFreeze, scanProcessorsInAny, preevaluate, shouldAllowRecursiveEvaluations, inject, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, snippetEvaluate, scanCustomApisInStoryboard, prefetchScript, scanBricksInBrickConf, loadScript, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, clearExpressionASTCache, clearFunctionASTCache, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable as isEvaluable$1, isTrackAll, trackAll, trackContext, trackState, trackFormState, transformAndInject, transform, JsonStorage, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, scanPermissionActionsInAny, deepFreeze, scanProcessorsInAny, preevaluate, shouldAllowRecursiveEvaluations, inject, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, snippetEvaluate, scanCustomApisInStoryboard, prefetchScript, scanBricksInBrickConf, loadScript, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, clearExpressionASTCache, clearFunctionASTCache, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
 import i18next, { getFixedT } from 'i18next';
@@ -612,7 +612,7 @@ function getTracks(value) {
   var contextNames = false;
   var stateNames = false;
   var formStateNames = false;
-  if (typeof value === "string" ? isEvaluable(value) : isPreEvaluated(value)) {
+  if (typeof value === "string" ? isEvaluable$1(value) : isPreEvaluated(value)) {
     var raw = typeof value === "string" ? value : getPreEvaluatedRaw(value);
     if (isTrackAll(raw)) {
       var result = trackAll(raw);
@@ -663,7 +663,7 @@ function doTransform(data, to, options) {
     }
     var result;
     var dismissRecursiveMarkingInjected = false;
-    if (preEvaluated || isEvaluable(to)) {
+    if (preEvaluated || isEvaluable$1(to)) {
       var runtimeContext = {
         data
       };
@@ -690,7 +690,7 @@ function doTransform(data, to, options) {
   // Get both string and symbol keys.
   Object.entries(to).map(_ref => {
     var [k, v] = _ref;
-    if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && (typeof v === "string" ? isEvaluable(v) : isPreEvaluated(v))) {
+    if (Array.isArray(options === null || options === void 0 ? void 0 : options.trackingContextList) && (typeof v === "string" ? isEvaluable$1(v) : isPreEvaluated(v))) {
       var raw;
       if (typeof v === "string") {
         raw = v;
@@ -1448,11 +1448,22 @@ function StoryboardFunctionRegistryFactory() {
       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) {
@@ -1465,35 +1476,39 @@ function StoryboardFunctionRegistryFactory() {
     if (collectCoverage) {
       collector = collectCoverage.createCollector(name);
     }
-    var precooked = precookFunction(fn.source, {
-      cacheKey: fn,
-      typescript: fn.typescript,
-      hooks: collector && {
-        beforeVisit: collector.beforeVisit
-      }
-    });
-    fn.cooked = 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({
-        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 => hasOwnProperty(globalVariables, key) ? globalVariables[key] : undefined));
+    } else {
+      var precooked = precookFunction(fn.source, {
+        cacheKey: fn,
+        typescript: fn.typescript,
+        hooks: collector && {
+          beforeVisit: collector.beforeVisit
+        }
+      });
+      fn.cooked = cook(precooked.function, fn.source, {
+        rules: {
+          noVar: true
+        },
+        globalVariables: getGlobalVariables(precooked.attemptToVisitGlobals),
+        hooks: _objectSpread({
+          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;
   }
@@ -1503,7 +1518,8 @@ function StoryboardFunctionRegistryFactory() {
     updateStoryboardFunction(name, data) {
       registeredFunctions.set(name, {
         source: data.source,
-        typescript: data.typescript
+        typescript: data.typescript,
+        transformed: data.transformed
       });
     }
   };
@@ -2725,7 +2741,7 @@ function sortMenuItems(list) {
 function attemptToVisit(data, globals) {
   var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
   if (typeof data === "string") {
-    if (isEvaluable(data)) {
+    if (isEvaluable$1(data)) {
       if (globals.some(key => data.includes(key))) {
         var {
           attemptToVisitGlobals
@@ -2762,7 +2778,7 @@ function _computeRealValueWithOverrideApp() {
     if ("if" in data && data.if === null) {
       delete data.if;
     }
-    if ("to" in data && data.to && !isEvaluable(data.to)) {
+    if ("to" in data && data.to && !isEvaluable$1(data.to)) {
       var yaml = pipes.yaml(data.to);
       if (isObject(yaml) && ["pathname", "search", "hash"].some(key => hasOwnProperty(yaml, key))) {
         data.to = yaml;
@@ -2879,7 +2895,7 @@ function evaluate(raw) {
   var _runtimeContext$overr;
   var runtimeContext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  if (options.isReEvaluation && !(typeof raw === "string" && isEvaluable(raw))) {
+  if (options.isReEvaluation && !(typeof raw === "string" && isEvaluable$1(raw))) {
     devtoolsHookEmit("re-evaluation", {
       id: options.evaluationId,
       detail: {
@@ -3240,7 +3256,7 @@ function propertyMergeAllOfObject(_ref2, object) {
   }, computedBaseValue);
 }
 
-function setupTemplateProxy(proxyContext, ref, slots) {
+function setupTemplateProxy(proxyContext, ref, slots, slotted) {
   var computedPropsFromProxy = {};
   var refForProxy;
   var {
@@ -3286,6 +3302,9 @@ function setupTemplateProxy(proxyContext, ref, slots) {
     // 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)) {
@@ -3373,7 +3392,7 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
     var lazy = (internalOptions === null || internalOptions === void 0 ? void 0 : internalOptions.$$lazyForUseBrick) && isLazyContentInUseBrick(internalOptions.$$stateOfUseBrick);
     var result;
     var dismissRecursiveMarkingInjected = lazy;
-    if (preEvaluated || isEvaluable(value)) {
+    if (preEvaluated || isEvaluable$1(value)) {
       var runtimeContext = {};
       if (context) {
         var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace", "formContextId", "query", "match", "app", "segues"];
@@ -6733,7 +6752,7 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
     var rawTargetRef = handler.targetRef;
     var computedTarget = rawTarget;
     // Allow `target` to be set as evaluable string.
-    if (typeof rawTarget === "string" ? isEvaluable(rawTarget) : isPreEvaluated(rawTarget)) {
+    if (typeof rawTarget === "string" ? isEvaluable$1(rawTarget) : isPreEvaluated(rawTarget)) {
       computedTarget = computeRealValue(rawTarget, _objectSpread(_objectSpread({}, context), {}, {
         event
       }));
@@ -6759,7 +6778,7 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
     } else if (rawTargetRef) {
       var computedTargetRef = rawTargetRef;
       // Allow `targetRef` to be set as evaluable string.
-      if (typeof rawTargetRef === "string" ? isEvaluable(rawTargetRef) : isPreEvaluated(rawTargetRef)) {
+      if (typeof rawTargetRef === "string" ? isEvaluable$1(rawTargetRef) : isPreEvaluated(rawTargetRef)) {
         computedTargetRef = computeRealValue(rawTargetRef, _objectSpread(_objectSpread({}, context), {}, {
           event
         }), true);
@@ -8437,6 +8456,38 @@ function collectMergeBases(conf, mergeBases, contextInTemplate, refToBrickConf)
   }
 }
 
+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 && 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) {
@@ -8565,38 +8616,48 @@ function lowLevelExpandCustomTemplate(template, brickConf, proxyBrick, context,
     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(brickConfInTemplate, _excluded2);
-  var slots = Object.fromEntries(Object.entries(slotsInTemplate !== null && slotsInTemplate !== void 0 ? slotsInTemplate : {}).map(_ref => {
+    } = _ref,
+    restBrickConfInTemplate = _objectWithoutProperties(_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(_objectSpread({}, 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.
@@ -15209,7 +15270,7 @@ function getRealValue(value) {
   }
   var compute = data => {
     if (typeof data === "string") {
-      if (isEvaluable(data)) {
+      if (isEvaluable$1(data)) {
         var result = evaluate(data, ctx);
         recursiveMarkAsInjected(result);
         return result;