@next-core/brick-utils 2.31.3 → 2.32.1

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.32.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.32.0...@next-core/brick-utils@2.32.1) (2021-12-28)
+
+
+### Bug Fixes
+
+* refine visiting storyboard ([5352ba4](https://github.com/easyops-cn/next-core/commit/5352ba460a333094e74a38257488085ebdad649e))
+
+
+
+
+
+# [2.32.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.31.5...@next-core/brick-utils@2.32.0) (2021-12-28)
+
+
+### Features
+
+* refine storyboard functions and expressions ([6626c61](https://github.com/easyops-cn/next-core/commit/6626c61bd910864daaa81be946f765630cfb8103))
+
+
+
+
+
+## [2.31.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.31.4...@next-core/brick-utils@2.31.5) (2021-12-24)
+
+**Note:** Version bump only for package @next-core/brick-utils
+
+
+
+
+
+## [2.31.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.31.3...@next-core/brick-utils@2.31.4) (2021-12-23)
+
+**Note:** Version bump only for package @next-core/brick-utils
+
+
+
+
+
 ## [2.31.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-utils@2.31.2...@next-core/brick-utils@2.31.3) (2021-12-17)
 
 **Note:** Version bump only for package @next-core/brick-utils

package/dist/index.bundle.js

@@ -19336,6 +19336,70 @@
     /* noop */
   }
 
+  function visitStoryboardFunctions(functions, beforeVisitGlobal) {
+    if (Array.isArray(functions)) {
+      for (var fn of functions) {
+        try {
+          precookFunction(fn.source, {
+            typescript: fn.typescript,
+            withParent: true,
+            hooks: {
+              beforeVisitGlobal
+            }
+          });
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.error("Parse storyboard function \"".concat(fn.name, "\" failed:"), error);
+        }
+      }
+    }
+  }
+  function visitStoryboardExpressions(data, beforeVisitGlobal, // If `options` is a string, it means the *keyword*.
+  options) {
+    var memo = new WeakSet();
+    var {
+      matchExpressionString,
+      visitNonExpressionString,
+      visitObject
+    } = typeof options === "string" ? {
+      matchExpressionString: v => v.includes(options)
+    } : options;
+
+    function visit(value) {
+      if (typeof value === "string") {
+        if (matchExpressionString(value) && isEvaluable(value)) {
+          try {
+            preevaluate(value, {
+              withParent: true,
+              hooks: {
+                beforeVisitGlobal
+              }
+            });
+          } catch (error) {
+            // eslint-disable-next-line no-console
+            console.error("Parse storyboard expression failed:", error);
+          }
+        } else {
+          visitNonExpressionString === null || visitNonExpressionString === void 0 ? void 0 : visitNonExpressionString(value);
+        }
+      } else if (isObject(value)) {
+        // Avoid call stack overflow.
+        if (memo.has(value)) {
+          return;
+        }
+
+        memo.add(value);
+        visitObject === null || visitObject === void 0 ? void 0 : visitObject(value);
+
+        for (var item of Array.isArray(value) ? value : Object.values(value)) {
+          visit(item);
+        }
+      }
+    }
+
+    visit(data);
+  }
+
   var PROCESSORS = "PROCESSORS";
   function scanProcessorsInStoryboard(storyboard) {
     var _storyboard$meta;
@@ -19346,50 +19410,21 @@
   function scanProcessorsInAny(data) {
     var isUniq = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     var collection = [];
-    collectProcessors(data, collection);
+    visitStoryboardExpressions(data, beforeVisitProcessorsFactory(collection), PROCESSORS);
     return isUniq ? lodash.uniq(collection) : collection;
   }
 
-  function collectProcessors(data, collection) {
-    var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
-
-    if (typeof data === "string") {
-      if (data.includes(PROCESSORS) && isEvaluable(data)) {
-        preevaluate(data, {
-          withParent: true,
-          hooks: {
-            beforeVisitGlobal(node, parent) {
-              if (node.name === PROCESSORS) {
-                var memberParent = parent[parent.length - 1];
-                var outerMemberParent = parent[parent.length - 2];
-
-                if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && (outerMemberParent === null || outerMemberParent === void 0 ? void 0 : outerMemberParent.node.type) === "MemberExpression" && outerMemberParent.key === "object" && !outerMemberParent.node.computed && outerMemberParent.node.property.type === "Identifier") {
-                  collection.push("".concat(memberParent.node.property.name, ".").concat(outerMemberParent.node.property.name));
-                }
-              }
-            }
-
-          }
-        });
-      }
-    } else if (isObject(data)) {
-      // Avoid call stack overflow.
-      if (memo.has(data)) {
-        return;
-      }
-
-      memo.add(data);
+  function beforeVisitProcessorsFactory(collection) {
+    return function beforeVisitProcessors(node, parent) {
+      if (node.name === PROCESSORS) {
+        var memberParent = parent[parent.length - 1];
+        var outerMemberParent = parent[parent.length - 2];
 
-      if (Array.isArray(data)) {
-        for (var item of data) {
-          collectProcessors(item, collection, memo);
-        }
-      } else {
-        for (var _item of Object.values(data)) {
-          collectProcessors(_item, collection, memo);
+        if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && (outerMemberParent === null || outerMemberParent === void 0 ? void 0 : outerMemberParent.node.type) === "MemberExpression" && outerMemberParent.key === "object" && !outerMemberParent.node.computed && outerMemberParent.node.property.type === "Identifier") {
+          collection.push("".concat(memberParent.node.property.name, ".").concat(outerMemberParent.node.property.name));
         }
       }
-    }
+    };
   }
 
   function getDllAndDepsOfStoryboard(storyboard, brickPackages, options) {
@@ -20142,58 +20177,37 @@
   function scanPermissionActionsInStoryboard(storyboard) {
     var _storyboard$meta;
 
-    return scanPermissionActionsInAny([storyboard.routes, (_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.customTemplates]);
+    var collection = new Set();
+    var beforeVisitPermissions = beforeVisitPermissionsFactory(collection);
+    var {
+      customTemplates,
+      functions
+    } = (_storyboard$meta = storyboard.meta) !== null && _storyboard$meta !== void 0 ? _storyboard$meta : {};
+    visitStoryboardExpressions([storyboard.routes, customTemplates], beforeVisitPermissions, PERMISSIONS);
+    visitStoryboardFunctions(functions, beforeVisitPermissions);
+    return Array.from(collection);
   }
   function scanPermissionActionsInAny(data) {
     var collection = new Set();
-    collectPermissionActions(data, collection);
+    visitStoryboardExpressions(data, beforeVisitPermissionsFactory(collection), PERMISSIONS);
     return Array.from(collection);
   }
 
-  function collectPermissionActions(data, collection) {
-    var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
-
-    if (typeof data === "string") {
-      if (data.includes(PERMISSIONS) && isEvaluable(data)) {
-        preevaluate(data, {
-          withParent: true,
-          hooks: {
-            beforeVisitGlobal(node, parent) {
-              if (node.name === PERMISSIONS) {
-                var memberParent = parent[parent.length - 1];
-                var callParent = parent[parent.length - 2];
-
-                if ((callParent === null || callParent === void 0 ? void 0 : callParent.node.type) === "CallExpression" && (callParent === null || callParent === void 0 ? void 0 : callParent.key) === "callee" && (memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && memberParent.node.property.name === check) {
-                  for (var arg of callParent.node.arguments) {
-                    if (arg.type === "Literal" && typeof arg.value === "string") {
-                      collection.add(arg.value);
-                    }
-                  }
-                }
-              }
-            }
+  function beforeVisitPermissionsFactory(collection) {
+    return function beforeVisitPermissions(node, parent) {
+      if (node.name === PERMISSIONS) {
+        var memberParent = parent[parent.length - 1];
+        var callParent = parent[parent.length - 2];
 
+        if ((callParent === null || callParent === void 0 ? void 0 : callParent.node.type) === "CallExpression" && (callParent === null || callParent === void 0 ? void 0 : callParent.key) === "callee" && (memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object" && !memberParent.node.computed && memberParent.node.property.type === "Identifier" && memberParent.node.property.name === check) {
+          for (var arg of callParent.node.arguments) {
+            if (arg.type === "Literal" && typeof arg.value === "string") {
+              collection.add(arg.value);
+            }
           }
-        });
-      }
-    } else if (isObject(data)) {
-      // Avoid call stack overflow.
-      if (memo.has(data)) {
-        return;
-      }
-
-      memo.add(data);
-
-      if (Array.isArray(data)) {
-        for (var item of data) {
-          collectPermissionActions(item, collection, memo);
-        }
-      } else {
-        for (var _item of Object.values(data)) {
-          collectPermissionActions(_item, collection, memo);
         }
       }
-    }
+    };
   }
 
   function scanRouteAliasInStoryboard(storyboard) {
@@ -20253,69 +20267,25 @@
     var _storyboard$meta;
 
     var collection = new Map();
-    var beforeVisitGlobal = beforeVisitGlobalFactory(collection); // Notice: `menus` may contain evaluations of I18N too.
+    var beforeVisitI18n = beforeVisitI18nFactory(collection); // Notice: `menus` may contain evaluations of I18N too.
 
     var {
       customTemplates,
       menus,
       functions
     } = (_storyboard$meta = storyboard.meta) !== null && _storyboard$meta !== void 0 ? _storyboard$meta : {};
-    collectI18N([storyboard.routes, customTemplates, menus], beforeVisitGlobal);
-
-    if (Array.isArray(functions)) {
-      for (var fn of functions) {
-        precookFunction(fn.source, {
-          typescript: fn.typescript,
-          withParent: true,
-          hooks: {
-            beforeVisitGlobal
-          }
-        });
-      }
-    }
-
+    visitStoryboardExpressions([storyboard.routes, customTemplates, menus], beforeVisitI18n, I18N);
+    visitStoryboardFunctions(functions, beforeVisitI18n);
     return collection;
   }
   function scanI18NInAny(data) {
     var collection = new Map();
-    collectI18N(data, beforeVisitGlobalFactory(collection));
+    visitStoryboardExpressions(data, beforeVisitI18nFactory(collection), I18N);
     return collection;
   }
 
-  function collectI18N(data, beforeVisitGlobal) {
-    var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
-
-    if (typeof data === "string") {
-      if (data.includes(I18N) && isEvaluable(data)) {
-        preevaluate(data, {
-          withParent: true,
-          hooks: {
-            beforeVisitGlobal
-          }
-        });
-      }
-    } else if (isObject(data)) {
-      // Avoid call stack overflow.
-      if (memo.has(data)) {
-        return;
-      }
-
-      memo.add(data);
-
-      if (Array.isArray(data)) {
-        for (var item of data) {
-          collectI18N(item, beforeVisitGlobal, memo);
-        }
-      } else {
-        for (var _item of Object.values(data)) {
-          collectI18N(_item, beforeVisitGlobal, memo);
-        }
-      }
-    }
-  }
-
-  function beforeVisitGlobalFactory(collection) {
-    return function beforeVisitGlobal(node, parent) {
+  function beforeVisitI18nFactory(collection) {
+    return function beforeVisitI18n(node, parent) {
       if (node.name === I18N) {
         var callParent = parent[parent.length - 1];
 
@@ -20924,6 +20894,7 @@
     convertUnitValueByPrecision: convertValueByPrecision
   } = pipes.utils;
 
+  var CTX$1 = "CTX";
   function resolveContextConcurrently(_x, _x2) {
     return _resolveContextConcurrently.apply(this, arguments);
   }
@@ -20999,9 +20970,7 @@
       };
 
       if (!_contextConf.property) {
-        collectContexts(_contextConf.if, stats);
-        collectContexts(_contextConf.value, stats);
-        collectContexts(_contextConf.resolve, stats);
+        visitStoryboardExpressions([_contextConf.if, _contextConf.value, _contextConf.resolve], beforeVisitContextFactory(stats), CTX$1);
       }
 
       depsMap.set(_contextConf, stats);
@@ -21009,60 +20978,30 @@
 
     return depsMap;
   }
-  var CTX$1 = "CTX";
 
-  function collectContexts(data, stats) {
-    var memo = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : new WeakSet();
-
-    if (typeof data === "string") {
-      if (data.includes(CTX$1) && isEvaluable(data)) {
-        preevaluate(data, {
-          withParent: true,
-          hooks: {
-            beforeVisitGlobal(node, parent) {
-              if (node.name === CTX$1) {
-                var memberParent = parent[parent.length - 1];
-
-                if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
-                  var memberNode = memberParent.node;
-                  var dep;
-
-                  if (!memberNode.computed && memberNode.property.type === "Identifier") {
-                    dep = memberNode.property.name;
-                  } else if (memberNode.computed && memberNode.property.type === "Literal" && typeof memberNode.property.value === "string") {
-                    dep = memberNode.property.value;
-                  } else {
-                    stats.includesComputed = true;
-                  }
+  function beforeVisitContextFactory(stats) {
+    return function beforeVisitContext(node, parent) {
+      if (node.name === CTX$1) {
+        var memberParent = parent[parent.length - 1];
 
-                  if (dep !== undefined && !stats.dependencies.includes(dep)) {
-                    stats.dependencies.push(dep);
-                  }
-                }
-              }
-            }
+        if ((memberParent === null || memberParent === void 0 ? void 0 : memberParent.node.type) === "MemberExpression" && memberParent.key === "object") {
+          var memberNode = memberParent.node;
+          var dep;
 
+          if (!memberNode.computed && memberNode.property.type === "Identifier") {
+            dep = memberNode.property.name;
+          } else if (memberNode.computed && memberNode.property.type === "Literal" && typeof memberNode.property.value === "string") {
+            dep = memberNode.property.value;
+          } else {
+            stats.includesComputed = true;
           }
-        });
-      }
-    } else if (isObject(data)) {
-      // Avoid call stack overflow.
-      if (memo.has(data)) {
-        return;
-      }
 
-      memo.add(data);
-
-      if (Array.isArray(data)) {
-        for (var item of data) {
-          collectContexts(item, stats, memo);
-        }
-      } else {
-        for (var _item of Object.values(data)) {
-          collectContexts(_item, stats, memo);
+          if (dep !== undefined && !stats.dependencies.includes(dep)) {
+            stats.dependencies.push(dep);
+          }
         }
       }
-    }
+    };
   }
 
   function detectCircularContexts(dependencyMap) {
@@ -21466,6 +21405,8 @@
   exports.trackContext = trackContext;
   exports.transform = transform;
   exports.transformAndInject = transformAndInject;
+  exports.visitStoryboardExpressions = visitStoryboardExpressions;
+  exports.visitStoryboardFunctions = visitStoryboardFunctions;
 
   Object.defineProperty(exports, '__esModule', { value: true });