fix: support destructuring assignment (#14)

* fix: mapStateToProps-no-store support destructuring assignment

* fix: allowing destructuring args in prefer-names

* fix: correcting test case

* chore: adding test case for ownProps destr assignment

Author: DianaSuvorova

docs/rules/mapDispatchToProps-prefer-parameters-names.md

@@ -28,6 +28,10 @@ const mapDispatchToProps = () => {}
 const mapDispatchToProps(dispatch, ownProps) => {}
 ```
 
+```js
+const mapDispatchToProps(dispatch, {prop1, prop2}) => {}
+```
+
 ```js
 const mapDispatchToProps(dispatch) => {}
 ```

docs/rules/mapStateToProps-no-store.md

@@ -35,6 +35,10 @@ const mapStateToProps = () => {}
 const mapStateToProps = (state) => {isActive: state.isActive}
 ```
 
+```js
+const mapStateToProps = ({isActive}) => {isActive}
+```
+
 ```js
 connect((state) => ({isActive: state.isActive}), null)(App)
 ```

docs/rules/mapStateToProps-prefer-parameters-names.md

@@ -28,6 +28,10 @@ const mapStateToProps = (state, ownProps) => {}
 const mapStateToProps = (state) => {}
 ```
 
+```js
+const mapStateToProps = ({isActive}) => {isActive}
+```
+
 ```js
 connect((state) => state, null)(App)
 ```

lib/rules/mapDispatchToProps-prefer-parameters-names.js

@@ -14,7 +14,7 @@ const report = function (context, node, i) {
 
 const check = function (context, params) {
   params.forEach((param, i) => {
-    if (argumentNames[i] && argumentNames[i] !== param.name) {
+    if (argumentNames[i] && param.type !== 'ObjectPattern' && argumentNames[i] !== param.name) {
       report(context, param, i);
     }
   });

lib/rules/mapStateToProps-no-store.js

@@ -8,8 +8,11 @@ const report = function (context, node) {
   });
 };
 
-const getFirstParamName = node =>
-  node.params && node.params[0] && node.params[0].name;
+// first param name or false for destructuring assignment;
+const getFirstParamName = (node) => {
+  const firstParam = node.params && node.params[0];
+  return firstParam && firstParam.type === 'Identifier' && firstParam.name;
+};
 
 const propertyIsStore = (prop, storeName) => {
   if (prop.type === 'Property' && prop.value && prop.value.name === storeName) {
@@ -47,23 +50,29 @@ module.exports = function (context) {
       node.declarations.forEach((decl) => {
         if (decl.id && decl.id.name === 'mapStateToProps') {
           const body = decl.init.body;
-          const firstParamName = decl.init.params &&
-                decl.init.params[0] &&
-                decl.init.params[0].name;
-          checkFunction(context, body, firstParamName);
+          const firstParamName = getFirstParamName(decl.init);
+          if (firstParamName) {
+            checkFunction(context, body, firstParamName);
+          }
         }
       });
     },
     FunctionDeclaration(node) {
       if (node.id && node.id.name === 'mapStateToProps') {
-        checkFunction(context, node.body, getFirstParamName(node));
+        const firstParamName = getFirstParamName(node);
+        if (firstParamName) {
+          checkFunction(context, node.body, firstParamName);
+        }
       }
     },
     CallExpression(node) {
       if (isReactReduxConnect(node)) {
         const mapStateToProps = node.arguments && node.arguments[0];
         if (mapStateToProps && mapStateToProps.body) {
-          checkFunction(context, mapStateToProps.body, getFirstParamName(mapStateToProps));
+          const firstParamName = getFirstParamName(mapStateToProps);
+          if (firstParamName) {
+            checkFunction(context, mapStateToProps.body, firstParamName);
+          }
         }
       }
     },

lib/rules/mapStateToProps-prefer-parameters-names.js

@@ -14,7 +14,7 @@ const report = function (context, node, i) {
 
 const check = function (context, params) {
   params.forEach((param, i) => {
-    if (argumentNames[i] && argumentNames[i] !== param.name) {
+    if (argumentNames[i] && param.type !== 'ObjectPattern' && argumentNames[i] !== param.name) {
       report(context, param, i);
     }
   });

tests/lib/rules/connect-prefer-minimum-two-arguments.js

@@ -17,6 +17,7 @@ ruleTester.run('connect-prefer-minimum-two-arguments', rule, {
   valid: [
     'connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)',
     'connect(mapStateToProps, mapDispatchToProps)(Component)',
+    'connect({prop1, prop2}, {action1, action2})(Component)',
   ],
   invalid: [{
     code: 'connect(mapStateToProps)(Component)',

tests/lib/rules/mapDispatchToProps-prefer-parameters-names.js

@@ -16,6 +16,7 @@ const ruleTester = new RuleTester({ parserOptions });
 ruleTester.run('mapDispatchToProps-prefer-parameters-names', rule, {
   valid: [
     'const mapDispatchToProps = (dispatch, ownProps) => {}',
+    'const mapDispatchToProps = (dispatch, {prop1, prop2}) => {}',
     'const mapDispatchToProps = (dispatch) => {}',
     'const mapDispatchToProps = (dispatch, ownProps, moreArgs) => {}',
     'const mapDispatchToProps = {anAction: anAction}',

tests/lib/rules/mapStateToProps-no-store.js

@@ -57,6 +57,12 @@ ruleTester.run('mapStateToProps-no-store', rule, {
     'const mapStateToProps = (state) => {isActive: state.isActive}',
     `const mapStateToProps = (state, ownProps) => {};
       connect(mapStateToProps, null)(Alert);`,
+    `const mapStateToProps = ({ header }) => ({
+      isLoggedIn: header.user && header.user.isLoggedIn,
+    }); `,
+    'const mapStateToProps = ({header}, ownProps) => {header};',
+    'connect(({header}, ownProps) => {header})(App);',
+    'connect(({header}, {ownProp1}) => {header, ownProp1})(App);',
   ],
   invalid: [{
     code: 'const mapStateToProps = (state) => state',

tests/lib/rules/mapStateToProps-prefer-parameters-names.js

@@ -15,6 +15,7 @@ const ruleTester = new RuleTester({ parserOptions });
 
 ruleTester.run('mapStateToProps-prefer-parameters-names', rule, {
   valid: [
+    'const mapStateToProps = ({prop1, prop2}, {ownProp1, ownProp2}) => {}',
     'const mapStateToProps = (state, ownProps) => {}',
     'const mapStateToProps = (state) => {}',
     'const mapStateToProps = (state, ownProps, moreArgs) => {}',
@@ -23,6 +24,7 @@ ruleTester.run('mapStateToProps-prefer-parameters-names', rule, {
     'connect({state}, null)(App)',
     'const mapStateToProps = {}',
     'connect(null, null)(App)',
+    'const mapStateToProps = ({prop1, prop2}, ownProps) => {}',
   ],
   invalid: [{
     code: 'const mapStateToProps = (anyOtherName) => {}',