build: fix typescript compilation errors

Author: jbedard

tests/legacy-cli/e2e/setup/010-local-publish.ts

@@ -3,7 +3,7 @@ import { execWithEnv } from '../utils/process';
 import { isPrereleaseCli } from '../utils/project';
 
 export default async function () {
-  const testRegistry = getGlobalVariable('package-registry');
+  const testRegistry: string = getGlobalVariable('package-registry');
   await execWithEnv(
     'npm',
     [

tests/legacy-cli/e2e/setup/100-global-cli.ts

@@ -7,7 +7,7 @@ export default async function () {
     return;
   }
 
-  const testRegistry = getGlobalVariable('package-registry');
+  const testRegistry: string = getGlobalVariable('package-registry');
 
   // Install global Angular CLI.
   await silentNpm('install', '--global', '@angular/cli', `--registry=${testRegistry}`);

tests/legacy-cli/e2e/setup/300-log-environment.ts

@@ -10,7 +10,7 @@ export default async function () {
       return;
     }
 
-    console.log(`  ${envName}: ${process.env[envName].replace(/[\n\r]+/g, '\n        ')}`);
+    console.log(`  ${envName}: ${process.env[envName]!.replace(/[\n\r]+/g, '\n        ')}`);
   });
 
   await node('--version');

tests/legacy-cli/e2e/setup/500-create-project.ts

@@ -17,7 +17,7 @@ export default async function () {
     process.chdir(argv.reuse);
     await gitClean();
   } else {
-    const extraArgs = [];
+    const extraArgs: string[] = [];
     const testRegistry = getGlobalVariable('package-registry');
     const isCI = getGlobalVariable('ci');
 

tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts

@@ -12,11 +12,13 @@ export default async function () {
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
   if (isSnapshotBuild) {
-    const packagesToInstall = [];
+    const packagesToInstall: string[] = [];
     await updateJsonFile('package.json', (packageJson) => {
       const dependencies = packageJson['dependencies'];
       // Iterate over all of the packages to update them to the snapshot version.
-      for (const [name, version] of Object.entries(snapshots.dependencies)) {
+      for (const [name, version] of Object.entries(
+        snapshots.dependencies as { [p: string]: string },
+      )) {
         if (name in dependencies && dependencies[name] !== version) {
           packagesToInstall.push(version);
         }

tests/legacy-cli/e2e/tests/build/platform-server.ts

@@ -12,11 +12,13 @@ export default async function () {
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
   if (isSnapshotBuild) {
-    const packagesToInstall = [];
+    const packagesToInstall: string[] = [];
     await updateJsonFile('package.json', (packageJson) => {
       const dependencies = packageJson['dependencies'];
       // Iterate over all of the packages to update them to the snapshot version.
-      for (const [name, version] of Object.entries(snapshots.dependencies)) {
+      for (const [name, version] of Object.entries(
+        snapshots.dependencies as { [p: string]: string },
+      )) {
         if (name in dependencies && dependencies[name] !== version) {
           packagesToInstall.push(version);
         }

tests/legacy-cli/e2e/tests/build/prod-build.ts

@@ -39,7 +39,7 @@ export default async function () {
   }
 
   const indexContent = await readFile('dist/test-project/index.html');
-  const mainPath = indexContent.match(/src="(main\.[0-9a-zA-Z]{0,32}\.js)"/)[1];
+  const mainPath = indexContent.match(/src="(main\.[0-9a-zA-Z]{0,32}\.js)"/)![1];
 
   // Content checks
   await expectFileToMatch(`dist/test-project/${mainPath}`, bootstrapRegExp);

tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts

@@ -53,7 +53,8 @@ export default async function () {
 
   // It should correctly generate assetGroups and include at least one URL in each group.
   const ngswJson = JSON.parse(await readFile(ngswPath));
-  const assetGroups = ngswJson.assetGroups.map(({ name, urls }) => ({
+  // @ts-ignore
+  const assetGroups: any[] = ngswJson.assetGroups.map(({ name, urls }) => ({
     name,
     urlCount: urls.length,
   }));

tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts

@@ -11,7 +11,7 @@ import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { externalServer, langTranslations, setupI18nConfig } from './setup';
 
-const baseHrefs = {
+const baseHrefs: { [l: string]: RegExp | string } = {
   'en-US': '/en/',
   fr: '/fr-FR/',
   de: '',
@@ -59,7 +59,7 @@ export default async function () {
     await ng('e2e', `--configuration=${lang}`, '--port=0');
 
     // Execute Application E2E tests for a production build without dev server
-    const server = externalServer(outputPath, baseHrefs[lang] || '/');
+    const server = externalServer(outputPath, (baseHrefs[lang] as string) || '/');
     try {
       await ng(
         'e2e',

tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts

@@ -27,7 +27,7 @@ export default async function () {
         continue;
       }
 
-      hashes.set(`${lang}/${match.groups.name}`, match.groups.hash);
+      hashes.set(`${lang}/${match!.groups!.name}`, match!.groups!.hash);
     }
   }
 
@@ -48,12 +48,12 @@ export default async function () {
         continue;
       }
 
-      const id = `${lang}/${match.groups.name}`;
+      const id = `${lang}/${match!.groups!.name}`;
       const hash = hashes.get(id);
       if (!hash) {
         throw new Error('Unexpected output entry: ' + id);
       }
-      if (hash === match.groups.hash) {
+      if (hash === match!.groups!.hash) {
         throw new Error('Hash value did not change for entry: ' + id);
       }
 

tests/legacy-cli/e2e/tests/i18n/setup.ts

@@ -98,12 +98,12 @@ export const formats = {
   'json': {
     ext: 'json',
     sourceCheck: '"locale": "en-US"',
-    replacements: [],
+    replacements: [] as RegExp[][],
   },
   'arb': {
     ext: 'arb',
     sourceCheck: '"@@locale": "en-US"',
-    replacements: [],
+    replacements: [] as RegExp[][],
   },
 };
 
@@ -248,7 +248,7 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
   for (const { lang, translationReplacements } of langTranslations) {
     if (lang != sourceLocale) {
       await copyFile(translationFile, `src/locale/messages.${lang}.${formats[format].ext}`);
-      for (const replacements of translationReplacements) {
+      for (const replacements of translationReplacements!) {
         await replaceInFile(
           `src/locale/messages.${lang}.${formats[format].ext}`,
           new RegExp(replacements[0], 'g'),

tests/legacy-cli/e2e/tests/misc/completion-prompt.ts

@@ -408,7 +408,7 @@ source <(ng completion script)
 
       const localCliDir = path.join(projectDir, 'node_modules', '.bin');
       const localCliBinary = path.join(localCliDir, 'ng');
-      const pathDirs = process.env['PATH'].split(':');
+      const pathDirs = process.env['PATH']!.split(':');
       const pathEnvVar = [...pathDirs, localCliDir].join(':');
       const { stdout } = await execWithEnv(localCliBinary, ['version'], {
         ...DEFAULT_ENV,

tests/legacy-cli/e2e/tests/misc/e2e-host.ts

@@ -3,7 +3,7 @@ import { killAllProcesses, ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
 export default async function () {
-  const interfaces = [].concat.apply([], Object.values(os.networkInterfaces()));
+  const interfaces = Object.values(os.networkInterfaces()).flat() as os.NetworkInterfaceInfo[];
   let host = '';
   for (const { family, address, internal } of interfaces) {
     if (family === 'IPv4' && !internal) {

tests/legacy-cli/e2e/tests/misc/http-headers.ts

@@ -24,7 +24,7 @@ export default async function () {
     };
   });
 
-  let errorMessage = null;
+  let errorMessage: string | null = null;
   try {
     await ng('e2e');
   } catch (error) {

tests/legacy-cli/e2e/tests/misc/npm-7.ts

@@ -39,7 +39,7 @@ export default async function () {
 
   const currentDirectory = process.cwd();
 
-  const extraArgs = [];
+  const extraArgs: string[] = [];
   if (isPrereleaseCli()) {
     extraArgs.push('--next');
   }

tests/legacy-cli/e2e/tests/misc/public-host.ts

@@ -8,8 +8,8 @@ export default function () {
 
   const firstLocalIp = Object.values(os.networkInterfaces())
     .flat()
-    .filter((ni) => ni.family === 'IPv4' && !ni.internal)
-    .map((ni) => ni.address)
+    .filter((ni) => ni?.family === 'IPv4' && !ni?.internal)
+    .map((ni) => ni!.address)
     .shift();
   const publicHost = `${firstLocalIp}:4200`;
   const localAddress = `http://${publicHost}`;

tests/legacy-cli/e2e/tests/update/update-secure-registry.ts

@@ -8,7 +8,7 @@ export default async function () {
   delete process.env['NPM_CONFIG_REGISTRY'];
   const worksMessage = 'We analyzed your package.json';
 
-  const extraArgs = [];
+  const extraArgs: string[] = [];
   if (isPrereleaseCli()) {
     extraArgs.push('--next');
   }

tests/legacy-cli/e2e/utils/env.ts

@@ -4,9 +4,9 @@ export function setGlobalVariable(name: string, value: any) {
   global[name] = value;
 }
 
-export function getGlobalVariable(name: string): any {
+export function getGlobalVariable<T = any>(name: string): T {
   if (!(name in global)) {
     throw new Error(`Trying to access variable "${name}" but it's not defined.`);
   }
-  return global[name];
+  return global[name] as T;
 }

tests/legacy-cli/e2e/utils/fs.ts

@@ -30,7 +30,7 @@ export function symlinkFile(from: string, to: string, type?: string): Promise<vo
 }
 
 export function createDir(path: string): Promise<string> {
-  return fs.mkdir(path, { recursive: true });
+  return fs.mkdir(path, { recursive: true }) as Promise<string>;
 }
 
 export async function copyFile(from: string, to: string): Promise<void> {

tests/legacy-cli/e2e/utils/process.ts

@@ -10,7 +10,7 @@ const treeKill = require('tree-kill');
 interface ExecOptions {
   silent?: boolean;
   waitForMatch?: RegExp;
-  env?: { [varname: string]: string };
+  env?: { [varname: string]: string | undefined };
   stdin?: string;
   cwd?: string;
 }
@@ -59,7 +59,8 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
   }
 
   const childProcess = child_process.spawn(cmd, args, spawnOptions);
-  childProcess.stdout.on('data', (data: Buffer) => {
+  // @ts-ignore
+  childProcess.stdout!.on('data', (data: Buffer) => {
     stdout += data.toString('utf-8');
     if (options.silent) {
       return;
@@ -70,7 +71,8 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
       .filter((line) => line !== '')
       .forEach((line) => console.log('  ' + line));
   });
-  childProcess.stderr.on('data', (data: Buffer) => {
+  // @ts-ignore
+  childProcess.stderr!.on('data', (data: Buffer) => {
     stderr += data.toString('utf-8');
     if (options.silent) {
       return;
@@ -116,13 +118,15 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
 
     if (options.waitForMatch) {
       const match = options.waitForMatch;
-      childProcess.stdout.on('data', (data: Buffer) => {
+      // @ts-ignore
+      childProcess.stdout!.on('data', (data: Buffer) => {
         if (data.toString().match(match)) {
           resolve({ stdout, stderr });
           matched = true;
         }
       });
-      childProcess.stderr.on('data', (data: Buffer) => {
+      // @ts-ignore
+      childProcess.stderr!.on('data', (data: Buffer) => {
         if (data.toString().match(match)) {
           resolve({ stdout, stderr });
           matched = true;
@@ -132,8 +136,8 @@ function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proce
 
     // Provide input to stdin if given.
     if (options.stdin) {
-      childProcess.stdin.write(options.stdin);
-      childProcess.stdin.end();
+      childProcess.stdin!.write(options.stdin);
+      childProcess.stdin!.end();
     }
   });
 }
@@ -155,13 +159,15 @@ export function waitForAnyProcessOutputToMatch(
       new Promise((resolve) => {
         let stdout = '';
         let stderr = '';
-        childProcess.stdout.on('data', (data: Buffer) => {
+        // @ts-ignore
+        childProcess.stdout!.on('data', (data: Buffer) => {
           stdout += data.toString();
           if (data.toString().match(match)) {
             resolve({ stdout, stderr });
           }
         });
-        childProcess.stderr.on('data', (data: Buffer) => {
+        // @ts-ignore
+        childProcess.stderr!.on('data', (data: Buffer) => {
           stderr += data.toString();
           if (data.toString().match(match)) {
             resolve({ stdout, stderr });
@@ -189,7 +195,7 @@ export function silentExec(cmd: string, ...args: string[]) {
 export function execWithEnv(
   cmd: string,
   args: string[],
-  env: { [varname: string]: string },
+  env: { [varname: string]: string | undefined },
   stdin?: string,
 ) {
   return _exec({ env, stdin }, cmd, args);
@@ -198,7 +204,7 @@ export function execWithEnv(
 export async function execAndCaptureError(
   cmd: string,
   args: string[],
-  env?: { [varname: string]: string },
+  env?: { [varname: string]: string | undefined },
   stdin?: string,
 ): Promise<Error> {
   try {
@@ -213,7 +219,7 @@ export function execAndWaitForOutputToMatch(
   cmd: string,
   args: string[],
   match: RegExp,
-  env?: { [varName: string]: string },
+  env?: { [varName: string]: string | undefined },
 ) {
   if (cmd === 'ng' && args[0] === 'serve') {
     // Accept matches up to 20 times after the initial match.

tests/legacy-cli/e2e/utils/project.ts

@@ -1,6 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { prerelease, SemVer } from 'semver';
+import yargsParser from 'yargs-parser';
 import { packages } from '../../../../lib/packages';
 import { getGlobalVariable } from './env';
 import { prependToFile, readFile, replaceInFile, writeFile } from './fs';
@@ -25,9 +26,8 @@ export function updateTsConfig(fn: (json: any) => any | void) {
 export function ngServe(...args: string[]) {
   return execAndWaitForOutputToMatch('ng', ['serve', ...args], / Compiled successfully./);
 }
-
-export async function prepareProjectForE2e(name) {
-  const argv: string[] = getGlobalVariable('argv');
+export async function prepareProjectForE2e(name: string) {
+  const argv: yargsParser.Arguments = getGlobalVariable('argv');
 
   await git('config', 'user.email', '[email protected]');
   await git('config', 'user.name', 'Angular CLI E2e');
@@ -87,7 +87,7 @@ export function useSha() {
     return updateJsonFile('package.json', (json) => {
       // Install over the project with snapshot builds.
       function replaceDependencies(key: string) {
-        const missingSnapshots = [];
+        const missingSnapshots: string[] = [];
         Object.keys(json[key] || {})
           .filter((name) => name.match(/^@angular\//))
           .forEach((name) => {
@@ -228,5 +228,5 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
 export const NgCLIVersion = new SemVer(packages['@angular/cli'].version);
 
 export function isPrereleaseCli(): boolean {
-  return prerelease(NgCLIVersion)?.length > 0;
+  return (prerelease(NgCLIVersion)?.length ?? 0) > 0;
 }

tests/legacy-cli/e2e_runner.ts

@@ -72,7 +72,7 @@ function lastLogger() {
 }
 
 const testGlob = argv.glob || 'tests/**/*.ts';
-let currentFileName = null;
+let currentFileName = '';
 
 const e2eRoot = path.join(__dirname, 'e2e');
 const allSetups = glob.sync('setup/**/*.ts', { nodir: true, cwd: e2eRoot }).sort();
@@ -159,7 +159,7 @@ Promise.all([findFreePort(), findFreePort()])
                 };
 
           let clean = true;
-          let previousDir = null;
+          let previousDir: string | null = null;
 
           return Promise.resolve()
             .then(() => printHeader(currentFileName, testIndex))