build: update/cleanup tslint rules & fix errors

Author: clydin

packages/angular/cli/models/architect-command.ts

@@ -20,8 +20,7 @@ import {
   tags,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { of } from 'rxjs';
-import { from } from 'rxjs';
+import { from, of } from 'rxjs';
 import { concatMap, map, tap, toArray } from 'rxjs/operators';
 import { Command, Option } from './command';
 import { WorkspaceLoader } from './workspace-loader';

packages/angular/cli/models/json-schema.ts

@@ -16,17 +16,20 @@ export async function convertSchemaToOptions(schema: string): Promise<Option[]>
 }
 
 function getOptions(schemaText: string, onlyRootProperties = true): Promise<Option[]> {
-  // TODO: refactor promise to an observable then use `.toPromise()`
-  return new Promise((resolve, reject) => {
+  // TODO: Use devkit core's visitJsonSchema
+  return new Promise((resolve) => {
     const fullSchema = parseJson(schemaText);
+    if (!isJsonObject(fullSchema)) {
+      return Promise.resolve([]);
+    }
     const traverseOptions = {};
     const options: Option[] = [];
     function postCallback(schema: JsonObject,
                           jsonPointer: string,
-                          rootSchema: string,
-                          parentJsonPointer: string,
+                          _rootSchema: string,
+                          _parentJsonPointer: string,
                           parentKeyword: string,
-                          parentSchema: string,
+                          _parentSchema: string,
                           property: string) {
       if (parentKeyword === 'properties') {
         let includeOption = true;
@@ -43,15 +46,15 @@ function getOptions(schemaText: string, onlyRootProperties = true): Promise<Opti
         }
         let $default: OptionSmartDefault | undefined = undefined;
         if (schema.$default !== null && isJsonObject(schema.$default)) {
-          $default = <OptionSmartDefault> schema.$default;
+          $default = schema.$default as OptionSmartDefault;
         }
         let required = false;
         if (typeof schema.required === 'boolean') {
           required = schema.required;
         }
         let aliases: string[] | undefined = undefined;
         if (typeof schema.aliases === 'object' && Array.isArray(schema.aliases)) {
-          aliases = <string[]> schema.aliases;
+          aliases = schema.aliases as string[];
         }
         let format: string | undefined = undefined;
         if (typeof schema.format === 'string') {
@@ -86,7 +89,7 @@ function getOptions(schemaText: string, onlyRootProperties = true): Promise<Opti
 
     const callbacks = { post: postCallback };
 
-    jsonSchemaTraverse(<object> fullSchema, traverseOptions, callbacks);
+    jsonSchemaTraverse(fullSchema, traverseOptions, callbacks);
   });
 }
 

packages/angular_devkit/build_angular/src/dev-server/index.ts

@@ -14,8 +14,7 @@ import {
 } from '@angular-devkit/architect';
 import { WebpackDevServerBuilder } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, resolve, tags, virtualFs } from '@angular-devkit/core';
-import { existsSync, readFileSync } from 'fs';
-import * as fs from 'fs';
+import { Stats, existsSync, readFileSync } from 'fs';
 import * as path from 'path';
 import { Observable, throwError } from 'rxjs';
 import { concatMap, map, tap } from 'rxjs/operators';
@@ -69,7 +68,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     const options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
+    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
     const webpackDevServerBuilder = new WebpackDevServerBuilder({ ...this.context, host });
     let browserOptions: BrowserBuilderSchema;
     let first = true;
@@ -175,7 +174,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
   buildWebpackConfig(
     root: Path,
     projectRoot: Path,
-    host: virtualFs.Host<fs.Stats>,
+    host: virtualFs.Host<Stats>,
     browserOptions: BrowserBuilderSchema,
   ) {
     const browserBuilder = new BrowserBuilder(this.context);

packages/angular_devkit/core/node/host.ts

@@ -336,11 +336,11 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
   }
 
   isDirectory(path: Path): Observable<boolean> {
-    // tslint:disable-next-line:non-null-operator
+    // tslint:disable-next-line:no-non-null-assertion
     return this.stat(path) !.pipe(map(stat => stat.isDirectory()));
   }
   isFile(path: Path): Observable<boolean> {
-    // tslint:disable-next-line:non-null-operator
+    // tslint:disable-next-line:no-non-null-assertion
     return this.stat(path) !.pipe(map(stat => stat.isFile()));
   }
 

packages/angular_devkit/core/node/host_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-any
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 // tslint:disable:no-implicit-dependencies
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { NodeJsAsyncHost, NodeJsSyncHost } from '@angular-devkit/core/node';

packages/angular_devkit/core/src/json/schema/visitor_spec.ts

@@ -28,7 +28,7 @@ function syncObs<T>(obs: Observable<T>): T {
     throw new Error('Async observable.');
   }
 
-  return value !;  // tslint:disable-line:non-null-operator
+  return value !;  // tslint:disable-line:no-non-null-assertion
 }
 
 

packages/angular_devkit/core/src/virtual-fs/host/alias.ts

@@ -74,7 +74,7 @@ export class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT>
         maybeAlias = join(maybeAlias, ...remaining);
       }
       // Allow non-null-operator because we know sp.length > 0 (condition on while).
-      remaining.unshift(sp.pop() !);  // tslint:disable-line:non-null-operator
+      remaining.unshift(sp.pop() !);  // tslint:disable-line:no-non-null-assertion
     }
 
     return maybeAlias || path;

packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { fragment, normalize } from '@angular-devkit/core';
 import { stringToFileBuffer } from './buffer';
 import { SimpleMemoryHost } from './memory';

packages/angular_devkit/core/src/virtual-fs/host/sync.ts

@@ -53,7 +53,7 @@ export class SyncDelegateHost<T extends object = {}> {
     // The non-null operation is to work around `void` type. We don't allow to return undefined
     // but ResultT could be void, which is undefined in JavaScript, so this doesn't change the
     // behaviour.
-    // tslint:disable-next-line:non-null-operator
+    // tslint:disable-next-line:no-non-null-assertion
     return result !;
   }
 

packages/angular_devkit/schematics/src/engine/schematic_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { logging } from '@angular-devkit/core';
 import { of as observableOf } from 'rxjs';
 import { chain } from '../rules/base';

packages/angular_devkit/schematics/src/index.ts

@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { FilePredicate, MergeStrategy } from './tree/interface';
-import { Tree as TreeInterface } from './tree/interface';
+import { FilePredicate, MergeStrategy, Tree as TreeInterface } from './tree/interface';
 import { branch, empty, merge, optimize, partition } from './tree/static';
 
 

packages/angular_devkit/schematics/src/rules/base_spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { Path, virtualFs } from '@angular-devkit/core';
 import {
   HostTree,

packages/angular_devkit/schematics/src/rules/call_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 // tslint:disable:no-any
 // tslint:disable:no-implicit-dependencies
 import { MergeStrategy } from '@angular-devkit/schematics';

packages/angular_devkit/schematics/src/rules/move_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { of as observableOf } from 'rxjs';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';

packages/angular_devkit/schematics/src/rules/rename_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { of as observableOf } from 'rxjs';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';

packages/angular_devkit/schematics/src/tree/common_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { normalize } from '@angular-devkit/core';
 import { Tree } from './interface';
 

packages/angular_devkit/schematics/src/tree/filesystem_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator
+// tslint:disable:no-non-null-assertion
 import { PathIsFileException, normalize, virtualFs } from '@angular-devkit/core';
 import { testTreeVisit } from './common_spec';
 import { FileSystemTree } from './filesystem';

packages/angular_devkit/schematics/src/tree/interface.ts

@@ -22,12 +22,12 @@ export enum MergeStrategy {
   Error                     = 1 << 0,
 
   // Only content conflicts are overwritten.
-  ContentOnly               = MergeStrategy.AllowOverwriteConflict,
+  ContentOnly               = AllowOverwriteConflict,
 
   // Overwrite everything with the latest change.
-  Overwrite                 = MergeStrategy.AllowOverwriteConflict
-                            + MergeStrategy.AllowCreationConflict
-                            + MergeStrategy.AllowDeleteConflict,
+  Overwrite                 = AllowOverwriteConflict
+                            + AllowCreationConflict
+                            + AllowDeleteConflict,
 }
 
 

packages/angular_devkit/schematics/src/tree/virtual_spec.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:non-null-operator no-big-function
+// tslint:disable:no-non-null-assertion no-big-function
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { FileAlreadyExistException, FileDoesNotExistException } from '../exception/exception';
 import { testTreeVisit } from './common_spec';

packages/ngtools/webpack/src/angular_compiler_plugin.ts

@@ -413,7 +413,7 @@ export class AngularCompilerPlugin {
           genDir: '',
         }),
         // TODO: fix compiler-cli typings; entryModule should not be string, but also optional.
-        // tslint:disable-next-line:non-null-operator
+        // tslint:disable-next-line:no-non-null-assertion
         entryModule: this._entryModule !,
       });
       timeEnd('AngularCompilerPlugin._getLazyRoutesFromNgtools');

packages/schematics/angular/app-shell/index.ts

@@ -62,7 +62,7 @@ function getServerModulePath(
   if (!expNode) {
     return null;
   }
-  const relativePath = <ts.StringLiteral> (<ts.ExportDeclaration> expNode).moduleSpecifier;
+  const relativePath = (expNode as ts.ExportDeclaration).moduleSpecifier as ts.StringLiteral;
   const modulePath = normalize(`/${project.root}/src/${relativePath.text}.ts`);
 
   return modulePath;
@@ -113,7 +113,7 @@ function getBootstrapComponentPath(
   const metadataNode = getDecoratorMetadata(moduleSource, 'NgModule', '@angular/core')[0];
   const bootstrapProperty = getMetadataProperty(metadataNode, 'bootstrap');
 
-  const arrLiteral = (<ts.PropertyAssignment> bootstrapProperty)
+  const arrLiteral = (bootstrapProperty as ts.PropertyAssignment)
     .initializer as ts.ArrayLiteralExpression;
 
   const componentSymbol = arrLiteral.elements[0].getText();
@@ -124,7 +124,7 @@ function getBootstrapComponentPath(
       return findNode(imp, ts.SyntaxKind.Identifier, componentSymbol);
     })
     .map((imp: ts.ImportDeclaration) => {
-      const pathStringLiteral = <ts.StringLiteral> imp.moduleSpecifier;
+      const pathStringLiteral = imp.moduleSpecifier as ts.StringLiteral;
 
       return pathStringLiteral.text;
     })[0];

packages/schematics/angular/e2e/index.ts

@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { strings, tags } from '@angular-devkit/core';
-import { experimental } from '@angular-devkit/core';
+import { experimental, strings, tags } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,

packages/schematics/angular/migrations/update-6/index.ts

@@ -517,7 +517,7 @@ function extractProjectsConfig(
         }
 
         return newItems;
-      }, <string[]> []);
+      }, [] as string[]);
 
         // Tslint target
       const lintOptions: JsonObject = {

packages/schematics/angular/universal/index.ts

@@ -221,7 +221,7 @@ export default function (options: UniversalOptions): Rule {
       template({
         ...strings,
         ...options as object,
-        stripTsExtension: (s: string) => { return s.replace(/\.ts$/, ''); },
+        stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
       }),
       move(join(normalize(clientProject.root), 'src')),
     ]);
@@ -230,7 +230,7 @@ export default function (options: UniversalOptions): Rule {
       template({
         ...strings,
         ...options as object,
-        stripTsExtension: (s: string) => { return s.replace(/\.ts$/, ''); },
+        stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
         outDir,
         tsConfigExtends,
         rootInSrc,

packages/schematics/angular/utility/ast-utils.ts

@@ -555,7 +555,7 @@ export function isImported(source: ts.SourceFile,
     .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
     .filter((imp: ts.ImportDeclaration) => imp.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral)
     .filter((imp: ts.ImportDeclaration) => {
-      return (<ts.StringLiteral> imp.moduleSpecifier).text === importPath;
+      return (imp.moduleSpecifier as ts.StringLiteral).text === importPath;
     })
     .filter((imp: ts.ImportDeclaration) => {
       if (!imp.importClause) {

packages/schematics/angular/utility/ng-ast-utils.ts

@@ -67,7 +67,7 @@ export function findBootstrapModulePath(host: Tree, mainPath: string): string {
       return findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
     })
     .map((imp: ts.ImportDeclaration) => {
-      const modulePathStringLiteral = <ts.StringLiteral> imp.moduleSpecifier;
+      const modulePathStringLiteral = imp.moduleSpecifier as ts.StringLiteral;
 
       return modulePathStringLiteral.text;
     })[0];

packages/schematics/update/update/index.ts

@@ -243,7 +243,7 @@ function _performUpdate(
 
   const toInstall = [...infoMap.values()]
       .map(x => [x.name, x.target, x.installed])
-      // tslint:disable-next-line:non-null-operator
+      // tslint:disable-next-line:no-non-null-assertion
       .filter(([name, target, installed]) => {
         return !!name && !!target && !!installed;
       }) as [string, PackageVersionInfo, PackageVersionInfo][];