Skip to content

refactor(@angular/build): pass files directly to inlineAll in i18n inliner #33984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clydin merged 1 commit into from
Sep 1, 2026
Merged

refactor(@angular/build): pass files directly to inlineAll in i18n inliner #33984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/angular/build/src/builders/application/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ export async function inlineI18n(
}> {
const { i18nOptions, baseHref, cacheOptions } = options;

// Create the multi-threaded inliner with common options and the files generated from the build.
// Create the multi-threaded inliner with common options.
const inliner = new I18nInliner(
{
missingTranslation: i18nOptions.missingTranslationBehavior ?? 'warning',
outputFiles: executionResult.outputFiles,
persistentCachePath: cacheOptions.enabled ? cacheOptions.path : undefined,
localizeVersion: i18nOptions.localizeVersion,
},
Expand Down Expand Up @@ -92,7 +91,7 @@ export async function inlineI18n(
};
});

const inlinedLocales = await inliner.inlineAll(localesToInline);
const inlinedLocales = await inliner.inlineAll(executionResult.outputFiles, localesToInline);

for (const locale of i18nOptions.inlineLocales) {
const localeInlineResult = inlinedLocales.get(locale);
Expand Down
88 changes: 51 additions & 37 deletions packages/angular/build/src/tools/esbuild/i18n-inliner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ async function serializeTranslation(
*/
export interface I18nInlinerOptions {
missingTranslation: 'error' | 'warning' | 'ignore';
outputFiles: BuildOutputFile[];
persistentCachePath?: string;
localizeVersion?: string;
}
Expand Down Expand Up @@ -165,19 +164,36 @@ export class I18nInliner {
#transformedFileCache: Cache<TransformedFileResult> | undefined;
#translationCache: Cache<Uint8Array> | undefined;
#generation = 0;
readonly #localizeFiles: ReadonlyMap<string, BuildOutputFile>;
readonly #unmodifiedFiles: Array<BuildOutputFile>;

constructor(
private readonly options: I18nInlinerOptions,
maxThreads?: number,
) {
this.#unmodifiedFiles = [];
const { outputFiles, missingTranslation } = options;
const files = new Map<string, BuildOutputFile>();
const { missingTranslation } = options;

this.#workerPool = new WorkerPool({
filename: require.resolve('./i18n-inliner-worker'),
maxThreads,
// Extract options to ensure only the named options are serialized and sent to the worker
workerData: {
missingTranslation,
},
});
}

const pendingMaps = [];
for (const file of outputFiles) {
#partitionFiles(files: Iterable<BuildOutputFile>): {
filenames: string[];
localizeFiles: Map<string, BuildOutputFile>;
localizeMaps: Map<string, BuildOutputFile>;
unmodifiedFiles: BuildOutputFile[];
} {
const filenames: string[] = [];
const localizeFiles = new Map<string, BuildOutputFile>();
const localizeMaps = new Map<string, BuildOutputFile>();
const unmodifiedFiles: BuildOutputFile[] = [];

const pendingMaps: BuildOutputFile[] = [];
for (const file of files) {
if (file.type === BuildOutputFileType.Root || file.type === BuildOutputFileType.ServerRoot) {
// Skip also the server entry-point.
// Skip stats and similar files.
Expand All @@ -193,7 +209,8 @@ export class I18nInliner {
const hasLocalize = contentBuffer.includes(LOCALIZE_KEYWORD);

if (hasLocalize) {
files.set(file.path, file);
localizeFiles.set(file.path, file);
filenames.push(file.path);

continue;
}
Expand All @@ -204,28 +221,20 @@ export class I18nInliner {
continue;
}

this.#unmodifiedFiles.push(file);
unmodifiedFiles.push(file);
}

// Check if any pending map files should be processed by checking if the parent JS file is present
for (const file of pendingMaps) {
if (files.has(file.path.slice(0, -4))) {
files.set(file.path, file);
const jsPath = file.path.slice(0, -4);
if (localizeFiles.has(jsPath)) {
localizeMaps.set(jsPath, file);
} else {
this.#unmodifiedFiles.push(file);
unmodifiedFiles.push(file);
}
}

this.#localizeFiles = files;

this.#workerPool = new WorkerPool({
filename: require.resolve('./i18n-inliner-worker'),
maxThreads,
// Extract options to ensure only the named options are serialized and sent to the worker
workerData: {
missingTranslation,
},
});
return { filenames, localizeFiles, localizeMaps, unmodifiedFiles };
}

/**
Expand All @@ -234,10 +243,12 @@ export class I18nInliner {
* An adaptive 2D task-partitioning algorithm distributes (files x locales) work units
* across all worker threads while caching AST metadata and sourcemaps in worker memory.
*
* @param files The build output files to transform.
* @param locales The locales and translations to inline.
* @returns A map of locale names to their inlined output files and diagnostics.
*/
async inlineAll(
files: Iterable<BuildOutputFile>,
locales: Iterable<LocaleInlineOptions>,
): Promise<Map<string, LocaleInlineResult>> {
await this.initCache();
Expand All @@ -250,16 +261,14 @@ export class I18nInliner {
return new Map();
}

const { filenames, localizeFiles, localizeMaps, unmodifiedFiles } = this.#partitionFiles(files);

const fileResultsByLocale = new Map<string, Map<string, TransformedFileResult>>();
for (const { locale } of localeList) {
assert(!fileResultsByLocale.has(locale), 'Duplicate locale provided to inliner: ' + locale);
fileResultsByLocale.set(locale, new Map());
}

const filenames = Array.from(this.#localizeFiles.keys()).filter(
(name) => !name.endsWith('.map'),
);

// Process locales in sliding windows to cap peak worker memory.
// Ensure the window has at least enough locales to saturate all available workers on high-core machines.
const windowSize = Math.max(DEFAULT_LOCALE_WINDOW_SIZE, this.#workerPool.maxThreads || 1);
Expand Down Expand Up @@ -304,7 +313,7 @@ export class I18nInliner {
const cacheChecks: Promise<void>[] = [];

for (const filename of filenames) {
const file = this.#localizeFiles.get(filename);
const file = localizeFiles.get(filename);
assert(file !== undefined, 'Localize file must exist: ' + filename);

const fileEntriesPromises = windowLocales.map(
Expand Down Expand Up @@ -361,6 +370,8 @@ export class I18nInliner {
// Adaptive 2D Sharding for uncached tasks in this window
if (uncachedByFile.size > 0) {
await this.#processUncachedBatches(
localizeFiles,
localizeMaps,
uncachedByFile,
fileResultsByLocale,
activeLocales,
Expand All @@ -381,7 +392,7 @@ export class I18nInliner {

if (fileResults) {
for (const filename of filenames) {
const originalFile = this.#localizeFiles.get(filename);
const originalFile = localizeFiles.get(filename);
assert(originalFile !== undefined, 'Localize file must exist: ' + filename);

const fileResult = fileResults.get(filename);
Expand All @@ -396,7 +407,7 @@ export class I18nInliner {
outputFiles.push(originalFile.clone());
}

const originalMap = this.#localizeFiles.get(filename + '.map');
const originalMap = localizeMaps.get(filename);
if (fileResult.map !== undefined) {
outputFiles.push(createOutputFile(filename + '.map', fileResult.map, type));
} else if (originalMap !== undefined) {
Expand All @@ -414,7 +425,7 @@ export class I18nInliner {
}

// Include cloned unmodified files for every locale
outputFiles.push(...this.#unmodifiedFiles.map((file) => file.clone()));
outputFiles.push(...unmodifiedFiles.map((file) => file.clone()));

resultsByLocale.set(locale, {
outputFiles,
Expand All @@ -427,6 +438,8 @@ export class I18nInliner {
}

async #processUncachedBatches(
localizeFiles: Map<string, BuildOutputFile>,
localizeMaps: Map<string, BuildOutputFile>,
uncachedByFile: Map<string, UncachedLocaleEntry[]>,
fileResultsByLocale: Map<string, Map<string, TransformedFileResult>>,
activeLocales?: string[],
Expand All @@ -438,7 +451,7 @@ export class I18nInliner {
// Extract file data and identify the heaviest file size in a single pass
let maxFileSize = 0;
const sortedFiles = Array.from(uncachedByFile, ([filename, entries]) => {
const codeFile = this.#localizeFiles.get(filename);
const codeFile = localizeFiles.get(filename);
assert(codeFile !== undefined, 'Localize file must exist: ' + filename);
const fileSize = codeFile.contents.byteLength;
if (fileSize > maxFileSize) {
Expand All @@ -456,7 +469,7 @@ export class I18nInliner {
const workerTasks: Promise<void>[] = [];

for (const { filename, entries, codeFile, fileSize } of sortedFiles) {
const mapFile = this.#localizeFiles.get(filename + '.map');
const mapFile = localizeMaps.get(filename);
const codeBlob = new Blob([codeFile.contents]);
const mapBlob = mapFile ? new Blob([mapFile.contents]) : undefined;

Expand Down Expand Up @@ -548,20 +561,21 @@ export class I18nInliner {
}

/**
* Performs inlining of translations for the provided locale and translations. The files that
* are processed originate from the files passed to the class constructor and filter by presence
* of the localize function keyword.
* Performs inlining of translations for the provided locale and translations.
*
* @param files The build output files to transform.
* @param locale The string representing the locale to inline.
* @param translation The translation messages to use when inlining.
* @param translationIntegrity An optional integrity value for the translation messages to use for caching.
* @returns A promise that resolves to an array of OutputFiles representing a translated result.
*/
async inlineForLocale(
files: Iterable<BuildOutputFile>,
locale: string,
translation: Record<string, ɵParsedTranslation> | undefined,
translationIntegrity?: string,
): Promise<LocaleInlineResult> {
const results = await this.inlineAll([{ locale, translation, translationIntegrity }]);
const results = await this.inlineAll(files, [{ locale, translation, translationIntegrity }]);
const result = results.get(locale);
assert(result !== undefined, `Result for locale '${locale}' should be present.`);

Expand Down
Loading
Loading