Move getComponentProperties to a util function

Author: jomasti

lib/rules/no-redundant-should-component-update.js

@@ -25,28 +25,13 @@ module.exports = {
   },
 
   create: Components.detect((context, components, utils) => {
-    /**
-     * Get properties for a given AST node
-     * @param {ASTNode} node The AST node being checked.
-     * @returns {Array} Properties array.
-     */
-    function getComponentProperties(node) {
-      switch (node.type) {
-        case 'ClassExpression':
-        case 'ClassDeclaration':
-          return node.body.body;
-        default:
-          return [];
-      }
-    }
-
     /**
      * Checks for shouldComponentUpdate property
      * @param {ASTNode} node The AST node being checked.
      * @returns {Boolean} Whether or not the property exists.
      */
     function hasShouldComponentUpdate(node) {
-      const properties = getComponentProperties(node);
+      const properties = astUtil.getComponentProperties(node);
       return properties.some(property => {
         const name = astUtil.getPropertyName(property);
         return name === 'shouldComponentUpdate';

lib/rules/prefer-stateless-function.js

@@ -44,23 +44,6 @@ module.exports = {
     // Public
     // --------------------------------------------------------------------------
 
-    /**
-     * Get properties for a given AST node
-     * @param {ASTNode} node The AST node being checked.
-     * @returns {Array} Properties array.
-     */
-    function getComponentProperties(node) {
-      switch (node.type) {
-        case 'ClassExpression':
-        case 'ClassDeclaration':
-          return node.body.body;
-        case 'ObjectExpression':
-          return node.properties;
-        default:
-          return [];
-      }
-    }
-
     /**
      * Checks whether a given array of statements is a single call of `super`.
      * @see ESLint no-useless-constructor rule
@@ -195,7 +178,7 @@ module.exports = {
      * @returns {Boolean} True if the node has at least one other property, false if not.
      */
     function hasOtherProperties(node) {
-      const properties = getComponentProperties(node);
+      const properties = astUtil.getComponentProperties(node);
       return properties.some(property => {
         const name = astUtil.getPropertyName(property);
         const isDisplayName = name === 'displayName';

lib/rules/require-render-return.js

@@ -33,29 +33,13 @@ module.exports = {
       });
     }
 
-    /**
-     * Get properties for a given AST node
-     * @param {ASTNode} node The AST node being checked.
-     * @returns {Array} Properties array.
-     */
-    function getComponentProperties(node) {
-      switch (node.type) {
-        case 'ClassDeclaration':
-          return node.body.body;
-        case 'ObjectExpression':
-          return node.properties;
-        default:
-          return [];
-      }
-    }
-
     /**
      * Check if a given AST node has a render method
      * @param {ASTNode} node The AST node being checked.
      * @returns {Boolean} True if there is a render method, false if not
      */
     function hasRenderMethod(node) {
-      const properties = getComponentProperties(node);
+      const properties = astUtil.getComponentProperties(node);
       for (let i = 0, j = properties.length; i < j; i++) {
         if (astUtil.getPropertyName(properties[i]) !== 'render' || !properties[i].value) {
           continue;

lib/rules/sort-comp.js

@@ -295,23 +295,6 @@ module.exports = {
       }
     }
 
-    /**
-     * Get properties for a given AST node
-     * @param {ASTNode} node The AST node being checked.
-     * @returns {Array} Properties array.
-     */
-    function getComponentProperties(node) {
-      switch (node.type) {
-        case 'ClassExpression':
-        case 'ClassDeclaration':
-          return node.body.body;
-        case 'ObjectExpression':
-          return node.properties.filter(property => property.type === 'Property');
-        default:
-          return [];
-      }
-    }
-
     /**
      * Compare two properties and find out if they are in the right order
      * @param {Array} propertiesInfos Array containing all the properties metadata.
@@ -424,7 +407,7 @@ module.exports = {
           if (!has(list, component)) {
             continue;
           }
-          const properties = getComponentProperties(list[component].node);
+          const properties = astUtil.getComponentProperties(list[component].node);
           checkPropsOrder(properties);
         }
 

lib/util/ast.js

@@ -17,6 +17,25 @@ function getPropertyName(node) {
   return '';
 }
 
+/**
+ * Get properties for a given AST node
+ * @param {ASTNode} node The AST node being checked.
+ * @returns {Array} Properties array.
+ */
+function getComponentProperties(node) {
+  switch (node.type) {
+    case 'ClassDeclaration':
+    case 'ClassExpression':
+      return node.body.body;
+    case 'ObjectExpression':
+      // return node.properties;
+      return node.properties;
+    default:
+      return [];
+  }
+}
+
 module.exports = {
-  getPropertyName: getPropertyName
+  getPropertyName: getPropertyName,
+  getComponentProperties: getComponentProperties
 };