@adminforth/i18n 2.0.16 → 2.0.17

package/dist/index.js

@@ -450,14 +450,21 @@ export default class I18nPlugin extends AdminForthPlugin {
         return __awaiter(this, arguments, void 0, function* (prompt, strings, translations, updateStrings = {}, lang, failedToTranslate, needToTranslateByLang = {}, jobId, promptCost) {
             // return [];
             const jsonSchemaProperties = {};
+            const schemaKeyToEnString = new Map();
+            const enStringToSchemaKey = new Map();
             strings.forEach(s => {
-                jsonSchemaProperties[s.en_string] = {
+                if (!enStringToSchemaKey.has(s.en_string)) {
+                    enStringToSchemaKey.set(s.en_string, s.schemaKey || `text_${enStringToSchemaKey.size}`);
+                }
+            });
+            enStringToSchemaKey.forEach((schemaKey, enString) => {
+                schemaKeyToEnString.set(schemaKey, enString);
+                jsonSchemaProperties[schemaKey] = {
                     type: 'string',
                     minLength: 1,
                 };
             });
-            const jsonSchemaRequired = strings.map(s => s.en_string);
-            const dedupRequired = Array.from(new Set(jsonSchemaRequired));
+            const dedupRequired = Array.from(schemaKeyToEnString.keys());
             // call OpenAI
             const resp = yield this.options.completeAdapter.complete({
                 content: prompt,
@@ -513,7 +520,8 @@ export default class I18nPlugin extends AdminForthPlugin {
                 });
                 return null;
             }
-            for (const [enStr, translatedStr] of Object.entries(res)) {
+            for (const [schemaKey, translatedStr] of Object.entries(res)) {
+                const enStr = schemaKeyToEnString.get(schemaKey) || schemaKey;
                 const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
                 // might be several with same en_string
                 for (const translation of translationsTargeted) {
@@ -590,7 +598,7 @@ export default class I18nPlugin extends AdminForthPlugin {
       
       ${region ? `Use the regional conventions for ${langCode} (region ${region}), including spelling, punctuation, and formatting.` : ''}
       ${requestSlavicPlurals ? `You should provide 4 slavic forms (in format "zero count | singular count | 2-4 | 5+") e.g. "apple | apples" should become "${SLAVIC_PLURAL_EXAMPLES[lang]}"` : ''}
-      Keep keys, as is, write translation into values! If keys have variables (in curly brackets), then translated strings should have them as well (variables itself should not be translated). Here are the strings:
+      JSON keys are internal identifiers. Keep keys as is and write translations into values. If values have variables (in curly brackets), then translated strings should have them as well (variables itself should not be translated). Here are the strings:
       \`\`\`json
       {
 
@@ -639,15 +647,20 @@ export default class I18nPlugin extends AdminForthPlugin {
                 const promptToGenerate = basePrompt.split(`\`\`\`json`)[0] +
                     `\`\`\`json
         {
-          ${stringBanch.map(s => `"${s}": ""`).join(",\n")}
+          ${Array.from(new Set(stringBanch))
+                        .map((s, index) => `"text_${index}": ${JSON.stringify(s)}`)
+                        .join(",\n")}
         }
         \`\`\``;
                 const stringBanchCopy = [...stringBanch];
+                const schemaKeyByEnString = Object.fromEntries(Array.from(new Set(stringBanch)).map((s, index) => [s, `text_${index}`]));
                 generationTasksInitialData.push({
                     state: {
                         taskName: `Translate ${strings.length} strings`,
                         prompt: promptToGenerate,
-                        strings: strings.filter(s => stringBanchCopy.includes(s.en_string)),
+                        strings: strings
+                            .filter(s => stringBanchCopy.includes(s.en_string))
+                            .map(s => (Object.assign(Object.assign({}, s), { schemaKey: schemaKeyByEnString[s.en_string] }))),
                         translations: translations.filter(t => stringBanchCopy.includes(t.en_string)),
                         updateStrings,
                         lang,

package/index.ts

@@ -514,7 +514,7 @@ export default class I18nPlugin extends AdminForthPlugin {
 
   async generateAndSaveBunch (
     prompt: string,
-    strings: { en_string: string, category: string }[], 
+    strings: { en_string: string, category: string, schemaKey?: string }[], 
     translations: any[],
     updateStrings: Record<string, { updates: any, category: string, strId: string, enStr: string, translatedStr: string }> = {},
     lang: string,
@@ -526,15 +526,22 @@ export default class I18nPlugin extends AdminForthPlugin {
 
     // return [];
     const jsonSchemaProperties = {};
+    const schemaKeyToEnString = new Map<string, string>();
+    const enStringToSchemaKey = new Map<string, string>();
     strings.forEach(s => {
-      jsonSchemaProperties[s.en_string] = { 
+      if (!enStringToSchemaKey.has(s.en_string)) {
+        enStringToSchemaKey.set(s.en_string, s.schemaKey || `text_${enStringToSchemaKey.size}`);
+      }
+    });
+    enStringToSchemaKey.forEach((schemaKey, enString) => {
+      schemaKeyToEnString.set(schemaKey, enString);
+      jsonSchemaProperties[schemaKey] = { 
         type: 'string',
         minLength: 1,
       };
     });
 
-    const jsonSchemaRequired = strings.map(s => s.en_string);
-    const dedupRequired = Array.from(new Set(jsonSchemaRequired));
+    const dedupRequired = Array.from(schemaKeyToEnString.keys());
     // call OpenAI
     const resp = await this.options.completeAdapter.complete({
       content: prompt,
@@ -597,7 +604,8 @@ export default class I18nPlugin extends AdminForthPlugin {
     }
 
 
-    for (const [enStr, translatedStr] of Object.entries(res) as [string, string][]) {
+    for (const [schemaKey, translatedStr] of Object.entries(res) as [string, string][]) {
+      const enStr = schemaKeyToEnString.get(schemaKey) || schemaKey;
       const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
       // might be several with same en_string
       for (const translation of translationsTargeted) {
@@ -705,7 +713,7 @@ export default class I18nPlugin extends AdminForthPlugin {
       
       ${region ? `Use the regional conventions for ${langCode} (region ${region}), including spelling, punctuation, and formatting.` : ''}
       ${requestSlavicPlurals ? `You should provide 4 slavic forms (in format "zero count | singular count | 2-4 | 5+") e.g. "apple | apples" should become "${SLAVIC_PLURAL_EXAMPLES[lang]}"` : ''}
-      Keep keys, as is, write translation into values! If keys have variables (in curly brackets), then translated strings should have them as well (variables itself should not be translated). Here are the strings:
+      JSON keys are internal identifiers. Keep keys as is and write translations into values. If values have variables (in curly brackets), then translated strings should have them as well (variables itself should not be translated). Here are the strings:
       \`\`\`json
       {
 
@@ -759,17 +767,27 @@ export default class I18nPlugin extends AdminForthPlugin {
         `\`\`\`json
         {
           ${
-            stringBanch.map(s => `"${s}": ""`).join(",\n")
+            Array.from(new Set(stringBanch))
+              .map((s, index) => `"text_${index}": ${JSON.stringify(s)}`)
+              .join(",\n")
           }
         }
         \`\`\``;
       const stringBanchCopy = [...stringBanch];
+      const schemaKeyByEnString = Object.fromEntries(
+        Array.from(new Set(stringBanch)).map((s, index) => [s, `text_${index}`])
+      );
       generationTasksInitialData.push(
         {
           state: {
             taskName: `Translate ${strings.length} strings`,
             prompt: promptToGenerate,
-            strings: strings.filter(s => stringBanchCopy.includes(s.en_string)),
+            strings: strings
+              .filter(s => stringBanchCopy.includes(s.en_string))
+              .map(s => ({
+                ...s,
+                schemaKey: schemaKeyByEnString[s.en_string],
+              })),
             translations: translations.filter(t => stringBanchCopy.includes(t.en_string)),
             updateStrings,
             lang,
@@ -1361,4 +1379,4 @@ export default class I18nPlugin extends AdminForthPlugin {
 
   }
 
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",