Merge pull request #1905 from alexzherdev/1700-boolean-prop-naming-fl…

…ow-crash [Fix] Handle inline Flow type in boolean-prop-naming
jsx-eslint · Jul 27, 2018 · 05d781b · 05d781b
2 parents 4e80833 + 470fdd9
commit 05d781b
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/lib/rules/boolean-prop-naming.js b/lib/rules/boolean-prop-naming.js
@@ -235,7 +235,14 @@ module.exports = {
             list[component].node.params[0].typeAnnotation
           ) {
             const typeNode = list[component].node.params[0].typeAnnotation;
-            const propType = objectTypeAnnotations.get(typeNode.typeAnnotation.id.name);
+            const annotation = typeNode.typeAnnotation;
+
+            let propType;
+            if (annotation.type === 'GenericTypeAnnotation') {
+              propType = objectTypeAnnotations.get(annotation.id.name);
+            } else if (annotation.type === 'ObjectTypeAnnotation') {
+              propType = annotation;
+            }
             if (propType) {
               validatePropNaming(list[component].node, propType.properties);
             }

diff --git a/tests/lib/rules/boolean-prop-naming.js b/tests/lib/rules/boolean-prop-naming.js
@@ -358,6 +358,23 @@ ruleTester.run('boolean-prop-naming', rule, {
     options: [{
       rule: '^is[A-Z]([A-Za-z0-9]?)+'
     }]
+  }, {
+    // inline Flow type
+    code: `
+      function SomeComponent({
+          isSomething,
+      }: {
+          isSomething: boolean,
+      }) {
+          return (
+              <span>{isSomething}</span>
+          );
+      }
+    `,
+    options: [{
+      rule: '^is[A-Z]([A-Za-z0-9]?)+'
+    }],
+    parser: 'babel-eslint'
   }],
 
   invalid: [{
@@ -772,5 +789,25 @@ ruleTester.run('boolean-prop-naming', rule, {
     errors: [{
       message: 'Prop name (something) doesn\'t match rule (^is[A-Z]([A-Za-z0-9]?)+)'
     }]
+  }, {
+    // inline Flow type
+    code: `
+      function SomeComponent({
+          something,
+      }: {
+          something: boolean,
+      }) {
+          return (
+              <span>{something}</span>
+          );
+      }
+    `,
+    options: [{
+      rule: '^is[A-Z]([A-Za-z0-9]?)+'
+    }],
+    parser: 'babel-eslint',
+    errors: [{
+      message: 'Prop name (something) doesn\'t match rule (^is[A-Z]([A-Za-z0-9]?)+)'
+    }]
   }]
 });