Merge pull request #1652 from lfades/fix/no-typos

support for custom propTypes with isRequired in no-typos
jsx-eslint · Jan 21, 2018 · f4cab9a · f4cab9a
2 parents 1d12044 + 942a92c
commit f4cab9a
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 2 deletions.
diff --git a/lib/rules/no-typos.js b/lib/rules/no-typos.js
@@ -59,9 +59,15 @@ module.exports = {
       if (node && node.type === 'MemberExpression' && node.object.type === 'MemberExpression') {
         checkValidPropType(node.object.property);
         checkValidPropTypeQualfier(node.property);
-      } else if (node && node.type === 'MemberExpression' && node.object.type === 'Identifier') {
+      } else if (node && node.type === 'MemberExpression' && node.object.type === 'Identifier' && node.property.name !== 'isRequired') {
         checkValidPropType(node.property);
-      } else if (node && node.type === 'CallExpression') {
+      } else if (node && (
+        node.type === 'MemberExpression' && node.object.type === 'CallExpression' || node.type === 'CallExpression'
+      )) {
+        if (node.type === 'MemberExpression') {
+          checkValidPropTypeQualfier(node.property);
+          node = node.object;
+        }
         const callee = node.callee;
         if (callee.type === 'MemberExpression' && callee.property.name === 'shape') {
           checkValidPropObject(node.arguments[0]);

diff --git a/tests/lib/rules/no-typos.js b/tests/lib/rules/no-typos.js
@@ -369,6 +369,27 @@ ruleTester.run('no-typos', rule, {
       };
     `,
     parser: 'babel-eslint'
+  }, {
+    code: `class Component extends React.Component {};
+     Component.propTypes = {
+       b: string.isRequired,
+       c: PropTypes.shape({
+         d: number.isRequired,
+       }).isRequired
+     }
+   `,
+    parserOptions: parserOptions
+  }, {
+    code: `class Component extends React.Component {};
+     Component.propTypes = {
+       b: string.isRequired,
+       c: PropTypes.shape({
+         d: number.isRequired,
+       }).isRequired
+     }
+   `,
+    parser: 'babel-eslint',
+    parserOptions: parserOptions
   }],
 
   invalid: [{
@@ -795,5 +816,36 @@ ruleTester.run('no-typos', rule, {
     }, {
       message: 'Typo in declared prop type: objectof'
     }]
+  }, {
+    code: `class Component extends React.Component {};
+     Component.propTypes = {
+       a: string.isrequired,
+       b: shape({
+         c: number
+       }).isrequired
+     }
+   `,
+    parserOptions: parserOptions,
+    errors: [{
+      message: 'Typo in declared prop type: isrequired'
+    }, {
+      message: 'Typo in prop type chain qualifier: isrequired'
+    }]
+  }, {
+    code: `class Component extends React.Component {};
+     Component.propTypes = {
+       a: string.isrequired,
+       b: shape({
+         c: number
+       }).isrequired
+     }
+   `,
+    parser: 'babel-eslint',
+    parserOptions: parserOptions,
+    errors: [{
+      message: 'Typo in declared prop type: isrequired'
+    }, {
+      message: 'Typo in prop type chain qualifier: isrequired'
+    }]
   }]
 });