Improve component detection (fixes #233)

Author: yannickcr

lib/rules/display-name.js

@@ -21,26 +21,12 @@ module.exports = function(context) {
   var MISSING_MESSAGE = 'Component definition is missing display name';
   var MISSING_MESSAGE_NAMED_COMP = '{{component}} component definition is missing display name';
 
-  /**
-   * Checks if the component must be validated
-   * @param {Object} component The component to process
-   * @returns {Boolean} True if the component must be validated, false if not.
-   */
-  function mustBeValidated(component) {
-    return (
-      component &&
-      component.isReactComponent &&
-      !component.hasDisplayName
-    );
-  }
-
   /**
    * Checks if we are declaring a display name
    * @param {ASTNode} node The AST node being checked.
    * @returns {Boolean} True if we are declaring a display name, false if not.
    */
   function isDisplayNameDeclaration(node) {
-
     // Special case for class properties
     // (babel-eslint does not expose property name so we have to rely on tokens)
     if (node.type === 'ClassProperty') {
@@ -126,7 +112,6 @@ module.exports = function(context) {
       if (!isDisplayNameDeclaration(node)) {
         return;
       }
-
       markDisplayNameAsDeclared(node);
     },
 
@@ -149,57 +134,39 @@ module.exports = function(context) {
     },
 
     ClassDeclaration: function(node) {
+      componentList.set(context, node);
       if (!acceptTranspilerName || !hasTranspilerName(node)) {
         return;
       }
       markDisplayNameAsDeclared(node);
     },
 
     ObjectExpression: function(node) {
-      // Search for the displayName declaration
-      node.properties.forEach(function(property) {
-        if (!property.key) {
-          return;
-        }
-
-        if (!isDisplayNameDeclaration(property.key)) {
-          return;
-        }
-        markDisplayNameAsDeclared(node);
-      });
-      // Has transpiler name
-      if (acceptTranspilerName && hasTranspilerName(node)) {
-        markDisplayNameAsDeclared(node);
-      }
-
-      if (componentUtil.isComponentDefinition(node)) {
-        componentList.set(context, node, {
-          isReactComponent: true
+      componentList.set(context, node);
+      if (!acceptTranspilerName || !hasTranspilerName(node)) {
+        // Search for the displayName declaration
+        node.properties.forEach(function(property) {
+          if (!property.key || !isDisplayNameDeclaration(property.key)) {
+            return;
+          }
+          markDisplayNameAsDeclared(node);
         });
+        return;
       }
+      markDisplayNameAsDeclared(node);
     },
 
     'Program:exit': function() {
       var list = componentList.getList();
-      // Report missing display name for all classes
+      // Report missing display name for all components
       for (var component in list) {
-        if (!list.hasOwnProperty(component) || !mustBeValidated(list[component])) {
+        if (!list.hasOwnProperty(component) || list[component].hasDisplayName) {
           continue;
         }
         reportMissingDisplayName(list[component]);
       }
-    },
-
-    ReturnStatement: function(node) {
-      if (!componentUtil.isReactComponent(context, node)) {
-        return;
-      }
-      componentList.set(context, node, {
-        isReactComponent: true
-      });
     }
   };
-
 };
 
 module.exports.schema = [{

lib/rules/no-direct-mutation-state.js

@@ -21,10 +21,7 @@ module.exports = function(context) {
    * @returns {Boolean} True if the component is valid, false if not.
    */
   function isValid(component) {
-    var isNotReactComponent = Boolean(component && !component.isReactComponent);
-    var doNotMutateSetState = Boolean(component && !component.mutateSetState);
-
-    return isNotReactComponent || doNotMutateSetState;
+    return Boolean(component && !component.mutateSetState);
   }
 
   /**
@@ -45,6 +42,14 @@ module.exports = function(context) {
 
   return {
 
+    ObjectExpression: function(node) {
+      componentList.set(context, node);
+    },
+
+    ClassDeclaration: function(node) {
+      componentList.set(context, node);
+    },
+
     AssignmentExpression: function(node) {
       var item;
       if (!node.left || !node.left.object || !node.left.object.object) {
@@ -76,15 +81,6 @@ module.exports = function(context) {
         }
         reportMutations(list[component]);
       }
-    },
-
-    ReturnStatement: function(node) {
-      if (!componentUtil.isReactComponent(context, node)) {
-        return;
-      }
-      componentList.set(context, node, {
-        isReactComponent: true
-      });
     }
   };
 

lib/rules/no-multi-comp.js

@@ -22,6 +22,15 @@ module.exports = function(context) {
   // --------------------------------------------------------------------------
 
   return {
+
+    ClassDeclaration: function(node) {
+      componentList.set(context, node);
+    },
+
+    ObjectExpression: function(node) {
+      componentList.set(context, node);
+    },
+
     'Program:exit': function() {
       if (componentList.count() <= 1) {
         return;
@@ -36,13 +45,6 @@ module.exports = function(context) {
         }
         context.report(list[component].node, MULTI_COMP_MESSAGE);
       }
-    },
-
-    ReturnStatement: function(node) {
-      if (!componentUtil.isReactComponent(context, node)) {
-        return;
-      }
-      componentList.set(context, node);
     }
   };
 };

lib/rules/prop-types.js

@@ -90,7 +90,6 @@ module.exports = function(context) {
   function mustBeValidated(component) {
     return Boolean(
       component &&
-      component.isReactComponent &&
       component.usedPropTypes &&
       !component.ignorePropsValidation
     );
@@ -519,6 +518,10 @@ module.exports = function(context) {
 
   return {
 
+    ClassDeclaration: function(node) {
+      componentList.set(context, node);
+    },
+
     ClassProperty: function(node) {
       if (!isPropTypesDeclaration(node)) {
         return;
@@ -576,19 +579,14 @@ module.exports = function(context) {
     },
 
     ObjectExpression: function(node) {
+      componentList.set(context, node);
       // Search for the proptypes declaration
       node.properties.forEach(function(property) {
         if (!isPropTypesDeclaration(property.key)) {
           return;
         }
         markPropTypesAsDeclared(node, property.value);
       });
-
-      if (componentUtil.isComponentDefinition(node)) {
-        componentList.set(context, node, {
-          isReactComponent: true
-        });
-      }
     },
 
     'Program:exit': function() {
@@ -600,15 +598,6 @@ module.exports = function(context) {
         }
         reportUndeclaredPropTypes(list[component]);
       }
-    },
-
-    ReturnStatement: function(node) {
-      if (!componentUtil.isReactComponent(context, node)) {
-        return;
-      }
-      componentList.set(context, node, {
-        isReactComponent: true
-      });
     }
   };
 

lib/rules/sort-comp.js

@@ -85,7 +85,6 @@ module.exports = function(context) {
   function mustBeValidated(component) {
     return (
       component &&
-      component.isReactComponent &&
       !component.hasDisplayName
     );
   }
@@ -346,9 +345,17 @@ module.exports = function(context) {
   }
 
   return {
+
+    ClassDeclaration: function(node) {
+      componentList.set(context, node);
+    },
+
+    ObjectExpression: function(node) {
+      componentList.set(context, node);
+    },
+
     'Program:exit': function() {
       var list = componentList.getList();
-
       for (var component in list) {
         if (!list.hasOwnProperty(component) || !mustBeValidated(list[component])) {
           continue;
@@ -358,15 +365,6 @@ module.exports = function(context) {
       }
 
       reportErrors();
-    },
-
-    ReturnStatement: function(node) {
-      if (!componentUtil.isReactComponent(context, node)) {
-        return;
-      }
-      componentList.set(context, node, {
-        isReactComponent: true
-      });
     }
   };