fixup! refactor(@angular/build): encapsulate library build state in BuilderState and ExecutionResult

Author: alan-agius4

packages/angular/build/src/builders/library/builder.ts

@@ -27,7 +27,7 @@ import type { BuildWatcher } from '../../utils/watcher';
 import { BuilderState } from './builder-state';
 import type { ExecutionResult } from './execution-result';
 import { normalizeLibraryOptions } from './options';
-import type { BuildActionContext, buildAction } from './pipeline/build-action';
+import type { BuildActionContext } from './pipeline/build-action';
 import { updateWatchedEntryPoints } from './pipeline/entry-points';
 import { loadPackageJson } from './pipeline/utils';
 import type { Schema as LibraryBuilderOptions } from './schema';
@@ -182,7 +182,7 @@ export async function* executeLibraryBuilder(
  * @param logger The Architect logger API.
  * @param withProgress Progress wrapper function (`withSpinner` or `withNoProgress`).
  * @param watcher Optional file watcher for watch mode.
- * @param buildActionFn The library build action function to execute.
+ * @param buildAction The library build action function to execute.
  * @returns A promise resolving to the Architect `BuilderOutput`.
  */
 async function executeBuild(
@@ -191,13 +191,13 @@ async function executeBuild(
   logger: logging.LoggerApi,
   withProgress: typeof withSpinner,
   watcher: BuildWatcher | undefined,
-  buildActionFn: typeof buildAction,
+  buildAction: typeof import('./pipeline/build-action').buildAction,
 ): Promise<BuilderOutput> {
   const startTime = process.hrtime.bigint();
   const { buildState, isWatchMode, options } = actionContext;
 
   try {
-    const result = await withProgress(message, () => buildActionFn(actionContext));
+    const result = await withProgress(message, () => buildAction(actionContext));
     logMessages(logger, result);
 
     const { output } = result;
@@ -233,7 +233,7 @@ async function executeBuild(
  * @param logger The Architect logger API.
  * @param withProgress Progress wrapper function (`withSpinner` or `withNoProgress`).
  * @param buildState The state preserved across incremental builds.
- * @param buildActionFn The library build action function to execute.
+ * @param buildAction The library build action function to execute.
  * @param signal Abort signal to terminate the watch loop.
  * @returns An async iterator yielding builder output results.
  */
@@ -244,7 +244,7 @@ async function* runWatchLoop(
   logger: logging.LoggerApi,
   withProgress: typeof withSpinner,
   buildState: BuilderState,
-  buildActionFn: typeof buildAction,
+  buildAction: typeof import('./pipeline/build-action').buildAction,
   signal: AbortSignal,
 ): AsyncIterableIterator<BuilderOutput> {
   const { collectAssetsToEmit } = await import('./pipeline/assets');
@@ -336,7 +336,7 @@ async function* runWatchLoop(
       logger,
       withProgress,
       watcher,
-      buildActionFn,
+      buildAction,
     );
   }
 }