@next-core/brick-utils 2.51.4 → 2.51.5

package/dist/index.bundle.js

@@ -20283,68 +20283,92 @@
 
     // Then, we remove dead conditions accordingly.
     traverse(ast, node => {
-      var rawContainer;
-      var conditionalNodes;
-      var rawKey;
-      var deleteEmptyArray = false;
+      // let conditionalNodes: ConditionalStoryboardNode[];
+      // let rawContainer: any;
+      // let rawKey: string;
+      // let deleteEmptyArray = false;
+      // let isUseBrickEntry = false;
+      // let keepConditionalHandlers = false;
+
       switch (node.type) {
         case "Root":
-          conditionalNodes = node.routes;
-          rawContainer = node.raw;
-          rawKey = "routes";
+          shakeConditionalNodes(node.routes, node.raw, "routes");
           break;
         case "Template":
-          conditionalNodes = node.bricks;
-          rawContainer = node.raw;
-          rawKey = "bricks";
+          shakeConditionalNodes(node.bricks, node.raw, "bricks");
           break;
         case "Route":
         case "Slot":
-          conditionalNodes = node.children;
-          rawContainer = node.raw;
-          rawKey = node.raw.type === "routes" ? "routes" : "bricks";
+          shakeConditionalNodes(node.children, node.raw, node.raw.type === "routes" ? "routes" : "bricks");
           break;
         case "Event":
         case "EventCallback":
         case "SimpleLifeCycle":
         case "ConditionalEvent":
-          conditionalNodes = node.handlers;
-          rawContainer = node.rawContainer;
-          rawKey = node.rawKey;
-          deleteEmptyArray = true;
+          shakeConditionalNodes(node.handlers, node.rawContainer, node.rawKey, {
+            deleteEmptyArray: true,
+            keepConditionalHandlers: true
+          });
           break;
         case "ResolveLifeCycle":
-          conditionalNodes = node.resolves;
-          rawContainer = node.rawContainer;
-          rawKey = node.rawKey;
-          deleteEmptyArray = true;
+          shakeConditionalNodes(node.resolves, node.rawContainer, node.rawKey, {
+            deleteEmptyArray: true
+          });
           break;
         case "UseBrickEntry":
-          conditionalNodes = node.children;
-          rawContainer = node.rawContainer;
-          rawKey = node.rawKey;
+          shakeConditionalNodes(node.children, node.rawContainer, node.rawKey, {
+            isUseBrickEntry: true
+          });
+          break;
+        case "EventHandler":
+          shakeConditionalNodes(node.then, node.raw, "then");
+          shakeConditionalNodes(node.else, node.raw, "else");
           break;
       }
-      shakeConditionalNodes(node, rawContainer, conditionalNodes, rawKey, deleteEmptyArray);
 
       // Remove unreachable context/state.
-      deleteEmptyArray = false;
       switch (node.type) {
         case "Route":
         case "Brick":
         case "Template":
-          rawContainer = node.raw;
-          rawKey = node.type === "Template" ? "state" : "context";
-          conditionalNodes = node.context;
-          break;
+          shakeConditionalNodes(node.context, node.raw, node.type === "Template" ? "state" : "context");
       }
-      shakeConditionalNodes(node, rawContainer, conditionalNodes, rawKey, deleteEmptyArray);
     });
   }
-  function shakeConditionalNodes(node, rawContainer, conditionalNodes, rawKey, deleteEmptyArray) {
-    var removedNodes = lodash.remove(conditionalNodes, node => node.raw.if === false);
+  function shakeConditionalNodes(conditionalNodes, rawContainer, rawKey) {
+    var {
+      deleteEmptyArray,
+      isUseBrickEntry,
+      keepConditionalHandlers
+    } = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    var removedNodes = [];
+    if (Array.isArray(conditionalNodes)) {
+      for (var node of conditionalNodes) {
+        var _else;
+        if (keepConditionalHandlers && (_else = node.else) !== null && _else !== void 0 && _else.length) {
+          switch (node.raw.if) {
+            case false:
+              node.then = node.else;
+              node.else = [];
+              node.raw.then = node.raw.else;
+              delete node.raw.else;
+              delete node.raw.if;
+              continue;
+            case true:
+            case undefined:
+              node.else = [];
+              delete node.raw.else;
+              continue;
+          }
+        }
+        if (node.raw.if === false) {
+          removedNodes.push(node);
+        }
+      }
+    }
+    lodash.pull(conditionalNodes, ...removedNodes);
     if (removedNodes.length > 0) {
-      if (node.type === "UseBrickEntry" && !Array.isArray(rawContainer[rawKey])) {
+      if (isUseBrickEntry && !Array.isArray(rawContainer[rawKey])) {
         rawContainer[rawKey] = {
           brick: "div",
           if: false
@@ -20392,6 +20416,8 @@
                 console.warn("[removed dead if]:", ifContainer.if, ifContainer);
               }
               ifContainer.if = false;
+            } else if (isConstantLogical(expression, true, options)) {
+              ifContainer.if = true;
             }
             return;
           }