prop-deprecation - required prop - support method and member (#1510)

* prop-deprecation - required prop - support method and member

* Prettify

* indent

Author: M-i-k-e-l

eslint-rules/lib/rules/component-prop-deprecation.js

@@ -115,15 +115,28 @@ module.exports = {
     function testAttributeForDeprecation(attribute, deprecatedPropList, componentName) {
       let wasFound = false;
       if (attribute.type === 'JSXAttribute') {
-        wasFound = checkPropDeprecation(attribute, attribute.name, attribute.name.name, deprecatedPropList, componentName);
+        wasFound = checkPropDeprecation(
+          attribute,
+          attribute.name,
+          attribute.name.name,
+          deprecatedPropList,
+          componentName
+        );
       } else if (attribute.type === 'JSXSpreadAttribute') {
-        const spreadSource = findValueNodeOfIdentifier(attribute.argument.name, context.getScope());
+        const identifierName =
+          _.get(attribute, 'argument.name') ||
+          _.get(attribute, 'argument.callee.name') ||
+          _.get(attribute, 'argument.property.name');
+        const spreadSource = findValueNodeOfIdentifier(identifierName, context.getScope());
         if (spreadSource) {
-          _.forEach(spreadSource.properties, property => {
-            const key = _.get(property, 'key');
-            const propName = _.get(property, 'key.name');
-            wasFound = checkPropDeprecation(key, key, propName, deprecatedPropList, componentName);
-          });
+          const properties = _.get(spreadSource, 'properties') || _.get(spreadSource, 'body.properties');
+          if (properties) {
+            _.forEach(properties, property => {
+              const key = _.get(property, 'key');
+              const propName = _.get(property, 'key.name');
+              wasFound = checkPropDeprecation(key, key, propName, deprecatedPropList, componentName);
+            });
+          }
         }
       }
       return wasFound;
@@ -160,12 +173,13 @@ module.exports = {
               /* handle required props */
               let foundAttribute = false;
               attributes.forEach(attribute => {
-                foundAttribute = foundAttribute || testAttributeForDeprecation(attribute, requiredPropList, componentName);
+                foundAttribute =
+                  foundAttribute || testAttributeForDeprecation(attribute, requiredPropList, componentName);
               });
-              
-              if (!foundAttribute && requiredPropList[0])  {
+
+              if (!foundAttribute && requiredPropList[0]) {
                 const prop = requiredPropList[0];
-                reportRequiredProps({node, name: componentName, prop: prop.prop, message: prop.message})
+                reportRequiredProps({node, name: componentName, prop: prop.prop, message: prop.message});
               }
             });
           }

eslint-rules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-uilib",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "uilib set of eslint rules",
   "keywords": [
     "eslint",

eslint-rules/tests/lib/rules/component-prop-deprecation.js

@@ -97,6 +97,22 @@ ruleTester.run('component-prop-deprecation', rule, {
       options: ruleOptions,
       code: 'import {Picker} from \'module-with-deprecations\'; pickerProps = {t: "title", s:"subtitle", migrate: true}; <Picker {...pickerProps}/>'
     },
+    {
+      options: ruleOptions,
+      code: `
+      import {Picker} from 'module-with-deprecations';
+      const getPickerProps = () => ({t: "title", s:"subtitle", migrate: true});
+      <Picker {...getPickerProps()}/>
+      `
+    },
+    {
+      options: ruleOptions,
+      code: `
+      import {Picker} from 'module-with-deprecations';
+      pickerProps = {t: "title", s:"subtitle", migrate: true};
+      <Picker {...this.pickerProps}/>
+      `
+    }
   ],
   invalid: [
     {
@@ -367,7 +383,7 @@ ruleTester.run('component-prop-deprecation', rule, {
       options: ruleOptions,
       code: 'import {Picker} from \'module-with-deprecations\'; <Picker t="title" s="subtitle"/>',
       errors: [
-        {message: "The 'Picker' component's prop 'migrate' is required. Please make sure to pass the 'migrate' prop."},
+        {message: "The 'Picker' component's prop 'migrate' is required. Please make sure to pass the 'migrate' prop."}
       ]
     }
   ]