refactor(@angular/cli): remove any type usage

Author: clydin

packages/angular/cli/commands/add-impl.ts

@@ -102,8 +102,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       if (latestManifest && Object.keys(latestManifest.peerDependencies).length === 0) {
         if (latestManifest.name === '@angular/pwa') {
           const version = await this.findProjectVersion('@angular/cli');
-          // tslint:disable-next-line:no-any
-          const semverOptions = { includePrerelease: true } as any;
+          const semverOptions = { includePrerelease: true };
 
           if (
             version &&
@@ -299,8 +298,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
             continue;
           }
 
-          // tslint:disable-next-line:no-any
-          const options = { includePrerelease: true } as any;
+          const options = { includePrerelease: true };
 
           if (
             !intersects(version, peerIdentifier.rawSpec, options) &&

packages/angular/cli/commands/new-impl.ts

@@ -5,8 +5,6 @@
  * 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:no-global-tslint-disable no-any
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { Schema as NewCommandSchema } from './new';

packages/angular/cli/commands/update-impl.ts

@@ -220,8 +220,11 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     return this.executePackageMigrations(migrations, packageName, commit);
   }
 
-  // tslint:disable-next-line: no-any
-  private async executePackageMigrations(migrations: any[], packageName: string, commit = false): Promise<boolean> {
+  private async executePackageMigrations(
+    migrations: Iterable<{ name: string; description: string; collection: { name: string }}>,
+    packageName: string,
+    commit = false,
+  ): Promise<boolean> {
     for (const migration of migrations) {
       this.logger.info(`${colors.symbols.pointer} ${migration.description.replace(/\. /g, '.\n  ')}`);
 

packages/angular/cli/lib/init.ts

@@ -42,7 +42,7 @@ function _fromPackageJson(cwd = process.cwd()): SemVer | null {
 if (process.env['NG_CLI_PROFILING']) {
   let profiler: {
     startProfiling: (name?: string, recsamples?: boolean) => void;
-    stopProfiling: (name?: string) => any; // tslint:disable-line:no-any
+    stopProfiling: (name?: string) => unknown;
   };
   try {
     profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies

packages/angular/cli/models/command.ts

@@ -5,8 +5,6 @@
  * 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:no-global-tslint-disable no-any
 import { analytics, logging, strings, tags } from '@angular-devkit/core';
 import * as path from 'path';
 import { colors } from '../utilities/color';

packages/angular/cli/utilities/color.ts

@@ -17,8 +17,9 @@ export function removeColor(text: string): string {
   return text.replace(new RegExp(ansiColors.ansiRegex), '');
 }
 
-// tslint:disable-next-line: no-any
-const colors = (ansiColors as any).create() as typeof ansiColors;
+// create a separate instance to prevent unintended global changes to the color configuration
+// create function is not defined in the typings
+const colors = (ansiColors as typeof ansiColors & { create: () => typeof ansiColors }).create();
 colors.enabled = supportsColor;
 
 export { colors };

packages/angular/cli/utilities/config.ts

@@ -93,16 +93,14 @@ export class AngularWorkspace {
 
   // tslint:disable-next-line: no-any
   getCli(): Record<string, any> {
-    // tslint:disable-next-line: no-any
-    return (this.workspace.extensions['cli'] as Record<string, any>) || {};
+    return (this.workspace.extensions['cli'] as Record<string, unknown>) || {};
   }
 
   // tslint:disable-next-line: no-any
   getProjectCli(projectName: string): Record<string, any> {
     const project = this.workspace.projects.get(projectName);
 
-    // tslint:disable-next-line: no-any
-    return (project?.extensions['cli'] as Record<string, any>) || {};
+    return (project?.extensions['cli'] as Record<string, unknown>) || {};
   }
 }
 

packages/angular/cli/utilities/package-metadata.ts

@@ -54,6 +54,7 @@ export interface PackageMetadata {
   name: string;
   tags: { [tag: string]: PackageManifest | undefined };
   versions: Record<string, PackageManifest>;
+  'dist-tags'?: unknown;
 }
 
 let npmrc: { [key: string]: string };
@@ -141,16 +142,15 @@ function readOptions(
   return options;
 }
 
-function normalizeManifest(rawManifest: {}): PackageManifest {
+function normalizeManifest(rawManifest: { name: string; version: string }): PackageManifest {
   // TODO: Fully normalize and sanitize
 
   return {
     dependencies: {},
     devDependencies: {},
     peerDependencies: {},
     optionalDependencies: {},
-    // tslint:disable-next-line:no-any
-    ...(rawManifest as any),
+    ...rawManifest,
   };
 }
 
@@ -187,14 +187,13 @@ export async function fetchPackageMetadata(
 
   if (response.versions) {
     for (const [version, manifest] of Object.entries(response.versions)) {
-      metadata.versions[version] = normalizeManifest(manifest as {});
+      metadata.versions[version] = normalizeManifest(manifest as { name: string; version: string });
     }
   }
 
   if (response['dist-tags']) {
     // Store this for use with other npm utility packages
-    // tslint:disable-next-line: no-any
-    (metadata as any)['dist-tags'] = response['dist-tags'];
+    metadata['dist-tags'] = response['dist-tags'];
 
     for (const [tag, version] of Object.entries(response['dist-tags'])) {
       const manifest = metadata.versions[version as string];

packages/angular/cli/utilities/project.ts

@@ -5,8 +5,6 @@
  * 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:no-global-tslint-disable no-any
 import { normalize } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
@@ -56,16 +54,14 @@ export function getWorkspaceDetails(): CommandWorkspace | null {
   };
 }
 
-function containsCliDep(obj: any): boolean {
+function containsCliDep(obj?: {
+  dependencies?: Record<string, string>;
+  devDependencies?: Record<string, string>;
+}): boolean {
   const pkgName = '@angular/cli';
-  if (obj) {
-    if (obj.dependencies && obj.dependencies[pkgName]) {
-      return true;
-    }
-    if (obj.devDependencies && obj.devDependencies[pkgName]) {
-      return true;
-    }
+  if (!obj) {
+    return false;
   }
 
-  return false;
+  return !!(obj.dependencies?.[pkgName] || obj.devDependencies?.[pkgName]);
 }