Fix path.evaluate for runtime errors in constant-folding (close #245)

babel · Nov 2, 2016 · bda4c1d · bda4c1d
1 parent eb9df7a
commit bda4c1d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/packages/babel-plugin-minify-constant-folding/__tests__/constant-folding-test.js b/packages/babel-plugin-minify-constant-folding/__tests__/constant-folding-test.js
@@ -49,4 +49,15 @@ describe("constant-folding-plugin", () => {
     `);
     expect(transform(source)).toBe(expected);
   });
+
+  it("should handle runtime errors", () => {
+    const source = unpad(`
+      try {
+        x({
+          toString: 0
+        } + '');
+      } catch (e) {}
+    `);
+    expect(transform(source)).toBe(source);
+  });
 });
diff --git a/packages/babel-plugin-minify-constant-folding/src/index.js b/packages/babel-plugin-minify-constant-folding/src/index.js
@@ -92,7 +92,7 @@ module.exports = ({ types: t, traverse }) => {
           return;
         }
 
-        const res = path.evaluate();
+        const res = evaluate(path);
         if (res.confident) {
           // Avoid fractions because they can be longer than the original expression.
           // There is also issues with number percision?
@@ -118,3 +118,14 @@ module.exports = ({ types: t, traverse }) => {
     },
   };
 };
+
+function evaluate(path) {
+  try {
+    return path.evaluate();
+  } catch (e) {
+    return {
+      confident: false,
+      error: e
+    };
+  }
+}