Upgrade tslint and update lint rules

Author: kondi

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 node_js:
   - "10"
   - "8"
-  - "6"
 
 cache:
   yarn: true

package.json

@@ -57,9 +57,12 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^1.16.4",
     "rxjs": "^6.0.0",
-    "tslint": "^4.5.1",
+    "tslint": "^5.13.0",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "~2.9.0"
+    "tslint-consistent-codestyle": "^1.15.0",
+    "tslint-microsoft-contrib": "^6.0.0",
+    "tslint-misc-rules": "^3.5.1",
+    "typescript": "~3.0.0"
   },
   "peerDependencies": {
     "rxjs": "^6.0.0"

src/cli.ts

@@ -1,12 +1,12 @@
+import { promisify } from 'bluebird';
 import * as jscodeshift from 'jscodeshift';
 import { ASTNode, ASTPath } from 'jscodeshift';
 import { Collection } from 'jscodeshift/src/Collection';
 import * as minimist from 'minimist';
+import { fs } from 'mz';
 import * as protobuf from 'protobufjs';
 import { pbjs, pbts } from 'protobufjs/cli';
 import * as tmp from 'tmp';
-import { fs } from 'mz';
-import { promisify } from 'bluebird';
 
 const pbjsMain = promisify(pbjs.main);
 const pbtsMain = promisify(pbts.main);
@@ -45,7 +45,7 @@ export async function main(args: string[]) {
     return 1;
   }
 
-  let ts = await buildTypeScript(protoFiles);
+  const ts = await buildTypeScript(protoFiles);
   if (out) {
     await fs.writeFile(out, ts);
   } else {

src/tests/enums.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('enums test', () => {

src/tests/examples.test.ts

@@ -1,8 +1,9 @@
-import * as path from 'path';
 import * as glob from 'glob';
 import { fs } from 'mz';
+import * as path from 'path';
 
 import * as cli from '../cli';
+
 import { compileInMemory, Sources } from './utils';
 
 describe('compile/examples', () => {

src/tests/full-api.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('full api test', () => {

src/tests/messages.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('messages test', () => {

src/tests/multiple-namespaces.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('multiple namespaces test', () => {

src/tests/multiple-services.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('multiple services test', () => {

src/tests/nested-namespaces.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('nested namespaces test', () => {

src/tests/reference.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('reference test', () => {

src/tests/required.test.ts

@@ -1,4 +1,5 @@
 import * as cli from '../cli';
+
 import { compileInMemory } from './utils';
 
 describe('required test', () => {

tsconfig.json

@@ -11,6 +11,12 @@
     "preserveConstEnums": true,
     "sourceMap": true,
     "target": "es5",
+    "plugins": [
+      {
+        "name": "typescript-tslint-plugin",
+        "ignoreDefinitionFiles": true
+      }
+    ],
     "typeRoots": [
       "./node_modules/@types"
     ]

tslint.json

@@ -1,93 +1,58 @@
 {
   "rulesDirectory": [
-    "node_modules/tslint-config-prettier"
+    "tslint-microsoft-contrib",
+    "tslint-misc-rules",
+    "tslint-consistent-codestyle",
+    "tslint-config-prettier"
   ],
   "rules": {
+    "ban-comma-operator": true,
     "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
+    "class-method-newlines": true,
+    "comment-format": [true, "check-space"],
     "curly": true,
-    "eofline": true,
     "forin": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
     "label-position": true,
-    "max-line-length": [
-      true,
-      140
-    ],
     "member-access": false,
     "member-ordering": [
       true,
-      "static-before-instance",
-      "variables-before-functions"
+      {
+        "order": ["static-field", "instance-field", "static-method", "instance-method"]
+      }
     ],
+    "no-accessor-recursion": true,
     "no-arg": true,
     "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
+    "no-console": [true, "debug", "info", "time", "timeEnd", "trace"],
     "no-construct": true,
     "no-debugger": true,
+    "no-duplicate-switch-case": true,
     "no-duplicate-variable": true,
     "no-empty": false,
     "no-eval": true,
-    "no-inferrable-types": true,
+    "no-inferrable-types": [true],
+    "no-return-await": true,
     "no-shadowed-variable": true,
+    "no-static-this": true,
     "no-string-literal": false,
+    "no-suspicious-comment": true,
     "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-unused-variable": true,
     "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "radix": true,
-    "semicolon": [
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
+    "ordered-imports": [
       true,
       {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
+        "grouped-imports": true
       }
     ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
+    "prefer-const": true,
+    "prefer-readonly": true,
+    "prefer-while": true,
+    "radix": true,
+    "semicolon": [true, "always"],
+    "triple-equals": [true, "allow-null-check"],
+    "variable-name": false
   }
 }