refactor(@angular/build): export NormalizedAssetsPattern and avoid mutating input patterns

Export the `NormalizedAssetsPattern` interface from `normalize-asset-patterns.ts`, avoid mutating input `AssetPatternClass` objects in place, and simplify directory detection using `statSync(..., { throwIfNoEntry: false })`.

Also import `normalizeAssetPatterns` directly in `library/options.ts`, use `export type *` in `library/index.ts`, remove the redundant `tslibVersion` truthiness check in `generatePackageManifests`, and add test coverage for asset `ignore` patterns.

Author: alan-agius4

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

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { Builder, createBuilder } from '@angular-devkit/architect';
+import { type Builder, createBuilder } from '@angular-devkit/architect';
 import { executeLibraryBuilder } from './builder';
 import type { Schema as LibraryBuilderOptions } from './schema';
 

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

@@ -9,9 +9,9 @@
 import type { BuilderContext } from '@angular-devkit/architect';
 import path from 'node:path';
 import type { StylesheetPluginsass } from '../../tools/esbuild/stylesheets/stylesheet-plugin-factory';
-import { normalizeAssetPatterns } from '../../utils';
 import { supportColor } from '../../utils/color';
 import { assertIsError } from '../../utils/error';
+import { normalizeAssetPatterns } from '../../utils/normalize-asset-patterns';
 import { normalizeCacheOptions } from '../../utils/normalize-cache';
 import { toPosixPath } from '../../utils/path';
 import {

packages/angular/build/src/builders/library/pipeline/package-manifests.ts

@@ -78,13 +78,10 @@ export async function generatePackageManifests(
   };
 
   if (hasTslibImport && !rawPackageJson.dependencies?.['tslib']) {
-    const tslibVersion = await getAngularTslibRange(options.workspaceRoot);
-    if (tslibVersion) {
-      distPackageJson.dependencies = {
-        ...rawPackageJson.dependencies,
-        tslib: tslibVersion,
-      };
-    }
+    distPackageJson.dependencies = {
+      ...rawPackageJson.dependencies,
+      tslib: await getAngularTslibRange(options.workspaceRoot),
+    };
   }
 
   // Retain scripts if keepLifecycleScripts is set
@@ -159,6 +156,11 @@ export async function generatePackageManifests(
 
 /**
  * Creates or updates export conditions for an entry point, preserving custom user-defined conditions.
+ *
+ * @param existingConditions Existing export conditions from the user's `package.json`.
+ * @param dtsPath Relative POSIX path to the bundled `.d.ts` file.
+ * @param fesmPath Relative POSIX path to the bundled FESM `.mjs` file.
+ * @returns The merged export conditions object.
  */
 function createExportConditions(
   existingConditions: unknown,

packages/angular/build/src/builders/library/tests/options/assets_spec.ts

@@ -15,6 +15,7 @@ describeLibraryBuilder(executeLibraryBuilder, LIBRARY_BUILDER_INFO, (harness) =>
       await harness.writeFiles({
         'projects/lib/assets-dir/file-a.png': 'PNG_A',
         'projects/lib/assets-dir/file-b.png': 'PNG_B',
+        'projects/lib/assets-dir/ignored.png': 'PNG_IGNORED',
         'projects/lib/assets-dir/file-c.svg': 'SVG_C',
       });
 
@@ -25,6 +26,7 @@ describeLibraryBuilder(executeLibraryBuilder, LIBRARY_BUILDER_INFO, (harness) =>
             glob: '**/*.png',
             input: 'projects/lib/assets-dir',
             output: 'assets',
+            ignore: ['ignored.png'],
           },
         ],
       });
@@ -34,6 +36,7 @@ describeLibraryBuilder(executeLibraryBuilder, LIBRARY_BUILDER_INFO, (harness) =>
 
       expect(harness.readFile('dist/lib/assets/file-a.png')).toBe('PNG_A');
       expect(harness.readFile('dist/lib/assets/file-b.png')).toBe('PNG_B');
+      expect(harness.hasFile('dist/lib/assets/ignored.png')).toBeFalse();
       expect(harness.hasFile('dist/lib/assets/file-c.svg')).toBeFalse();
     });
 

packages/angular/build/src/utils/normalize-asset-patterns.ts

@@ -6,18 +6,35 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import assert from 'node:assert';
 import { statSync } from 'node:fs';
-import * as path from 'node:path';
-import { AssetPattern, AssetPatternClass } from '../builders/application/schema';
+import path from 'node:path';
+import type { AssetPattern, AssetPatternClass } from '../builders/application/schema';
 import { isSubDirectory } from './path';
 
+/**
+ * Asset pattern configuration normalized into its object form with a resolved `output` directory.
+ */
+export interface NormalizedAssetsPattern extends AssetPatternClass {
+  /** Relative output directory within the build output path. */
+  output: string;
+}
+
+/**
+ * Normalizes raw string and object asset patterns into {@link NormalizedAssetsPattern} objects
+ * and validates that all asset inputs and outputs stay within the workspace and output directories.
+ *
+ * @param assetPatterns Raw string or object asset patterns from builder options.
+ * @param workspaceRoot Workspace root directory path.
+ * @param projectRoot Project root directory path.
+ * @param projectSourceRoot Optional project source root directory path.
+ * @returns An array of normalized asset pattern configurations.
+ */
 export function normalizeAssetPatterns(
   assetPatterns: AssetPattern[],
   workspaceRoot: string,
   projectRoot: string,
   projectSourceRoot: string | undefined,
-): (AssetPatternClass & { output: string })[] {
+): NormalizedAssetsPattern[] {
   if (assetPatterns.length === 0) {
     return [];
   }
@@ -29,6 +46,8 @@ export function normalizeAssetPatterns(
   const resolvedProjectRoot = path.resolve(resolvedWorkspaceRoot, projectRoot);
 
   return assetPatterns.map((assetPattern) => {
+    let normalized: NormalizedAssetsPattern;
+
     // Normalize string asset patterns to objects.
     if (typeof assetPattern === 'string') {
       const assetPath = path.normalize(assetPattern);
@@ -46,45 +65,30 @@ export function normalizeAssetPatterns(
         throw new Error(`The ${assetPattern} asset path must be within the workspace root.`);
       }
 
-      let glob: string, input: string;
-      let isDirectory: boolean;
-
-      try {
-        isDirectory = statSync(resolvedAssetPath).isDirectory();
-      } catch {
-        isDirectory = true;
-      }
-
-      if (isDirectory) {
-        // Folders get a recursive star glob.
-        glob = '**/*';
-        // Input directory is their original path.
-        input = assetPath;
-      } else {
-        // Files are their own glob.
-        glob = path.basename(assetPath);
-        // Input directory is their original dirname.
-        input = path.dirname(assetPath);
-      }
+      const isDirectory =
+        statSync(resolvedAssetPath, { throwIfNoEntry: false })?.isDirectory() ?? true;
+      const glob = isDirectory ? '**/*' : path.basename(assetPath);
+      const input = isDirectory ? assetPath : path.dirname(assetPath);
 
       // Output directory for both is the relative path from the root to input.
       const output = path.relative(root, path.resolve(resolvedWorkspaceRoot, input));
 
-      assetPattern = { glob, input, output };
+      normalized = { glob, input, output };
     } else {
       if (!isSubDirectory(resolvedWorkspaceRoot, assetPattern.input)) {
         throw new Error(`The ${assetPattern.input} asset path must be within the workspace root.`);
       }
 
-      assetPattern.output = path.join('.', assetPattern.output ?? '');
+      normalized = {
+        ...assetPattern,
+        output: path.join('.', assetPattern.output ?? ''),
+      };
     }
 
-    assert(assetPattern.output !== undefined);
-
-    if (assetPattern.output.startsWith('..')) {
+    if (normalized.output.startsWith('..')) {
       throw new Error('An asset cannot be written to a location outside of the output path.');
     }
 
-    return assetPattern as AssetPatternClass & { output: string };
+    return normalized;
   });
 }