Merge pull request #159 from gajus/optionalNames

feat: support optional Flow names (closes #145)
gajus · Nov 30, 2016 · 915a284 · 915a284
2 parents 25e11f2 + c40ad7c
commit 915a284
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 0 deletions.
diff --git a/src/rules/typeColonSpacing/reporter.js b/src/rules/typeColonSpacing/reporter.js
@@ -14,6 +14,13 @@ export default (direction, context, {always, allowLineBreak}) => {
   return ({colon, node, name = '', type = 'type annotation'}) => {
     let spaces;
 
+    // Support optional names
+    // type X = { [string]: a }
+    // type X = string => string
+    if (colon.value !== ':') {
+      return;
+    }
+
     const data = {
       direction,
       name,

diff --git a/tests/rules/assertions/spaceAfterTypeColon.js b/tests/rules/assertions/spaceAfterTypeColon.js
@@ -453,6 +453,41 @@ const FUNCTION_TYPE_PARAMS = {
     {
       code: 'type TArrayPredicate = (el:T, i?:number) => boolean',
       options: ['never']
+    },
+    {
+      code: 'type X = (number) => string;'
+    },
+    {
+      code: 'type X = (?number) => string;'
+    },
+    {
+      code: 'type X = number => string;'
+    },
+    {
+      code: 'type X = ?number => string;'
+    },
+    {
+      code: 'type X = ({ foo: bar }) => string;'
+    },
+    {
+      code: 'type X = (number) => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = (?number) => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = number => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = ?number => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = ({ foo: bar }) => string;',
+      options: ['always']
     }
   ]
 };
@@ -948,6 +983,14 @@ const OBJECT_TYPE_INDEXERS = {
     {
       code: 'type X = { +[a:b]:c }',
       options: ['never']
+    },
+    {
+      code: 'type X = { [string]: c }',
+      options: ['always']
+    },
+    {
+      code: 'type X = { [string]:c }',
+      options: ['never']
     }
   ]
 };

diff --git a/tests/rules/assertions/spaceBeforeTypeColon.js b/tests/rules/assertions/spaceBeforeTypeColon.js
@@ -338,6 +338,41 @@ const FUNCTION_TYPE_PARAMS = {
     {
       code: 'type X = (foo? : ?string) => number',
       options: ['always']
+    },
+    {
+      code: 'type X = (number) => string;'
+    },
+    {
+      code: 'type X = (?number) => string;'
+    },
+    {
+      code: 'type X = number => string;'
+    },
+    {
+      code: 'type X = ?number => string;'
+    },
+    {
+      code: 'type X = ({ foo: bar }) => string;'
+    },
+    {
+      code: 'type X = (number) => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = (?number) => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = number => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = ?number => string;',
+      options: ['always']
+    },
+    {
+      code: 'type X = ({ foo : bar }) => string;',
+      options: ['always']
     }
   ]
 };
@@ -749,6 +784,14 @@ const OBJECT_TYPE_INDEXERS = {
       code: 'type X = { [a:b]:c }',
       options: ['never']
     },
+    {
+      code: 'type X = { [string] : c }',
+      options: ['always']
+    },
+    {
+      code: 'type X = { [string]:c }',
+      options: ['never']
+    },
     {
       code: 'type X = { +[a : b] : c }',
       options: ['always']