refactor(@angular/build): eliminate circular dependencies in bundler context

goldens/circular-deps/packages.json

@@ -1,30 +1 @@
-[
-  [
-    "packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts",
-    "packages/angular/build/src/tools/esbuild/bundler-context.ts",
-    "packages/angular/build/src/tools/esbuild/utils.ts",
-    "packages/angular/build/src/tools/esbuild/bundler-execution-result.ts"
-  ],
-  [
-    "packages/angular/build/src/tools/esbuild/bundler-context.ts",
-    "packages/angular/build/src/tools/esbuild/utils.ts"
-  ],
-  [
-    "packages/angular/build/src/tools/esbuild/bundler-context.ts",
-    "packages/angular/build/src/tools/esbuild/utils.ts",
-    "packages/angular/build/src/tools/esbuild/bundler-execution-result.ts"
-  ],
-  [
-    "packages/angular/build/src/tools/esbuild/bundler-context.ts",
-    "packages/angular/build/src/tools/esbuild/utils.ts",
-    "packages/angular/build/src/utils/server-rendering/manifest.ts"
-  ],
-  [
-    "packages/angular/build/src/tools/esbuild/bundler-execution-result.ts",
-    "packages/angular/build/src/tools/esbuild/utils.ts"
-  ],
-  [
-    "packages/angular/build/src/tools/esbuild/utils.ts",
-    "packages/angular/build/src/utils/server-rendering/manifest.ts"
-  ]
-]
+[]

goldens/public-api/angular/build/index.api.md

@@ -8,7 +8,7 @@ import { BuilderContext } from '@angular-devkit/architect';
 import { BuilderOutput } from '@angular-devkit/architect';
 import type { ConfigOptions } from 'karma';
 import type http from 'node:http';
-import { OutputFile } from 'esbuild';
+import type { OutputFile } from 'esbuild';
 import type { Plugin as Plugin_2 } from 'esbuild';
 
 // @public (undocumented)

packages/angular/build/src/builders/application/build-action.ts

@@ -9,8 +9,8 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
-import { BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
+import { BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 import { shutdownSassWorkerPool } from '../../tools/esbuild/stylesheets/sass-language';
 import { logMessages, withNoProgress, withSpinner } from '../../tools/esbuild/utils';
 import { ChangedFiles } from '../../tools/esbuild/watcher';

packages/angular/build/src/builders/application/chunk-optimizer.ts

@@ -20,13 +20,13 @@
 import type { Message, Metafile } from 'esbuild';
 import assert from 'node:assert';
 import { type Plugin, rollup } from 'rollup';
+import { BundleContextResult } from '../../tools/esbuild/bundler-context';
 import {
-  BuildOutputFile,
+  type BuildOutputFile,
   BuildOutputFileType,
-  BundleContextResult,
-  InitialFileRecord,
-} from '../../tools/esbuild/bundler-context';
-import { createOutputFile } from '../../tools/esbuild/utils';
+  type InitialFileRecord,
+  createOutputFile,
+} from '../../tools/esbuild/bundler-files';
 import { useRolldownChunks } from '../../utils/environment-options';
 import { assertIsError } from '../../utils/error';
 import { toPosixPath } from '../../utils/path';

packages/angular/build/src/builders/application/execute-build.ts

@@ -10,12 +10,9 @@ import { BuilderContext } from '@angular-devkit/architect';
 import { createAngularCompilation } from '../../tools/angular/compilation';
 import { SourceFileCache } from '../../tools/esbuild/angular/source-file-cache';
 import { generateBudgetStats } from '../../tools/esbuild/budget-stats';
-import {
-  BuildOutputFileType,
-  BundleContextResult,
-  BundlerContext,
-} from '../../tools/esbuild/bundler-context';
+import { BundleContextResult, BundlerContext } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
+import { BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 import { checkCommonJSModules } from '../../tools/esbuild/commonjs-checker';
 import { extractLicenses } from '../../tools/esbuild/license-extractor';
 import { profileAsync } from '../../tools/esbuild/profiling';

packages/angular/build/src/builders/application/execute-post-bundle.ts

@@ -9,16 +9,16 @@
 import type { Metafile } from 'esbuild';
 import assert from 'node:assert';
 import {
-  BuildOutputFile,
-  BuildOutputFileType,
-  InitialFileRecord,
-} from '../../tools/esbuild/bundler-context';
-import {
-  BuildOutputAsset,
-  PrerenderedRoutesRecord,
+  type BuildOutputAsset,
+  type PrerenderedRoutesRecord,
 } from '../../tools/esbuild/bundler-execution-result';
+import {
+  type BuildOutputFile,
+  BuildOutputFileType,
+  type InitialFileRecord,
+  createOutputFile,
+} from '../../tools/esbuild/bundler-files';
 import { generateIndexHtml } from '../../tools/esbuild/index-html-generator';
-import { createOutputFile } from '../../tools/esbuild/utils';
 import { maxWorkers } from '../../utils/environment-options';
 import {
   SERVER_APP_MANIFEST_FILENAME,

packages/angular/build/src/builders/application/i18n.ts

@@ -9,11 +9,11 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import type { Metafile } from 'esbuild';
 import { join } from 'node:path';
-import { BuildOutputFileType, InitialFileRecord } from '../../tools/esbuild/bundler-context';
 import {
   ExecutionResult,
   PrerenderedRoutesRecord,
 } from '../../tools/esbuild/bundler-execution-result';
+import { BuildOutputFileType, InitialFileRecord } from '../../tools/esbuild/bundler-files';
 import { I18nInliner } from '../../tools/esbuild/i18n-inliner';
 import { maxWorkers } from '../../utils/environment-options';
 import { loadTranslations } from '../../utils/i18n-options';

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

@@ -10,7 +10,7 @@ import { Builder, BuilderContext, BuilderOutput, createBuilder } from '@angular-
 import assert from 'node:assert';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
+import { BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 import { createJsonBuildManifest, emitFilesToDisk } from '../../tools/esbuild/utils';
 import { colors as ansiColors } from '../../utils/color';
 import { deleteOutputDir } from '../../utils/delete-output-dir';

packages/angular/build/src/builders/application/results.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
+import { BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 
 export enum ResultKind {
   Failure,

packages/angular/build/src/builders/dev-server/internal.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-export { type BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-context';
+export { type BuildOutputFile, BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 export { createRxjsEsmResolutionPlugin } from '../../tools/esbuild/rxjs-esm-resolution-plugin';
 export { JavaScriptTransformer } from '../../tools/esbuild/javascript-transformer';
 export { getFeatureSupport, isZonelessApp } from '../../tools/esbuild/utils';

packages/angular/build/src/builders/karma/utils.ts

@@ -8,7 +8,7 @@
 
 import type { BuilderContext } from '@angular-devkit/architect';
 import { createRequire } from 'node:module';
-import { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
+import { BuildOutputFileType } from '../../tools/esbuild/bundler-files';
 import { getProjectRootPaths } from '../../utils/project-metadata';
 import { findTests, getTestEntrypoints } from './find-tests';
 import type { NormalizedKarmaBuilderOptions } from './options';

packages/angular/build/src/index.ts

@@ -8,7 +8,7 @@
 
 export { buildApplication, type ApplicationBuilderOptions } from './builders/application';
 export type { ApplicationBuilderExtensions } from './builders/application/options';
-export { type BuildOutputFile, BuildOutputFileType } from './tools/esbuild/bundler-context';
+export { type BuildOutputFile, BuildOutputFileType } from './tools/esbuild/bundler-files';
 export type { BuildOutputAsset } from './tools/esbuild/bundler-execution-result';
 
 export {

packages/angular/build/src/tools/esbuild/angular/component-stylesheets.ts

@@ -9,12 +9,8 @@
 import assert from 'node:assert';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
-import {
-  BuildOutputFile,
-  BuildOutputFileType,
-  BundleContextResult,
-  BundlerContext,
-} from '../bundler-context';
+import { BundleContextResult, BundlerContext } from '../bundler-context';
+import { type BuildOutputFile, BuildOutputFileType } from '../bundler-files';
 import { MemoryCache } from '../cache';
 import {
   BundleStylesheetOptions,

packages/angular/build/src/tools/esbuild/application-code-bundle.ts

@@ -17,6 +17,7 @@ import { toPosixPath } from '../../utils/path';
 import {
   SERVER_APP_ENGINE_MANIFEST_FILENAME,
   SERVER_APP_MANIFEST_FILENAME,
+  SERVER_GENERATED_EXTERNALS,
 } from '../../utils/server-rendering/manifest';
 import { AngularCompilation, NoopCompilation } from '../angular/compilation';
 import { createCompilerPlugin } from './angular/compiler-plugin';
@@ -32,7 +33,7 @@ import { createLoaderImportAttributePlugin } from './loader-import-attribute-plu
 import { createRxjsEsmResolutionPlugin } from './rxjs-esm-resolution-plugin';
 import { createServerBundleMetadata } from './server-bundle-metadata-plugin';
 import { createSourcemapIgnorelistPlugin } from './sourcemap-ignorelist-plugin';
-import { SERVER_GENERATED_EXTERNALS, getFeatureSupport, isZonelessApp } from './utils';
+import { getFeatureSupport, isZonelessApp } from './utils';
 import { createVirtualModulePlugin } from './virtual-module-plugin';
 import { createWasmPlugin } from './wasm-plugin';
 

packages/angular/build/src/tools/esbuild/budget-stats.ts

@@ -8,11 +8,7 @@
 
 import type { Metafile } from 'esbuild';
 import type { BudgetStats } from '../../utils/bundle-calculator';
-import {
-  type BuildOutputFile,
-  BuildOutputFileType,
-  type InitialFileRecord,
-} from './bundler-context';
+import { type BuildOutputFile, BuildOutputFileType, type InitialFileRecord } from './bundler-files';
 import { getChunkNameFromMetafile } from './utils';
 
 /**

packages/angular/build/src/tools/esbuild/bundler-context.ts

@@ -20,8 +20,14 @@ import {
 import assert from 'node:assert';
 import { builtinModules } from 'node:module';
 import { basename, extname, join, relative } from 'node:path';
+import { SERVER_GENERATED_EXTERNALS } from '../../utils/server-rendering/manifest';
+import {
+  type BuildOutputFile,
+  BuildOutputFileType,
+  type InitialFileRecord,
+  convertOutputFile,
+} from './bundler-files';
 import { LoadResultCache, MemoryLoadResultCache } from './load-result-cache';
-import { SERVER_GENERATED_EXTERNALS, convertOutputFile } from './utils';
 
 export type BundleContextResult =
   | { errors: Message[]; warnings: Message[] }
@@ -38,29 +44,6 @@ export type BundleContextResult =
       externalConfiguration?: string[];
     };
 
-export interface InitialFileRecord {
-  entrypoint: boolean;
-  name?: string;
-  type: 'script' | 'style';
-  external?: boolean;
-  serverFile: boolean;
-  depth: number;
-}
-
-export enum BuildOutputFileType {
-  Browser,
-  Media,
-  ServerApplication,
-  ServerRoot,
-  Root,
-}
-
-export interface BuildOutputFile extends OutputFile {
-  type: BuildOutputFileType;
-  readonly size: number;
-  clone: () => BuildOutputFile;
-}
-
 export type BundlerOptionsFactory<T extends BuildOptions = BuildOptions> = (
   loadCache: LoadResultCache | undefined,
 ) => T;

packages/angular/build/src/tools/esbuild/bundler-execution-result.ts

@@ -11,8 +11,8 @@ import { normalize } from 'node:path';
 import type { ChangedFiles } from '../../tools/esbuild/watcher';
 import type { ComponentStylesheetBundler } from './angular/component-stylesheets';
 import type { SourceFileCache } from './angular/source-file-cache';
-import type { BuildOutputFile, BuildOutputFileType, BundlerContext } from './bundler-context';
-import { createOutputFile } from './utils';
+import type { BundlerContext } from './bundler-context';
+import { type BuildOutputFile, BuildOutputFileType, createOutputFile } from './bundler-files';
 
 export interface BuildOutputAsset {
   source: string;