refactor: additional lint fixes

clydin · clydin · commit 77f2dfdd7937 · 2018-05-30T09:36:10.000-04:00
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "test:messages": "node scripts/test-commit-messages.js",
     "test:packages": "node scripts/run-packages-spec.js",
     "eslint": "eslint .",
-    "tslint": "tslint \"**/*.ts\" -c tslint.json -e \"**/config/schema.d.ts\" -e \"**/tests/**\" -e \"node_modules/**\" -e \"tmp/**\" -e \"dist/**\"",
+    "tslint": "tslint \"**/*.ts\" -c tslint.json -e \"**/config/schema.d.ts\" -e \"**/tests/**\" -e \"node_modules/**\" -e \"tmp/**\" -e \"dist/**\" -e \"tools/**\"",
     "lint": "npm-run-all -c eslint tslint",
     "tool": "node scripts/run-tool.js"
   },
diff --git a/packages/@angular/cli/commands/add.ts b/packages/@angular/cli/commands/add.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { CommandScope, Option } from '../models/command';
diff --git a/packages/@angular/cli/commands/build.ts b/packages/@angular/cli/commands/build.ts
@@ -18,6 +18,7 @@ export default class BuildCommand extends ArchitectCommand {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.project.root);
     Version.assertTypescriptVersion(this.project.root);
+
     return super.validate(options);
   }
 
diff --git a/packages/@angular/cli/commands/config.ts b/packages/@angular/cli/commands/config.ts
@@ -105,6 +105,7 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
             value[current] = {};
           }
         }
+
         return value[current];
       } else if (typeof current == 'number' && Array.isArray(value)) {
         if (index === fragments.length - 1) {
@@ -116,6 +117,7 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
             value[current] = {};
           }
         }
+
         return value[current];
       } else {
         return undefined;
@@ -211,7 +213,12 @@ export default class ConfigCommand extends Command {
   }
 
   private get(config: experimental.workspace.WorkspaceSchema, options: ConfigOptions) {
-    const value = options.jsonPath ? getValueFromPath(config as any, options.jsonPath) : config;
+    let value;
+    if (options.jsonPath) {
+      value = getValueFromPath(config as {} as JsonObject, options.jsonPath);
+    } else {
+      value = config;
+    }
 
     if (value === undefined) {
       this.logger.error('Value cannot be found.');
diff --git a/packages/@angular/cli/commands/doc.ts b/packages/@angular/cli/commands/doc.ts
@@ -24,6 +24,7 @@ export default class DocCommand extends Command {
   public validate(options: Options) {
     if (!options.keyword) {
       this.logger.error(`keyword argument is required.`);
+
       return false;
     }
   }
diff --git a/packages/@angular/cli/commands/easter-egg.ts b/packages/@angular/cli/commands/easter-egg.ts
@@ -12,7 +12,7 @@ export default class AwesomeCommand extends Command {
   readonly arguments: string[] = [];
   readonly options: Option[] = [];
 
-  run(_options: any) {
+  run() {
     const phrase = pickOne([
       `You're on it, there's nothing for me to do!`,
       `Let's take a look... nope, it's all good!`,
diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { CommandScope, Option } from '../models/command';
 import { SchematicCommand } from '../models/schematic-command';
diff --git a/packages/@angular/cli/commands/help.ts b/packages/@angular/cli/commands/help.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { terminal } from '@angular-devkit/core';
 import { Command, Option } from '../models/command';
 
@@ -13,6 +14,7 @@ export default class HelpCommand extends Command {
       .map(key => {
         const Cmd = options.commandMap[key];
         const command: Command = new Cmd(null, null);
+
         return command;
       })
       .filter(cmd => !cmd.hidden && !cmd.unknown)
diff --git a/packages/@angular/cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { CommandScope, Option } from '../models/command';
 import { SchematicCommand } from '../models/schematic-command';
 import { getDefaultSchematicCollection } from '../utilities/config';
@@ -93,6 +94,7 @@ export default class NewCommand extends SchematicCommand {
     const opts = Object.assign({}, options);
     delete opts.verbose;
     delete opts.collection;
+
     return opts;
   }
 }
diff --git a/packages/@angular/cli/commands/serve.ts b/packages/@angular/cli/commands/serve.ts
@@ -18,6 +18,7 @@ export default class ServeCommand extends ArchitectCommand {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.project.root);
     Version.assertTypescriptVersion(this.project.root);
+
     return true;
   }
 
diff --git a/packages/@angular/cli/commands/update.ts b/packages/@angular/cli/commands/update.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { normalize } from '@angular-devkit/core';
 import { CommandScope, Option } from '../models/command';
 import { CoreSchematicOptions, SchematicCommand } from '../models/schematic-command';
diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts
@@ -13,11 +13,11 @@ export default class VersionCommand extends Command {
   public readonly arguments: string[] = [];
   public readonly options: Option[] = [];
 
-  public run(_options: any) {
+  public run() {
     let angularCoreVersion = '';
     const angularSameAsCore: string[] = [];
     const pkg = require(path.resolve(__dirname, '..', 'package.json'));
-    let projPkg: any;
+    let projPkg;
     try {
       projPkg = require(path.resolve(this.project.root, 'package.json'));
     } catch (exception) {
@@ -66,6 +66,7 @@ export default class VersionCommand extends Command {
         }
 
         acc[name] = this.getVersion(name, packageRoot, maybeNodeModules);
+
         return acc;
       }, {} as { [module: string]: string });
 
@@ -124,6 +125,7 @@ export default class VersionCommand extends Command {
         } else {
           acc[acc.length - 1] = line;
         }
+
         return acc;
       }, []).join('\n... ')}
 
@@ -144,6 +146,7 @@ export default class VersionCommand extends Command {
     try {
       if (projectNodeModules) {
         const modulePkg = require(path.resolve(projectNodeModules, moduleName, 'package.json'));
+
         return modulePkg.version;
       }
     } catch (_) {
@@ -152,6 +155,7 @@ export default class VersionCommand extends Command {
     try {
       if (cliNodeModules) {
         const modulePkg = require(path.resolve(cliNodeModules, moduleName, 'package.json'));
+
         return modulePkg.version + ' (cli-only)';
       }
     } catch (e) {
diff --git a/packages/@angular/cli/custom-typings.d.ts b/packages/@angular/cli/custom-typings.d.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 declare module 'yargs-parser' {
   const parseOptions: any;
   const yargsParser: <T = any>(args: string | string[], options?: parseOptions) => T;
diff --git a/packages/@angular/cli/lib/cli/index.ts b/packages/@angular/cli/lib/cli/index.ts
@@ -39,7 +39,7 @@ function loadCommands() {
   };
 }
 
-export default async function(options: any) {
+export default async function(options: { testing?: boolean, cliArgs: string[] }) {
   const commands = loadCommands();
 
   const logger = new logging.IndentLogger('cling');
@@ -83,6 +83,7 @@ export default async function(options: any) {
     }
 
     loggingSubscription.unsubscribe();
+
     return 1;
   }
 }
diff --git a/packages/@angular/cli/lib/init.ts b/packages/@angular/cli/lib/init.ts
@@ -41,9 +41,9 @@ function _fromPackageJson(cwd?: string) {
 
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
-  const profiler = require('v8-profiler');
+  const profiler = require('v8-profiler'); // tslint:disable-line:no-implicit-dependencies
   profiler.startProfiling();
-  function exitHandler(options: any, _err: Error) {
+  function exitHandler(options: { cleanup: boolean, exit: boolean }, _err: Error) {
     if (options.cleanup) {
       const cpuProfile = profiler.stopProfiling();
       fs.writeFileSync(path.resolve(process.cwd(), process.env.NG_CLI_PROFILING) + '.cpuprofile',
diff --git a/packages/@angular/cli/models/architect-command.ts b/packages/@angular/cli/models/architect-command.ts
@@ -1,5 +1,8 @@
+// tslint:disable:no-any
 import {
-  Architect, BuildEvent, BuilderDescription,
+  Architect,
+  BuildEvent,
+  BuilderDescription,
   TargetSpecifier,
 } from '@angular-devkit/architect';
 import { JsonObject, experimental, schema, strings } from '@angular-devkit/core';
@@ -84,6 +87,7 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
           + `'${this.target}' would be run on the following projects: ${projectNames.join()}`);
       }
     }
+
     return true;
   }
 
@@ -187,6 +191,7 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
 
         if (newErrors.length > 0) {
           this.logger.error(new schema.SchemaValidationException(newErrors).message);
+
           return 1;
         }
       } else {
diff --git a/packages/@angular/cli/models/command-runner.ts b/packages/@angular/cli/models/command-runner.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { logging, tags } from '@angular-devkit/core';
 import { camelize } from '@angular-devkit/core/src/utils/strings';
 import {
@@ -85,6 +86,7 @@ export async function runCommand(commandMap: CommandMap,
       if (!(b in commandsDistance)) {
         commandsDistance[b] = levenshtein(b, commandName);
       }
+
       return commandsDistance[a] - commandsDistance[b];
     });
 
@@ -176,6 +178,7 @@ export function parseOptions<T = any>(
     .reduce((aliases: any, opt: Option) => {
       aliases[opt.name] = opt.aliases
         .filter(a => a.length === 1);
+
       return aliases;
     }, {});
 
@@ -187,6 +190,7 @@ export function parseOptions<T = any>(
     .filter(o => o.default !== undefined || booleans.indexOf(o.name) !== -1)
     .reduce((defaults: any, opt: Option) => {
       defaults[opt.name] = opt.default;
+
       return defaults;
     }, {});
 
@@ -277,6 +281,7 @@ function findCommand(map: CommandMap, name: string): CommandConstructor | null {
   if (!Cmd) {
     return null;
   }
+
   return Cmd;
 }
 
diff --git a/packages/@angular/cli/models/command.ts b/packages/@angular/cli/models/command.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { logging, terminal } from '@angular-devkit/core';
 
 export interface CommandConstructor {
@@ -30,6 +31,7 @@ export abstract class Command<T = any> {
 
   async initializeRaw(args: string[]): Promise<any> {
     this._rawArgs = args;
+
     return args;
   }
   async initialize(_options: any): Promise<void> {
diff --git a/packages/@angular/cli/models/error.ts b/packages/@angular/cli/models/error.ts
@@ -5,7 +5,7 @@ export class NgToolkitError extends Error {
     if (message) {
       this.message = message;
     } else {
-      this.message = (<any> this.constructor).name;
+      this.message = this.constructor.name;
     }
   }
 }
diff --git a/packages/@angular/cli/models/schematic-command.ts b/packages/@angular/cli/models/schematic-command.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { JsonObject, experimental } from '@angular-devkit/core';
 import { normalize, strings, tags, terminal, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
@@ -70,12 +71,14 @@ export abstract class SchematicCommand extends Command {
     if (workingDir === '') {
       return {};
     }
+
     return this.options
       .filter(o => o.format === 'path')
       .map(o => o.name)
       .filter(name => options[name] === undefined)
       .reduce((acc: any, curr) => {
         acc[curr] = workingDir;
+
         return acc;
       }, {});
   }
@@ -120,6 +123,7 @@ export abstract class SchematicCommand extends Command {
         return this._workspace.getProjectByPath(normalize(process.cwd()))
                || this._workspace.getDefaultProjectName();
       }
+
       return undefined;
     });
 
@@ -214,6 +218,7 @@ export abstract class SchematicCommand extends Command {
     if (this._originalOptions.find(option => option.name == 'debug')) {
       delete opts.debug;
     }
+
     return opts;
   }
 
diff --git a/packages/@angular/cli/utilities/config.ts b/packages/@angular/cli/utilities/config.ts
@@ -60,6 +60,7 @@ export function getWorkspace(
 
   if (!configPath) {
     cachedWorkspaces.set(level, null);
+
     return null;
   }
 
@@ -72,6 +73,7 @@ export function getWorkspace(
 
   workspace.loadWorkspaceFromHost(file).subscribe();
   cachedWorkspaces.set(level, workspace);
+
   return workspace;
 }
 
@@ -109,6 +111,7 @@ export function getWorkspaceRaw(
   if (ast.kind != 'object') {
     throw new Error('Invalid JSON');
   }
+
   return [ast as JsonAstObject, configPath];
 }
 
@@ -164,6 +167,7 @@ export function getPackageManager(): string {
       return legacyPackageManager;
     }
   }
+
   return 'npm';
 }
 
@@ -211,6 +215,7 @@ export function migrateLegacyGlobalConfig(): boolean {
       if (Object.getOwnPropertyNames(cli).length > 0) {
         const globalPath = path.join(homeDir, globalFileName);
         writeFileSync(globalPath, JSON.stringify({ version: 1, cli }, null, 2));
+
         return true;
       }
     }
@@ -238,6 +243,7 @@ function getLegacyPackageManager(): string | null {
       }
     }
   }
+
   return null;
 }
 
diff --git a/packages/@angular/cli/utilities/project.ts b/packages/@angular/cli/utilities/project.ts
@@ -1,3 +1,4 @@
+// tslint:disable:no-any
 import { normalize } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
@@ -44,6 +45,7 @@ export function getProjectDetails(): ProjectDetails | null {
       return null;
     }
   }
+
   return {
     root: possibleDir,
     configFile: configFileName,
@@ -60,5 +62,6 @@ function containsCliDep(obj: any): boolean {
       return true;
     }
   }
+
   return false;
 }
diff --git a/packages/@angular/cli/utilities/schematics.ts b/packages/@angular/cli/utilities/schematics.ts
@@ -4,7 +4,7 @@
  *
  * require('@schematics/angular')
  */
-
+// tslint:disable:no-any
 import { schema } from '@angular-devkit/core';
 import {
   Collection,
diff --git a/tslint.json b/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// tslint:disable:no-any`
`1`	`2`	`import { tags, terminal } from '@angular-devkit/core';`
`2`	`3`	`import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';`
`3`	`4`	`import { CommandScope, Option } from '../models/command';`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ export default class BuildCommand extends ArchitectCommand {`
`18`	`18`	`// Check Angular and TypeScript versions.`
`19`	`19`	`Version.assertCompatibleAngularVersion(this.project.root);`
`20`	`20`	`Version.assertTypescriptVersion(this.project.root);`
	`21`	`+`
`21`	`22`	`return super.validate(options);`
`22`	`23`	`}`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ function setValueFromPath<T extends JsonArray \| JsonObject>(`
`105`	`105`	`value[current] = {};`
`106`	`106`	`}`
`107`	`107`	`}`
	`108`	`+`
`108`	`109`	`return value[current];`
`109`	`110`	`} else if (typeof current == 'number' && Array.isArray(value)) {`
`110`	`111`	`if (index === fragments.length - 1) {`
`@@ -116,6 +117,7 @@ function setValueFromPath<T extends JsonArray \| JsonObject>(`
`116`	`117`	`value[current] = {};`
`117`	`118`	`}`
`118`	`119`	`}`
	`120`	`+`
`119`	`121`	`return value[current];`
`120`	`122`	`} else {`
`121`	`123`	`return undefined;`
`@@ -211,7 +213,12 @@ export default class ConfigCommand extends Command {`
`211`	`213`	`}`
`212`	`214`
`213`	`215`	`private get(config: experimental.workspace.WorkspaceSchema, options: ConfigOptions) {`
`214`		`- const value = options.jsonPath ? getValueFromPath(config as any, options.jsonPath) : config;`
	`216`	`+ let value;`
	`217`	`+ if (options.jsonPath) {`
	`218`	`+ value = getValueFromPath(config as {} as JsonObject, options.jsonPath);`
	`219`	`+ } else {`
	`220`	`+ value = config;`
	`221`	`+ }`
`215`	`222`
`216`	`223`	`if (value === undefined) {`
`217`	`224`	`this.logger.error('Value cannot be found.');`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ export default class DocCommand extends Command {`
`24`	`24`	`public validate(options: Options) {`
`25`	`25`	`if (!options.keyword) {`
`26`	`26`	this.logger.error(`keyword argument is required.`);
	`27`	`+`
`27`	`28`	`return false;`
`28`	`29`	`}`
`29`	`30`	`}`