cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ngcc): log Angular error codes correctly (#34014)

Browse Source 
Replaces the "TS-99" sequence with just "NG", so that error codes are
logged correctly.

PR Close #34014
This commit is contained in:
JoostK 2019-11-23 19:17:16 +01:00 committed by Andrew Kushnir
parent 0f0fd25038
commit 95429d55ff
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/compiler-cli/ngcc/src/main.ts
View File

@ -12,6 +12,7 @@ import {DepGraph} from 'dependency-graph';
import * as os from 'os'; import * as os from 'os';
import * as ts from 'typescript'; import * as ts from 'typescript';
import {replaceTsWithNgInErrors} from '../../src/ngtsc/diagnostics';
import {AbsoluteFsPath, FileSystem, absoluteFrom, dirname, getFileSystem, resolve} from '../../src/ngtsc/file_system'; import {AbsoluteFsPath, FileSystem, absoluteFrom, dirname, getFileSystem, resolve} from '../../src/ngtsc/file_system';
import {CommonJsDependencyHost} from './dependencies/commonjs_dependency_host'; import {CommonJsDependencyHost} from './dependencies/commonjs_dependency_host';
@ -262,11 +263,13 @@ export function mainNgcc(
const result = transformer.transform(bundle); const result = transformer.transform(bundle);
if (result.success) { if (result.success) {
if (result.diagnostics.length > 0) { if (result.diagnostics.length > 0) {
logger.warn(ts.formatDiagnostics(result.diagnostics, bundle.src.host)); logger.warn(replaceTsWithNgInErrors(
ts.formatDiagnosticsWithColorAndContext(result.diagnostics, bundle.src.host)));
} }
fileWriter.writeBundle(bundle, result.transformedFiles, formatPropertiesToMarkAsProcessed); fileWriter.writeBundle(bundle, result.transformedFiles, formatPropertiesToMarkAsProcessed);
} else { } else {
const errors = ts.formatDiagnostics(result.diagnostics, bundle.src.host); const errors = replaceTsWithNgInErrors(
ts.formatDiagnosticsWithColorAndContext(result.diagnostics, bundle.src.host));
throw new Error( throw new Error(
`Failed to compile entry-point ${entryPoint.name} due to compilation errors:\n${errors}`); `Failed to compile entry-point ${entryPoint.name} due to compilation errors:\n${errors}`);
} }

15
packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts
View File

@ -759,13 +759,20 @@ runInEachFileSystem(() => {
`, `,
}, },
]); ]);
expect(() => mainNgcc({
try {
mainNgcc({
basePath: '/node_modules', basePath: '/node_modules',
targetEntryPointPath: 'fatal-error', targetEntryPointPath: 'fatal-error',
propertiesToConsider: ['es2015'] propertiesToConsider: ['es2015']
})) });
.toThrowError( fail('should have thrown');
/^Failed to compile entry-point fatal-error due to compilation errors:\nnode_modules\/fatal-error\/index\.js\(5,17\): error TS-992001: component is missing a template\r?\n$/); } catch (e) {
expect(e.message).toContain(
'Failed to compile entry-point fatal-error due to compilation errors:');
expect(e.message).toContain('NG2001');
expect(e.message).toContain('component is missing a template');
}
}); });
}); });

11
packages/compiler-cli/src/ngtsc/diagnostics/src/util.ts
View File

@ -6,10 +6,17 @@
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import * as ts from 'typescript';
const ERROR_CODE_MATCHER = /(\u001b\[\d+m ?)TS-99(\d+: ?\u001b\[\d+m)/g; const ERROR_CODE_MATCHER = /(\u001b\[\d+m ?)TS-99(\d+: ?\u001b\[\d+m)/g;
/**
* During formatting of `ts.Diagnostic`s, the numeric code of each diagnostic is prefixed with the
* hard-coded "TS" prefix. For Angular's own error codes, a prefix of "NG" is desirable. To achieve
* this, all Angular error codes start with "-99" so that the sequence "TS-99" can be assumed to
* correspond with an Angular specific error code. This function replaces those occurrences with
* just "NG".
*
* @param errors The formatted diagnostics
*/
export function replaceTsWithNgInErrors(errors: string): string { export function replaceTsWithNgInErrors(errors: string): string {
return errors.replace(ERROR_CODE_MATCHER, '$1NG$2'); return errors.replace(ERROR_CODE_MATCHER, '$1NG$2');
} }