refactor(@angular-devkit/build-angular): use base class for esbuild Angular JIT/AOT compilation

Types and functionality that were used by both the AOT and JIT compilation classes within
the esbuild Angular compiler plugin have been extracted into a common base class that
both now extend. This removes duplicate code from both classes.

(cherry picked from commit 587c4d0)

Author: clydin

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/angular-compilation.ts

@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import type ng from '@angular/compiler-cli';
+import type ts from 'typescript';
+import { loadEsmModule } from '../../../utils/load-esm';
+import type { AngularHostOptions } from './angular-host';
+
+export interface EmitFileResult {
+  content?: string;
+  map?: string;
+  dependencies: readonly string[];
+}
+
+export type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
+
+export abstract class AngularCompilation {
+  static #angularCompilerCliModule?: typeof ng;
+
+  static async loadCompilerCli(): Promise<typeof ng> {
+    // This uses a wrapped dynamic import to load `@angular/compiler-cli` which is ESM.
+    // Once TypeScript provides support for retaining dynamic imports this workaround can be dropped.
+    AngularCompilation.#angularCompilerCliModule ??= await loadEsmModule<typeof ng>(
+      '@angular/compiler-cli',
+    );
+
+    return AngularCompilation.#angularCompilerCliModule;
+  }
+
+  abstract initialize(
+    rootNames: string[],
+    compilerOptions: ts.CompilerOptions,
+    hostOptions: AngularHostOptions,
+    configurationDiagnostics?: ts.Diagnostic[],
+  ): Promise<{ affectedFiles: ReadonlySet<ts.SourceFile> }>;
+
+  abstract collectDiagnostics(): Iterable<ts.Diagnostic>;
+
+  abstract createFileEmitter(onAfterEmit?: (sourceFile: ts.SourceFile) => void): FileEmitter;
+}

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/angular-host.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import ng from '@angular/compiler-cli';
+import type ng from '@angular/compiler-cli';
 import ts from 'typescript';
 
 export type AngularCompilerOptions = ng.CompilerOptions;

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/aot-compilation.ts

@@ -9,8 +9,8 @@
 import type ng from '@angular/compiler-cli';
 import assert from 'node:assert';
 import ts from 'typescript';
-import { loadEsmModule } from '../../../utils/load-esm';
 import { profileAsync, profileSync } from '../profiling';
+import { AngularCompilation, FileEmitter } from './angular-compilation';
 import {
   AngularHostOptions,
   createAngularCompilerHost,
@@ -35,36 +35,17 @@ class AngularCompilationState {
   }
 }
 
-export interface EmitFileResult {
-  content?: string;
-  map?: string;
-  dependencies: readonly string[];
-}
-export type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
-
-export class AotCompilation {
-  static #angularCompilerCliModule?: typeof ng;
-
+export class AotCompilation extends AngularCompilation {
   #state?: AngularCompilationState;
 
-  static async loadCompilerCli(): Promise<typeof ng> {
-    // This uses a wrapped dynamic import to load `@angular/compiler-cli` which is ESM.
-    // Once TypeScript provides support for retaining dynamic imports this workaround can be dropped.
-    this.#angularCompilerCliModule ??= await loadEsmModule<typeof ng>('@angular/compiler-cli');
-
-    return this.#angularCompilerCliModule;
-  }
-
-  constructor() {}
-
   async initialize(
     rootNames: string[],
     compilerOptions: ng.CompilerOptions,
     hostOptions: AngularHostOptions,
     configurationDiagnostics?: ts.Diagnostic[],
   ): Promise<{ affectedFiles: ReadonlySet<ts.SourceFile> }> {
     // Dynamically load the Angular compiler CLI package
-    const { NgtscProgram, OptimizeFor } = await AotCompilation.loadCompilerCli();
+    const { NgtscProgram, OptimizeFor } = await AngularCompilation.loadCompilerCli();
 
     // Create Angular compiler host
     const host = createAngularCompilerHost(compilerOptions, hostOptions);

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/compiler-plugin.ts

@@ -29,8 +29,9 @@ import {
   resetCumulativeDurations,
 } from '../profiling';
 import { BundleStylesheetOptions, bundleComponentStylesheet } from '../stylesheets';
+import { AngularCompilation, FileEmitter } from './angular-compilation';
 import { AngularHostOptions } from './angular-host';
-import { AotCompilation, FileEmitter } from './aot-compilation';
+import { AotCompilation } from './aot-compilation';
 import { JitCompilation } from './jit-compilation';
 import { setupJitPluginCallbacks } from './jit-plugin-callbacks';
 
@@ -166,7 +167,7 @@ export function createCompilerPlugin(
       const javascriptTransformer = new JavaScriptTransformer(pluginOptions, maxWorkers);
 
       const { GLOBAL_DEFS_FOR_TERSER_WITH_AOT, readConfiguration } =
-        await AotCompilation.loadCompilerCli();
+        await AngularCompilation.loadCompilerCli();
 
       // Setup defines based on the values provided by the Angular compiler-cli
       build.initialOptions.define ??= {};
@@ -239,7 +240,7 @@ export function createCompilerPlugin(
 
       let stylesheetMetafiles: Metafile[];
 
-      let compilation: AotCompilation | undefined;
+      let compilation: AngularCompilation | undefined;
 
       build.onStart(async () => {
         const result: OnStartResult = {

packages/angular_devkit/build_angular/src/builders/browser-esbuild/angular/jit-compilation.ts

@@ -9,7 +9,7 @@
 import assert from 'node:assert';
 import ts from 'typescript';
 import { profileSync } from '../profiling';
-import { AngularCompilation } from './angular-compilation';
+import { AngularCompilation, FileEmitter } from './angular-compilation';
 import { AngularHostOptions, createAngularCompilerHost } from './angular-host';
 import { createJitResourceTransformer } from './jit-resource-transformer';
 
@@ -21,14 +21,7 @@ class JitCompilationState {
   ) {}
 }
 
-export interface EmitFileResult {
-  content?: string;
-  map?: string;
-  dependencies: readonly string[];
-}
-export type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;
-
-export class JitCompilation {
+export class JitCompilation extends AngularCompilation {
   #state?: JitCompilationState;
 
   async initialize(