support &&

walaura · walaura · commit c791455637df · 2019-12-05T16:38:40.000Z
diff --git a/scripts/eslint-rules/__tests__/no-production-logging-test.internal.js b/scripts/eslint-rules/__tests__/no-production-logging-test.internal.js
@@ -24,7 +24,11 @@ ruleTester.run('no-production-logging', rule, {
     },
     /* calls wrapped on an outer bound */
     {
-      code: 'if (__DEV__) { if (potato) { while (true) { warning(test) }}}',
+      code: 'if (__DEV__) { if (potato) { while (true) { warning(test) } } }',
+    },
+    /* calls wrapped on an if with && */
+    {
+      code: 'if (banana && __DEV__ && potato && kitten) { warning(test) }',
     },
     /* don't do anything to arbitrary fn's or invariants */
     {
@@ -44,7 +48,7 @@ ruleTester.run('no-production-logging', rule, {
       ],
     },
     {
-      code: 'if (potato) {warningWithoutStack(test)}',
+      code: 'if (potato) { warningWithoutStack(test) }',
       errors: [
         {
           message: 'Wrap warningWithoutStack in a `if (__DEV__)` check',
@@ -59,5 +63,13 @@ ruleTester.run('no-production-logging', rule, {
         },
       ],
     },
+    {
+      code: 'if (__DEV__ || potato && true) { warning(test) }',
+      errors: [
+        {
+          message: 'Wrap warning in a `if (__DEV__)` check',
+        },
+      ],
+    },
   ],
 });
diff --git a/scripts/eslint-rules/no-production-logging.js b/scripts/eslint-rules/no-production-logging.js
@@ -10,14 +10,31 @@
 'use strict';
 
 module.exports = function(context) {
+  function traverseIf(node) {
+    switch (node.type) {
+      case 'Identifier':
+        return [node.name];
+      case 'LogicalExpression':
+        if (node.operator === '&&') {
+          return [...traverseIf(node.left), ...traverseIf(node.right)];
+        }
+        return [];
+      default:
+        return [];
+    }
+  }
+
   function hasIfInParents(node) {
     let done = false;
     while (!done) {
       if (!node.parent) {
         return false;
       }
       node = node.parent;
-      if (node.type === 'IfStatement' && node.test.name === '__DEV__') {
+      if (
+        node.type === 'IfStatement' &&
+        traverseIf(node.test).includes('__DEV__')
+      ) {
         return true;
       }
     }
