[WIP] getting rid of strict null checks errors

All tests are passing with these changes, 70 errors remain.

package.json

@@ -31,7 +31,7 @@
     "gulp-sourcemaps": "^1.6.0",
     "gulp-spawn-mocha": "^2.2.2",
     "gulp-tslint": "^8.0.0",
-    "gulp-typescript": "^3.0.1",
+    "gulp-typescript": "^3.1.6",
     "tslint": "^5.0.0",
     "typescript": "^2.2.0",
     "yargs": "^5.0.0"

src/readme/fetch.ts

@@ -20,8 +20,8 @@ function requestFromGithub(path, callback) {
   };
   https.get(options, (resp) => {
     resp.setEncoding('utf8');
-    const buffer = [];
-    resp.on('data', (chunk) => {
+    const buffer: string[] = [];
+    resp.on('data', (chunk: string) => {
       buffer.push(chunk);
     });
     resp.on('end', () => {
@@ -43,7 +43,7 @@ function compareToESLint() {
       const esRules = Object.keys(ruleESMap);
       const missing = arrayDiff(rules.map(x => toCamelCase(x)), esRules);
       const deprecated = arrayDiff(esRules, rules.map(x => toCamelCase(x)));
-      const buffer = [];
+      const buffer: string[] = [];
 
       if (missing.length) {
         buffer.push('Missing ESLint rules (http://eslint.org/docs/rules):');
@@ -88,7 +88,7 @@ function compareToTSLint() {
 
       const tsRules = Object.keys(ruleTSMap);
       const missing = arrayDiff(rules, tsRules);
-      const buffer = [];
+      const buffer: string[] = [];
 
       if (missing.length) {
         buffer.push('Missing TSLint rules (http://palantir.github.io/tslint/rules):');

src/readme/index.ts

@@ -8,8 +8,8 @@ function formatUsage(usage) {
 }
 
 function createRuleTable() {
-  const buffer = [];
-  let category = null;
+  const buffer: string[] = [];
+  let category = '';
   rules.forEach((rule) => {
     if (category !== rule.category) {
       category = rule.category;
@@ -108,10 +108,10 @@ ${rule.description}${usage}${note}
 `;
 }
 
-function updateRuleFile(name: string, rule: IRule) {
+function updateRuleFile(name: string, rule: IRule): Promise<void> {
   const baseUrl = 'https://github.com/buzinas/tslint-eslint-rules/blob/master';
   const docFileName = `src/docs/rules/${name}Rule.md`;
-  return new Promise((fulfill, reject) => {
+  return new Promise<void>((fulfill, reject) => {
     fs.readFile(docFileName, 'utf8', (readErr, data) => {
       rule.tslintUrl = rule.tslintUrl || `${baseUrl}/${docFileName}`;
       let content = readErr || !data ? '<!-- Start:AutoDoc\n End:AutoDoc -->' : data;
@@ -142,7 +142,7 @@ function updateRuleFiles(cb: Function) {
   const ruleNames = allFiles
     .filter(name => /\.ts$/.test(name))
     .map(name => name.substr(0, name.length - 7));
-  const allPromises = [];
+  const allPromises: Promise<void>[] = [];
   ruleNames.forEach((name) => {
     allPromises.push(updateRuleFile(name, ruleTSMap[name]));
   });

src/rules/arrayBracketSpacingRule.ts

@@ -236,7 +236,7 @@ class ArrayBracketSpacingWalker extends Lint.RuleWalker {
     const start = node.end;
     const text = this.getSourceFile().text.substring(start, end);
     const m = text.match(/\/\*.*\*\//);
-    if (m) {
+    if (m && m.index >= 0) {
       const len = m[0].length;
       return trailing ? end - (start + m.index + len) : m.index;
     }

src/rules/braceStyleRule.ts

@@ -120,7 +120,8 @@ class BraceStyleWalker extends Lint.RuleWalker {
     const openingCurlyBrace = blockChildren.filter(ch => ch.kind === ts.SyntaxKind.OpenBraceToken).shift();
     const closingCurlyBrace = blockChildren.filter(ch => ch.kind === ts.SyntaxKind.CloseBraceToken).pop();
     const syntaxList = blockChildren.filter(ch => ch.kind === ts.SyntaxKind.SyntaxList).shift();
-    const blockPreviousNode = block.parent.getChildren()[block.parent.getChildren().indexOf(block) - 1];
+    const parentChildren = block.parent ? block.parent.getChildren() : [];
+    const blockPreviousNode = parentChildren[parentChildren.indexOf(block) - 1];
 
     if (!openingCurlyBrace || !closingCurlyBrace || !syntaxList || !blockPreviousNode) {
       return;
@@ -165,9 +166,11 @@ class BraceStyleWalker extends Lint.RuleWalker {
     let position = children.indexOf(node) - 1;
     while (position >= 0) { // is first child always block or catch clause?
       if (children[position].kind === ts.SyntaxKind.Block || children[position].kind === ts.SyntaxKind.CatchClause) {
-        return children[position];
+        break;
       }
       position -= 1;
     }
+    return children[position];
   }
+
 }

src/rules/handleCallbackErrRule.ts

@@ -128,7 +128,8 @@ class ErrCallbackHandlerWalker extends Lint.RuleWalker {
    * Pops a function scope from the stack.
    */
   private exitScope(): IFunctionScope {
-    return this.stack.pop();
+    // There will an item to pop because this method is called after `enterScope`.
+    return this.stack.pop()!;
   }
 
   protected visitSourceFile(node: ts.SourceFile) {
@@ -188,8 +189,9 @@ class ErrCallbackHandlerWalker extends Lint.RuleWalker {
     // Only execute when inside a function scope and dealing with an identifier.
     if (
       this.stack.length > 0 &&
-      node.parent.kind !== ts.SyntaxKind.Parameter &&
-      node.kind === ts.SyntaxKind.Identifier
+      node.kind === ts.SyntaxKind.Identifier &&
+      node.parent &&
+      node.parent.kind !== ts.SyntaxKind.Parameter
     ) {
       let doCheck = false;
       const inPropertyAccess = this.isPropAccess(node.parent);

src/rules/terIndentRule.ts

@@ -16,6 +16,15 @@ let indentType = 'space';
 let indentSize = 4;
 let OPTIONS: any;
 
+interface INodeIndent {
+  contentStart: number;
+  firstInLine: boolean;
+  space: number;
+  tab: number;
+  goodChar: number;
+  badChar: number;
+}
+
 function assign(target: any, ...sources: any[]): any {
   sources.forEach((source) => {
     if (source !== undefined && source !== null) {
@@ -374,11 +383,11 @@ class IndentWalker extends Lint.RuleWalker {
    * user's desired indentation character, and `badChar` is the amount of the other indentation
    * character.
    */
-  private getNodeIndent(node: ts.Node) {
+  private getNodeIndent(node: ts.Node): INodeIndent {
     if (node === this.getSourceFile()) {
-      return { space: 0, tab: 0, goodChar: 0, badChar: 0 };
+      return { contentStart: 0, firstInLine: true, space: 0, tab: 0, goodChar: 0, badChar: 0 };
     }
-    if (node.kind === ts.SyntaxKind.SyntaxList) {
+    if (node.kind === ts.SyntaxKind.SyntaxList && node.parent) {
       return this.getNodeIndent(node.parent);
     }
 
@@ -417,7 +426,7 @@ class IndentWalker extends Lint.RuleWalker {
     if (isKind(node, 'IfStatement')) {
       const elseStatement = (node as ts.IfStatement).elseStatement;
       if (elseStatement) {
-        const elseKeyword = node.getChildren().filter(ch => isKind(ch, 'ElseKeyword')).shift();
+        const elseKeyword = node.getChildren().filter(ch => isKind(ch, 'ElseKeyword')).shift()!;
         this.checkNodeIndent(elseKeyword, neededIndent);
         if (!this.isNodeFirstInLine(elseStatement)) {
           this.checkNodeIndent(elseStatement, neededIndent);
@@ -426,7 +435,7 @@ class IndentWalker extends Lint.RuleWalker {
     } else if (isKind(node, 'TryStatement')) {
       const handler = (node as ts.TryStatement).catchClause;
       if (handler) {
-        const catchKeyword = handler.getChildren().filter(ch => isKind(ch, 'CatchKeyword')).shift();
+        const catchKeyword = handler.getChildren().filter(ch => isKind(ch, 'CatchKeyword')).shift()!;
         this.checkNodeIndent(catchKeyword, neededIndent);
         if (!this.isNodeFirstInLine(handler)) {
           this.checkNodeIndent(handler, neededIndent);
@@ -435,11 +444,11 @@ class IndentWalker extends Lint.RuleWalker {
 
       const finalizer = (node as ts.TryStatement).finallyBlock;
       if (finalizer) {
-        const finallyKeyword = node.getChildren().filter(ch => isKind(ch, 'FinallyKeyword')).shift();
+        const finallyKeyword = node.getChildren().filter(ch => isKind(ch, 'FinallyKeyword')).shift()!;
         this.checkNodeIndent(finallyKeyword, neededIndent);
       }
     } else if (isKind(node, 'DoStatement')) {
-      const whileKeyword = node.getChildren().filter(ch => isKind(ch, 'WhileKeyword')).shift();
+      const whileKeyword = node.getChildren().filter(ch => isKind(ch, 'WhileKeyword')).shift()!;
       this.checkNodeIndent(whileKeyword, neededIndent);
     }
   }
@@ -473,7 +482,7 @@ class IndentWalker extends Lint.RuleWalker {
     }
 
     let indent;
-    let nodesToCheck = [];
+    let nodesToCheck: ts.Node[] = [];
 
     /* For these statements we should check indent from statement beginning, not from the beginning
        of the block.
@@ -495,7 +504,7 @@ class IndentWalker extends Lint.RuleWalker {
     if (node.parent && isOneOf(node.parent, statementsWithProperties) && this.isNodeBodyBlock(node)) {
       indent = this.getNodeIndent(node.parent).goodChar;
     } else if (node.parent && isKind(node.parent, 'CatchClause')) {
-      indent = this.getNodeIndent(node.parent.parent).goodChar;
+      indent = this.getNodeIndent(node.parent.parent!).goodChar;
     } else {
       indent = this.getNodeIndent(node).goodChar;
     }
@@ -506,6 +515,7 @@ class IndentWalker extends Lint.RuleWalker {
       if (node.kind === ts.SyntaxKind.Block) {
         nodesToCheck = node.getChildren()[1].getChildren();
       } else if (
+        node.parent &&
         isOneOf(node.parent, [
           'ClassDeclaration',
           'ClassExpression',
@@ -623,7 +633,7 @@ class IndentWalker extends Lint.RuleWalker {
    */
   private isArgBeforeCalleeNodeMultiline(node: ts.Node): boolean {
     const parent = node.parent;
-    if (parent['arguments'].length >= 2 && parent['arguments'][1] === node) {
+    if (parent && parent['arguments'].length >= 2 && parent['arguments'][1] === node) {
       const firstArg = parent['arguments'][0];
       return this.getLine(firstArg, true) > this.getLine(firstArg);
     }
@@ -720,7 +730,7 @@ class IndentWalker extends Lint.RuleWalker {
    */
   private expectedVarIndent(node: ts.VariableDeclaration, varIndent?: number) {
     // VariableStatement -> VariableDeclarationList -> VariableDeclaration
-    const varNode = node.parent;
+    const varNode = node.parent!;
     const line = this.getLine(varNode);
     let indent;
 
@@ -745,31 +755,32 @@ class IndentWalker extends Lint.RuleWalker {
     node: ts.Node,
     kind: number,
     stopAtList: number[] = [ts.SyntaxKind.SourceFile]
-  ): T {
+  ): T | null {
     let parent = node.parent;
 
     while (
-      parent.kind !== kind
+      parent
+      && parent.kind !== kind
       && stopAtList.indexOf(parent.kind) === -1
       && parent.kind !== ts.SyntaxKind.SourceFile
     ) {
       parent = parent.parent;
     }
 
-    return parent.kind === kind ? parent as T : null;
+    return parent && parent.kind === kind ? parent as T : null;
   }
 
   /**
    * Returns the VariableDeclarator based on the current node if not present then return null.
    */
-  protected getVariableDeclaratorNode(node: ts.Node): ts.VariableDeclaration {
+  protected getVariableDeclaratorNode(node: ts.Node): ts.VariableDeclaration | null {
     return this.getParentNodeByType<ts.VariableDeclaration>(node, ts.SyntaxKind.VariableDeclaration);
   }
 
   /**
    * Returns the BinaryExpression based on the current node if not present then return null.
    */
-  protected getBinaryExpressionNode(node: ts.Node): ts.BinaryExpression {
+  protected getBinaryExpressionNode(node: ts.Node): ts.BinaryExpression | null {
     return this.getParentNodeByType<ts.BinaryExpression>(node, ts.SyntaxKind.BinaryExpression);
   }
 
@@ -794,7 +805,7 @@ class IndentWalker extends Lint.RuleWalker {
     let varKind;
     const parentVarNode = this.getVariableDeclaratorNode(node);
 
-    if (this.isNodeFirstInLine(node)) {
+    if (this.isNodeFirstInLine(node) && node.parent) {
       const parent = node.parent;
 
       nodeIndent = this.getNodeIndent(parent).goodChar;

src/test/rules/ruleTester.ts

@@ -186,7 +186,7 @@ class Test {
     ].join('\n');
     assert(expected.length === 0 && found.length === 0, msg);
     if (this.testFixer && this.output) {
-      const fixes = linter.getResult().failures.filter(f => f.hasFix()).map(f => f.getFix());
+      const fixes = linter.getResult().failures.filter(f => f.hasFix()).map(f => f.getFix()!);
       const fixedCode = Lint.Replacement.applyFixes(this.code, fixes);
       const fixerMsg = [
         `Fixer output mismatch in ${this.name}:`,
@@ -257,7 +257,7 @@ class TestGroup {
           config.rules[ruleName] = [true, ...groupConfig];
         }
         const configFile = Lint.Configuration.parseConfigFile(config);
-        return new Test(codeFileName, test, undefined, configFile, []);
+        return new Test(codeFileName, test, '', configFile, []);
       }
       if (test.options) {
         config.rules[ruleName] = [true, ...test.options];

tsconfig.json

@@ -7,6 +7,7 @@
     "importHelpers": true,
     "noUnusedParameters": true,
     "noUnusedLocals": true,
+    "strictNullChecks": false,
     "removeComments": true
   }
 }