fix: adding spread support (#13)

* fix: adding spread support

* chore: package scripts clean up

Author: DianaSuvorova

docs/rules/mapStateToProps-no-store.md

@@ -17,6 +17,10 @@ const mapStateToProps = state => {
       }
 ```
 
+```js
+const mapStateToProps = state => ({...state});
+```
+
 ```js
 connect((state) => state, null)(App)
 ```
@@ -34,3 +38,14 @@ const mapStateToProps = (state) => {isActive: state.isActive}
 ```js
 connect((state) => ({isActive: state.isActive}), null)(App)
 ```
+
+## Not supported use cases.
+
+Please note that the following use case although common is not supported due to the nature of static code analysis.
+
+The following would not warn:
+
+```js
+const getProps = (state) => state;
+const mapStateToProps = (state) => getProps(state);
+```

lib/rules/mapStateToProps-no-store.js

@@ -11,6 +11,21 @@ const report = function (context, node) {
 const getFirstParamName = node =>
   node.params && node.params[0] && node.params[0].name;
 
+const propertyIsStore = (prop, storeName) => {
+  if (prop.type === 'Property' && prop.value && prop.value.name === storeName) {
+    // state
+    return true;
+  } else if (
+    // ...state
+    prop.type === 'ExperimentalSpreadProperty'
+    && prop.argument && prop.argument.type === 'Identifier'
+    && prop.argument.name === storeName
+  ) {
+    return true;
+  }
+  return false;
+};
+
 const checkFunction = function (context, body, firstParamName) {
   const returnNode = utils.getReturnNode(body);
   // return state;
@@ -20,7 +35,8 @@ const checkFunction = function (context, body, firstParamName) {
   // return {store: state};
   if (returnNode && returnNode.type === 'ObjectExpression' &&
     returnNode.properties.reduce((acc, cv) =>
-      acc || (cv.value.name === firstParamName), false)) {
+      (acc || propertyIsStore(cv, firstParamName)), false)
+  ) {
     report(context, body);
   }
 };

package.json

@@ -13,8 +13,6 @@
   "scripts": {
     "lint": "eslint ./",
     "test": "npm run lint && mocha tests --recursive",
-    "test-single": "mocha tests/lib/rules/mapStateToProps-prefer-parameters-names",
-    "debug-test": "mocha --debug-brk --inspect tests/lib/rules/mapStateToProps-prefer-parameters-names",
     "semantic-release": "semantic-release",
     "commitmsg": "npm run test && commitlint -e $GIT_PARAMS"
   },

tests/lib/rules/mapDispatchToProps-prefer-object.js

@@ -15,6 +15,7 @@ const ruleTester = new RuleTester({ parserOptions });
 
 ruleTester.run('mapDispatchToProps-prefer-object', rule, {
   valid: [
+    'const mapDispatchToProps = {...actions}',
     'const mapDispatchToProps = {anAction: anAction}',
     `export default connect(
       state => ({

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

@@ -15,6 +15,15 @@ const ruleTester = new RuleTester({ parserOptions });
 
 ruleTester.run('mapStateToProps-no-store', rule, {
   valid: [
+    ` const mapStateToProps = state => ({
+       ...getSomeStateFromASelector(state),
+       showDefaultHeader: showDefaultHeader(state),
+      });
+    `,
+    ` const mapStateToProps = state => ({
+        aField: getSomeStateFromASelector(state),
+      });
+    `,
     'export default function observeStore(store) {return store;}',
     'export default connect(() => {})(Alert)',
     'export default connect(() => {})(Alert)',
@@ -107,5 +116,19 @@ ruleTester.run('mapStateToProps-no-store', rule, {
         message: 'mapStateToProps should not return complete store object',
       },
     ],
+  }, {
+    code: 'const mapStateToProps = state => ({...state});',
+    errors: [
+      {
+        message: 'mapStateToProps should not return complete store object',
+      },
+    ],
+  }, {
+    code: 'connect((state) => ({...state}), null)(App)',
+    errors: [
+      {
+        message: 'mapStateToProps should not return complete store object',
+      },
+    ],
   }],
 });