refactor: clean up unused code and imports

alan-agius4 · alan-agius4 · commit 05588fcee1a0 · 2020-07-24T08:01:52.000+02:00
diff --git a/lib/packages.ts b/lib/packages.ts
@@ -14,7 +14,7 @@ import * as path from 'path';
 import * as ts from 'typescript';
 
 const distRoot = path.join(__dirname, '../dist');
-const { versions: monorepoVersions, packages: monorepoPackages } = require('../.monorepo.json');
+const { packages: monorepoPackages } = require('../.monorepo.json');
 
 
 export interface PackageInfo {
diff --git a/packages/angular/cli/commands/analytics-impl.ts b/packages/angular/cli/commands/analytics-impl.ts
@@ -29,7 +29,7 @@ export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
         return 1;
       } else {
         // No argument were passed.
-        await this.printHelp(options);
+        await this.printHelp();
 
         return 2;
       }
@@ -70,7 +70,7 @@ export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
               break;
 
             default:
-              await this.printHelp(options);
+              await this.printHelp();
 
               return 3;
           }
@@ -81,7 +81,7 @@ export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
           break;
 
         default:
-          await this.printHelp(options);
+          await this.printHelp();
 
           return 4;
       }
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
@@ -37,13 +37,6 @@ function _validateBoolean(value: string) {
     throw new Error(`Invalid value type; expected Boolean, received ${JSON.stringify(value)}.`);
   }
 }
-function _validateNumber(value: string) {
-  const numberValue = Number(value);
-  if (!Number.isFinite(numberValue)) {
-    return numberValue;
-  }
-  throw new Error(`Invalid value type; expected Number, received ${JSON.stringify(value)}.`);
-}
 function _validateString(value: string) {
   return value;
 }
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
@@ -61,7 +61,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
 
   public async run(options: GenerateCommandSchema & Arguments) {
     if (!this.schematicName || !this.collectionName) {
-      return this.printHelp(options);
+      return this.printHelp();
     }
 
     return this.runSchematic({
@@ -105,8 +105,8 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     return [collectionName, schematicName];
   }
 
-  public async printHelp(options: GenerateCommandSchema & Arguments) {
-    await super.printHelp(options);
+  public async printHelp() {
+    await super.printHelp();
 
     this.logger.info('');
     // Find the generate subcommand.
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
@@ -193,7 +193,7 @@ export abstract class ArchitectCommand<
     return await this.runArchitectTarget(options);
   }
 
-  protected async runBepTarget<T>(
+  protected async runBepTarget(
     command: string,
     configuration: Target,
     overrides: json.JsonObject,
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
@@ -49,7 +49,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     return;
   }
 
-  async printHelp(options: T & Arguments): Promise<number> {
+  async printHelp(): Promise<number> {
     await this.printHelpUsage();
     await this.printHelpOptions();
 
@@ -175,7 +175,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     await this.initialize(options);
 
     if (options.help === true) {
-      return this.printHelp(options);
+      return this.printHelp();
     } else if (options.help === 'json' || options.help === 'JSON') {
       return this.printJsonHelp(options);
     } else {
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
@@ -110,8 +110,8 @@ export abstract class SchematicCommand<
     }
   }
 
-  public async printHelp(options: T & Arguments) {
-    await super.printHelp(options);
+  public async printHelp() {
+    await super.printHelp();
     this.logger.info('');
 
     const subCommandOption = this.description.options.filter(x => x.subcommands)[0];
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -7,7 +7,7 @@
  */
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { EMPTY, Subscription } from 'rxjs';
-import { catchError, first, ignoreElements, map, share, shareReplay, tap } from 'rxjs/operators';
+import { catchError, first, ignoreElements, map, shareReplay } from 'rxjs/operators';
 import {
   BuilderInfo,
   BuilderInput,
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture.ts b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
@@ -8,7 +8,7 @@
 
 import { Observable } from 'rxjs';
 import { map, reduce } from 'rxjs/operators';
-import { AggregatedProcessStats, Capture, MetricGroup, MonitoredProcess } from './interfaces';
+import { AggregatedProcessStats, Capture, MetricGroup } from './interfaces';
 import { cumulativeMovingAverage, max } from './utils';
 
 
diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -122,7 +122,7 @@ export class NgBuildAnalyticsPlugin {
 
     return metrics;
   }
-  protected _getDimensions(stats: Stats) {
+  protected _getDimensions() {
     const dimensions: (string | number | boolean)[] = [];
 
     if (this._stats.errors.length) {
@@ -136,13 +136,13 @@ export class NgBuildAnalyticsPlugin {
   }
 
   protected _reportBuildMetrics(stats: Stats) {
-    const dimensions = this._getDimensions(stats);
+    const dimensions = this._getDimensions();
     const metrics = this._getMetrics(stats);
     this._analytics.event(this._category, 'build', { dimensions, metrics });
   }
 
   protected _reportRebuildMetrics(stats: Stats) {
-    const dimensions = this._getDimensions(stats);
+    const dimensions = this._getDimensions();
     const metrics = this._getMetrics(stats);
     this._analytics.event(this._category, 'rebuild', { dimensions, metrics });
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Compiler, compilation } from 'webpack';
-import { Budget, Type } from '../../browser/schema';
+import { Budget } from '../../browser/schema';
 import { ProcessBundleResult } from '../../utils/process-bundle';
 import { ThresholdSeverity, checkBudgets } from '../utilities/bundle-calculator';
 
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -11,7 +11,7 @@ import {
   createBuilder,
   targetFromTargetString,
 } from '@angular-devkit/architect';
-import { JsonObject, join, normalize, resolve } from '@angular-devkit/core';
+import { JsonObject, normalize, resolve } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/rebuild_spec.ts
@@ -8,7 +8,7 @@
 // tslint:disable:no-big-function
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
-import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
 import {
   createArchitect,
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/scripts-array_spec.ts
@@ -7,7 +7,6 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { TestLogger } from '@angular-devkit/architect/testing';
 import { logging } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/vendor-source-map_spec.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
-import { browserBuild, createArchitect, host, veEnabled } from '../../test-utils';
+import { browserBuild, createArchitect, host } from '../../test-utils';
 
 describe('Browser Builder external source map', () => {
   const target = { project: 'app', target: 'build' };
diff --git a/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
@@ -5,11 +5,10 @@
  * 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 { Observable, from, of } from 'rxjs';
+import { Observable, from } from 'rxjs';
 import { concatMap, first } from 'rxjs/operators';
-import { JsonValue, schema } from '../../json';
-import { JobDescription, JobHandler, JobName, Registry, isJobHandler } from './api';
-import { JobNameAlreadyRegisteredException } from './exception';
+import { JsonValue } from '../../json';
+import {  JobHandler, JobName, Registry } from './api';
 
 
 /**
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
@@ -6,12 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function no-non-null-assertion
-import { EMPTY, Observable, of, timer } from 'rxjs';
-import { map, take, toArray } from 'rxjs/operators';
-import { JobHandlerContext, JobOutboundMessage, JobOutboundMessageKind, JobState } from './api';
 import { createJobHandler } from './create-job-handler';
 import { SimpleJobRegistry } from './simple-registry';
-import { SimpleScheduler } from './simple-scheduler';
 
 describe('SimpleJobRegistry', () => {
   let registry: SimpleJobRegistry;
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -294,7 +294,6 @@ export class SimpleScheduler<
     handler: Observable<JobHandlerWithExtra | null>,
     inboundBus: Observer<JobInboundMessage<I>>,
     outboundBus: Observable<JobOutboundMessage<O>>,
-    options: ScheduleJobOptions,
   ): Job<A, I, O> {
     const schemaRegistry = this._schemaRegistry;
 
@@ -541,6 +540,6 @@ export class SimpleScheduler<
       ),
     );
 
-    return this._createJob(name, argument, handler, inboundBus, outboundBus, options);
+    return this._createJob(name, argument, handler, inboundBus, outboundBus);
   }
 }
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
@@ -71,7 +71,6 @@ export namespace strategy {
     O extends JsonValue = JsonValue,
   >(replayMessages = false): JobStrategy<A, I, O> {
     let inboundBus = new Subject<JobInboundMessage<I>>();
-    let runContext: JobHandlerContext | null = null;
     let run: Observable<JobOutboundMessage<O>> | null = null;
     let state: JobOutboundMessage<O> | null = null;
 
@@ -108,7 +107,6 @@ export namespace strategy {
           ),
           replayMessages ? shareReplay() : share(),
         );
-        runContext = context;
 
         return run;
       };
diff --git a/packages/angular_devkit/core/src/experimental/workspace/workspace.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
@@ -6,8 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { existsSync } from 'fs';
-import * as path from 'path';
 import { Observable, of, throwError } from 'rxjs';
 import { concatMap, first, map, tap } from 'rxjs/operators';
 import { BaseException } from '../../exception';
diff --git a/packages/angular_devkit/schematics/src/rules/base_spec.ts b/packages/angular_devkit/schematics/src/rules/base_spec.ts
@@ -82,14 +82,12 @@ describe('chain', () => {
 describe('apply', () => {
   it('works with simple rules', done => {
     const rulesCalled: Tree[] = [];
-    let sourceCalled = false;
-
     const tree0 = empty();
     const tree1 = empty();
     const tree2 = empty();
     const tree3 = empty();
 
-    const source: Source = () => (sourceCalled = true, tree0);
+    const source: Source = () => tree0;
     const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, tree1);
     const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, tree2);
     const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
@@ -108,14 +106,12 @@ describe('apply', () => {
 
   it('works with observable rules', done => {
     const rulesCalled: Tree[] = [];
-    let sourceCalled = false;
-
     const tree0 = empty();
     const tree1 = empty();
     const tree2 = empty();
     const tree3 = empty();
 
-    const source: Source = () => (sourceCalled = true, tree0);
+    const source: Source = () => tree0;
     const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, observableOf(tree1));
     const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, observableOf(tree2));
     const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -7,7 +7,7 @@
  */
 import { logging, schema, virtualFs } from '@angular-devkit/core';
 import { EMPTY, Observable, Subject, concat, from, of, throwError } from 'rxjs';
-import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
+import { concatMap, defaultIfEmpty, ignoreElements, last, tap } from 'rxjs/operators';
 import { Engine, EngineHost, SchematicEngine } from '../engine';
 import { UnsuccessfulWorkflowExecution } from '../exception/exception';
 import { standardFormats } from '../formats';
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -9,7 +9,6 @@ import { Observable, of as observableOf, throwError } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { Url } from 'url';
 import {
-  Collection,
   CollectionDescription,
   EngineHost,
   RuleFactory,
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -35,7 +35,6 @@ import {
   UnregisteredTaskException,
 } from '../src';
 import {
-  FileSystemCollection,
   FileSystemCollectionDesc,
   FileSystemEngineHost,
   FileSystemSchematicContext,
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
-import { schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -1144,7 +1144,6 @@ export class AngularCompilerPlugin {
     // Report any diagnostics.
     reportDiagnostics(
       diagnostics,
-      this._compilerHost,
       msg => this._errors.push(new Error(msg)),
       msg => this._warnings.push(msg),
     );
diff --git a/packages/ngtools/webpack/src/diagnostics.ts b/packages/ngtools/webpack/src/diagnostics.ts
@@ -109,7 +109,6 @@ export function gatherDiagnostics(
 
 export function reportDiagnostics(
   diagnostics: Diagnostics,
-  compilerHost: WebpackCompilerHost & CompilerHost,
   reportError: (msg: string) => void,
   reportWarning: (msg: string) => void,
 ) {
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
@@ -13,7 +13,6 @@ import {
   Program,
   createCompilerHost,
   createProgram,
-  formatDiagnostics,
 } from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
@@ -111,7 +110,6 @@ export class TypeChecker {
     if (!cancellationToken.isCancellationRequested()) {
       reportDiagnostics(
         allDiagnostics,
-        this._compilerHost,
         msg => this.sendMessage(new LogMessage('error', 'ERROR in ' + msg)),
         msg => this.sendMessage(new LogMessage('warn', 'WARNING in ' + msg)),
       );
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
@@ -6,13 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  JsonAstObject,
   JsonObject,
-  JsonParseMode,
-  JsonValue,
   join,
   normalize,
-  parseJsonAst,
   strings,
 } from '@angular-devkit/core';
 import {
@@ -73,20 +69,6 @@ function addDependenciesToPackageJson(options: ApplicationOptions) {
   };
 }
 
-function readTsLintConfig(host: Tree, path: string): JsonAstObject {
-  const buffer = host.read(path);
-  if (!buffer) {
-    throw new SchematicsException(`Could not read ${path}.`);
-  }
-
-  const config = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
-  if (config.kind !== 'object') {
-    throw new SchematicsException(`Invalid ${path}. Was expecting an object.`);
-  }
-
-  return config;
-}
-
 /**
  * Merges the application tslint.json with the workspace tslint.json
  * when the application being created is a root application
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
diff --git a/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts b/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts
diff --git a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs_spec.ts
diff --git a/packages/schematics/angular/utility/config.ts b/packages/schematics/angular/utility/config.ts
diff --git a/scripts/build.ts b/scripts/build.ts

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,6 @@ function _validateBoolean(value: string) {`
`37`	`37`	throw new Error(`Invalid value type; expected Boolean, received ${JSON.stringify(value)}.`);
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-function _validateNumber(value: string) {`
`41`		`- const numberValue = Number(value);`
`42`		`- if (!Number.isFinite(numberValue)) {`
`43`		`- return numberValue;`
`44`		`- }`
`45`		- throw new Error(`Invalid value type; expected Number, received ${JSON.stringify(value)}.`);
`46`		`-}`
`47`	`40`	`function _validateString(value: string) {`
`48`	`41`	`return value;`
`49`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ export abstract class ArchitectCommand<`
`193`	`193`	`return await this.runArchitectTarget(options);`
`194`	`194`	`}`
`195`	`195`
`196`		`- protected async runBepTarget<T>(`
	`196`	`+ protected async runBepTarget(`
`197`	`197`	`command: string,`
`198`	`198`	`configuration: Target,`
`199`	`199`	`overrides: json.JsonObject,`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,8 @@ export abstract class SchematicCommand<`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- public async printHelp(options: T & Arguments) {`
`114`		`- await super.printHelp(options);`
	`113`	`+ public async printHelp() {`
	`114`	`+ await super.printHelp();`
`115`	`115`	`this.logger.info('');`
`116`	`116`
`117`	`117`	`const subCommandOption = this.description.options.filter(x => x.subcommands)[0];`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ export class NgBuildAnalyticsPlugin {`
`122`	`122`
`123`	`123`	`return metrics;`
`124`	`124`	`}`
`125`		`- protected _getDimensions(stats: Stats) {`
	`125`	`+ protected _getDimensions() {`
`126`	`126`	`const dimensions: (string \| number \| boolean)[] = [];`
`127`	`127`
`128`	`128`	`if (this._stats.errors.length) {`
`@@ -136,13 +136,13 @@ export class NgBuildAnalyticsPlugin {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`protected _reportBuildMetrics(stats: Stats) {`
`139`		`- const dimensions = this._getDimensions(stats);`
	`139`	`+ const dimensions = this._getDimensions();`
`140`	`140`	`const metrics = this._getMetrics(stats);`
`141`	`141`	`this._analytics.event(this._category, 'build', { dimensions, metrics });`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`protected _reportRebuildMetrics(stats: Stats) {`
`145`		`- const dimensions = this._getDimensions(stats);`
	`145`	`+ const dimensions = this._getDimensions();`
`146`	`146`	`const metrics = this._getMetrics(stats);`
`147`	`147`	`this._analytics.event(this._category, 'rebuild', { dimensions, metrics });`
`148`	`148`	`}`