fix: bump versions of babel-eslint, eslint and eslint-config-canonical (#359)

pnevyk · gajus · commit 68ed51579060 · 2018-09-27T13:31:20.000+01:00
diff --git a/package.json b/package.json
@@ -11,14 +11,14 @@
   "devDependencies": {
     "ajv": "^6.5.0",
     "babel-cli": "^6.26.0",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^9.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-register": "^6.26.0",
     "chai": "^4.1.2",
-    "eslint": "^3.16.0",
-    "eslint-config-canonical": "1.8.1",
+    "eslint": "^5.6.0",
+    "eslint-config-canonical": "^12.0.0",
     "gitdown": "^2.5.2",
     "glob": "^7.1.2",
     "husky": "^0.14.3",
diff --git a/src/rules/defineFlowType.js b/src/rules/defineFlowType.js
@@ -57,9 +57,8 @@ const create = (context) => {
         makeDefined(qid);
       }
     },
-    InterfaceDeclaration (node) {
-      makeDefined(node.id);
-    },
+
+    // Can be removed once https://github.com/babel/babel-eslint/pull/696 is published
     OpaqueType (node) {
       if (node.id.type === 'Identifier') {
         makeDefined(node.id);
diff --git a/src/rules/genericSpacing.js b/src/rules/genericSpacing.js
@@ -1,4 +1,4 @@
-import {spacingFixers} from './../utilities';
+import {spacingFixers} from '../utilities';
 
 const schema = [
   {
@@ -16,9 +16,9 @@ const create = (context) => {
     GenericTypeAnnotation (node) {
       const types = node.typeParameters;
 
-            // Promise<foo>
-            // ^^^^^^^^^^^^ GenericTypeAnnotation (with typeParameters)
-            //         ^^^  GenericTypeAnnotation (without typeParameters)
+      // Promise<foo>
+      // ^^^^^^^^^^^^ GenericTypeAnnotation (with typeParameters)
+      //         ^^^  GenericTypeAnnotation (without typeParameters)
       if (!types) {
         return;
       }
diff --git a/src/rules/newlineAfterFlowAnnotation.js b/src/rules/newlineAfterFlowAnnotation.js
@@ -36,9 +36,9 @@ const create = (context) => {
           context.report({
             fix: (fixer) => {
               return fixer.insertTextAfter(
-              potentialFlowFileAnnotation,
-              newline
-            );
+                potentialFlowFileAnnotation,
+                newline
+              );
             },
             message: 'Expected newline after flow annotation',
             node
diff --git a/src/rules/noDupeKeys.js b/src/rules/noDupeKeys.js
@@ -1,7 +1,7 @@
 import _ from 'lodash/';
 import {
   getParameterName
-} from './../utilities';
+} from '../utilities';
 
 const schema = [];
 
diff --git a/src/rules/noPrimitiveConstructorTypes.js b/src/rules/noPrimitiveConstructorTypes.js
@@ -3,11 +3,13 @@ import _ from 'lodash';
 const schema = [];
 
 const create = (context) => {
+  const regex = /^(Boolean|Number|String)$/;
+
   return {
     GenericTypeAnnotation: (node) => {
       const name = _.get(node, 'id.name');
 
-      if (RegExp(/^(Boolean|Number|String)$/).test(name)) {
+      if (regex.test(name)) {
         context.report({
           data: {
             name
diff --git a/src/rules/noWeakTypes.js b/src/rules/noWeakTypes.js
@@ -4,13 +4,13 @@ const schema = [
   {
     additionalProperties: false,
     properties: {
-      Function: {
+      any: {
         type: 'boolean'
       },
-      Object: {
+      Function: {
         type: 'boolean'
       },
-      any: {
+      Object: {
         type: 'boolean'
       }
     },
diff --git a/src/rules/objectTypeDelimiter.js b/src/rules/objectTypeDelimiter.js
@@ -1,5 +1,5 @@
- // ported from babel/flow-object-type; original author: Nat Mote
- // https://github.com/babel/eslint-plugin-babel/blob/c0a49d25a97feb12c1d07073a0b37317359a5fe5/rules/flow-object-type.js
+// ported from babel/flow-object-type; original author: Nat Mote
+// https://github.com/babel/eslint-plugin-babel/blob/c0a49d25a97feb12c1d07073a0b37317359a5fe5/rules/flow-object-type.js
 
 const SEMICOLON = {
   char: ';',
diff --git a/src/rules/requireParameterType.js b/src/rules/requireParameterType.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import {
-    getParameterName,
-    iterateFunctionNodes,
-    quoteName
-} from './../utilities';
+  getParameterName,
+  iterateFunctionNodes,
+  quoteName
+} from '../utilities';
 
 const schema = [
   {
diff --git a/src/rules/requireValidFileAnnotation.js b/src/rules/requireValidFileAnnotation.js
@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import {
-    isFlowFileAnnotation,
-    fuzzyStringMatch
-} from './../utilities';
+  isFlowFileAnnotation,
+  fuzzyStringMatch
+} from '../utilities';
 
 const defaults = {
   annotationStyle: 'none'
diff --git a/src/rules/requireVariableType.js b/src/rules/requireVariableType.js
@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import {
-    isFlowFile,
-    quoteName
-} from './../utilities';
+  isFlowFile,
+  quoteName
+} from '../utilities';
 
 const schema = [
   {
diff --git a/src/rules/semi.js b/src/rules/semi.js
@@ -11,7 +11,8 @@ const create = (context) => {
 
   const report = (node, missing) => {
     const lastToken = sourceCode.getLastToken(node);
-    let fix, message;
+    let fix;
+    let message;
     let {loc} = lastToken;
 
     if (missing) {
diff --git a/src/rules/sortKeys.js b/src/rules/sortKeys.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import {
   getParameterName
-} from './../utilities';
+} from '../utilities';
 
 const defaults = {
   caseSensitive: true,
diff --git a/src/rules/spaceBeforeGenericBracket.js b/src/rules/spaceBeforeGenericBracket.js
@@ -14,9 +14,9 @@ const create = (context) => {
     GenericTypeAnnotation (node) {
       const types = node.typeParameters;
 
-            // Promise<foo>
-            // ^^^^^^^^^^^^ GenericTypeAnnotation (with typeParameters)
-            //         ^^^  GenericTypeAnnotation (without typeParameters)
+      // Promise<foo>
+      // ^^^^^^^^^^^^ GenericTypeAnnotation (with typeParameters)
+      //         ^^^  GenericTypeAnnotation (without typeParameters)
       if (!types) {
         return;
       }
diff --git a/src/rules/typeColonSpacing/reporter.js b/src/rules/typeColonSpacing/reporter.js
@@ -22,7 +22,8 @@ const getSpaces = (direction, colon, context) => {
 
 export default (direction, context, {always, allowLineBreak}) => {
   return ({colon, node, name = '', type = 'type annotation'}) => {
-    let lineBreak, spaces;
+    let lineBreak;
+    let spaces;
 
     // Support optional names
     // type X = { [string]: a }
diff --git a/src/rules/typeImportStyle.js b/src/rules/typeImportStyle.js
@@ -39,9 +39,7 @@ const create = (context) => {
               });
               const source = node.source.value;
 
-              return fixer.replaceText(node,
-                'import {' + imports.join(', ') + '} from \'' + source + '\';'
-              );
+              return fixer.replaceText(node, 'import {' + imports.join(', ') + '} from \'' + source + '\';');
             },
             message: 'Unexpected "import type"',
             node
@@ -56,4 +54,3 @@ export default {
   create,
   schema
 };
-
diff --git a/src/rules/validSyntax.js b/src/rules/validSyntax.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import {
-    getParameterName,
-    iterateFunctionNodes,
-    quoteName
-} from './../utilities';
+  getParameterName,
+  iterateFunctionNodes,
+  quoteName
+} from '../utilities';
 
 const schema = [];
 
diff --git a/src/utilities/fuzzyStringMatch.js b/src/utilities/fuzzyStringMatch.js
@@ -1,16 +1,17 @@
 import _ from 'lodash';
 
-/**
- * Creates an array of letter pairs from a given an array
- * https://github.com/d3/d3-array/blob/master/src/pairs.js
- *
- * @param {any} array
- * @returns array
- */
-/* eslint-disable */
-function d3ArrayPairs (array) {
-  var i = 0, n = array.length - 1, p = array[0], pairs = new Array(n < 0 ? 0 : n);
-  while (i < n) pairs[i] = [p, p = array[++i]];
+// Creates an array of letter pairs from a given array
+// origin: https://github.com/d3/d3-array/blob/master/src/pairs.js
+const arrayPairs = (array) => {
+  let ii = 0;
+  const length = array.length - 1;
+  let letter = array[0];
+  const pairs = new Array(length < 0 ? 0 : length);
+
+  while (ii < length) {
+    pairs[ii] = [letter, letter = array[++ii]];
+  }
+
   return pairs;
 };
 /* eslint-enable */
@@ -20,8 +21,8 @@ export default (needle, haystack, weight = 0.5) => {
 
   const stringSimilarity = (str1, str2) => {
     if (str1.length > 0 && str2.length > 0) {
-      const pairs1 = d3ArrayPairs(str1);
-      const pairs2 = d3ArrayPairs(str2);
+      const pairs1 = arrayPairs(str1);
+      const pairs2 = arrayPairs(str2);
       const unionLen = pairs1.length + pairs2.length;
       let hitCount;
 
diff --git a/src/utilities/index.js b/src/utilities/index.js
@@ -5,12 +5,12 @@ import * as spacingFixers from './spacingFixers';
 
 export {default as checkFlowFileAnnotation} from './checkFlowFileAnnotation';
 export {default as fuzzyStringMatch} from './fuzzyStringMatch';
-export {default as getParameterName} from './getParameterName.js';
+export {default as getParameterName} from './getParameterName';
 export {default as getTokenAfterParens} from './getTokenAfterParens';
 export {default as getTokenBeforeParens} from './getTokenBeforeParens';
-export {default as isFlowFile} from './isFlowFile.js';
-export {default as isFlowFileAnnotation} from './isFlowFileAnnotation.js';
-export {default as iterateFunctionNodes} from './iterateFunctionNodes.js';
+export {default as isFlowFile} from './isFlowFile';
+export {default as isFlowFileAnnotation} from './isFlowFileAnnotation';
+export {default as iterateFunctionNodes} from './iterateFunctionNodes';
 export {default as quoteName} from './quoteName';
 
 export {
diff --git a/src/utilities/isFlowFile.js b/src/utilities/isFlowFile.js
@@ -1,4 +1,4 @@
-import isFlowFileAnnotation from './isFlowFileAnnotation.js';
+import isFlowFileAnnotation from './isFlowFileAnnotation';
 /* eslint-disable flowtype/require-valid-file-annotation */
 /**
  * Checks whether a file has an @flow or @noflow annotation.
diff --git a/tests/rules/assertions/defineFlowType.js b/tests/rules/assertions/defineFlowType.js
@@ -1,5 +1,5 @@
 import {
-    RuleTester
+  RuleTester
 } from 'eslint';
 import noUndefRule from 'eslint/lib/rules/no-undef';
 
@@ -45,7 +45,7 @@ const VALID_WITH_DEFINE_FLOW_TYPE = [
   {
     code: 'opaque type A = AType',
     errors: [
-      // Complaining about 'A' not being defined might be an upstream bug
+      // Complaining about 'A' is fixed in https://github.com/babel/babel-eslint/pull/696
       '\'A\' is not defined.',
       '\'AType\' is not defined.'
     ]
@@ -105,12 +105,6 @@ const VALID_WITH_DEFINE_FLOW_TYPE = [
       '\'AType\' is not defined.'
     ]
   },
-  {
-    code: 'interface AType {}',
-    errors: [
-      '\'AType\' is not defined.'
-    ]
-  },
   {
     code: 'declare interface A {}',
     errors: [
@@ -120,8 +114,8 @@ const VALID_WITH_DEFINE_FLOW_TYPE = [
   {
     code: '({ a: ({b() {}}: AType) })',
 
-        // `AType` appears twice in `globalScope.through` as distinct
-        // references, this may be a babel-eslint bug.
+    // `AType` appears twice in `globalScope.through` as distinct
+    // references, this may be a babel-eslint bug.
     errors: [
       '\'AType\' is not defined.',
       '\'AType\' is not defined.'
@@ -133,13 +127,6 @@ const VALID_WITH_DEFINE_FLOW_TYPE = [
       '\'AType\' is not defined.',
       '\'BType\' is not defined.'
     ]
-  },
-  {
-    code: 'interface AType<BType> {}',
-    errors: [
-      '\'AType\' is not defined.',
-      '\'BType\' is not defined.'
-    ]
   }
 ];
 
@@ -196,7 +183,7 @@ const ALWAYS_VALID = [
     parser: 'babel-eslint'
   });
 
-  ruleTester.run('no-under must not trigger an error in these cases', noUndefRule, {
+  ruleTester.run('no-undef must not trigger an error in these cases', noUndefRule, {
     invalid: [],
     valid: ALWAYS_VALID
   });
diff --git a/tests/rules/assertions/genericSpacing.js b/tests/rules/assertions/genericSpacing.js
diff --git a/tests/rules/assertions/noWeakTypes.js b/tests/rules/assertions/noWeakTypes.js
diff --git a/tests/rules/assertions/requireExactType.js b/tests/rules/assertions/requireExactType.js
diff --git a/tests/rules/assertions/unionIntersectionSpacing.js b/tests/rules/assertions/unionIntersectionSpacing.js
diff --git a/tests/rules/assertions/useFlowType.js b/tests/rules/assertions/useFlowType.js
diff --git a/tests/rules/index.js b/tests/rules/index.js
