fix: don't lint connect() of not redux (#103)

koooge · web-flow · commit 55b9b31aca75 · 2025-03-16T10:52:09.000-07:00
* fix: don't lint connect() of not redux

Signed-off-by: koooge &lt;koooooge@gmail.com&gt;

* fix: Lint connect() for cjs

Signed-off-by: koooge &lt;koooooge@gmail.com&gt;

---------

Signed-off-by: koooge &lt;koooooge@gmail.com&gt;
diff --git a/lib/isReactReduxConnect.js b/lib/isReactReduxConnect.js
@@ -1,5 +1,17 @@
-module.exports = function (node) {
-  return (
-    node.callee.name === 'connect'
-  );
+module.exports = function (node, context) {
+  if (node.callee.type === 'Identifier' && node.callee.name === 'connect') {
+    const sourceCode = context.getSourceCode();
+    const scope = sourceCode.getScope(node);
+    const variable = scope.variables.find(v => v.name === 'connect');
+    if (variable && variable.defs.length > 0) {
+      const def = variable.defs[0];
+      if (
+        (def.node.type === 'ImportSpecifier' && def.parent.source.value === 'react-redux') ||
+        (def.node.type === 'VariableDeclarator' && def.node.init && def.node.init.callee && def.node.init.callee.name === 'require' && def.node.init.arguments[0].value === 'react-redux')
+      ) {
+        return true;
+      }
+    }
+  }
+  return false;
 };
diff --git a/lib/rules/connect-prefer-minimum-two-arguments.js b/lib/rules/connect-prefer-minimum-two-arguments.js
@@ -10,7 +10,7 @@ const create = function (context) {
 
   return {
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         if (node.arguments.length < 2) {
           report(node);
         }
diff --git a/lib/rules/connect-prefer-named-arguments.js b/lib/rules/connect-prefer-named-arguments.js
@@ -17,7 +17,7 @@ const create = function (context) {
 
   return {
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         node.arguments.forEach((argument, i) => {
           if (argument.raw && argument.raw !== 'null') {
             report(node, i);
diff --git a/lib/rules/mapDispatchToProps-prefer-parameters-names.js b/lib/rules/mapDispatchToProps-prefer-parameters-names.js
@@ -40,7 +40,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapDispatchToProps = node.arguments && node.arguments[1];
         if (mapDispatchToProps && (
           mapDispatchToProps.type === 'ArrowFunctionExpression' ||
diff --git a/lib/rules/mapDispatchToProps-prefer-shorthand.js b/lib/rules/mapDispatchToProps-prefer-shorthand.js
@@ -71,7 +71,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapDispatchToProps = node.arguments && node.arguments[1];
         if (mapDispatchToProps && (
           mapDispatchToProps.type === 'ArrowFunctionExpression' ||
diff --git a/lib/rules/mapDispatchToProps-returns-object.js b/lib/rules/mapDispatchToProps-returns-object.js
@@ -34,7 +34,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapDispatchToProps = node.arguments && node.arguments[1];
         if (mapDispatchToProps && (
           mapDispatchToProps.type === 'ArrowFunctionExpression' ||
diff --git a/lib/rules/mapStateToProps-no-store.js b/lib/rules/mapStateToProps-no-store.js
@@ -66,7 +66,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapStateToProps = node.arguments && node.arguments[0];
         if (mapStateToProps && mapStateToProps.body) {
           const firstParamName = getFirstParamName(mapStateToProps);
diff --git a/lib/rules/mapStateToProps-prefer-hoisted.js b/lib/rules/mapStateToProps-prefer-hoisted.js
@@ -52,7 +52,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapStateToProps = node.arguments && node.arguments[0];
         if (mapStateToProps && mapStateToProps.body) {
           checkFunction(context, mapStateToProps.body);
diff --git a/lib/rules/mapStateToProps-prefer-parameters-names.js b/lib/rules/mapStateToProps-prefer-parameters-names.js
@@ -40,7 +40,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapStateToProps = node.arguments && node.arguments[0];
         if (mapStateToProps && (
           mapStateToProps.type === 'ArrowFunctionExpression' ||
diff --git a/lib/rules/mapStateToProps-prefer-selectors.js b/lib/rules/mapStateToProps-prefer-selectors.js
@@ -83,7 +83,7 @@ const create = function (context) {
       }
     },
     CallExpression(node) {
-      if (isReactReduxConnect(node)) {
+      if (isReactReduxConnect(node, context)) {
         const mapStateToProps = node.arguments && node.arguments[0];
         if (mapStateToProps && (
           mapStateToProps.type === 'ArrowFunctionExpression' ||
diff --git a/lib/rules/no-unused-prop-types.js b/lib/rules/no-unused-prop-types.js
@@ -33,7 +33,7 @@ const belongsToReduxReact = (node, objectName, destrArg) => {
       }
     }
   } else if (node.type === 'CallExpression') {
-    if (isReactReduxConnect(node)) {
+    if (isReactReduxConnect(node, context)) {
       const check = (mapToProps) => {
         if (mapToProps && mapToProps.body) {
           const secondArgument = mapToProps.params && mapToProps.params[1];
@@ -85,4 +85,4 @@ const getPropNameFromReduxRuleMessage = message => message.replace('exclude:', '
 module.exports = filterReports([
   propsUsedInRedux,
   noUnusedPropTypesReact,
-], getPropNameFromReactRuleMessage, getPropNameFromReduxRuleMessage);
+], getPropNameFromReactRuleMessage, getPropNameFromReduxRuleMessage);
diff --git a/lib/rules/prefer-separate-component-file.js b/lib/rules/prefer-separate-component-file.js
@@ -12,7 +12,7 @@ module.exports = {
     const sourceCode = context.sourceCode ?? context.getSourceCode();
     return {
       CallExpression(node) {
-        if (isReactReduxConnect(node)) {
+        if (isReactReduxConnect(node, context)) {
           const component =
             node.parent &&
             node.parent.arguments &&
diff --git a/tests/lib/rules/connect-prefer-minimum-two-arguments.js b/tests/lib/rules/connect-prefer-minimum-two-arguments.js
@@ -13,12 +13,12 @@ const ruleTester = new RuleTester( parserOptions );
 ruleTester.run('connect-prefer-minimum-two-arguments', rule, {
   valid: [
     ...codeSamples,
-    'connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)',
-    'connect(mapStateToProps, mapDispatchToProps)(Component)',
-    'connect({prop1, prop2}, {action1, action2})(Component)',
+    `import { connect } from 'react-redux'; connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)`,
+    `import { connect } from 'react-redux'; connect(mapStateToProps, mapDispatchToProps)(Component)`,
+    `import { connect } from 'react-redux'; connect({prop1, prop2}, {action1, action2})(Component)`,
   ],
   invalid: [{
-    code: 'connect(mapStateToProps)(Component)',
+    code: `import { connect } from 'react-redux'; connect(mapStateToProps)(Component)`,
     errors: [
       {
         message: 'Connect function should have at least 2 arguments.',
diff --git a/tests/lib/rules/connect-prefer-named-arguments.js b/tests/lib/rules/connect-prefer-named-arguments.js
@@ -13,13 +13,16 @@ const ruleTester = new RuleTester( parserOptions );
 ruleTester.run('connect-prefer-named-arguments', rule, {
   valid: [
     ...codeSamples,
-    'export default connect(null, mapDispatchToProps)(TodoApp)',
-    'connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)',
-    'connect(mapStateToProps, mapDispatchToProps)(Component)',
-    'connect()(TodoApp)',
+    `import { connect } from 'react-redux'; export default connect(null, mapDispatchToProps)(TodoApp)`,
+    `import { connect } from 'react-redux'; connect(mapStateToProps, mapDispatchToProps, mergeProps, options)(Component)`,
+    `import { connect } from 'react-redux'; connect(mapStateToProps, mapDispatchToProps)(Component)`,
+    `import { connect } from 'react-redux'; connect()(TodoApp)`,
+    'connect(() => {}, () => {}, mergeProps, options)(Component)',
+    'connect({}, {})(Component)',
+    'connect(state => state)(TodoApp)',
   ],
   invalid: [{
-    code: 'connect(() => {}, () => {}, mergeProps, options)(Component)',
+    code: `import { connect } from 'react-redux'; connect(() => {}, () => {}, mergeProps, options)(Component)`,
     errors: [
       {
         message: 'Connect function argument #1 should be named mapStateToProps',
@@ -28,7 +31,7 @@ ruleTester.run('connect-prefer-named-arguments', rule, {
       },
     ],
   }, {
-    code: 'connect({}, {})(Component)',
+    code: `import { connect } from 'react-redux'; connect({}, {})(Component)`,
     errors: [
       {
         message: 'Connect function argument #1 should be named mapStateToProps',
@@ -37,7 +40,7 @@ ruleTester.run('connect-prefer-named-arguments', rule, {
       },
     ],
   }, {
-    code: 'connect(state => state)(TodoApp)',
+    code: `import { connect } from 'react-redux'; connect(state => state)(TodoApp)`,
     errors: [
       {
         message: 'Connect function argument #1 should be named mapStateToProps',
diff --git a/tests/lib/rules/mapDispatchToProps-prefer-parameters-names.js b/tests/lib/rules/mapDispatchToProps-prefer-parameters-names.js
@@ -18,11 +18,12 @@ ruleTester.run('mapDispatchToProps-prefer-parameters-names', rule, {
     'const mapDispatchToProps = (dispatch) => {}',
     'const mapDispatchToProps = (dispatch, ownProps, moreArgs) => {}',
     'const mapDispatchToProps = {anAction: anAction}',
-    'connect((state) => state, {anAction: anAction})(App)',
-    'connect(null, null)(App)',
-    'connect((state) => state, (dispatch, ownProps, moreArgs) => {})(App)',
+    `import { connect } from 'react-redux'; connect((state) => state, {anAction: anAction})(App)`,
+    `import { connect } from 'react-redux'; connect(null, null)(App)`,
+    `import { connect } from 'react-redux'; connect((state) => state, (dispatch, ownProps, moreArgs) => {})(App)`,
+    `import { connect } from './path/to/connect.js'; connect('something')`,
+    `import { connect } from './path/to/connect.js'; connect((state) => state, (anyOtherName) => {})(App)`,
     'function mapDispatchToProps(dispatch, ownProps) {}',
-
   ],
   invalid: [{
     code: 'const mapDispatchToProps = (anyOtherName) => {}',
@@ -48,7 +49,14 @@ ruleTester.run('mapDispatchToProps-prefer-parameters-names', rule, {
       },
     ],
   }, {
-    code: 'connect((state) => state, (anyOtherName) => {})(App)',
+    code: `import { connect } from 'react-redux'; connect((state) => state, (anyOtherName) => {})(App)`,
+    errors: [
+      {
+        message: 'mapDispatchToProps function parameter #0 should be named dispatch',
+      },
+    ],
+  }, {
+    code: `const { connect } = require('react-redux'); connect((state) => state, (anyOtherName) => {})(App)`,
     errors: [
       {
         message: 'mapDispatchToProps function parameter #0 should be named dispatch',
diff --git a/tests/lib/rules/mapDispatchToProps-prefer-shorthand.js b/tests/lib/rules/mapDispatchToProps-prefer-shorthand.js
@@ -27,14 +27,15 @@ ruleTester.run('mapDispatchToProps-prefer-shorthand', rule, {
     'const mapDispatchToProps = actionsMap',
     'const mapDispatchToProps = {...actions}',
     'const mapDispatchToProps = {anAction: anAction}',
-    `export default connect(
+    `import { connect } from 'react-redux';
+    export default connect(
       state => ({
         productsList: state.Products.productsList,
       }),
       { fetchProducts }
     )(Products);
     `,
-    'connect(null, null)(App)',
+    `import { connect } from 'react-redux'; connect(null, null)(App)`,
     'function mapDispatchToProps () {return aThing}',
   ],
   invalid: [{
diff --git a/tests/lib/rules/mapDispatchToProps-returns-object.js b/tests/lib/rules/mapDispatchToProps-returns-object.js
@@ -17,7 +17,8 @@ ruleTester.run('mapDispatchToProps-returns-object', rule, {
     'const mapDispatchToProps = actionsMap',
     'const mapDispatchToProps = {...actions}',
     'const mapDispatchToProps = {anAction: anAction}',
-    `export default connect(
+    `import { connect } from 'react-redux';
+    export default connect(
       state => ({
         productsList: state.Products.productsList,
       }),
@@ -42,7 +43,7 @@ ruleTester.run('mapDispatchToProps-returns-object', rule, {
           }
         }
     }`,
-    'connect(null, null)(App)',
+    `import { connect } from 'react-redux'; connect(null, null)(App)`,
     'function mapDispatchToProps () {return aThing}',
     `function mapDispatchToProps(dispatch) {
       return { actions: bindActionCreators(actionCreators, dispatch) }
@@ -63,7 +64,8 @@ ruleTester.run('mapDispatchToProps-returns-object', rule, {
       },
     ],
   }, {
-    code: `export default connect(
+    code: `import { connect } from 'react-redux';
+            export default connect(
               state => ({
                 productsList: state.Products.productsList,
               }),
@@ -76,7 +78,8 @@ ruleTester.run('mapDispatchToProps-returns-object', rule, {
       },
     ],
   }, {
-    code: `export default connect(
+    code: `import { connect } from 'react-redux';
+            export default connect(
               state => ({
                 productsList: state.Products.productsList,
               }),
diff --git a/tests/lib/rules/mapStateToProps-no-store.js b/tests/lib/rules/mapStateToProps-no-store.js
@@ -29,11 +29,12 @@ ruleTester.run('mapStateToProps-no-store', rule, {
       });
     `,
     'export default function observeStore(store) {return store;}',
-    'export default connect(() => {})(Alert)',
-    'export default connect(null, null)(Alert)',
-    'connect((state) => ({isActive: state.isActive}), null)(App)',
-    'connect(null, null)(App)',
-    `connect(
+    `import { connect } from 'react-redux'; export default connect(() => {})(Alert)`,
+    `import { connect } from 'react-redux'; export default connect(null, null)(Alert)`,
+    `import { connect } from 'react-redux'; connect((state) => ({isActive: state.isActive}), null)(App)`,
+    `import { connect } from 'react-redux'; connect(null, null)(App)`,
+    `import { connect } from 'react-redux';
+        connect(
           (state) => {
               return {
                   isActive: state.isActive
@@ -42,7 +43,8 @@ ruleTester.run('mapStateToProps-no-store', rule, {
           null
         )(App)
     `,
-    `connect(function(state){
+    `import { connect } from 'react-redux';
+        connect(function(state){
               return {
                   isActive: state.isActive
               }
@@ -58,14 +60,15 @@ ruleTester.run('mapStateToProps-no-store', rule, {
     }`,
     'const mapStateToProps = (state, ownProps) => {}',
     'const mapStateToProps = (state) => {isActive: state.isActive}',
-    `const mapStateToProps = (state, ownProps) => {};
+    `import { connect } from 'react-redux';
+      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);',
+    `import { connect } from 'react-redux'; connect(({header}, ownProps) => {header})(App);`,
+    `import { connect } from 'react-redux'; connect(({header}, {ownProp1}) => {header, ownProp1})(App);`,
   ],
   invalid: [{
     code: 'const mapStateToProps = (state) => state',
@@ -93,7 +96,8 @@ ruleTester.run('mapStateToProps-no-store', rule, {
       },
     ],
   }, {
-    code: `export default connect(
+    code: `import { connect } from 'react-redux';
+    export default connect(
         (state) => {
             return {
                 state: state
@@ -111,14 +115,15 @@ ruleTester.run('mapStateToProps-no-store', rule, {
       },
     ],
   }, {
-    code: 'connect((state) => state, null)(App)',
+    code: `import { connect } from 'react-redux'; connect((state) => state, null)(App)`,
     errors: [
       {
         message: 'mapStateToProps should not return complete store object',
       },
     ],
   }, {
-    code: `const mapStateToProps = (state, ownProps) => state;
+    code: `import { connect } from 'react-redux';
+      const mapStateToProps = (state, ownProps) => state;
       connect(mapStateToProps, null)(Alert);`,
     errors: [
       {
@@ -133,7 +138,7 @@ ruleTester.run('mapStateToProps-no-store', rule, {
       },
     ],
   }, {
-    code: 'connect((state) => ({...state}), null)(App)',
+    code: `import { connect } from 'react-redux'; connect((state) => ({...state}), null)(App)`,
     errors: [
       {
         message: 'mapStateToProps should not return complete store object',
diff --git a/tests/lib/rules/mapStateToProps-prefer-hoisted.js b/tests/lib/rules/mapStateToProps-prefer-hoisted.js
diff --git a/tests/lib/rules/mapStateToProps-prefer-parameters-names.js b/tests/lib/rules/mapStateToProps-prefer-parameters-names.js
diff --git a/tests/lib/rules/mapStateToProps-prefer-selectors.js b/tests/lib/rules/mapStateToProps-prefer-selectors.js
diff --git a/tests/lib/rules/no-unused-prop-types.js b/tests/lib/rules/no-unused-prop-types.js
diff --git a/tests/lib/rules/prefer-separate-component-file.js b/tests/lib/rules/prefer-separate-component-file.js

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ const create = function (context) {`
`10`	`10`
`11`	`11`	`return {`
`12`	`12`	`CallExpression(node) {`
`13`		`- if (isReactReduxConnect(node)) {`
	`13`	`+ if (isReactReduxConnect(node, context)) {`
`14`	`14`	`if (node.arguments.length < 2) {`
`15`	`15`	`report(node);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ const create = function (context) {`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`CallExpression(node) {`
`43`		`- if (isReactReduxConnect(node)) {`
	`43`	`+ if (isReactReduxConnect(node, context)) {`
`44`	`44`	`const mapDispatchToProps = node.arguments && node.arguments[1];`
`45`	`45`	`if (mapDispatchToProps && (`
`46`	`46`	`mapDispatchToProps.type === 'ArrowFunctionExpression' \|\|`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ const create = function (context) {`
`71`	`71`	`}`
`72`	`72`	`},`
`73`	`73`	`CallExpression(node) {`
`74`		`- if (isReactReduxConnect(node)) {`
	`74`	`+ if (isReactReduxConnect(node, context)) {`
`75`	`75`	`const mapDispatchToProps = node.arguments && node.arguments[1];`
`76`	`76`	`if (mapDispatchToProps && (`
`77`	`77`	`mapDispatchToProps.type === 'ArrowFunctionExpression' \|\|`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const create = function (context) {`
`34`	`34`	`}`
`35`	`35`	`},`
`36`	`36`	`CallExpression(node) {`
`37`		`- if (isReactReduxConnect(node)) {`
	`37`	`+ if (isReactReduxConnect(node, context)) {`
`38`	`38`	`const mapDispatchToProps = node.arguments && node.arguments[1];`
`39`	`39`	`if (mapDispatchToProps && (`
`40`	`40`	`mapDispatchToProps.type === 'ArrowFunctionExpression' \|\|`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ const create = function (context) {`
`66`	`66`	`}`
`67`	`67`	`},`
`68`	`68`	`CallExpression(node) {`
`69`		`- if (isReactReduxConnect(node)) {`
	`69`	`+ if (isReactReduxConnect(node, context)) {`
`70`	`70`	`const mapStateToProps = node.arguments && node.arguments[0];`
`71`	`71`	`if (mapStateToProps && mapStateToProps.body) {`
`72`	`72`	`const firstParamName = getFirstParamName(mapStateToProps);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ const create = function (context) {`
`52`	`52`	`}`
`53`	`53`	`},`
`54`	`54`	`CallExpression(node) {`
`55`		`- if (isReactReduxConnect(node)) {`
	`55`	`+ if (isReactReduxConnect(node, context)) {`
`56`	`56`	`const mapStateToProps = node.arguments && node.arguments[0];`
`57`	`57`	`if (mapStateToProps && mapStateToProps.body) {`
`58`	`58`	`checkFunction(context, mapStateToProps.body);`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ const create = function (context) {`
`83`	`83`	`}`
`84`	`84`	`},`
`85`	`85`	`CallExpression(node) {`
`86`		`- if (isReactReduxConnect(node)) {`
	`86`	`+ if (isReactReduxConnect(node, context)) {`
`87`	`87`	`const mapStateToProps = node.arguments && node.arguments[0];`
`88`	`88`	`if (mapStateToProps && (`
`89`	`89`	`mapStateToProps.type === 'ArrowFunctionExpression' \|\|`