style: fix lint issues

Author: alan-agius4

modules/aspnetcore-engine/src/file-loader.ts

@@ -5,8 +5,8 @@
  * 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 * as fs from 'fs';
 import { ResourceLoader } from '@angular/compiler';
+import * as fs from 'fs';
 
 /** ResourceLoader implementation for loading files */
 export class FileLoader implements ResourceLoader {

modules/aspnetcore-engine/src/interfaces/engine-options.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
  */
-import { Type, NgModuleFactory, StaticProvider } from '@angular/core';
+import { NgModuleFactory, StaticProvider, Type } from '@angular/core';
 import { IRequestParams } from './request-params';
 
 export interface IEngineOptions {

modules/aspnetcore-engine/src/main.ts

@@ -5,12 +5,12 @@
  * 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 {Type, NgModuleFactory, CompilerFactory, Compiler, StaticProvider} from '@angular/core';
-import { platformDynamicServer } from '@angular/platform-server';
 import { DOCUMENT } from '@angular/common';
 import { ResourceLoader } from '@angular/compiler';
+import { Compiler, CompilerFactory, NgModuleFactory, StaticProvider, Type } from '@angular/core';
+import { platformDynamicServer } from '@angular/platform-server';
 
-import { REQUEST, ORIGIN_URL } from '@nguniversal/aspnetcore-engine/tokens';
+import { ORIGIN_URL, REQUEST } from '@nguniversal/aspnetcore-engine/tokens';
 import { FileLoader } from './file-loader';
 import { IEngineOptions } from './interfaces/engine-options';
 import { IEngineRenderResult } from './interfaces/engine-render-result';
@@ -37,7 +37,9 @@ function _getUniversalData(doc: Document): UniversalData {
   const META: string[] = [];
   const LINKS: string[] = [];
 
+  // tslint:disable-next-line: no-non-null-assertion
   for (let i = 0; i < doc.head!.children.length; i++) {
+    // tslint:disable-next-line: no-non-null-assertion
     const element = doc.head!.children[i];
     const tagName = element.tagName.toUpperCase();
 
@@ -83,6 +85,7 @@ function _getUniversalData(doc: Document): UniversalData {
 
   return {
     title: doc.title,
+    // tslint:disable-next-line: no-non-null-assertion
     appNode: doc.querySelector(appSelector)!.outerHTML,
     scripts: SCRIPTS.join('\n'),
     styles: STYLES.join('\n'),
@@ -158,6 +161,7 @@ function getReqResProviders(origin: string, request: string): StaticProvider[] {
       useValue: request
     }
   ];
+
   return providers;
 }
 
@@ -170,7 +174,7 @@ async function getFactory(
   if (moduleOrFactory instanceof NgModuleFactory) {
     return moduleOrFactory;
   } else {
-    let moduleFactory = factoryCacheMap.get(moduleOrFactory);
+    const moduleFactory = factoryCacheMap.get(moduleOrFactory);
     // If module factory is cached
     if (moduleFactory) {
       return moduleFactory;
@@ -179,6 +183,7 @@ async function getFactory(
     // Compile the module and cache it
     const factory = await compiler.compileModuleAsync(moduleOrFactory);
     factoryCacheMap.set(moduleOrFactory, factory);
+
     return factory;
   }
 }

modules/aspnetcore-engine/src/platform-server-utils.ts

@@ -20,15 +20,15 @@ import {
   StaticProvider,
   Type
 } from '@angular/core';
-import {ɵTRANSITION_ID} from '@angular/platform-browser';
+import { ɵTRANSITION_ID } from '@angular/platform-browser';
 import {
-  platformDynamicServer,
-  platformServer,
   BEFORE_APP_SERIALIZED,
   INITIAL_CONFIG,
-  PlatformState
+  PlatformState,
+  platformDynamicServer,
+  platformServer
 } from '@angular/platform-server';
-import {first} from 'rxjs/operators';
+import { first } from 'rxjs/operators';
 
 interface PlatformOptions {
   document?: string;
@@ -45,14 +45,17 @@ function _getPlatform(
   platformFactory: (extraProviders: StaticProvider[]) => PlatformRef,
   options: PlatformOptions): PlatformRef {
   const extraProviders = options.extraProviders ? options.extraProviders : [];
+
   return platformFactory([
     { provide: INITIAL_CONFIG, useValue: { document: options.document, url: options.url } },
     extraProviders
   ]);
 }
 
-async function _render<T>(platform: PlatformRef,
-                    moduleRefPromise: Promise<NgModuleRef<T>>): Promise<ModuleRenderResult<T>> {
+async function _render<T>(
+  platform: PlatformRef,
+  moduleRefPromise: Promise<NgModuleRef<T>>,
+): Promise<ModuleRenderResult<T>> {
   const moduleRef = await moduleRefPromise;
   const transitionId = moduleRef.injector.get(ɵTRANSITION_ID, null);
   if (!transitionId) {
@@ -75,12 +78,14 @@ async function _render<T>(platform: PlatformRef,
         callback();
       } catch (e) {
         // Ignore exceptions.
+        // tslint:disable-next-line: no-console
         console.warn('Ignoring BEFORE_APP_SERIALIZED Exception: ', e);
       }
     }
   }
   const output = platformState.renderToString();
   platform.destroy();
+
   return { html: output, moduleRef };
 }
 
@@ -100,6 +105,7 @@ export function renderModule<T>(
   module: Type<T>, options: { document?: string, url?: string, extraProviders?: StaticProvider[] }):
   Promise<ModuleRenderResult<T>> {
   const platform = _getPlatform(platformDynamicServer, options);
+
   return _render(platform, platform.bootstrapModule(module));
 }
 
@@ -117,5 +123,6 @@ export function renderModuleFactory<T>(
   options: { document?: string, url?: string, extraProviders?: StaticProvider[] }):
   Promise<ModuleRenderResult<T>> {
   const platform = _getPlatform(platformServer, options);
+
   return _render(platform, platform.bootstrapModuleFactory(moduleFactory));
 }

modules/builders/src/prerender/index.spec.ts

@@ -7,8 +7,8 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { createArchitect, host, outputPathBrowser } from '../../testing/utils';
 import { join, virtualFs } from '@angular-devkit/core';
+import { createArchitect, host, outputPathBrowser } from '../../testing/utils';
 
 describe('Prerender Builder', () => {
   const target = { project: 'app', target: 'prerender' };

modules/builders/src/prerender/index.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { BuilderOutput, createBuilder, BuilderContext, targetFromTargetString } from '@angular-devkit/architect';
+import { BuilderContext, BuilderOutput, createBuilder, targetFromTargetString } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { Buffer } from 'buffer';
 import * as fs from 'fs';
@@ -116,6 +116,7 @@ async function _renderUniversal(
       }
     }
   }
+
   return browserResult;
 }
 

modules/builders/src/prerender/utils.spec.ts

@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { getRoutes } from './utils';
 import * as fs from 'fs';
+import { getRoutes } from './utils';
 
 describe('Prerender Builder Utils', () => {
   describe('#getRoutes', () => {

modules/builders/src/ssr-dev-server/index.spec.ts

@@ -7,12 +7,12 @@
  */
 
 import { Architect, BuilderRun } from '@angular-devkit/architect';
-import { debounceTime, take, concatMap, retryWhen, mergeMap } from 'rxjs/operators';
 import * as browserSync from 'browser-sync';
+import { concatMap, debounceTime, mergeMap, retryWhen, take } from 'rxjs/operators';
 
+import { from, throwError, timer } from 'rxjs';
 import { createArchitect, host } from '../../testing/utils';
 import { SSRDevServerBuilderOutput } from './index';
-import { from, throwError, timer } from 'rxjs';
 
 // todo check why it resolves to mjs
 // [ERR_REQUIRE_ESM]: Must use import to load ES Module
@@ -46,7 +46,7 @@ describe('Serve SSR Builder', () => {
     expect(output.success).toBe(true);
     expect(output.baseUrl).toBe('http://localhost:4200');
 
-    const response = await from(fetch(output.baseUrl!)).pipe(
+    const response = await from(fetch(output.baseUrl as string)).pipe(
       retryWhen(err => err.pipe(
         mergeMap((error, attempts) => {
           return attempts > 10 || error.code !== 'ECONNRESET'
@@ -81,7 +81,7 @@ describe('Serve SSR Builder', () => {
         concatMap(async (output, index) => {
           expect(output.baseUrl).toBe('http://localhost:7001');
           expect(output.success).toBe(true, `index: ${index}`);
-          const response = await fetch(output.baseUrl!);
+          const response = await fetch(output.baseUrl as string);
           const text = await response.text();
 
           switch (index) {

modules/builders/src/ssr-dev-server/index.ts

@@ -7,39 +7,39 @@
  */
 
 import {
+  BuilderContext,
   BuilderOutput,
   createBuilder,
-  BuilderContext,
   targetFromTargetString,
 } from '@angular-devkit/architect';
-import { json, tags, logging } from '@angular-devkit/core';
+import { json, logging, tags } from '@angular-devkit/core';
+import * as browserSync from 'browser-sync';
+import * as proxy from 'http-proxy-middleware';
+import { join } from 'path';
 import {
+  EMPTY,
   Observable,
-  of,
   combineLatest,
-  zip,
   from,
-  EMPTY,
+  of,
+  zip,
 } from 'rxjs';
-import { Schema } from './schema';
 import {
-  switchMap,
-  map,
-  tap,
   catchError,
-  startWith,
-  mapTo,
-  ignoreElements,
-  finalize,
   concatMap,
   debounce,
   debounceTime,
   delay,
+  finalize,
+  ignoreElements,
+  map,
+  mapTo,
+  startWith,
+  switchMap,
+  tap,
 } from 'rxjs/operators';
-import * as browserSync from 'browser-sync';
-import { join } from 'path';
 import * as url from 'url';
-import * as proxy from 'http-proxy-middleware';
+import { Schema } from './schema';
 
 import { getAvailablePort, spawnAsObservable, waitUntilServerIsListening } from './utils';
 
@@ -97,23 +97,28 @@ export function execute(
           if (!s.success) {
             return of(s);
           }
+
           return startNodeServer(s, nodeServerPort, context.logger).pipe(
             mapTo(s),
             catchError(err => {
               context.logger.error(`A server error has occurred.\n${mapErrorToMessage(err)}`);
+
               return EMPTY;
             }),
           );
         }));
 
-      return combineLatest(br.output, server$).pipe(
+      return combineLatest([br.output, server$]).pipe(
         // This is needed so that if both server and browser emit close to each other
         // we only emit once. This typically happens on the first build.
         debounceTime(120),
-        map(([b, s]) => ([{
-          success: b.success && s.success,
-          error: b.error || s.error,
-        }, nodeServerPort] as [SSRDevServerBuilderOutput, number])),
+        map(([b, s]) => ([
+          {
+            success: b.success && s.success,
+            error: b.error || s.error,
+          },
+          nodeServerPort,
+        ] as [SSRDevServerBuilderOutput, number])),
         tap(([builderOutput]) => {
           if (builderOutput.success) {
             context.logger.info('\nCompiled successfully.');
@@ -131,6 +136,7 @@ export function execute(
 
       if (bsInstance.active) {
         bsInstance.reload();
+
         return of(builderOutput);
       } else {
         return from(initBrowserSync(bsInstance, nodeServerPort, options))

modules/builders/src/ssr-dev-server/utils.ts

@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { spawn, SpawnOptions } from 'child_process';
+import { SpawnOptions, spawn } from 'child_process';
+import { AddressInfo, createConnection, createServer } from 'net';
 import { Observable, throwError, timer } from 'rxjs';
+import { mergeMap, retryWhen } from 'rxjs/operators';
 import * as treeKill from 'tree-kill';
-import { createServer, AddressInfo, createConnection } from 'net';
-import { retryWhen, mergeMap } from 'rxjs/operators';
 
 export function getAvailablePort(): Promise<number> {
   return new Promise((resolve, reject) => {

modules/builders/testing/utils.ts

@@ -8,21 +8,21 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { TestingArchitectHost, TestProjectHost } from '@angular-devkit/architect/testing';
+import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   Path,
   getSystemPath,
   normalize,
   schema,
   workspaces,
 } from '@angular-devkit/core';
-import { mkdirSync, symlinkSync, existsSync } from 'fs';
+import { existsSync, mkdirSync, symlinkSync } from 'fs';
 import * as path from 'path';
 import { cp } from 'shelljs';
 
 // Add link from src -> tmp hello-world-app
 const templateRoot = path.join(
-  process.env.TEST_TMPDIR!,
+  process.env.TEST_TMPDIR as string,
   `hello-world-app-${Math.random().toString(36).slice(2)}`,
 );
 
@@ -39,7 +39,7 @@ cp(
 // link node packages
 symlinkSync(
   path.join(require.resolve('npm/node_modules/@angular/core/package.json'), '../../../'),
-  path.join(process.env.TEST_TMPDIR!, 'node_modules'),
+  path.join(process.env.TEST_TMPDIR as string, 'node_modules'),
   'junction'
 );