feat(@angular-devkit/schematics): allow tslintfix task on files

Before we only allowed tsconfig files (with includes added). This is necessary
for the lint fixing for schematics to target specific files.

Also added a feature that look for the tslint.json file if no tslint.json
file or configuration object was passed. Skipping the first argument to the
task constructor will look for the tslint closest to EVERY files being
linted.

Author: hansl

packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts

@@ -31,9 +31,9 @@ function _loadConfiguration(
   if (options.tslintConfig) {
     return Configuration.parseConfigFile(options.tslintConfig, root);
   } else if (options.tslintPath) {
-    const tslintPath = path.join(root, options.tslintPath);
-
-    return Configuration.findConfiguration(tslintPath, file && path.join(root, file)).results;
+    return Configuration.findConfiguration(path.join(root, options.tslintPath)).results;
+  } else if (file) {
+    return Configuration.findConfiguration(null, file).results;
   } else {
     throw new Error('Executor must specify a tslint configuration.');
   }
@@ -103,13 +103,18 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
           ? options.includes
           : (options.includes ? [options.includes] : [])
       );
+      const files = (
+        Array.isArray(options.files)
+          ? options.files
+          : (options.files ? [options.files] : [])
+      );
 
       const Linter = tslint.Linter as LinterT;
       const Configuration = tslint.Configuration as ConfigurationT;
       let program: ts.Program | undefined = undefined;
-      let filesToLint: string[] = [];
+      let filesToLint: string[] = files;
 
-      if (options.tsConfigPath) {
+      if (options.tsConfigPath && files.length == 0) {
         const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);
 
         if (!fs.existsSync(tsConfigPath)) {
@@ -148,9 +153,16 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
       };
 
       const linter = new Linter(lintOptions, program);
-      const config = _loadConfiguration(Configuration, options, root);
+      // If directory doesn't change, we
+      let lastDirectory: string | null = null;
+      let config;
 
       for (const file of filesToLint) {
+        const dir = path.dirname(file);
+        if (lastDirectory !== dir) {
+          lastDirectory = dir;
+          config = _loadConfiguration(Configuration, options, root, file);
+        }
         const content = _getFileContent(file, options, program);
 
         if (!content) {

packages/angular_devkit/schematics/tasks/tslint-fix/options.ts

@@ -17,16 +17,10 @@ export interface TslintFixTaskOptionsBase {
   ignoreErrors?: boolean;
 
   includes?: string | string[];
-}
-
-export interface TslintFixTaskOptionsPath extends TslintFixTaskOptionsBase {
-  tslintPath: string;
-  tslintConfig?: never;
-}
+  files?: string | string[];
 
-export interface TslintFixTaskOptionsConfig extends TslintFixTaskOptionsBase {
-  tslintPath?: never;
-  tslintConfig: JsonObject;
+  tslintPath?: string;
+  tslintConfig?: JsonObject;
 }
 
-export type TslintFixTaskOptions = TslintFixTaskOptionsPath | TslintFixTaskOptionsConfig;
+export type TslintFixTaskOptions = TslintFixTaskOptionsBase;

packages/angular_devkit/schematics/tasks/tslint-fix/task.ts

@@ -11,19 +11,34 @@ import { TslintFixName, TslintFixTaskOptions, TslintFixTaskOptionsBase } from '.
 
 
 export class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOptions> {
+  protected _configOrPath: null | string | JsonObject;
+  protected _options: TslintFixTaskOptionsBase;
+
   constructor(config: JsonObject, options: TslintFixTaskOptionsBase);
+  constructor(options: TslintFixTaskOptionsBase);
   constructor(path: string, options: TslintFixTaskOptionsBase);
   constructor(
-    protected _configOrPath: string | JsonObject,
-    protected _options: TslintFixTaskOptionsBase,
-  ) {}
+    configOrPath: string | JsonObject | TslintFixTaskOptionsBase,
+    options?: TslintFixTaskOptionsBase,
+  ) {
+    if (options) {
+      this._configOrPath = configOrPath as string | JsonObject;
+      this._options = options;
+    } else {
+      this._options = configOrPath as TslintFixTaskOptionsBase;
+      this._configOrPath = null;
+    }
+  }
 
   toConfiguration(): TaskConfiguration<TslintFixTaskOptions> {
+    const path = typeof this._configOrPath == 'string' ? { tslintPath: this._configOrPath } : {};
+    const config = typeof this._configOrPath == 'object' && this._configOrPath !== null
+                 ? { tslintConfig: this._configOrPath }
+                 : {};
     const options = {
       ...this._options,
-      ...((typeof this._configOrPath == 'string'
-        ? { tslintPath: this._configOrPath }
-        : { tslintConfig: this._configOrPath })),
+      ...path,
+      ...config,
     };
 
     return { name: TslintFixName, options };