fixup! feat(@angular/build): add library builder

Author: alan-agius4

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

@@ -22,28 +22,10 @@ import {
   loadPostcssConfiguration,
 } from '../../utils/postcss-configuration';
 import { getProjectRootPaths } from '../../utils/project-metadata';
-import { getEntryPointBundleName } from './pipeline/utils';
+import { type NormalizedEntryPoint, getEntryPointBundleName } from './pipeline/entry-points';
 import type { Schema as LibraryBuilderOptions } from './schema';
 
-export interface NormalizedEntryPoint {
-  /** The subpath in package.json exports (e.g. '.' or './testing'). */
-  subpath: string;
-
-  /** Subpath name without leading './' (e.g. '.' or 'testing'). */
-  name: string;
-
-  /** Display name of the entry point (e.g. '@my/lib' or '@my/lib/testing'). */
-  displayName: string;
-
-  /** Base name of the output bundle (e.g. 'my-lib' or 'my-lib-testing'). */
-  bundleName: string;
-
-  /** Absolute path to entry file. */
-  entryFilePath: string;
-
-  /** Is this the primary entry point ('.')? */
-  isPrimary: boolean;
-}
+export type { NormalizedEntryPoint } from './pipeline/entry-points';
 
 export interface PackageJsonData {
   name: string;

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

@@ -15,9 +15,10 @@ import type { NormalizedEntryPoint, NormalizedLibraryOptions } from '../options'
 import { collectAssetsToEmit } from './assets';
 import { type BundleEntryPointInput, type BundleResult, bundleEntryPoints } from './bundler';
 import { type SingleProgramCache, compileLibrary } from './compilation';
+import { type EntryPointLookup, createEntryDirectoryLookup } from './entry-points';
 import { generatePackageManifests } from './package-manifests';
 import type { createComponentStylesheetBundlerForLibrary } from './stylesheet-bundler';
-import { type EntryPointLookup, type OutputFile, createEntryDirectoryLookup } from './utils';
+import type { OutputFile } from './utils';
 
 /**
  * State preserved across incremental builds in watch mode.

packages/angular/build/src/builders/library/pipeline/bundler.ts

@@ -18,12 +18,11 @@ import {
 import { dts } from 'rolldown-plugin-dts';
 import { toPosixPath } from '../../../utils/path';
 import type { NormalizedEntryPoint, NormalizedLibraryOptions } from '../options';
+import { type EntryPointLookup, createEntryDirectoryLookup } from './entry-points';
 import {
-  type EntryPointLookup,
   FESM_OUTPUT_DIR,
   type MemoryOutputFile,
   TYPES_OUTPUT_DIR,
-  createEntryDirectoryLookup,
   createMemoryOutputFile,
 } from './utils';
 

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

@@ -0,0 +1,108 @@
+/**
+ * @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.dev/license
+ */
+
+import path from 'node:path';
+import { toPosixPath } from '../../../utils/path';
+
+export interface NormalizedEntryPoint {
+  /** The subpath in package.json exports (e.g. '.' or './testing'). */
+  subpath: string;
+
+  /** Subpath name without leading './' (e.g. '.' or 'testing'). */
+  name: string;
+
+  /** Display name of the entry point (e.g. '@my/lib' or '@my/lib/testing'). */
+  displayName: string;
+
+  /** Base name of the output bundle (e.g. 'my-lib' or 'my-lib-testing'). */
+  bundleName: string;
+
+  /** Absolute path to entry file. */
+  entryFilePath: string;
+
+  /** Is this the primary entry point ('.')? */
+  isPrimary: boolean;
+}
+
+/**
+ * Function that resolves a file path to its containing normalized library entry point, if any.
+ */
+export type EntryPointLookup = (filePath: string) => NormalizedEntryPoint | undefined;
+
+/**
+ * Creates an optimized, memoized lookup function that maps arbitrary file paths
+ * to their closest containing library entry point.
+ *
+ * Entry point root directories are sorted in descending order of path length so that
+ * more specific, nested sub-entry points take precedence over shallower or primary
+ * entry points. Lookups are cached to avoid repeated path scanning.
+ *
+ * @example
+ * Given two entry points:
+ * - Primary entry point `.` at `/project/src/public-api.ts` (dir: `/project/src`)
+ * - Secondary entry point `./testing` at `/project/src/testing/public-api.ts` (dir: `/project/src/testing`)
+ *
+ * ```ts
+ * const findEntryPoint = createEntryDirectoryLookup(entryPoints);
+ *
+ * // Resolves to the 'testing' sub-entry point because /project/src/testing is the longest matching prefix:
+ * findEntryPoint('/project/src/testing/test-bed.ts'); // -> NormalizedEntryPoint ('./testing')
+ *
+ * // Resolves to the primary entry point:
+ * findEntryPoint('/project/src/button.ts'); // -> NormalizedEntryPoint ('.')
+ *
+ * // Returns undefined for files located outside any entry point directory:
+ * findEntryPoint('/project/shared/utils.ts'); // -> undefined
+ * ```
+ *
+ * @param entryPoints Iterable of normalized entry points.
+ * @returns An {@link EntryPointLookup} function that returns the owning {@link NormalizedEntryPoint},
+ * or `undefined` if the file does not belong to any entry point directory.
+ */
+export function createEntryDirectoryLookup(
+  entryPoints: Iterable<NormalizedEntryPoint>,
+): EntryPointLookup {
+  const dirs = Array.from(entryPoints, (ep) => {
+    const dir = toPosixPath(path.dirname(ep.entryFilePath));
+
+    return {
+      ep,
+      dir,
+      dirSlash: dir.endsWith('/') ? dir : `${dir}/`,
+    };
+  }).sort((a, b) => b.dir.length - a.dir.length);
+
+  const cache = new Map<string, NormalizedEntryPoint | undefined>();
+
+  return (filePath: string): NormalizedEntryPoint | undefined => {
+    const posix = toPosixPath(filePath);
+    const cached = cache.get(posix);
+    if (cached !== undefined || cache.has(posix)) {
+      return cached;
+    }
+    const found = dirs.find(({ dir, dirSlash }) => posix === dir || posix.startsWith(dirSlash))?.ep;
+    cache.set(posix, found);
+
+    return found;
+  };
+}
+
+/**
+ * Computes the base bundle file name for an entry point.
+ *
+ * @param packageName The package name from package.json.
+ * @param entryPointName The entry point subpath name (defaults to '.').
+ * @returns The sanitized bundle base name.
+ */
+export function getEntryPointBundleName(packageName: string, entryPointName = '.'): string {
+  const isPrimary = !entryPointName || entryPointName === '.';
+  const pkgName = packageName[0] === '@' ? packageName.slice(1) : packageName;
+  const epName = isPrimary ? pkgName : `${pkgName}-${entryPointName}`;
+
+  return epName.replaceAll('/', '-');
+}

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

@@ -9,8 +9,9 @@
 import assert from 'node:assert';
 import { join } from 'node:path';
 import type { NormalizedEntryPoint, NormalizedLibraryOptions, PackageJsonData } from '../options';
+import { getEntryPointBundleName } from './entry-points';
 import { generatePackageManifests } from './package-manifests';
-import { type MemoryOutputFile, getEntryPointBundleName } from './utils';
+import type { MemoryOutputFile } from './utils';
 
 describe('generatePackageManifests', () => {
   const tempDir = '/workspace/my-lib';

packages/angular/build/src/builders/library/pipeline/utils.ts

@@ -6,10 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import path from 'node:path';
-import { toPosixPath } from '../../../utils/path';
-import type { NormalizedEntryPoint } from '../options';
-
 const IS_DTS_FILE_REGEXP = /\.d\.[cm]?ts$/i;
 const IS_DTS_MAP_FILE_REGEXP = /\.d\.[cm]?ts\.map$/i;
 
@@ -23,11 +19,6 @@ export const FESM_OUTPUT_DIR = 'fesm2022';
  */
 export const TYPES_OUTPUT_DIR = 'types';
 
-/**
- * Function that resolves a file path to its containing normalized library entry point, if any.
- */
-export type EntryPointLookup = (filePath: string) => NormalizedEntryPoint | undefined;
-
 /**
  * Represents an in-memory file to be emitted to disk.
  */
@@ -114,76 +105,3 @@ export function isDeclarationFile(path: string): boolean {
 export function isDeclarationSourceMapFile(path: string): boolean {
   return IS_DTS_MAP_FILE_REGEXP.test(path);
 }
-
-/**
- * Creates an optimized, memoized lookup function that maps arbitrary file paths
- * to their closest containing library entry point.
- *
- * Entry point root directories are sorted in descending order of path length so that
- * more specific, nested sub-entry points take precedence over shallower or primary
- * entry points. Lookups are cached to avoid repeated path scanning.
- *
- * @example
- * Given two entry points:
- * - Primary entry point `.` at `/project/src/public-api.ts` (dir: `/project/src`)
- * - Secondary entry point `./testing` at `/project/src/testing/public-api.ts` (dir: `/project/src/testing`)
- *
- * ```ts
- * const findEntryPoint = createEntryDirectoryLookup(entryPoints);
- *
- * // Resolves to the 'testing' sub-entry point because /project/src/testing is the longest matching prefix:
- * findEntryPoint('/project/src/testing/test-bed.ts'); // -> NormalizedEntryPoint ('./testing')
- *
- * // Resolves to the primary entry point:
- * findEntryPoint('/project/src/button.ts'); // -> NormalizedEntryPoint ('.')
- *
- * // Returns undefined for files located outside any entry point directory:
- * findEntryPoint('/project/shared/utils.ts'); // -> undefined
- * ```
- *
- * @param entryPoints Iterable of normalized entry points.
- * @returns An {@link EntryPointLookup} function that returns the owning {@link NormalizedEntryPoint},
- * or `undefined` if the file does not belong to any entry point directory.
- */
-export function createEntryDirectoryLookup(
-  entryPoints: Iterable<NormalizedEntryPoint>,
-): EntryPointLookup {
-  const dirs = Array.from(entryPoints, (ep) => {
-    const dir = toPosixPath(path.dirname(ep.entryFilePath));
-
-    return {
-      ep,
-      dir,
-      dirSlash: dir.endsWith('/') ? dir : `${dir}/`,
-    };
-  }).sort((a, b) => b.dir.length - a.dir.length);
-
-  const cache = new Map<string, NormalizedEntryPoint | undefined>();
-
-  return (filePath: string): NormalizedEntryPoint | undefined => {
-    const posix = toPosixPath(filePath);
-    const cached = cache.get(posix);
-    if (cached !== undefined || cache.has(posix)) {
-      return cached;
-    }
-    const found = dirs.find(({ dir, dirSlash }) => posix === dir || posix.startsWith(dirSlash))?.ep;
-    cache.set(posix, found);
-
-    return found;
-  };
-}
-
-/**
- * Computes the base bundle file name for an entry point.
- *
- * @param packageName The package name from package.json.
- * @param entryPointName The entry point subpath name (defaults to '.').
- * @returns The sanitized bundle base name.
- */
-export function getEntryPointBundleName(packageName: string, entryPointName = '.'): string {
-  const isPrimary = !entryPointName || entryPointName === '.';
-  const pkgName = packageName[0] === '@' ? packageName.slice(1) : packageName;
-  const epName = isPrimary ? pkgName : `${pkgName}-${entryPointName}`;
-
-  return epName.replaceAll('/', '-');
-}