fix(@angular-devkit/build-angular): fix duplicate lint messages when having multiple tsconfigs

alan-agius4 · filipesilva · commit 9295217ce92d · 2018-07-24T12:48:05.000+01:00
Closes angular#11633
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -23,7 +23,6 @@ import * as tslint from 'tslint'; // tslint:disable-line:no-implicit-dependencie
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { stripBom } from '../angular-cli-files/utilities/strip-bom';
 
-
 export interface TslintBuilderOptions {
   tslintConfig?: string;
   tsConfig?: string | string[];
@@ -45,7 +44,7 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
     try {
       tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
     } catch {
-      throw new Error('Unable to find TSLint.  Ensure TSLint is installed.');
+      throw new Error('Unable to find TSLint. Ensure TSLint is installed.');
     }
 
     const version = tslint.Linter.VERSION && tslint.Linter.VERSION.split('.');
@@ -72,7 +71,7 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
         : null;
       const Linter = projectTslint.Linter;
 
-      let result;
+      let result: undefined | tslint.LintResult;
       if (options.tsConfig) {
         const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
 
@@ -82,9 +81,15 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
           if (result == undefined) {
             result = partial;
           } else {
+            result.failures = result.failures
+              .filter(curr => !partial.failures.some(prev => curr.equals(prev)))
+              .concat(partial.failures);
+
+            // we are not doing much with 'errorCount' and 'warningCount'
+            // apart from checking if they are greater than 0 thus no need to dedupe these.
             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;
             }
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
@@ -25,6 +25,22 @@ describe('Tslint Target', () => {
     ).toPromise().then(done, done.fail);
   }, 30000);
 
+  it('should report lint error once', (done) => {
+    host.writeMultipleFiles({'src/app/app.component.ts': 'const foo = "";\n' });
+    const logger = new TestLogger('lint-error');
+
+    runTargetSpec(host, tslintTargetSpec, undefined, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      tap(() => {
+        // this is to make sure there are no duplicates
+        expect(logger.includes(`" should be \'\nERROR`)).toBe(false);
+
+        expect(logger.includes(`" should be '`)).toBe(true);
+        expect(logger.includes(`Lint errors found in the listed files`)).toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
   it('supports exclude', (done) => {
     host.writeMultipleFiles(filesWithErrors);
     const overrides: Partial<TslintBuilderOptions> = { exclude: ['**/foo.ts'] };
diff --git a/tests/angular_devkit/build_angular/hello-world-app/angular.json b/tests/angular_devkit/build_angular/hello-world-app/angular.json
@@ -115,7 +115,10 @@
         "lint": {
           "builder": "../../../../packages/angular_devkit/build_angular:tslint",
           "options": {
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
             "exclude": [
               "**/node_modules/**"
             ]
