Add stricter types

Author: infctr

.prettierignore

@@ -1 +1,4 @@
 tests/fixtures/**
+build
+dist
+lib

package.json

@@ -13,16 +13,16 @@
   "repository": "git@github.com:infctr/eslint-plugin-typescript-sort-keys.git",
   "scripts": {
     "build": "yarn rimraf lib && yarn compile",
-    "build-tests": "yarn rimraf build && yarn compile-tests",
+    "build-tests": "yarn rimraf build && yarn compile-tests && mv build/rules build/source && cp -r tests/fixtures/rulesdir build/rules",
     "compile": "yarn rollup -c",
     "compile-tests": "yarn babel --extensions .ts src --out-dir build",
     "docs": "eslint-docs",
     "docs:check": "eslint-docs check",
     "lint": "eslint --ext .js,.ts src/ tests/",
-    "postlint": "yarn docs:check",
     "format": "prettier --write src/**/*.{js,ts} tests/**/*.{js,ts}",
-    "test": "yarn jest --runInBand",
-    "test-compiled": "mv build/rules build/source && cp -r tests/fixtures/rulesdir build/rules && USE_COMPILED=1 yarn test",
+    "test": "yarn jest",
+    "test-compiled": "USE_COMPILED=1 yarn test",
+    "test-coverage": "yarn test-compiled --coverage --watchAll=false --coverageReporters=lcov,text-summary",
     "verify": "yarn build && yarn lint && yarn build-tests && yarn test-compiled && rimraf build"
   },
   "dependencies": {

src/rules/string-enum.ts

@@ -1,4 +1,5 @@
 import { JSONSchema4 } from 'json-schema';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
 
 import { getObjectBody } from 'utils/ast';
 import { createReporter } from 'utils/plugin';
@@ -72,11 +73,11 @@ export const rule = createRule<keyof typeof errorMessages, Options>({
 
     return {
       TSEnumDeclaration(node) {
-        const body = getObjectBody(node);
+        const body = getObjectBody(node) as TSESTree.TSEnumMember[];
         const isStringEnum = body.every(
-          member =>
+          (member: TSESTree.TSEnumMember) =>
             member.initializer &&
-            member.initializer.type === 'Literal' &&
+            member.initializer.type === AST_NODE_TYPES.Literal &&
             typeof member.initializer.value === 'string',
         );
 

src/utils/ast.ts

@@ -14,8 +14,6 @@ export function getObjectBody(
     case AST_NODE_TYPES.TSEnumDeclaration:
     case AST_NODE_TYPES.TSTypeLiteral:
       return node.members;
-    default:
-      return null;
   }
 }
 

src/utils/plugin.ts

@@ -43,7 +43,6 @@ function createNodeSwapper(context: UtilRuleContext<string, RuleOptions>) {
    */
   function getLineRange(node: TSESTree.Comment): TSESTree.Range {
     const [start] = getRangeWithIndent(node);
-    // TODO check SourceCode own methods
     const index = sourceCode.lineStartIndices.findIndex(n => start === n);
 
     if (index < 0) {
@@ -63,14 +62,11 @@ function createNodeSwapper(context: UtilRuleContext<string, RuleOptions>) {
     return sourceCode.text.slice(...getIndentRange(node));
   }
 
-  function getNodePunctuator(token: TSESTree.Token) {
-    const punctuator =
-      token.type === AST_TOKEN_TYPES.Punctuator
-        ? token
-        : sourceCode.getTokenAfter(token, {
-            filter: n => n.type === AST_TOKEN_TYPES.Punctuator && n.value !== ':',
-            includeComments: false,
-          });
+  function getNodePunctuator(node: TSESTree.Node) {
+    const punctuator = sourceCode.getTokenAfter(node, {
+      filter: n => n.type === AST_TOKEN_TYPES.Punctuator && n.value !== ':',
+      includeComments: false,
+    });
 
     // Check the punctuator value outside of filter because we
     // want to stop traversal on any terminating punctuator
@@ -83,17 +79,18 @@ function createNodeSwapper(context: UtilRuleContext<string, RuleOptions>) {
     currentNode: TSType,
     replaceNode: TSType,
   ) =>
-    [currentNode, replaceNode].reduce((acc, node) => {
+    [currentNode, replaceNode].reduce<RuleFix[]>((acc, node) => {
       const otherNode = node === currentNode ? replaceNode : currentNode;
       const comments = sourceCode.getCommentsBefore(node);
       const nextSibling = sourceCode.getTokenAfter(node);
       const isLastReplacingLast =
         nodePositions.get(node).final === nodePositions.size - 1 &&
         nodePositions.get(node).final === nodePositions.get(otherNode).initial;
 
-      let text = `${comments.length ? getIndentText(node) : ''}${sourceCode.getText(
-        node,
-      )}`;
+      let text = [
+        comments.length ? getIndentText(node) : '',
+        sourceCode.getText(node),
+      ].join('');
 
       // If nextSibling is the node punctuator, remove it
       if (nextSibling === getNodePunctuator(node)) {
@@ -116,7 +113,7 @@ function createNodeSwapper(context: UtilRuleContext<string, RuleOptions>) {
           fixer.insertTextBefore(
             otherNode,
             comments
-              .map(c => sourceCode.getText(c))
+              .map(comment => sourceCode.getText(comment as any))
               .concat('')
               .join('\n'),
           ),
@@ -133,7 +130,7 @@ function createNodeSwapper(context: UtilRuleContext<string, RuleOptions>) {
       );
 
       return acc;
-    }, [] as RuleFix[]);
+    }, []);
 }
 
 export function createReporter<MessageIds extends string>(