feat(@angular-devkit/build-webpack): support multi-tsconfig tslint

clydin · hansl · commit de3a07636bb6 · 2018-06-05T17:55:16.000-07:00
diff --git a/packages/angular_devkit/build_webpack/src/tslint/index.ts b/packages/angular_devkit/build_webpack/src/tslint/index.ts
@@ -26,7 +26,7 @@ import { stripBom } from '../angular-cli-files/utilities/strip-bom';
 
 export interface TslintBuilderOptions {
   tslintConfig?: string;
-  tsConfig?: string;
+  tsConfig?: string | string[];
   fix: boolean;
   typeCheck: boolean;
   force: boolean;
@@ -58,39 +58,32 @@ export class TslintBuilder implements Builder<TslintBuilderOptions> {
         ? path.resolve(systemRoot, options.tslintConfig)
         : null;
       const Linter = projectTslint.Linter;
-      const Configuration = projectTslint.Configuration;
 
-      let program: ts.Program | undefined = undefined;
+      let result;
       if (options.tsConfig) {
-        program = Linter.createProgram(path.resolve(systemRoot, options.tsConfig));
-      }
-
-      const files = getFilesToLint(systemRoot, options, Linter, program);
-      const lintOptions = {
-        fix: options.fix,
-        formatter: options.format,
-      };
-
-      const linter = new Linter(lintOptions, program);
-
-      let lastDirectory;
-      let configLoad;
-      for (const file of files) {
-        const contents = getFileContents(file, options, program);
-
-        // Only check for a new tslint config if the path changes.
-        const currentDirectory = path.dirname(file);
-        if (currentDirectory !== lastDirectory) {
-          configLoad = Configuration.findConfiguration(tslintConfigPath, file);
-          lastDirectory = currentDirectory;
-        }
-
-        if (contents && configLoad) {
-          linter.lint(file, contents, configLoad.results);
+        const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
+
+        for (const tsConfig of tsConfigs) {
+          const program = Linter.createProgram(path.resolve(systemRoot, tsConfig));
+          const partial = lint(projectTslint, systemRoot, tslintConfigPath, options, program);
+          if (result == undefined) {
+            result = partial;
+          } else {
+            result.errorCount += partial.errorCount;
+            result.warningCount += partial.warningCount;
+            result.failures = result.failures.concat(partial.failures);
+            if (partial.fixes) {
+              result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
+            }
+          }
         }
+      } else {
+        result = lint(projectTslint, systemRoot, tslintConfigPath, options);
       }
 
-      const result = linter.getResult();
+      if (result == undefined) {
+        throw new Error('Invalid lint configuration. Nothing to lint.');
+      }
 
       if (!options.silent) {
         const Formatter = projectTslint.findFormatter(options.format);
@@ -130,6 +123,44 @@ export class TslintBuilder implements Builder<TslintBuilderOptions> {
   }
 }
 
+function lint(
+  projectTslint: typeof tslint,
+  systemRoot: string,
+  tslintConfigPath: string | null,
+  options: TslintBuilderOptions,
+  program?: ts.Program,
+) {
+  const Linter = projectTslint.Linter;
+  const Configuration = projectTslint.Configuration;
+
+  const files = getFilesToLint(systemRoot, options, Linter, program);
+  const lintOptions = {
+    fix: options.fix,
+    formatter: options.format,
+  };
+
+  const linter = new Linter(lintOptions, program);
+
+  let lastDirectory;
+  let configLoad;
+  for (const file of files) {
+    const contents = getFileContents(file, options, program);
+
+    // Only check for a new tslint config if the path changes.
+    const currentDirectory = path.dirname(file);
+    if (currentDirectory !== lastDirectory) {
+      configLoad = Configuration.findConfiguration(tslintConfigPath, file);
+      lastDirectory = currentDirectory;
+    }
+
+    if (contents && configLoad) {
+      linter.lint(file, contents, configLoad.results);
+    }
+  }
+
+  return linter.getResult();
+}
+
 function getFilesToLint(
   root: string,
   options: TslintBuilderOptions,
diff --git a/packages/angular_devkit/build_webpack/src/tslint/schema.json b/packages/angular_devkit/build_webpack/src/tslint/schema.json
@@ -8,8 +8,16 @@
       "description": "The name of the TSLint configuration file."
     },
     "tsConfig": {
-      "type": "string",
-      "description": "The name of the TypeScript configuration file."
+      "description": "The name of the TypeScript configuration file.",
+      "oneOf": [
+        { "type": "string" },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      ]
     },
     "fix": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_webpack/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_webpack/test/tslint/works_spec_large.ts
@@ -127,6 +127,36 @@ describe('Tslint Target', () => {
     ).subscribe(undefined, done.fail, done);
   }, 30000);
 
+  it('supports using one project as a string', (done) => {
+    const overrides: Partial<TslintBuilderOptions> = {
+      tsConfig: 'src/tsconfig.app.json',
+    };
+
+    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).subscribe(undefined, done.fail, done);
+  }, 30000);
+
+  it('supports using one project as an array', (done) => {
+    const overrides: Partial<TslintBuilderOptions> = {
+      tsConfig: ['src/tsconfig.app.json'],
+    };
+
+    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).subscribe(undefined, done.fail, done);
+  }, 30000);
+
+  it('supports using two projects', (done) => {
+    const overrides: Partial<TslintBuilderOptions> = {
+      tsConfig: ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
+    };
+
+    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).subscribe(undefined, done.fail, done);
+  }, 30000);
+
   it('errors when type checking is used without a project', (done) => {
     const overrides: Partial<TslintBuilderOptions> = {
       tsConfig: undefined,
