Merge branch 'SimeonC-fix-interface-delimiters'

.README/rules/delimiter-dangle.md

@@ -4,7 +4,9 @@ _The `--fix` option on the command line automatically fixes problems reported by
 
 Enforces consistent use of trailing commas in Object and Tuple annotations.
 
-This rule takes one argument which mirrors ESLint's default `comma-dangle` rule.
+This rule takes two arguments which both mirror ESLint's default `comma-dangle` rule.
+The first argument is for Object and Tuple annotations.
+The second argument is used for Interface annotations as ESLint's default `comma-dangle` doesn't apply to interfaces - this defaults to whatever the first argument is.
 
 If it is `'never'` then a problem is raised when there is a trailing comma.
 

README.md

@@ -604,7 +604,9 @@ _The `--fix` option on the command line automatically fixes problems reported by
 
 Enforces consistent use of trailing commas in Object and Tuple annotations.
 
-This rule takes one argument which mirrors ESLint's default `comma-dangle` rule.
+This rule takes two arguments which both mirror ESLint's default `comma-dangle` rule.
+The first argument is for Object and Tuple annotations.
+The second argument is used for Interface annotations as ESLint's default `comma-dangle` doesn't apply to interfaces - this defaults to whatever the first argument is.
 
 If it is `'never'` then a problem is raised when there is a trailing comma.
 
@@ -660,6 +662,10 @@ foo: string
 type X = { foo: string; }
 // Message: Unexpected trailing delimiter
 
+// Options: ["always","never"]
+interface X { foo: string; }
+// Message: Unexpected trailing delimiter
+
 // Options: ["never"]
 type X = { [key: string]: number, }
 // Message: Unexpected trailing delimiter
@@ -862,6 +868,9 @@ type X = {
 foo: string;
 }
 
+// Options: ["never","always"]
+interface X { foo: string; }
+
 // Options: ["never"]
 type X = {}
 
@@ -1152,7 +1161,7 @@ import Foo from './foo';
 // Message: Expected newline after flow annotation
 
 // Options: ["always-windows"]
-// @flow
+// @flow
 import Foo from './foo';
 // Message: Expected newline after flow annotation
 
@@ -1172,8 +1181,8 @@ The following patterns are not considered problems:
 import Foo from './foo';
 
 // Options: ["always-windows"]
-// @flow
-
+// @flow
+
 import Foo from './foo';
 
 // Options: ["never"]
@@ -4028,7 +4037,7 @@ The following patterns are not considered problems:
   { a: string, b: number }) => {}
 
 // Options: ["always",{"allowLineBreak":true}]
-(foo:
+(foo:
   { a: string, b: number }) => {}
 
 // Options: ["never"]

src/bin/addAssertions.js

@@ -48,7 +48,7 @@ const getAssertions = () => {
 
     return {
       invalid: _.map(codes.invalid, formatCodeSnippet),
-      valid: _.map(codes.valid, formatCodeSnippet),
+      valid: _.map(codes.valid, formatCodeSnippet)
     };
   });
 

src/bin/checkDocs.js

@@ -6,7 +6,7 @@ import fs from 'fs';
 import path from 'path';
 import {
   getRules,
-  isFile,
+  isFile
 } from './utilities';
 
 const windows = (array, size) => {

src/bin/checkTests.js

@@ -4,7 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import {
   getRules,
-  isFile,
+  isFile
 } from './utilities';
 
 const getTestIndexRules = () => {
@@ -24,7 +24,7 @@ const getTestIndexRules = () => {
     return acc;
   }, {
     inRulesArray: false,
-    rules: [],
+    rules: []
   });
 
   const rules = result.rules;

src/index.js

@@ -78,12 +78,12 @@ const rules = {
   'type-import-style': typeImportStyle,
   'union-intersection-spacing': unionIntersectionSpacing,
   'use-flow-type': useFlowType,
-  'valid-syntax': validSyntax,
+  'valid-syntax': validSyntax
 };
 
 export default {
   configs: {
-    recommended,
+    recommended
   },
   rules: _.mapValues(rules, (rule, key) => {
     if (key === 'no-types-missing-file-annotation') {
@@ -92,7 +92,7 @@ export default {
 
     return {
       ...rule,
-      create: _.partial(checkFlowFileAnnotation, rule.create),
+      create: _.partial(checkFlowFileAnnotation, rule.create)
     };
   }),
   rulesConfig: {
@@ -123,6 +123,6 @@ export default {
     'type-import-style': 0,
     'union-intersection-spacing': 0,
     'use-flow-type': 0,
-    'valid-syntax': 0,
-  },
+    'valid-syntax': 0
+  }
 };

src/rules/arrayStyle/index.js

@@ -4,8 +4,8 @@ import needWrap from './needWrap';
 const schema = [
   {
     enum: ['verbose', 'shorthand'],
-    type: 'string',
-  },
+    type: 'string'
+  }
 ];
 
 const inlineType = (type) => {
@@ -33,13 +33,13 @@ export default (defaultConfig, simpleType) => {
           context.report({
             data: {
               type: inlinedType,
-              wrappedType: wrappedInlinedType,
+              wrappedType: wrappedInlinedType
             },
             fix (fixer) {
               return fixer.replaceText(node, 'Array<' + rawElementType + '>');
             },
             message: 'Use "Array<{{ type }}>", not "{{ wrappedType }}[]"',
-            node,
+            node
           });
         }
       },
@@ -59,7 +59,7 @@ export default (defaultConfig, simpleType) => {
               context.report({
                 data: {
                   type: inlinedType,
-                  wrappedType: wrappedInlinedType,
+                  wrappedType: wrappedInlinedType
                 },
                 fix (fixer) {
                   if (needWrap(elementTypeNode)) {
@@ -69,17 +69,17 @@ export default (defaultConfig, simpleType) => {
                   }
                 },
                 message: 'Use "{{ wrappedType }}[]", not "Array<{{ type }}>"',
-                node,
+                node
               });
             }
           }
         }
-      },
+      }
     };
   };
 
   return {
     create,
-    schema,
+    schema
   };
 };

src/rules/arrayStyle/isSimpleType.js

@@ -20,7 +20,7 @@
 
 const simpleTypePatterns = [
   /^(?:Any|Array|Boolean|Generic|Mixed|Number|String|Void)TypeAnnotation$/,
-  /.+LiteralTypeAnnotation$/,
+  /.+LiteralTypeAnnotation$/
 ];
 
 export default (node) => {

src/rules/arrowParens.js

@@ -1,7 +1,7 @@
 const getLocation = (node) => {
   return {
     end: node.params[node.params.length - 1].loc.end,
-    start: node.params[0].loc.start,
+    start: node.params[0].loc.start
   };
 };
 
@@ -40,7 +40,7 @@ export default {
 
         return fixer.replaceTextRange([
           firstTokenOfParam.range[0],
-          closingParenToken.range[1],
+          closingParenToken.range[1]
         ], `${shouldAddSpaceForAsync ? ' ' : ''}${paramToken.value}`);
       };
 
@@ -70,7 +70,7 @@ export default {
             fix: fixParamsWithParenthesis,
             loc: getLocation(node),
             messageId: 'unexpectedParensInline',
-            node,
+            node
           });
         }
 
@@ -88,7 +88,7 @@ export default {
             },
             loc: getLocation(node),
             messageId: 'expectedParensBlock',
-            node,
+            node
           });
         }
 
@@ -107,7 +107,7 @@ export default {
             fix: fixParamsWithParenthesis,
             loc: getLocation(node),
             messageId: 'unexpectedParens',
-            node,
+            node
           });
         }
 
@@ -125,14 +125,14 @@ export default {
             },
             loc: getLocation(node),
             messageId: 'expectedParens',
-            node,
+            node
           });
         }
       }
     };
 
     return {
-      ArrowFunctionExpression: parens,
+      ArrowFunctionExpression: parens
     };
   },
 
@@ -141,7 +141,7 @@ export default {
       category: 'ECMAScript 6',
       description: 'require parentheses around arrow function arguments',
       recommended: false,
-      url: 'https://eslint.org/docs/rules/arrow-parens',
+      url: 'https://eslint.org/docs/rules/arrow-parens'
     },
 
     fixable: 'code',
@@ -151,25 +151,25 @@ export default {
       expectedParensBlock: 'Expected parentheses around arrow function argument having a body with curly braces.',
 
       unexpectedParens: 'Unexpected parentheses around single function argument.',
-      unexpectedParensInline: 'Unexpected parentheses around single function argument having a body with no curly braces.',
+      unexpectedParensInline: 'Unexpected parentheses around single function argument having a body with no curly braces.'
     },
 
-    type: 'layout',
+    type: 'layout'
   },
 
   schema: [
     {
-      enum: ['always', 'as-needed'],
+      enum: ['always', 'as-needed']
     },
     {
       additionalProperties: false,
       properties: {
         requireForBlockBody: {
           default: false,
-          type: 'boolean',
-        },
+          type: 'boolean'
+        }
       },
-      type: 'object',
-    },
-  ],
+      type: 'object'
+    }
+  ]
 };

src/rules/booleanStyle.js

@@ -1,8 +1,8 @@
 const schema = [
   {
     enum: ['bool', 'boolean'],
-    type: 'string',
-  },
+    type: 'string'
+  }
 ];
 
 const create = (context) => {
@@ -18,7 +18,7 @@ const create = (context) => {
             return fixer.replaceText(node, 'boolean');
           },
           message: 'Use "boolean", not "bool"',
-          node,
+          node
         });
       }
 
@@ -28,14 +28,14 @@ const create = (context) => {
             return fixer.replaceText(node, 'bool');
           },
           message: 'Use "bool", not "boolean"',
-          node,
+          node
         });
       }
-    },
+    }
   };
 };
 
 export default {
   create,
-  schema,
+  schema
 };

src/rules/defineFlowType.js

@@ -71,11 +71,11 @@ const create = (context) => {
       node.params.forEach((param) => {
         makeDefined(param);
       });
-    },
+    }
   };
 };
 
 export default {
   create,
-  schema,
+  schema
 };