fixup! refactor(@angular/build): consolidate library asset collection and watch check

Author: alan-agius4

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

@@ -107,14 +107,14 @@ export async function* executeLibraryBuilder(
       target,
     );
 
-    // Track all referenced files for watch mode
-    const allWatchedFiles = new Set<string>([
+    // Track all referenced compilation files for watch mode
+    const watchedCompilationFiles = new Set<string>([
       toPosixPath(tsConfigPath),
       toPosixPath(packageJsonPath),
     ]);
 
     for (const entryPoint of normalizedOptions.entryPoints.values()) {
-      allWatchedFiles.add(toPosixPath(entryPoint.entryFilePath));
+      watchedCompilationFiles.add(toPosixPath(entryPoint.entryFilePath));
     }
 
     if (isWatchMode) {
@@ -131,7 +131,7 @@ export async function* executeLibraryBuilder(
         poll,
         preserveSymlinks,
         signal,
-        watchFiles: allWatchedFiles,
+        watchFiles: watchedCompilationFiles,
       });
 
       context.addTeardown?.(() => void watcher?.close());
@@ -143,7 +143,7 @@ export async function* executeLibraryBuilder(
       {
         options: normalizedOptions,
         stylesheetBundler,
-        allWatchedFiles,
+        watchedCompilationFiles,
         isWatchMode,
         context,
         buildState,
@@ -162,7 +162,7 @@ export async function* executeLibraryBuilder(
       watcher,
       normalizedOptions,
       stylesheetBundler,
-      allWatchedFiles,
+      watchedCompilationFiles,
       context,
       withProgress,
       buildState,
@@ -190,7 +190,7 @@ async function executeBuild(
   buildAction: typeof import('./pipeline/build-action').buildAction,
 ): Promise<BuilderOutput> {
   const startTime = process.hrtime.bigint();
-  const { context, allWatchedFiles, isWatchMode } = actionContext;
+  const { context, watchedCompilationFiles, isWatchMode } = actionContext;
 
   try {
     await withProgress(message, () => buildAction(actionContext));
@@ -206,7 +206,14 @@ async function executeBuild(
 
     return { success: false, error: error.message };
   } finally {
-    watcher?.add(Array.from(allWatchedFiles));
+    if (watcher) {
+      watcher.add(Array.from(watchedCompilationFiles));
+
+      const { assetsToEmit } = actionContext;
+      if (assetsToEmit?.length) {
+        watcher.add(assetsToEmit.map((asset) => asset.source));
+      }
+    }
   }
 }
 
@@ -217,7 +224,7 @@ async function* runWatchLoop(
   watcher: BuildWatcher,
   options: NormalizedLibraryOptions,
   stylesheetBundler: ReturnType<typeof createComponentStylesheetBundlerForLibrary>,
-  allWatchedFiles: Set<string>,
+  watchedCompilationFiles: Set<string>,
   context: BuilderContext,
   withProgress: typeof withSpinner,
   buildState: SingleBuildState,
@@ -281,7 +288,7 @@ async function* runWatchLoop(
           packageJson,
           options,
           buildState,
-          allWatchedFiles,
+          watchedCompilationFiles,
           packageJsonPath,
         );
 
@@ -302,7 +309,7 @@ async function* runWatchLoop(
       !buildState.singleProgramCache ||
       buildState.hasCompilationError ||
       buildState.hasEntryPointsChanges ||
-      hasModifiedWatchedFile(changedFiles, allWatchedFiles, posixPackageJsonPath);
+      hasModifiedWatchedFile(changedFiles, watchedCompilationFiles, posixPackageJsonPath);
 
     const assetsToEmit = await collectAssetsToEmit(
       assets,
@@ -319,7 +326,7 @@ async function* runWatchLoop(
       {
         options,
         stylesheetBundler,
-        allWatchedFiles,
+        watchedCompilationFiles,
         isWatchMode: true,
         context,
         buildState,

packages/angular/build/src/builders/library/pipeline/build-action.ts

@@ -9,14 +9,14 @@
 import type { BuilderContext } from '@angular-devkit/architect';
 import { constants, copyFile, mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
+import type { ComponentStylesheetBundler } from '../../../tools/esbuild/angular/component-stylesheets';
 import { emitFilesToDisk } from '../../../tools/esbuild/utils';
 import { toPosixPath } from '../../../utils/path';
 import type { NormalizedLibraryOptions, SingleBuildState } from '../types';
 import { collectAssetsToEmit } from './assets';
 import { type BundleEntryPointInput, bundleEntryPoints } from './bundler';
 import { compileLibrary } from './compilation';
 import { generatePackageManifests } from './package-manifests';
-import type { createComponentStylesheetBundlerForLibrary } from './stylesheet-bundler';
 import type { DiskOutputFile, OutputFile } from './utils';
 
 /**
@@ -35,13 +35,39 @@ export function createSingleBuildState(): SingleBuildState {
  * Context required to execute a single library build iteration.
  */
 export interface BuildActionContext {
+  /** Normalized options for the library build. */
   options: NormalizedLibraryOptions;
+
+  /** The Architect builder context. */
   context: BuilderContext;
-  stylesheetBundler: ReturnType<typeof createComponentStylesheetBundlerForLibrary>;
+
+  /** Bundler instance used to process component stylesheets. */
+  stylesheetBundler: ComponentStylesheetBundler;
+
+  /** Whether the builder is running in watch mode. */
   isWatchMode: boolean;
-  allWatchedFiles: Set<string>;
+
+  /**
+   * Set of file paths tracked for compilation and configuration
+   * (including `tsconfig.json`, `package.json`, entry points, and referenced source,
+   * template, and stylesheet files). Updated during compilation and used to determine
+   * whether file changes require recompiling entry points, excluding asset files so
+   * asset-only changes do not trigger code compilation.
+   */
+  watchedCompilationFiles: Set<string>;
+
+  /** State preserved across incremental builds in watch mode. */
   buildState: SingleBuildState;
+
+  /** Set of file paths modified since the last build iteration. */
   modifiedFiles?: Set<string>;
+
+  /**
+   * Asset files to emit to disk for the current build iteration.
+   * Pre-collected in the watch loop to avoid redundant asset matching, or resolved and
+   * populated by `buildAction` when omitted (such as during the initial build) so the
+   * caller can register their source paths with the file watcher.
+   */
   assetsToEmit?: DiskOutputFile[];
 }
 
@@ -58,10 +84,9 @@ export async function buildAction(actionContext: BuildActionContext): Promise<vo
     context,
     stylesheetBundler,
     isWatchMode,
-    allWatchedFiles,
+    watchedCompilationFiles,
     buildState,
     modifiedFiles,
-    assetsToEmit,
   } = actionContext;
 
   const posixPackageJsonPath = toPosixPath(options.packageJsonPath);
@@ -78,7 +103,7 @@ export async function buildAction(actionContext: BuildActionContext): Promise<vo
     buildState.hasEntryPointsChanges ||
     pendingChangedEsmFiles.size > 0 ||
     pendingChangedDtsFiles.size > 0 ||
-    hasModifiedWatchedFile(modifiedFiles, allWatchedFiles, posixPackageJsonPath);
+    hasModifiedWatchedFile(modifiedFiles, watchedCompilationFiles, posixPackageJsonPath);
   const shouldGenerateManifests = !buildState.hasEmittedManifests;
 
   if (shouldGenerateManifests) {
@@ -109,7 +134,7 @@ export async function buildAction(actionContext: BuildActionContext): Promise<vo
     buildState.singleProgramCache = cache;
 
     for (const file of referencedFiles) {
-      allWatchedFiles.add(file);
+      watchedCompilationFiles.add(file);
     }
 
     for (const file of changedEsmFiles) {
@@ -172,16 +197,11 @@ export async function buildAction(actionContext: BuildActionContext): Promise<vo
     filesToEmit.push(...generatePackageManifests(options, isWatchMode));
   }
 
-  const resolvedAssetsToEmit =
-    assetsToEmit ??
-    (await collectAssetsToEmit(
-      options.assets,
-      options.workspaceRoot,
-      buildState.hasEmittedAssets ? modifiedFiles : undefined,
-    ));
-  for (const asset of resolvedAssetsToEmit) {
-    allWatchedFiles.add(toPosixPath(asset.source));
-  }
+  const resolvedAssetsToEmit = (actionContext.assetsToEmit ??= await collectAssetsToEmit(
+    options.assets,
+    options.workspaceRoot,
+    buildState.hasEmittedAssets ? modifiedFiles : undefined,
+  ));
   filesToEmit.push(...resolvedAssetsToEmit);
 
   await emitFilesToDisk<OutputFile>(filesToEmit, async (file) => {
@@ -205,11 +225,11 @@ export async function buildAction(actionContext: BuildActionContext): Promise<vo
 
 export function hasModifiedWatchedFile(
   modifiedFiles: ReadonlySet<string>,
-  allWatchedFiles: ReadonlySet<string>,
+  watchedCompilationFiles: ReadonlySet<string>,
   posixPackageJsonPath: string,
 ): boolean {
   for (const file of modifiedFiles) {
-    if (file !== posixPackageJsonPath && allWatchedFiles.has(file)) {
+    if (file !== posixPackageJsonPath && watchedCompilationFiles.has(file)) {
       return true;
     }
   }

packages/angular/build/src/builders/library/pipeline/entry-points.ts

@@ -238,7 +238,7 @@ export function updateWatchedEntryPoints(
   packageJson: PackageJsonData,
   options: NormalizedLibraryOptions,
   buildState: SingleBuildState,
-  allWatchedFiles: Set<string>,
+  watchedCompilationFiles: Set<string>,
   packageJsonPath: string,
 ): void {
   const newEntryPoints = normalizeEntryPoints(
@@ -250,7 +250,7 @@ export function updateWatchedEntryPoints(
 
   if (haveEntryPointsChanged(options.entryPoints, newEntryPoints)) {
     for (const entryPoint of newEntryPoints.values()) {
-      allWatchedFiles.add(toPosixPath(entryPoint.entryFilePath));
+      watchedCompilationFiles.add(toPosixPath(entryPoint.entryFilePath));
     }
 
     for (const name of buildState.previousBundleResults.keys()) {

packages/angular/build/src/builders/library/pipeline/entry-points_spec.ts

@@ -530,7 +530,7 @@ describe('entry-points pipeline', () => {
         hasEntryPointsChanges: false,
       } as unknown as SingleBuildState;
 
-      const allWatchedFiles = new Set<string>();
+      const watchedCompilationFiles = new Set<string>();
 
       const newPackageJson: PackageJsonData = {
         name: packageName,
@@ -544,7 +544,7 @@ describe('entry-points pipeline', () => {
         newPackageJson,
         options,
         buildState,
-        allWatchedFiles,
+        watchedCompilationFiles,
         packageJsonPath,
       );
 
@@ -553,9 +553,13 @@ describe('entry-points pipeline', () => {
       expect(options.entryPoints.has('old-feature')).toBeFalse();
       expect(buildState.previousBundleResults.has('old-feature')).toBeFalse();
       expect(buildState.previousBundleResults.has('.')).toBeTrue();
-      expect(allWatchedFiles.has(toPosixPath(join(projectRoot, 'src/public-api.ts')))).toBeTrue();
       expect(
-        allWatchedFiles.has(toPosixPath(join(projectRoot, 'new-feature/src/public-api.ts'))),
+        watchedCompilationFiles.has(toPosixPath(join(projectRoot, 'src/public-api.ts'))),
+      ).toBeTrue();
+      expect(
+        watchedCompilationFiles.has(
+          toPosixPath(join(projectRoot, 'new-feature/src/public-api.ts')),
+        ),
       ).toBeTrue();
     });
 
@@ -584,7 +588,7 @@ describe('entry-points pipeline', () => {
         hasEntryPointsChanges: false,
       } as unknown as SingleBuildState;
 
-      const allWatchedFiles = new Set<string>();
+      const watchedCompilationFiles = new Set<string>();
 
       const samePackageJson: PackageJsonData = {
         name: packageName,
@@ -598,13 +602,13 @@ describe('entry-points pipeline', () => {
         samePackageJson,
         options,
         buildState,
-        allWatchedFiles,
+        watchedCompilationFiles,
         packageJsonPath,
       );
 
       expect(buildState.hasEntryPointsChanges).toBeFalse();
       expect(options.entryPoints).toBe(initialEntryPoints);
-      expect(allWatchedFiles).toHaveSize(0);
+      expect(watchedCompilationFiles).toHaveSize(0);
       expect(buildState.previousBundleResults).toHaveSize(2);
     });
 
@@ -631,7 +635,7 @@ describe('entry-points pipeline', () => {
         hasEntryPointsChanges: false,
       } as unknown as SingleBuildState;
 
-      const allWatchedFiles = new Set<string>();
+      const watchedCompilationFiles = new Set<string>();
 
       const updatedPackageJson: PackageJsonData = {
         name: packageName,
@@ -644,7 +648,7 @@ describe('entry-points pipeline', () => {
         updatedPackageJson,
         options,
         buildState,
-        allWatchedFiles,
+        watchedCompilationFiles,
         packageJsonPath,
       );
 
@@ -653,7 +657,9 @@ describe('entry-points pipeline', () => {
       expect(options.entryPoints.get('.')?.entryFilePath).toBe(
         join(projectRoot, 'src/other-api.ts'),
       );
-      expect(allWatchedFiles.has(toPosixPath(join(projectRoot, 'src/other-api.ts')))).toBeTrue();
+      expect(
+        watchedCompilationFiles.has(toPosixPath(join(projectRoot, 'src/other-api.ts'))),
+      ).toBeTrue();
     });
 
     it('should prune previousBundleResults when an entry point bundleName changes', () => {
@@ -679,7 +685,7 @@ describe('entry-points pipeline', () => {
         hasEntryPointsChanges: false,
       } as unknown as SingleBuildState;
 
-      const allWatchedFiles = new Set<string>();
+      const watchedCompilationFiles = new Set<string>();
 
       const updatedPackageJson: PackageJsonData = {
         name: '@renamed-scope/my-lib',
@@ -694,7 +700,7 @@ describe('entry-points pipeline', () => {
         updatedPackageJson,
         options,
         buildState,
-        allWatchedFiles,
+        watchedCompilationFiles,
         packageJsonPath,
       );