refactor(compiler): delete View Engine components of @angular/compiler (angular#44368)

This commit finishes the removal of View Engine from the codebase, deleting
those pieces of @angular/compiler which were only used for VE.

Co-Authored-By: JoostK <joost.koehoorn@gmail.com>

PR Close angular#44368

Author: alxhub

packages/bazel/src/ngc-wrapped/index.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import type {AngularCompilerOptions, CompilerHost as NgCompilerHost, TsEmitCallback, Program, Diagnostics, Diagnostic as NgDiagnostic, CompilerOptions} from '@angular/compiler-cli';
+import type {AngularCompilerOptions, CompilerHost as NgCompilerHost, TsEmitCallback, Program, CompilerOptions} from '@angular/compiler-cli';
 import {BazelOptions, CachedFileLoader, CompilerHost, constructManifest, debug, FileCache, FileLoader, parseTsconfig, resolveNormalizedPath, runAsWorker, runWorkerLoop, UncachedFileLoader} from '@bazel/typescript';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -195,9 +195,9 @@ export function compile({
         bazelOpts: BazelOptions,
         files: string[],
         expectedOuts: string[],
-  gatherDiagnostics?: (program: Program) => Diagnostics,
+  gatherDiagnostics?: (program: Program) => readonly ts.Diagnostic[],
   bazelHost?: CompilerHost, ng: CompilerCliModule,
-}): {diagnostics: Diagnostics, program: Program} {
+}): {diagnostics: readonly ts.Diagnostic[], program: Program} {
   let fileLoader: FileLoader;
 
   if (bazelOpts.maxCacheSizeMb !== undefined) {
@@ -449,15 +449,15 @@ function convertToForwardSlashPath(filePath: string): string {
 
 function gatherDiagnosticsForInputsOnly(
     options: CompilerOptions, bazelOpts: BazelOptions, ngProgram: Program,
-    ng: CompilerCliModule): (NgDiagnostic|ts.Diagnostic)[] {
+    ng: CompilerCliModule): ts.Diagnostic[] {
   const tsProgram = ngProgram.getTsProgram();
 
   // For the Ivy compiler, track the amount of time spent fetching TypeScript diagnostics.
   let previousPhase = ng.PerfPhase.Unaccounted;
   if (ngProgram instanceof ng.NgtscProgram) {
     previousPhase = ngProgram.compiler.perfRecorder.phase(ng.PerfPhase.TypeScriptDiagnostics);
   }
-  const diagnostics: (NgDiagnostic|ts.Diagnostic)[] = [];
+  const diagnostics: ts.Diagnostic[] = [];
   // These checks mirror ts.getPreEmitDiagnostics, with the important
   // exception of avoiding b/30708240, which is that if you call
   // program.getDeclarationDiagnostics() it somehow corrupts the emit.

packages/common/test/pipes/date_pipe_spec.ts

@@ -9,7 +9,6 @@
 import {DatePipe} from '@angular/common';
 import localeEn from '@angular/common/locales/en';
 import localeEnExtra from '@angular/common/locales/extra/en';
-import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
 import {ɵregisterLocaleData, ɵunregisterLocaleData} from '@angular/core';
 
 {

packages/common/test/pipes/i18n_plural_pipe_spec.ts

@@ -7,7 +7,6 @@
  */
 
 import {I18nPluralPipe, NgLocalization} from '@angular/common';
-import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
 
 {
   describe('I18nPluralPipe', () => {

packages/common/test/pipes/i18n_select_pipe_spec.ts

@@ -7,7 +7,6 @@
  */
 
 import {I18nSelectPipe} from '@angular/common';
-import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
 
 {
   describe('I18nSelectPipe', () => {

packages/compiler-cli/index.ts

@@ -7,7 +7,6 @@
  */
 import {NodeJSFileSystem, setFileSystem} from './src/ngtsc/file_system';
 
-export {AotCompilerHost, AotCompilerHost as StaticReflectorHost, StaticReflector, StaticSymbol} from '@angular/compiler';
 export {VERSION} from './src/version';
 
 export * from './src/transformers/api';
@@ -18,8 +17,6 @@ export * from './src/perform_compile';
 // TODO(tbosch): remove this once usages in G3 are changed to `CompilerOptions`
 export {CompilerOptions as AngularCompilerOptions} from './src/transformers/api';
 
-export {ngToTsDiagnostic} from './src/transformers/util';
-
 // Internal exports needed for packages relying on the compiler-cli.
 // TODO: Remove this when the CLI has switched to the private entry-point.
 export * from './private/tooling';

packages/compiler-cli/src/main.ts

@@ -9,7 +9,7 @@
 import ts from 'typescript';
 import type {TsickleHost} from 'tsickle';
 import yargs from 'yargs';
-import {Diagnostics, exitCodeFromResult, formatDiagnostics, ParsedConfiguration, performCompilation, readConfiguration} from './perform_compile';
+import {exitCodeFromResult, formatDiagnostics, ParsedConfiguration, performCompilation, readConfiguration} from './perform_compile';
 import {createPerformWatchHost, performWatchCompilation} from './perform_watch';
 import * as api from './transformers/api';
 import {GENERATED_FILES} from './transformers/util';
@@ -57,7 +57,7 @@ export function mainDiagnosticsForTest(
     programReuse?: {program: api.Program|undefined}, modifiedResourceFiles?: Set<string>|null,
     tsickle?: TsickleModule): {
   exitCode: number,
-  diagnostics: ReadonlyArray<ts.Diagnostic|api.Diagnostic>,
+  diagnostics: ReadonlyArray<ts.Diagnostic>,
 } {
   let {rootNames, options, errors: configErrors, emitFlags} =
       config || readNgcCommandLineAndConfiguration(args);
@@ -223,7 +223,7 @@ function getFormatDiagnosticsHost(options?: api.CompilerOptions): ts.FormatDiagn
 }
 
 function reportErrorsAndExit(
-    allDiagnostics: Diagnostics, options?: api.CompilerOptions,
+    allDiagnostics: ReadonlyArray<ts.Diagnostic>, options?: api.CompilerOptions,
     consoleError: (s: string) => void = console.error): number {
   const errorsAndWarnings =
       allDiagnostics.filter(d => d.category !== ts.DiagnosticCategory.Message);
@@ -239,8 +239,8 @@ export function watchMode(
 }
 
 function printDiagnostics(
-    diagnostics: ReadonlyArray<ts.Diagnostic|api.Diagnostic>,
-    options: api.CompilerOptions|undefined, consoleError: (s: string) => void): void {
+    diagnostics: ReadonlyArray<ts.Diagnostic>, options: api.CompilerOptions|undefined,
+    consoleError: (s: string) => void): void {
   if (diagnostics.length === 0) {
     return;
   }

packages/compiler-cli/src/ngtsc/program.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {GeneratedFile, HtmlParser, MessageBundle} from '@angular/compiler';
+import {HtmlParser, MessageBundle} from '@angular/compiler';
 import ts from 'typescript';
 
 import * as api from '../transformers/api';
@@ -179,18 +179,18 @@ export class NgtscProgram implements api.Program {
   }
 
   getNgOptionDiagnostics(cancellationToken?: ts.CancellationToken|
-                         undefined): readonly(ts.Diagnostic|api.Diagnostic)[] {
+                         undefined): readonly ts.Diagnostic[] {
     return this.compiler.getOptionDiagnostics();
   }
 
   getNgStructuralDiagnostics(cancellationToken?: ts.CancellationToken|
-                             undefined): readonly api.Diagnostic[] {
+                             undefined): readonly ts.Diagnostic[] {
     return [];
   }
 
   getNgSemanticDiagnostics(
-      fileName?: string|undefined, cancellationToken?: ts.CancellationToken|undefined):
-      readonly(ts.Diagnostic|api.Diagnostic)[] {
+      fileName?: string|undefined,
+      cancellationToken?: ts.CancellationToken|undefined): readonly ts.Diagnostic[] {
     let sf: ts.SourceFile|undefined = undefined;
     if (fileName !== undefined) {
       sf = this.tsProgram.getSourceFile(fileName);
@@ -337,14 +337,6 @@ export class NgtscProgram implements api.Program {
     return this.compiler.getIndexedComponents();
   }
 
-  getLibrarySummaries(): Map<string, api.LibrarySummary> {
-    throw new Error('Method not implemented.');
-  }
-
-  getEmittedGeneratedFiles(): Map<string, GeneratedFile> {
-    throw new Error('Method not implemented.');
-  }
-
   getEmittedSourceFiles(): Map<string, ts.SourceFile> {
     throw new Error('Method not implemented.');
   }

packages/compiler-cli/src/perform_compile.ts

@@ -6,99 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {isSyntaxError, Position} from '@angular/compiler';
+import {isSyntaxError} from '@angular/compiler';
 import ts from 'typescript';
 
 import {absoluteFrom, AbsoluteFsPath, FileSystem, getFileSystem, ReadonlyFileSystem, relative, resolve} from '../src/ngtsc/file_system';
-import {NgCompilerOptions} from './ngtsc/core/api';
 
+import {NgCompilerOptions} from './ngtsc/core/api';
 import {replaceTsWithNgInErrors} from './ngtsc/diagnostics';
 import * as api from './transformers/api';
 import * as ng from './transformers/entry_points';
 import {createMessageDiagnostic} from './transformers/util';
 
-export type Diagnostics = ReadonlyArray<ts.Diagnostic|api.Diagnostic>;
-
 const defaultFormatHost: ts.FormatDiagnosticsHost = {
   getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
   getCanonicalFileName: fileName => fileName,
   getNewLine: () => ts.sys.newLine
 };
 
-function displayFileName(fileName: string, host: ts.FormatDiagnosticsHost): string {
-  return relative(
-      resolve(host.getCurrentDirectory()), resolve(host.getCanonicalFileName(fileName)));
-}
-
-export function formatDiagnosticPosition(
-    position: Position, host: ts.FormatDiagnosticsHost = defaultFormatHost): string {
-  return `${displayFileName(position.fileName, host)}(${position.line + 1},${position.column + 1})`;
-}
-
-export function flattenDiagnosticMessageChain(
-    chain: api.DiagnosticMessageChain, host: ts.FormatDiagnosticsHost = defaultFormatHost,
-    indent = 0): string {
-  const newLine = host.getNewLine();
-  let result = '';
-  if (indent) {
-    result += newLine;
-
-    for (let i = 0; i < indent; i++) {
-      result += '  ';
-    }
-  }
-  result += chain.messageText;
-
-  const position = chain.position;
-  // add position if available, and we are not at the depest frame
-  if (position && indent !== 0) {
-    result += ` at ${formatDiagnosticPosition(position, host)}`;
-  }
-
-  indent++;
-  if (chain.next) {
-    for (const kid of chain.next) {
-      result += flattenDiagnosticMessageChain(kid, host, indent);
-    }
-  }
-  return result;
-}
-
-export function formatDiagnostic(
-    diagnostic: api.Diagnostic, host: ts.FormatDiagnosticsHost = defaultFormatHost) {
-  let result = '';
-  const newLine = host.getNewLine();
-  const span = diagnostic.span;
-  if (span) {
-    result += `${
-        formatDiagnosticPosition(
-            {fileName: span.start.file.url, line: span.start.line, column: span.start.col},
-            host)}: `;
-  } else if (diagnostic.position) {
-    result += `${formatDiagnosticPosition(diagnostic.position, host)}: `;
-  }
-  if (diagnostic.span && diagnostic.span.details) {
-    result += `${diagnostic.span.details}, ${diagnostic.messageText}${newLine}`;
-  } else if (diagnostic.chain) {
-    result += `${flattenDiagnosticMessageChain(diagnostic.chain, host)}.${newLine}`;
-  } else {
-    result += `${diagnostic.messageText}${newLine}`;
-  }
-  return result;
-}
-
 export function formatDiagnostics(
-    diags: Diagnostics, host: ts.FormatDiagnosticsHost = defaultFormatHost): string {
+    diags: ReadonlyArray<ts.Diagnostic>,
+    host: ts.FormatDiagnosticsHost = defaultFormatHost): string {
   if (diags && diags.length) {
     return diags
-        .map(diagnostic => {
-          if (api.isTsDiagnostic(diagnostic)) {
-            return replaceTsWithNgInErrors(
-                ts.formatDiagnosticsWithColorAndContext([diagnostic], host));
-          } else {
-            return formatDiagnostic(diagnostic, host);
-          }
-        })
+        .map(
+            diagnostic => replaceTsWithNgInErrors(
+                ts.formatDiagnosticsWithColorAndContext([diagnostic], host)))
         .join('');
   } else {
     return '';
@@ -264,12 +196,12 @@ function getExtendedConfigPathWorker(
 }
 
 export interface PerformCompilationResult {
-  diagnostics: Diagnostics;
+  diagnostics: ReadonlyArray<ts.Diagnostic>;
   program?: api.Program;
   emitResult?: ts.EmitResult;
 }
 
-export function exitCodeFromResult(diags: Diagnostics|undefined): number {
+export function exitCodeFromResult(diags: ReadonlyArray<ts.Diagnostic>|undefined): number {
   if (!diags) return 0;
   if (diags.every((diag) => diag.category !== ts.DiagnosticCategory.Error)) {
     // If we have a result and didn't get any errors, we succeeded.
@@ -298,14 +230,14 @@ export function performCompilation({
   oldProgram?: api.Program,
   emitCallback?: api.TsEmitCallback,
   mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback,
-  gatherDiagnostics?: (program: api.Program) => Diagnostics,
+  gatherDiagnostics?: (program: api.Program) => ReadonlyArray<ts.Diagnostic>,
   customTransformers?: api.CustomTransformers,
   emitFlags?: api.EmitFlags,
   modifiedResourceFiles?: Set<string>| null,
 }): PerformCompilationResult {
   let program: api.Program|undefined;
   let emitResult: ts.EmitResult|undefined;
-  let allDiagnostics: Array<ts.Diagnostic|api.Diagnostic> = [];
+  let allDiagnostics: Array<ts.Diagnostic> = [];
   try {
     if (!host) {
       host = ng.createCompilerHost({options});
@@ -344,15 +276,21 @@ export function performCompilation({
       program = undefined;
       code = api.UNKNOWN_ERROR_CODE;
     }
-    allDiagnostics.push(
-        {category: ts.DiagnosticCategory.Error, messageText: errMsg, code, source: api.SOURCE});
+    allDiagnostics.push({
+      category: ts.DiagnosticCategory.Error,
+      messageText: errMsg,
+      code,
+      file: undefined,
+      start: undefined,
+      length: undefined,
+    });
     return {diagnostics: allDiagnostics, program};
   }
 }
-export function defaultGatherDiagnostics(program: api.Program): Diagnostics {
-  const allDiagnostics: Array<ts.Diagnostic|api.Diagnostic> = [];
+export function defaultGatherDiagnostics(program: api.Program): ReadonlyArray<ts.Diagnostic> {
+  const allDiagnostics: Array<ts.Diagnostic> = [];
 
-  function checkDiagnostics(diags: Diagnostics|undefined) {
+  function checkDiagnostics(diags: ReadonlyArray<ts.Diagnostic>|undefined) {
     if (diags) {
       allDiagnostics.push(...diags);
       return !hasErrors(diags);
@@ -367,7 +305,7 @@ export function defaultGatherDiagnostics(program: api.Program): Diagnostics {
 
   // Check syntactic diagnostics
   checkOtherDiagnostics =
-      checkOtherDiagnostics && checkDiagnostics(program.getTsSyntacticDiagnostics() as Diagnostics);
+      checkOtherDiagnostics && checkDiagnostics(program.getTsSyntacticDiagnostics());
 
   // Check TypeScript semantic and Angular structure diagnostics
   checkOtherDiagnostics =
@@ -377,11 +315,11 @@ export function defaultGatherDiagnostics(program: api.Program): Diagnostics {
 
   // Check Angular semantic diagnostics
   checkOtherDiagnostics =
-      checkOtherDiagnostics && checkDiagnostics(program.getNgSemanticDiagnostics() as Diagnostics);
+      checkOtherDiagnostics && checkDiagnostics(program.getNgSemanticDiagnostics());
 
   return allDiagnostics;
 }
 
-function hasErrors(diags: Diagnostics) {
+function hasErrors(diags: ReadonlyArray<ts.Diagnostic>) {
   return diags.some(d => d.category === ts.DiagnosticCategory.Error);
 }