[Fix] forbid-prop-types: warn on destructured values as well

Fixes #2662. Co-authored-by: Alex Kovar <ajkovar@gmail.com> Co-authored-by: Jordan Harband <ljharb@gmail.com>
jsx-eslint · Jun 16, 2020 · 08cdd39 · 08cdd39
1 parent b8e91a5
commit 08cdd39
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/lib/rules/forbid-prop-types.js b/lib/rules/forbid-prop-types.js
@@ -93,10 +93,7 @@ module.exports = {
         ) {
           value = value.object;
         }
-        if (
-          value.type === 'CallExpression'
-          && value.callee.type === 'MemberExpression'
-        ) {
+        if (value.type === 'CallExpression') {
           value = value.callee;
         }
         if (value.property) {

diff --git a/tests/lib/rules/forbid-prop-types.js b/tests/lib/rules/forbid-prop-types.js
@@ -1460,5 +1460,42 @@ ruleTester.run('forbid-prop-types', rule, {
       checkChildContextTypes: true
     }],
     errors: 1
+  }, {
+    code: [
+      'import { object, string } from "prop-types";',
+      'function C({ a, b }) { return [a, b]; }',
+      'C.propTypes = {',
+      '  a: object,',
+      '  b: string',
+      '};'
+    ].join('\n'),
+    options: [{
+      forbid: ['object']
+    }],
+    errors: 1
+  }, {
+    code: [
+      'import { objectOf, any } from "prop-types";',
+      'function C({ a }) { return a; }',
+      'C.propTypes = {',
+      '  a: objectOf(any)',
+      '};'
+    ].join('\n'),
+    options: [{
+      forbid: ['any']
+    }],
+    errors: 1
+  }, {
+    code: [
+      'import { objectOf, any } from "prop-types";',
+      'function C({ a }) { return a; }',
+      'C.propTypes = {',
+      '  a: objectOf(any)',
+      '};'
+    ].join('\n'),
+    options: [{
+      forbid: ['objectOf']
+    }],
+    errors: 1
   }]
 });