Merge pull request #172 from Tyriar/tslint

Update tslint, add rules

.travis.yml

@@ -15,4 +15,4 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-4.8 ; fi
 script:
   - npm test
-  - npm run tslint
+  - npm run lint

package.json

@@ -33,7 +33,7 @@
   ],
   "scripts": {
     "tsc": "tsc",
-    "tslint": "tslint src/**/*.ts",
+    "lint": "tslint src/**/*.ts",
     "install": "node scripts/install.js",
     "postinstall": "node scripts/post-install.js",
     "test": "cross-env NODE_ENV=test mocha -R spec lib/*.test.js",
@@ -48,7 +48,7 @@
     "cross-env": "^3.2.4",
     "mocha": "^3.1.2",
     "pollUntil": "^1.0.3",
-    "tslint": "^4.3.1",
+    "tslint": "^5.9.1",
     "typescript": "^2.1.4"
   }
 }

src/index.ts

@@ -28,17 +28,17 @@ if (process.platform === 'win32') {
  */
 export function spawn(file?: string, args?: ArgvOrCommandLine, opt?: IPtyForkOptions): ITerminal {
   return new Terminal(file, args, opt);
-};
+}
 
 /** @deprecated */
 export function fork(file?: string, args?: ArgvOrCommandLine, opt?: IPtyForkOptions): ITerminal {
   return new Terminal(file, args, opt);
-};
+}
 
 /** @deprecated */
 export function createTerminal(file?: string, args?: ArgvOrCommandLine, opt?: IPtyForkOptions): ITerminal {
   return new Terminal(file, args, opt);
-};
+}
 
 export function open(options: IPtyOpenOptions): ITerminal {
   return Terminal.open(options);

src/interfaces.ts

@@ -4,7 +4,9 @@
 
 import * as net from 'net';
 
-export type ProcessEnv = {[key: string]: string};
+export interface IProcessEnv {
+  [key: string]: string;
+}
 
 export interface ITerminal {
   /**
@@ -109,7 +111,7 @@ export interface IPtyForkOptions {
   cols?: number;
   rows?: number;
   cwd?: string;
-  env?: ProcessEnv;
+  env?: IProcessEnv;
   uid?: number;
   gid?: number;
   encoding?: string;

src/terminal.ts

@@ -56,7 +56,7 @@ export abstract class Terminal implements ITerminal {
   }
 
   /** See net.Socket.end */
-  public end(data: string): void{
+  public end(data: string): void {
     this._socket.end(data);
   }
 

src/unixTerminal.ts

@@ -8,15 +8,15 @@ import * as path from 'path';
 import * as tty from 'tty';
 import * as os from 'os';
 import { Terminal, DEFAULT_COLS, DEFAULT_ROWS } from './terminal';
-import { ProcessEnv, IPtyForkOptions, IPtyOpenOptions } from './interfaces';
+import { IProcessEnv, IPtyForkOptions, IPtyOpenOptions } from './interfaces';
 import { ArgvOrCommandLine } from './types';
 import { assign } from './utils';
 
-declare type NativePty = {
+declare interface INativePty {
   master: number;
   slave: number;
   pty: string;
-};
+}
 
 const pty = require(path.join('..', 'build', 'Release', 'pty.node'));
 
@@ -180,7 +180,7 @@ export class UnixTerminal extends Terminal {
     const encoding = opt.encoding ? 'utf8' : opt.encoding;
 
     // open
-    const term: NativePty = pty.open(cols, rows);
+    const term: INativePty = pty.open(cols, rows);
 
     self._master = new PipeSocket(<number>term.master);
     self._master.setEncoding(encoding);
@@ -263,7 +263,7 @@ export class UnixTerminal extends Terminal {
     pty.resize(this._fd, cols, rows);
   }
 
-  private _sanitizeEnv(env: ProcessEnv): void {
+  private _sanitizeEnv(env: IProcessEnv): void {
       // Make sure we didn't start our server from inside tmux.
       delete env['TMUX'];
       delete env['TMUX_PANE'];

tslint.json

@@ -1,5 +1,9 @@
 {
   "rules": {
+    "array-type": [
+      true,
+      "array"
+    ],
     "class-name": true,
     "comment-format": [
       true,
@@ -9,11 +13,21 @@
       true,
       "spaces"
     ],
+    "interface-name": [
+      true,
+      "always-prefix"
+    ],
+    "interface-over-type-literal": true,
+    "typedef": [
+      true,
+      "call-signature",
+      "parameter"
+    ],
     "eofline": true,
-    "one-variable-per-declaration": [true, "ignore-for-loop"],
     "no-eval": true,
     "no-internal-module": true,
     "no-trailing-whitespace": true,
+    "one-variable-per-declaration": true,
     "no-unsafe-finally": true,
     "no-var-keyword": true,
     "quotemark": [
@@ -28,13 +42,6 @@
       true,
       "allow-null-check"
     ],
-    "typedef": [
-      true,
-      "call-signature",
-      "parameter",
-      "property-declaration",
-      "member-variable-declaration"
-    ],
     "typedef-whitespace": [
       true,
       {
@@ -47,15 +54,22 @@
     ],
     "variable-name": [
       true,
-      "ban-keywords"
+      "ban-keywords",
+      "check-format",
+      "allow-leading-underscore",
+      "allow-pascal-case"
     ],
     "whitespace": [
       true,
       "check-branch",
       "check-decl",
+      "check-module",
       "check-operator",
+      "check-rest-spread",
       "check-separator",
-      "check-type"
+      "check-type",
+      "check-type-operator",
+      "check-preblock"
     ]
   }
 }