refactor: apply translations by result identity, drop keys slice in batch

- applyTranslations(parsedPo, results): lookup by result.msgctxt and result.msgid
- clearFuzzyFromEntries(parsedPo, results): same; accept results with msgid/msgctxt
- PoEntryOutput: add optional msgctxt for lookup
- runTranslate: no batchKeys or keys.slice; pass batchResults only
- tests: update po.test.ts for new applyTranslations/clearFuzzyFromEntries signatures

Made-with: Cursor

Author: AlexMost

src/cli/runTranslate.ts

@@ -67,7 +67,7 @@ export async function runTranslate(
   try {
     const poContent = fs.readFileSync(poFilePath, 'utf8');
     const parsedPo = parsePoContent(poContent);
-    const { entries, keys } = getEntriesToTranslate(parsedPo, { includeFuzzy });
+    const { entries } = getEntriesToTranslate(parsedPo, { includeFuzzy });
 
     if (entries.length === 0) {
       console.log(`Nothing to translate in ${poFilePath}.`);
@@ -87,7 +87,6 @@ export async function runTranslate(
     }
     const options = { apiKey, sourceLanguage: sourceLang, formula, pluralSamples };
 
-    const allResults: Awaited<ReturnType<typeof translateStrings>> = [];
     for (let i = 0; i < entries.length; i += TRANSLATE_BATCH_SIZE) {
       const batch = entries.slice(i, i + TRANSLATE_BATCH_SIZE);
       const batchNum = Math.floor(i / TRANSLATE_BATCH_SIZE) + 1;
@@ -103,14 +102,13 @@ export async function runTranslate(
           console.log(`  ${r.msgid_plural} (plural) => ${r.msgstr.join(' | ')}`);
         }
       }
-      allResults.push(...batchResults);
+      applyTranslations(parsedPo, batchResults);
+      if (includeFuzzy) {
+        clearFuzzyFromEntries(parsedPo, batchResults);
+      }
+      fs.writeFileSync(poFilePath, compilePo(parsedPo));
     }
 
-    applyTranslations(parsedPo, keys, allResults);
-    if (includeFuzzy) {
-      clearFuzzyFromEntries(parsedPo, keys);
-    }
-    fs.writeFileSync(poFilePath, compilePo(parsedPo), undefined);
     return 0;
   } catch (error) {
     const apiMessage = getApiErrorMessage(error);

src/po.ts

@@ -115,19 +115,18 @@ export function getEntriesToTranslate(
 /**
  * Applies translation results into the parsed PO (mutates parsedPo.translations).
  * Singular results become one-element msgstr; plural results stay as string[].
+ * Lookup is by result.msgctxt (default '') and result.msgid.
  */
 export function applyTranslations(
   parsedPo: GetTextTranslations,
-  keys: PoEntryKey[],
   results: PoEntryOutput[],
 ): void {
-  for (let i = 0; i < keys.length; i++) {
-    const key = keys[i];
-    const result = results[i];
+  for (const result of results) {
     if (result == null) continue;
-    const contextEntries = parsedPo.translations[key.context];
+    const context = result.msgctxt ?? '';
+    const contextEntries = parsedPo.translations[context];
     if (contextEntries == null) continue;
-    const entry = contextEntries[key.msgid];
+    const entry = contextEntries[result.msgid];
     if (entry == null) continue;
 
     if (typeof result.msgstr === 'string') {
@@ -139,14 +138,18 @@ export function applyTranslations(
 }
 
 /**
- * Removes the "fuzzy" flag from entries at the given keys (mutates parsedPo.translations).
- * Used after applying new translations so fuzzy entries are no longer marked fuzzy.
+ * Removes the "fuzzy" flag from entries corresponding to the given results (mutates parsedPo.translations).
+ * Lookup is by result.msgctxt (default '') and result.msgid.
  */
-export function clearFuzzyFromEntries(parsedPo: GetTextTranslations, keys: PoEntryKey[]): void {
-  for (const key of keys) {
-    const contextEntries = parsedPo.translations[key.context];
+export function clearFuzzyFromEntries(
+  parsedPo: GetTextTranslations,
+  results: Array<{ msgid: string; msgctxt?: string }>,
+): void {
+  for (const result of results) {
+    const context = result.msgctxt ?? '';
+    const contextEntries = parsedPo.translations[context];
     if (contextEntries == null) continue;
-    const entry = contextEntries[key.msgid];
+    const entry = contextEntries[result.msgid];
     if (entry == null || !entry.comments?.flag) continue;
 
     const newFlag = entry.comments.flag

src/translate.ts

@@ -246,8 +246,8 @@ export type PoEntryInput = {
 
 /** .po-style entry output: same shape as input with msgstr filled (string for singular, string[] for plural). */
 export type PoEntryOutput =
-  | { msgid: string; msgstr: string; msgid_plural?: undefined }
-  | { msgid: string; msgid_plural: string; msgstr: string[] };
+  | { msgid: string; msgstr: string; msgid_plural?: undefined; msgctxt?: string }
+  | { msgid: string; msgid_plural: string; msgstr: string[]; msgctxt?: string };
 
 export async function translateItems(
   items: TranslateItem[],

test/po.test.ts

@@ -152,15 +152,11 @@ msgstr[2] ""
       'utf8',
     ),
   );
-  const keys = [
-    { context: '', msgid: 'Hello' },
-    { context: '', msgid: 'Count' },
-  ];
   const results = [
     { msgid: 'Hello', msgstr: 'Привіт' },
     { msgid: 'Count', msgid_plural: 'Counts', msgstr: ['один', 'два', 'багато'] },
   ];
-  applyTranslations(parsed, keys, results);
+  applyTranslations(parsed, results);
   expect(parsed.translations['']['Hello'].msgstr).toEqual(['Привіт']);
   expect(parsed.translations['']['Count'].msgstr).toEqual(['один', 'два', 'багато']);
 });
@@ -179,7 +175,7 @@ msgstr ""
     ),
   );
   const before = parsed.translations['']['Hello'].msgstr.slice();
-  applyTranslations(parsed, [{ context: '', msgid: 'Hello' }], []);
+  applyTranslations(parsed, []);
   expect(parsed.translations['']['Hello'].msgstr).toEqual(before);
 });
 
@@ -221,7 +217,7 @@ msgstr ""
   expect(keys).toHaveLength(1);
   expect(keys[0]).toEqual({ context: '', msgid: 'Hello' });
 
-  applyTranslations(parsed, keys, [{ msgid: 'Hello', msgstr: 'Привіт' }]);
+  applyTranslations(parsed, [{ msgid: 'Hello', msgstr: 'Привіт', msgctxt: '' }]);
 
   expect(parsed.translations['auth']['Hello'].msgstr).toEqual(['Вітаємо']);
   expect(parsed.translations['']['Hello'].msgstr).toEqual(['Привіт']);
@@ -276,9 +272,9 @@ msgstr "Старий переклад"
   const parsed = parsePoContent(tempPo.poContent);
   expect(isEntryFuzzy(parsed.translations['']['Hello'])).toBe(true);
 
-  const keys = [{ context: '', msgid: 'Hello' }];
-  applyTranslations(parsed, keys, [{ msgid: 'Hello', msgstr: 'Новий переклад' }]);
-  clearFuzzyFromEntries(parsed, keys);
+  const results = [{ msgid: 'Hello', msgstr: 'Новий переклад' }];
+  applyTranslations(parsed, results);
+  clearFuzzyFromEntries(parsed, results);
 
   expect(parsed.translations['']['Hello'].msgstr).toEqual(['Новий переклад']);
   expect(isEntryFuzzy(parsed.translations['']['Hello'])).toBe(false);