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';