Merge branch 'fix-2309' into fix/useContext

Author: ed-jinyoung-park

lib/rules/destructuring-assignment.js

@@ -47,12 +47,18 @@ module.exports = {
      */
     function handleStatelessComponent(node) {
       const destructuringProps = node.params && node.params[0] && node.params[0].type === 'ObjectPattern';
+      const destructuringContext = node.params && node.params[1] && node.params[1].type === 'ObjectPattern';
 
       if (destructuringProps && components.get(node) && configuration === 'never') {
         context.report({
           node,
           message: 'Must never use destructuring props assignment in SFC argument'
         });
+      } else if (destructuringContext && components.get(node) && configuration === 'never') {
+        context.report({
+          node,
+          message: 'Must never use destructuring context assignment in SFC argument'
+        });
       }
     }
 
@@ -151,7 +157,7 @@ module.exports = {
           context.report({
             node,
             message: `Must never use destructuring ${node.init.callee.name} assignment`
-          })
+          });
         }
 
         if (SFCComponent && destructuringSFC && configuration === 'never') {

tests/lib/rules/destructuring-assignment.js

@@ -17,7 +17,7 @@ const parserOptions = {
   }
 };
 
-const ruleTester = new RuleTester({parserOptions});
+const ruleTester = new RuleTester({ parserOptions });
 ruleTester.run('destructuring-assignment', rule, {
   valid: [{
     code: `const MyComponent = ({ id, className }) => (
@@ -163,7 +163,7 @@ ruleTester.run('destructuring-assignment', rule, {
         bar = this.props.bar
       }
     `,
-    options: ['always', {ignoreClassFields: true}],
+    options: ['always', { ignoreClassFields: true }],
     parser: parsers.BABEL_ESLINT
   }, {
     code: [
@@ -174,7 +174,7 @@ ruleTester.run('destructuring-assignment', rule, {
       '  }',
       '}'
     ].join('\n'),
-    options: ['always', {ignoreClassFields: true}],
+    options: ['always', { ignoreClassFields: true }],
     parser: parsers.BABEL_ESLINT
   }, {
     code: `const MyComponent = (props) => {
@@ -189,21 +189,28 @@ ruleTester.run('destructuring-assignment', rule, {
     };`,
     options: ['never']
   }],
-
   invalid: [{
     code: `const MyComponent = (props) => {
       return (<div id={props.id} />)
     };`,
     errors: [
-      {message: 'Must use destructuring props assignment'}
+      { message: 'Must use destructuring props assignment' }
     ]
   }, {
     code: `const MyComponent = ({ id, className }) => (
       <div id={id} className={className} />
     );`,
     options: ['never'],
     errors: [
-      {message: 'Must never use destructuring props assignment in SFC argument'}
+      { message: 'Must never use destructuring props assignment in SFC argument' }
+    ]
+  }, {
+    code: `const MyComponent = (props, { color }) => (
+      <div id={props.id} className={props.className} />
+    );`,
+    options: ['never'],
+    errors: [
+      { message: 'Must never use destructuring context assignment in SFC argument' }
     ]
   }, {
     code: `const Foo = class extends React.PureComponent {
@@ -212,7 +219,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     };`,
     errors: [
-      {message: 'Must use destructuring props assignment'}
+      { message: 'Must use destructuring props assignment' }
     ]
   }, {
     code: `const Foo = class extends React.PureComponent {
@@ -221,7 +228,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     };`,
     errors: [
-      {message: 'Must use destructuring state assignment'}
+      { message: 'Must use destructuring state assignment' }
     ]
   }, {
     code: `const Foo = class extends React.PureComponent {
@@ -230,7 +237,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     };`,
     errors: [
-      {message: 'Must use destructuring context assignment'}
+      { message: 'Must use destructuring context assignment' }
     ]
   }, {
     code: `class Foo extends React.Component {
@@ -240,7 +247,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     }`,
     errors: [
-      {message: 'Must use destructuring props assignment'}
+      { message: 'Must use destructuring props assignment' }
     ]
   }, {
     code: `var Hello = React.createClass({
@@ -249,7 +256,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     });`,
     errors: [
-      {message: 'Must use destructuring props assignment'}
+      { message: 'Must use destructuring props assignment' }
     ]
   }, {
     code: `
@@ -259,21 +266,21 @@ ruleTester.run('destructuring-assignment', rule, {
         }
       }
     `,
-    errors: [{message: 'Must use destructuring props assignment'}]
+    errors: [{ message: 'Must use destructuring props assignment' }]
   }, {
     code: `
       export default function Foo(props) {
         return <p>{props.a}</p>;
       }
     `,
-    errors: [{message: 'Must use destructuring props assignment'}]
+    errors: [{ message: 'Must use destructuring props assignment' }]
   }, {
     code: `
       function hof() {
         return (props) => <p>{props.a}</p>;
       }
     `,
-    errors: [{message: 'Must use destructuring props assignment'}]
+    errors: [{ message: 'Must use destructuring props assignment' }]
   }, {
     code: `const Foo = class extends React.PureComponent {
       render() {
@@ -282,7 +289,7 @@ ruleTester.run('destructuring-assignment', rule, {
       }
     };`,
     errors: [
-      {message: 'Must use destructuring props assignment'}
+      { message: 'Must use destructuring props assignment' }
     ]
   }, {
     code: `const Foo = class extends React.PureComponent {
@@ -294,7 +301,7 @@ ruleTester.run('destructuring-assignment', rule, {
     options: ['never'],
     parser: parsers.BABEL_ESLINT,
     errors: [
-      {message: 'Must never use destructuring props assignment'}
+      { message: 'Must never use destructuring props assignment' }
     ]
   }, {
     code: `const MyComponent = (props) => {
@@ -304,7 +311,7 @@ ruleTester.run('destructuring-assignment', rule, {
     options: ['never'],
     parser: parsers.BABEL_ESLINT,
     errors: [
-      {message: 'Must never use destructuring props assignment'}
+      { message: 'Must never use destructuring props assignment' }
     ]
   }, {
     code: `const Foo = class extends React.PureComponent {
@@ -316,7 +323,25 @@ ruleTester.run('destructuring-assignment', rule, {
     options: ['never'],
     parser: parsers.BABEL_ESLINT,
     errors: [
-      {message: 'Must never use destructuring state assignment'}
+      { message: 'Must never use destructuring state assignment' }
+    ]
+  }, {
+    code: `const MyComponent = (props) => {
+      const foo = useContext(aContext);
+      return <div>{foo.test}</div>
+    };`,
+    options: ['always'],
+    errors: [
+      { message: 'Must use destructuring foo assignment' }
+    ]
+  }, {
+    code: `const MyComponent = (props) => {
+      const {foo} = useContext(aContext);
+      return <div>{foo}</div>
+    };`,
+    options: ['never'],
+    errors: [
+      { message: 'Must never use destructuring useContext assignment' }
     ]
   }, {
     code: `const MyComponent = (props) => {
@@ -325,7 +350,7 @@ ruleTester.run('destructuring-assignment', rule, {
     };`,
     options: ['always'],
     errors: [
-      {message: 'Must use destructuring foo assignment'}
+      { message: 'Must use destructuring foo assignment' }
     ]
   }, {
     code: `const MyComponent = (props) => {
@@ -334,7 +359,7 @@ ruleTester.run('destructuring-assignment', rule, {
     };`,
     options: ['never'],
     errors: [
-      {message: 'Must never use destructuring useContext assignment'}
+      { message: 'Must never use destructuring useContext assignment' }
     ]
   }]
 });