refactor(@angular/build): add typed helper for worker pool execution in i18n inliner

Add a strongly-typed private helper method #runWorkerTask to I18nInliner to encapsulate worker pool execution.

The helper maps worker task names ('inlineFileBatch' and 'inlineCode') to their exact request and result types exported from the worker module. This eliminates manual type assertions and untyped return values while centralizing worker pool task dispatch.

Author: clydin

packages/angular/build/src/tools/esbuild/i18n-inliner-worker.ts

@@ -21,7 +21,7 @@ import { createSharedTranslationProxy } from './i18n-translation-reader';
 /**
  * The options passed to the inliner for each code request
  */
-interface InlineCodeRequest {
+export interface InlineCodeRequest {
   /**
    * The code that should be processed.
    */
@@ -45,10 +45,18 @@ interface InlineCodeRequest {
   translation?: Blob | SharedArrayBuffer;
 }
 
+/**
+ * The response returned from a code request.
+ */
+export interface InlineCodeResult {
+  output: string;
+  messages: { type: 'error' | 'warning'; message: string }[];
+}
+
 /**
  * The options passed to the inliner for a batch file request
  */
-interface InlineFileBatchRequest {
+export interface InlineFileBatchRequest {
   /**
    * The filename that should be processed.
    */
@@ -91,7 +99,7 @@ interface InlineFileBatchRequest {
 /**
  * The result for a single locale within a batch file request.
  */
-interface InlineLocaleResult {
+export interface InlineLocaleResult {
   locale: string;
   code?: string;
   map?: string;
@@ -101,7 +109,7 @@ interface InlineLocaleResult {
 /**
  * The response returned from a batch file request.
  */
-type InlineFileBatchResult =
+export type InlineFileBatchResult =
   | {
       file: string;
       unmodified: true;
@@ -292,7 +300,7 @@ export async function inlineFileBatch(
  * @param request An InlineRequest object representing the options for inlining
  * @returns An object containing the inlined code.
  */
-export async function inlineCode(request: InlineCodeRequest) {
+export async function inlineCode(request: InlineCodeRequest): Promise<InlineCodeResult> {
   const metadata = extractLocalizeMetadata(request.filename, request.code);
   const result = await inlineLocalize(
     request.code,

packages/angular/build/src/tools/esbuild/i18n-inliner.ts

@@ -14,8 +14,25 @@ import { calculateHash, createContentHash, initializeHash } from '../../utils/ha
 import { WorkerPool } from '../../utils/worker-pool';
 import { type BuildOutputFile, BuildOutputFileType, createOutputFile } from './bundler-files';
 import { type Cache, type PersistentCacheStore, createPersistentCacheStore } from './cache';
+import type {
+  InlineCodeRequest,
+  InlineCodeResult,
+  InlineFileBatchRequest,
+  InlineFileBatchResult,
+} from './i18n-inliner-worker';
 import { encodeTranslationToBuffer } from './i18n-translation-encoder';
 
+interface WorkerTaskMap {
+  inlineFileBatch: {
+    request: InlineFileBatchRequest;
+    result: InlineFileBatchResult;
+  };
+  inlineCode: {
+    request: InlineCodeRequest;
+    result: InlineCodeResult;
+  };
+}
+
 /**
  * A keyword used to indicate if a JavaScript file may require inlining of translations.
  * This keyword is used to avoid processing files that would not otherwise need i18n processing.
@@ -492,28 +509,15 @@ export class I18nInliner {
       for (let i = 0; i < entries.length; i += localesPerBatch) {
         const batchEntries = entries.slice(i, i + localesPerBatch);
         const task = (async () => {
-          const batchResult = (await this.#workerPool.run(
-            {
-              filename,
-              code: codeBlob,
-              map: mapBlob,
-              locales: new Map(batchEntries.map((e) => [e.locale, e.translation])),
-              ephemeral,
-              activeLocales,
-              generation,
-            },
-            { name: 'inlineFileBatch' },
-          )) as
-            | {
-                file: string;
-                unmodified: true;
-                messages: { type: 'error' | 'warning'; message: string }[];
-              }
-            | {
-                file: string;
-                unmodified?: false;
-                results: Array<TransformedFileResult & { locale: string }>;
-              };
+          const batchResult = await this.#runWorkerTask('inlineFileBatch', {
+            filename,
+            code: codeBlob,
+            map: mapBlob,
+            locales: new Map(batchEntries.map((e) => [e.locale, e.translation])),
+            ephemeral,
+            activeLocales,
+            generation,
+          });
 
           if (batchResult.unmodified) {
             const unmodifiedResult: TransformedFileResult = {
@@ -535,19 +539,18 @@ export class I18nInliner {
             for (const res of batchResult.results) {
               const matchingEntry = batchEntries.find((e) => e.locale === res.locale);
               const cacheKey = matchingEntry?.cacheKey;
+              const fileResult: TransformedFileResult = {
+                file: filename,
+                code: res.code,
+                map: res.map,
+                messages: res.messages,
+              };
 
               if (this.#transformedFileCache && cacheKey) {
-                cachePromises.push(
-                  this.#transformedFileCache.put(cacheKey, {
-                    file: filename,
-                    code: res.code,
-                    map: res.map,
-                    messages: res.messages,
-                  }),
-                );
+                cachePromises.push(this.#transformedFileCache.put(cacheKey, fileResult));
               }
 
-              fileResultsByLocale.get(res.locale)?.set(filename, res);
+              fileResultsByLocale.get(res.locale)?.set(filename, fileResult);
             }
             await Promise.allSettled(cachePromises);
           }
@@ -560,6 +563,13 @@ export class I18nInliner {
     await Promise.all(workerTasks);
   }
 
+  #runWorkerTask<T extends keyof WorkerTaskMap>(
+    name: T,
+    request: WorkerTaskMap[T]['request'],
+  ): Promise<WorkerTaskMap[T]['result']> {
+    return this.#workerPool.run(request, { name }) as Promise<WorkerTaskMap[T]['result']>;
+  }
+
   /**
    * Performs inlining of translations for the provided locale and translations.
    *
@@ -599,19 +609,16 @@ export class I18nInliner {
       };
     }
 
-    const { output, messages } = await this.#workerPool.run(
-      {
-        code: templateCode,
-        filename: templateId,
-        locale,
-        translation: await serializeTranslation(
-          translation,
-          translationIntegrity,
-          this.#translationCache,
-        ),
-      },
-      { name: 'inlineCode' },
-    );
+    const { output, messages } = await this.#runWorkerTask('inlineCode', {
+      code: templateCode,
+      filename: templateId,
+      locale,
+      translation: await serializeTranslation(
+        translation,
+        translationIntegrity,
+        this.#translationCache,
+      ),
+    });
 
     const errors: string[] = [];
     const warnings: string[] = [];