refactor(@ngtools/webpack): support strict null checks

clydin · hansl · commit 4586abd22609 · 2017-08-20T11:52:34.000-07:00
diff --git a/packages/@ngtools/webpack/src/compiler_host.ts b/packages/@ngtools/webpack/src/compiler_host.ts
@@ -59,7 +59,7 @@ export class VirtualDirStats extends VirtualStats {
 }
 
 export class VirtualFileStats extends VirtualStats {
-  private _sourceFile: ts.SourceFile;
+  private _sourceFile: ts.SourceFile | null;
   constructor(_fileName: string, private _content: string) {
     super(_fileName);
   }
@@ -93,8 +93,8 @@ export class VirtualFileStats extends VirtualStats {
 
 export class WebpackCompilerHost implements ts.CompilerHost {
   private _delegate: ts.CompilerHost;
-  private _files: {[path: string]: VirtualFileStats} = Object.create(null);
-  private _directories: {[path: string]: VirtualDirStats} = Object.create(null);
+  private _files: {[path: string]: VirtualFileStats | null} = Object.create(null);
+  private _directories: {[path: string]: VirtualDirStats | null} = Object.create(null);
 
   private _changedFiles: {[path: string]: boolean} = Object.create(null);
   private _changedDirs: {[path: string]: boolean} = Object.create(null);
@@ -233,7 +233,9 @@ export class WebpackCompilerHost implements ts.CompilerHost {
 
   readFile(fileName: string): string {
     fileName = this._resolve(fileName);
-    if (this._files[fileName] == null) {
+
+    const stats = this._files[fileName];
+    if (stats == null) {
       const result = this._delegate.readFile(fileName);
       if (result !== undefined && this._cache) {
         this._setFileContent(fileName, result);
@@ -242,13 +244,14 @@ export class WebpackCompilerHost implements ts.CompilerHost {
         return result;
       }
     }
-    return this._files[fileName].content;
+    return stats.content;
   }
 
   directoryExists(directoryName: string): boolean {
     directoryName = this._resolve(directoryName);
     return (this._directories[directoryName] != null)
-        || this._delegate.directoryExists(directoryName);
+            || (this._delegate.directoryExists != undefined
+                && this._delegate.directoryExists(directoryName));
   }
 
   getFiles(path: string): string[] {
@@ -276,18 +279,19 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, _onError?: OnErrorFn) {
     fileName = this._resolve(fileName);
 
-    if (this._files[fileName] == null) {
+    const stats = this._files[fileName];
+    if (stats == null) {
       const content = this.readFile(fileName);
       if (!this._cache) {
         return ts.createSourceFile(fileName, content, languageVersion, this._setParentNodes);
       }
     }
 
-    return this._files[fileName].getSourceFile(languageVersion, this._setParentNodes);
+    return this._files[fileName]!.getSourceFile(languageVersion, this._setParentNodes);
   }
 
   getCancellationToken() {
-    return this._delegate.getCancellationToken();
+    return this._delegate.getCancellationToken!();
   }
 
   getDefaultLibFileName(options: ts.CompilerOptions) {
diff --git a/packages/@ngtools/webpack/src/entry_resolver.ts b/packages/@ngtools/webpack/src/entry_resolver.ts
@@ -12,7 +12,7 @@ function _recursiveSymbolExportLookup(refactor: TypeScriptFileRefactor,
   // Check this file.
   const hasSymbol = refactor.findAstNodes(null, ts.SyntaxKind.ClassDeclaration)
     .some((cd: ts.ClassDeclaration) => {
-      return cd.name && cd.name.text == symbolName;
+      return cd.name != undefined && cd.name.text == symbolName;
     });
   if (hasSymbol) {
     return refactor.fileName;
@@ -64,7 +64,7 @@ function _recursiveSymbolExportLookup(refactor: TypeScriptFileRefactor,
         const source = new TypeScriptFileRefactor(module, host, program);
         const hasSymbol = source.findAstNodes(null, ts.SyntaxKind.ClassDeclaration)
           .some((cd: ts.ClassDeclaration) => {
-            return cd.name && cd.name.text == symbolName;
+            return cd.name != undefined && cd.name.text == symbolName;
           });
 
         if (hasSymbol) {
@@ -101,13 +101,15 @@ function _symbolImportLookup(refactor: TypeScriptFileRefactor,
     }
 
     const module = resolvedModule.resolvedModule.resolvedFileName;
-    if (decl.importClause.namedBindings.kind == ts.SyntaxKind.NamespaceImport) {
+    if (decl.importClause.namedBindings
+        && decl.importClause.namedBindings.kind == ts.SyntaxKind.NamespaceImport) {
       const binding = decl.importClause.namedBindings as ts.NamespaceImport;
       if (binding.name.text == symbolName) {
         // This is a default export.
         return module;
       }
-    } else if (decl.importClause.namedBindings.kind == ts.SyntaxKind.NamedImports) {
+    } else if (decl.importClause.namedBindings
+               && decl.importClause.namedBindings.kind == ts.SyntaxKind.NamedImports) {
       const binding = decl.importClause.namedBindings as ts.NamedImports;
       for (const specifier of binding.elements) {
         if (specifier.name.text == symbolName) {
diff --git a/packages/@ngtools/webpack/src/extract_i18n_plugin.ts b/packages/@ngtools/webpack/src/extract_i18n_plugin.ts
@@ -21,7 +21,7 @@ export interface ExtractI18nPluginOptions {
 export class ExtractI18nPlugin implements Tapable {
   private _resourceLoader: WebpackResourceLoader;
 
-  private _donePromise: Promise<void>;
+  private _donePromise: Promise<void> | null;
   private _compiler: any = null;
   private _compilation: any = null;
 
@@ -35,9 +35,9 @@ export class ExtractI18nPlugin implements Tapable {
   private _compilerHost: ts.CompilerHost;
   private _program: ts.Program;
 
-  private _i18nFormat: string;
-  private _locale: string;
-  private _outFile: string;
+  private _i18nFormat?: string;
+  private _locale?: string;
+  private _outFile?: string;
 
   constructor(options: ExtractI18nPluginOptions) {
     this._setupOptions(options);
@@ -67,7 +67,7 @@ export class ExtractI18nPlugin implements Tapable {
       throw new Error(`An error happened while parsing ${this._tsConfigPath} JSON: ${err}.`);
     }
     const tsConfig = ts.parseJsonConfigFileContent(
-      tsConfigJson, ts.sys, basePath, null, this._tsConfigPath);
+      tsConfigJson, ts.sys, basePath, undefined, this._tsConfigPath);
 
     let fileNames = tsConfig.fileNames;
     if (options.hasOwnProperty('exclude')) {
diff --git a/packages/@ngtools/webpack/src/lazy_routes.ts b/packages/@ngtools/webpack/src/lazy_routes.ts
@@ -4,7 +4,7 @@ import * as ts from 'typescript';
 import {TypeScriptFileRefactor} from './refactor';
 
 
-function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string {
+function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
   if (node.kind == ts.SyntaxKind.Identifier) {
     return (node as ts.Identifier).text;
   } else if (node.kind == ts.SyntaxKind.StringLiteral) {
@@ -16,7 +16,7 @@ function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string
 
 
 export interface LazyRouteMap {
-  [path: string]: string;
+  [path: string]: string | null;
 }
 
 
diff --git a/packages/@ngtools/webpack/src/loader.ts b/packages/@ngtools/webpack/src/loader.ts
@@ -24,7 +24,7 @@ const changeMap: {[key: string]: Platform} = {
   }
 };
 
-function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string {
+function _getContentOfKeyLiteral(_source: ts.SourceFile, node?: ts.Node): string | null {
   if (!node) {
     return null;
   } else if (node.kind == ts.SyntaxKind.Identifier) {
@@ -73,6 +73,7 @@ function _angularImportsFromNode(node: ts.ImportDeclaration, _sourceFile: ts.Sou
     // This is of the form `import 'path';`. Nothing to do.
     return [];
   }
+  return [];
 }
 
 
@@ -224,8 +225,8 @@ function _replacePlatform(
 
 function _replaceBootstrapOrRender(refactor: TypeScriptFileRefactor, call: ts.CallExpression) {
   // If neither bootstrapModule or renderModule can't be found, bail out early.
-  let replacementTarget: string;
-  let identifier: ts.Identifier;
+  let replacementTarget: string | undefined;
+  let identifier: ts.Identifier | undefined;
   if (call.getText().includes('bootstrapModule')) {
     if (call.expression.kind != ts.SyntaxKind.PropertyAccessExpression) {
       return;
@@ -252,8 +253,9 @@ function _replaceBootstrapOrRender(refactor: TypeScriptFileRefactor, call: ts.Ca
 }
 
 
-function _getCaller(node: ts.Node): ts.CallExpression {
-  while (node = node.parent) {
+function _getCaller(node: ts.Node): ts.CallExpression | null {
+  while (node.parent) {
+    node = node.parent;
     if (node.kind === ts.SyntaxKind.CallExpression) {
       return node as ts.CallExpression;
     }
@@ -266,8 +268,9 @@ function _replaceEntryModule(plugin: AotPlugin, refactor: TypeScriptFileRefactor
   const modules = refactor.findAstNodes(refactor.sourceFile, ts.SyntaxKind.Identifier, true)
     .filter(identifier => identifier.getText() === plugin.entryModule.className)
     .filter(identifier =>
-      identifier.parent.kind === ts.SyntaxKind.CallExpression ||
-      identifier.parent.kind === ts.SyntaxKind.PropertyAssignment)
+      identifier.parent &&
+      (identifier.parent.kind === ts.SyntaxKind.CallExpression ||
+      identifier.parent.kind === ts.SyntaxKind.PropertyAssignment))
     .filter(node => !!_getCaller(node));
 
   if (modules.length == 0) {
@@ -282,7 +285,9 @@ function _replaceEntryModule(plugin: AotPlugin, refactor: TypeScriptFileRefactor
     .forEach(reference => {
       refactor.replaceNode(reference, factoryClassName);
       const caller = _getCaller(reference);
-      _replaceBootstrapOrRender(refactor, caller);
+      if (caller) {
+        _replaceBootstrapOrRender(refactor, caller);
+      }
     });
 }
 
@@ -309,7 +314,7 @@ function _removeModuleId(refactor: TypeScriptFileRefactor) {
   refactor.findAstNodes(sourceFile, ts.SyntaxKind.Decorator, true)
     .reduce((acc, node) => {
       return acc.concat(refactor.findAstNodes(node, ts.SyntaxKind.ObjectLiteralExpression, true));
-    }, [])
+    }, new Array<ts.Node>())
     // Get all their property assignments.
     .filter((node: ts.ObjectLiteralExpression) => {
       return node.properties.some(prop => {
@@ -496,7 +501,7 @@ export function _exportModuleMap(plugin: AotPlugin, refactor: TypeScriptFileRefa
         });
 
       modules.forEach((module, index) => {
-        const relativePath = path.relative(dirName, module.modulePath).replace(/\\/g, '/');
+        const relativePath = path.relative(dirName, module.modulePath!).replace(/\\/g, '/');
         refactor.prependBefore(node, `import * as __lazy_${index}__ from './${relativePath}'`);
       });
 
@@ -577,7 +582,7 @@ export function ngcLoader(this: LoaderContext & { _compilation: any }, source: s
               const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
 
               if (diagnostic.file) {
-                const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+                const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
                 const fileName = diagnostic.file.fileName;
                 const {line, character} = position;
                 message += `${fileName} (${line + 1},${character + 1}): ${messageText}\n`;
diff --git a/packages/@ngtools/webpack/src/paths-plugin.ts b/packages/@ngtools/webpack/src/paths-plugin.ts
@@ -67,13 +67,13 @@ export class PathsPlugin implements Tapable {
     }
     this._tsConfigPath = options.tsConfigPath;
 
-    if (options.hasOwnProperty('compilerOptions')) {
-      this._compilerOptions = Object.assign({}, options.compilerOptions);
+    if (options.compilerOptions) {
+      this._compilerOptions = options.compilerOptions;
     } else {
-      this._compilerOptions = PathsPlugin._loadOptionsFromTsConfig(this._tsConfigPath, null);
+      this._compilerOptions = PathsPlugin._loadOptionsFromTsConfig(this._tsConfigPath);
     }
 
-    if (options.hasOwnProperty('compilerHost')) {
+    if (options.compilerHost) {
       this._host = options.compilerHost;
     } else {
       this._host = ts.createCompilerHost(this._compilerOptions, false);
diff --git a/packages/@ngtools/webpack/src/plugin.ts b/packages/@ngtools/webpack/src/plugin.ts
@@ -56,7 +56,7 @@ export class AotPlugin implements Tapable {
   private _tsConfigPath: string;
   private _entryModule: string;
 
-  private _donePromise: Promise<void>;
+  private _donePromise: Promise<void> | null;
   private _compiler: any = null;
   private _compilation: any = null;
 
@@ -66,10 +66,10 @@ export class AotPlugin implements Tapable {
   private _basePath: string;
   private _genDir: string;
 
-  private _i18nFile: string;
-  private _i18nFormat: string;
-  private _locale: string;
-  private _missingTranslation: string;
+  private _i18nFile?: string;
+  private _i18nFormat?: string;
+  private _locale?: string;
+  private _missingTranslation?: string;
 
   private _diagnoseFiles: { [path: string]: boolean } = {};
   private _firstRun = true;
@@ -128,7 +128,7 @@ export class AotPlugin implements Tapable {
       const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
 
       if (diagnostic.file) {
-        const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+        const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
         throw new Error(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message})`);
       } else {
         throw new Error(message);
@@ -166,7 +166,7 @@ export class AotPlugin implements Tapable {
     }
 
     const tsConfig = ts.parseJsonConfigFileContent(
-      tsConfigJson, ts.sys, basePath, null, this._tsConfigPath);
+      tsConfigJson, ts.sys, basePath, undefined, this._tsConfigPath);
 
     let fileNames = tsConfig.fileNames;
     this._rootFilePath = fileNames;
@@ -192,23 +192,23 @@ export class AotPlugin implements Tapable {
     this._basePath = basePath;
     this._genDir = genDir;
 
-    if (options.hasOwnProperty('typeChecking')) {
+    if (options.typeChecking !== undefined) {
       this._typeCheck = options.typeChecking;
     }
-    if (options.hasOwnProperty('skipCodeGeneration')) {
+    if (options.skipCodeGeneration !== undefined) {
       this._skipCodeGeneration = options.skipCodeGeneration;
     }
 
     this._compilerHost = new WebpackCompilerHost(this._compilerOptions, this._basePath);
 
     // Override some files in the FileSystem.
-    if (options.hasOwnProperty('hostOverrideFileSystem')) {
+    if (options.hostOverrideFileSystem) {
       for (const filePath of Object.keys(options.hostOverrideFileSystem)) {
         this._compilerHost.writeFile(filePath, options.hostOverrideFileSystem[filePath], false);
       }
     }
     // Override some files in the FileSystem with paths from the actual file system.
-    if (options.hasOwnProperty('hostReplacementPaths')) {
+    if (options.hostReplacementPaths) {
       for (const filePath of Object.keys(options.hostReplacementPaths)) {
         const replacementFilePath = options.hostReplacementPaths[filePath];
         const content = this._compilerHost.readFile(replacementFilePath);
@@ -345,7 +345,7 @@ export class AotPlugin implements Tapable {
           return callback(null, result);
         }
 
-        this.done.then(() => {
+        this.done!.then(() => {
           result.resource = this.genDir;
           result.dependencies.forEach((d: any) => d.critical = false);
           result.resolveDependencies = (_fs: any, _resource: any, _recursive: any,
@@ -380,7 +380,7 @@ export class AotPlugin implements Tapable {
       // Virtual file system.
       compiler.resolvers.normal.plugin('before-resolve', (request: any, cb: () => void) => {
         if (request.request.match(/\.ts$/)) {
-          this.done.then(() => cb(), () => cb());
+          this.done!.then(() => cb(), () => cb());
         } else {
           cb();
         }
@@ -432,21 +432,20 @@ export class AotPlugin implements Tapable {
       return;
     }
 
-    const diagnostics: ts.Diagnostic[] = []
-      .concat(
-        this._program.getCompilerOptions().declaration
-          ? this._program.getDeclarationDiagnostics(sourceFile) : [],
-        this._program.getSyntacticDiagnostics(sourceFile),
-        this._program.getSemanticDiagnostics(sourceFile)
-      );
+    const diagnostics: Array<ts.Diagnostic> = [
+        ...(this._program.getCompilerOptions().declaration
+            ? this._program.getDeclarationDiagnostics(sourceFile) : []),
+        ...this._program.getSyntacticDiagnostics(sourceFile),
+        ...this._program.getSemanticDiagnostics(sourceFile)
+    ];
 
     if (diagnostics.length > 0) {
       diagnostics.forEach(diagnostic => {
         const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
         let message;
 
         if (diagnostic.file) {
-          const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
+          const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start!);
 
           const sourceText = diagnostic.file.getFullText();
           let {line, character, fileName} = this._translateSourceMap(sourceText,
@@ -532,7 +531,7 @@ export class AotPlugin implements Tapable {
 
                 if (diagnostic.file) {
                   const {line, character} = diagnostic.file.getLineAndCharacterOfPosition(
-                    diagnostic.start);
+                    diagnostic.start!);
                   return `${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message})`;
                 } else {
                   return message;
diff --git a/packages/@ngtools/webpack/src/refactor.ts b/packages/@ngtools/webpack/src/refactor.ts
