@adminforth/i18n 1.0.18-next.5 → 1.0.18-next.7

package/dist/index.js

@@ -13,6 +13,9 @@ import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import { AsyncQueue } from '@sapphire/async-queue';
+console.log = (...args) => {
+    process.stdout.write(args.join(" ") + "\n");
+};
 const processFrontendMessagesQueue = new AsyncQueue();
 const SLAVIC_PLURAL_EXAMPLES = {
     uk: 'яблук | Яблуко | Яблука | Яблук', // zero | singular | 2-4 | 5+
@@ -288,7 +291,7 @@ export default class I18N extends AdminForthPlugin {
                                 return { ok: false, error: e.message };
                             }
                         }
-                        process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', selectedIds);
+                        process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', translatedCount);
                         this.updateUntranslatedMenuBadge();
                         return {
                             ok: true,
@@ -325,6 +328,77 @@ export default class I18N extends AdminForthPlugin {
             });
         });
     }
+    translateToLang(langIsoCode_1, strings_1) {
+        return __awaiter(this, arguments, void 0, function* (langIsoCode, strings, plurals = false, translations, updateStrings = {}) {
+            const maxKeysInOneReq = 10;
+            if (strings.length === 0) {
+                return [];
+            }
+            if (strings.length > maxKeysInOneReq) {
+                let totalTranslated = [];
+                for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
+                    const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
+                    process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
+                    const madeKeys = yield this.translateToLang(langIsoCode, slicedStrings, plurals, translations, updateStrings);
+                    totalTranslated = totalTranslated.concat(madeKeys);
+                }
+                return totalTranslated;
+            }
+            const lang = langIsoCode;
+            const requestSlavicPlurals = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang) && plurals;
+            const prompt = `
+I need to translate strings in JSON to ${lang} language from English for my web app.
+${requestSlavicPlurals ? `You should provide 4 translations (in format zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
+Keep keys, as is, write translation into values! Here are the strings:
+
+\`\`\`json
+${JSON.stringify(strings.reduce((acc, s) => {
+                acc[s.en_string] = '';
+                return acc;
+            }, {}), null, 2)}
+\`\`\`
+`;
+            // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
+            // call OpenAI
+            const resp = yield this.options.completeAdapter.complete(prompt, [], 300);
+            // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
+            if (resp.error) {
+                throw new AiTranslateError(resp.error);
+            }
+            // parse response like
+            // Here are the translations for the strings you provided:
+            // ```json
+            // [{"live": "canlı"}, {"Table Games": "Masa Oyunları"}]
+            // ```
+            let res;
+            try {
+                res = resp.content.split("```json")[1].split("```")[0];
+            }
+            catch (e) {
+                console.error('error in parsing OpenAI', resp);
+                throw new AiTranslateError('Error in parsing OpenAI response');
+            }
+            res = JSON.parse(res);
+            for (const [enStr, translatedStr] of Object.entries(res)) {
+                const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
+                // might be several with same en_string
+                for (const translation of translationsTargeted) {
+                    //translation[this.trFieldNames[lang]] = translatedStr;
+                    // process.env.HEAVY_DEBUG && console.log(`🪲translated to ${lang} ${translation.en_string}, ${translatedStr}`)
+                    if (!updateStrings[translation[this.primaryKeyFieldName]]) {
+                        updateStrings[translation[this.primaryKeyFieldName]] = {
+                            updates: {},
+                            translatedStr,
+                            category: translation[this.options.categoryFieldName],
+                            strId: translation[this.primaryKeyFieldName],
+                        };
+                    }
+                    updateStrings[translation[this.primaryKeyFieldName]].updates[this.trFieldNames[lang]] = translatedStr;
+                }
+            }
+            return Object.keys(updateStrings);
+        });
+    }
     // returns translated count
     bulkTranslate(_a) {
         return __awaiter(this, arguments, void 0, function* ({ selectedIds }) {
@@ -349,89 +423,22 @@ export default class I18N extends AdminForthPlugin {
             }
             const maxKeysInOneReq = 10;
             const updateStrings = {};
-            const translateToLang = (langIsoCode_1, strings_1, ...args_1) => __awaiter(this, [langIsoCode_1, strings_1, ...args_1], void 0, function* (langIsoCode, strings, plurals = false) {
-                if (strings.length === 0) {
-                    return [];
-                }
-                if (strings.length > maxKeysInOneReq) {
-                    let totalTranslated = [];
-                    for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
-                        const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
-                        process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
-                        const madeKeys = yield translateToLang(langIsoCode, slicedStrings, plurals);
-                        totalTranslated = totalTranslated.concat(madeKeys);
-                    }
-                    return totalTranslated;
-                }
-                const lang = langIsoCode;
-                const requestSlavicPlurals = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang) && plurals;
-                const prompt = `
-I need to translate strings in JSON to ${lang} language from English for my web app.
-${requestSlavicPlurals ? `You should provide 4 translations (in format zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
-Keep keys, as is, write translation into values! Here are the strings:
-
-\`\`\`json
-${JSON.stringify(strings.reduce((acc, s) => {
-                    acc[s.en_string] = '';
-                    return acc;
-                }, {}), null, 2)}
-\`\`\`
-`;
-                // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
-                // call OpenAI
-                const resp = yield this.options.completeAdapter.complete(prompt, [], 300);
-                // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
-                if (resp.error) {
-                    throw new AiTranslateError(resp.error);
-                }
-                // parse response like
-                // Here are the translations for the strings you provided:
-                // ```json
-                // [{"live": "canlı"}, {"Table Games": "Masa Oyunları"}]
-                // ```
-                let res;
-                try {
-                    res = resp.content.split("```json")[1].split("```")[0];
-                }
-                catch (e) {
-                    console.error('error in parsing OpenAI', resp);
-                    throw new AiTranslateError('Error in parsing OpenAI response');
-                }
-                res = JSON.parse(res);
-                for (const [enStr, translatedStr] of Object.entries(res)) {
-                    const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
-                    // might be several with same en_string
-                    for (const translation of translationsTargeted) {
-                        //translation[this.trFieldNames[lang]] = translatedStr;
-                        // process.env.HEAVY_DEBUG && console.log(`🪲translated to ${lang} ${translation.en_string}, ${translatedStr}`)
-                        if (!updateStrings[translation[this.primaryKeyFieldName]]) {
-                            updateStrings[translation[this.primaryKeyFieldName]] = {
-                                updates: {},
-                                translatedStr,
-                                category: translation[this.options.categoryFieldName],
-                                strId: translation[this.primaryKeyFieldName],
-                            };
-                        }
-                        updateStrings[translation[this.primaryKeyFieldName]].updates[this.trFieldNames[lang]] = translatedStr;
-                    }
-                }
-                return Object.keys(updateStrings);
-            });
             const langsInvolved = new Set(Object.keys(needToTranslateByLang));
             let totalTranslated = [];
+            process.env.HEAVY_DEBUG && console.log(' 🐛starting Promise.all Object.entries(needToTranslateByLang)');
             yield Promise.all(Object.entries(needToTranslateByLang).map((_b) => __awaiter(this, [_b], void 0, function* ([lang, strings]) {
                 // first translate without plurals
                 const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
                 process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals started ${stringsWithoutPlurals.length}`);
-                const noPluralKeys = yield translateToLang(lang, stringsWithoutPlurals, false);
+                const noPluralKeys = yield this.translateToLang(lang, stringsWithoutPlurals, false, translations, updateStrings);
                 process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals finished`);
                 const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
                 process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals started ${stringsWithPlurals.length}`);
-                const pluralKeys = yield translateToLang(lang, stringsWithPlurals, true);
+                const pluralKeys = yield this.translateToLang(lang, stringsWithPlurals, true, translations, updateStrings);
                 process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
                 totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
             })));
-            process.env.HEAVY_DEBUG && console.log('updateStrings were formed', totalTranslated);
+            process.env.HEAVY_DEBUG && console.log('✅ updateStrings were formed', (new Set(totalTranslated)));
             yield Promise.all(Object.entries(updateStrings).map((_c) => __awaiter(this, [_c], void 0, function* ([_, { updates, strId }]) {
                 // because this will translate all languages, we can set completedLangs to all languages
                 const futureCompletedFieldValue = this.fullCompleatedFieldValue;

package/index.ts

@@ -7,6 +7,11 @@ import fs from 'fs-extra';
 import chokidar from 'chokidar';
 import  { AsyncQueue } from '@sapphire/async-queue';
 
+
+console.log = (...args) => {
+  process.stdout.write(args.join(" ") + "\n");
+};
+
 const processFrontendMessagesQueue = new AsyncQueue();
 
 const SLAVIC_PLURAL_EXAMPLES = {
@@ -329,7 +334,7 @@ export default class I18N extends AdminForthPlugin {
                 return { ok: false, error: e.message };
               }
             }
-            process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', selectedIds);
+            process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', translatedCount);
             this.updateUntranslatedMenuBadge();
             return { 
               ok: true, 
@@ -367,6 +372,101 @@ export default class I18N extends AdminForthPlugin {
     });
   }
 
+  async translateToLang (
+      langIsoCode: LanguageCode, 
+      strings: { en_string: string, category: string }[], 
+      plurals=false,
+      translations: any[],
+      updateStrings: Record<string, { updates: any, category: string, strId: string, translatedStr: string }> = {}
+  ): Promise<string[]> {
+    const maxKeysInOneReq = 10;
+    if (strings.length === 0) {
+      return [];
+    }
+
+    if (strings.length > maxKeysInOneReq) {
+      let totalTranslated = [];
+      for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
+        const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
+        process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
+        const madeKeys = await this.translateToLang(langIsoCode, slicedStrings, plurals, translations, updateStrings);
+        totalTranslated = totalTranslated.concat(madeKeys);
+      }
+      return totalTranslated;
+    }
+    const lang = langIsoCode;
+
+    const requestSlavicPlurals = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang) && plurals;
+
+    const prompt = `
+I need to translate strings in JSON to ${lang} language from English for my web app.
+${requestSlavicPlurals ? `You should provide 4 translations (in format zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
+Keep keys, as is, write translation into values! Here are the strings:
+
+\`\`\`json
+${
+JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object => {
+  acc[s.en_string] = '';
+  return acc;
+}, {}), null, 2)
+}
+\`\`\`
+`;
+
+    // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
+
+    // call OpenAI
+    const resp = await this.options.completeAdapter.complete(
+      prompt,
+      [],
+      300,
+    );
+
+    // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
+
+    if (resp.error) {
+      throw new AiTranslateError(resp.error);
+    }
+
+    // parse response like
+    // Here are the translations for the strings you provided:
+    // ```json
+    // [{"live": "canlı"}, {"Table Games": "Masa Oyunları"}]
+    // ```
+    let res;
+    try {
+      res = resp.content.split("```json")[1].split("```")[0];
+    } catch (e) {
+      console.error('error in parsing OpenAI', resp);
+      throw new AiTranslateError('Error in parsing OpenAI response');
+    }
+    res = JSON.parse(res);
+
+
+    for (const [enStr, translatedStr] of Object.entries(res) as [string, string][]) {
+      const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
+      // might be several with same en_string
+      for (const translation of translationsTargeted) {
+        //translation[this.trFieldNames[lang]] = translatedStr;
+        // process.env.HEAVY_DEBUG && console.log(`🪲translated to ${lang} ${translation.en_string}, ${translatedStr}`)
+        if (!updateStrings[translation[this.primaryKeyFieldName]]) {
+
+          updateStrings[translation[this.primaryKeyFieldName]] = {
+            updates: {},
+            translatedStr,
+            category: translation[this.options.categoryFieldName],
+            strId: translation[this.primaryKeyFieldName],
+          };
+        }
+        updateStrings[
+          translation[this.primaryKeyFieldName]
+        ].updates[this.trFieldNames[lang]] = translatedStr;
+      }
+    }
+
+    return Object.keys(updateStrings);
+  }
+
   // returns translated count
   async bulkTranslate({ selectedIds }: { selectedIds: string[] }): Promise<number> {
 
@@ -409,115 +509,34 @@ export default class I18N extends AdminForthPlugin {
       translatedStr: string
      }> = {};
 
-    const translateToLang = async (langIsoCode: LanguageCode, strings: { en_string: string, category: string }[], plurals=false): Promise<string[]> => {
-      if (strings.length === 0) {
-        return [];
-      }
-
-      if (strings.length > maxKeysInOneReq) {
-        let totalTranslated = [];
-        for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
-          const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
-          process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
-          const madeKeys = await translateToLang(langIsoCode, slicedStrings, plurals);
-          totalTranslated = totalTranslated.concat(madeKeys);
-        }
-        return totalTranslated;
-      }
-      const lang = langIsoCode;
-
-      const requestSlavicPlurals = Object.keys(SLAVIC_PLURAL_EXAMPLES).includes(lang) && plurals;
-
-      const prompt = `
-I need to translate strings in JSON to ${lang} language from English for my web app.
-${requestSlavicPlurals ? `You should provide 4 translations (in format zero | singular | 2-4 | 5+) e.g. ${SLAVIC_PLURAL_EXAMPLES[lang]}` : ''}
-Keep keys, as is, write translation into values! Here are the strings:
-
-\`\`\`json
-${
-  JSON.stringify(strings.reduce((acc: object, s: { en_string: string }): object => {
-    acc[s.en_string] = '';
-    return acc;
-  }, {}), null, 2)
-}
-\`\`\`
-`;
-
-      // process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
-
-      // call OpenAI
-      const resp = await this.options.completeAdapter.complete(
-        prompt,
-        [],
-        300,
-      );
-
-      // process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
-
-      if (resp.error) {
-        throw new AiTranslateError(resp.error);
-      }
-
-      // parse response like
-      // Here are the translations for the strings you provided:
-      // ```json
-      // [{"live": "canlı"}, {"Table Games": "Masa Oyunları"}]
-      // ```
-      let res;
-      try {
-        res = resp.content.split("```json")[1].split("```")[0];
-      } catch (e) {
-        console.error('error in parsing OpenAI', resp);
-        throw new AiTranslateError('Error in parsing OpenAI response');
-      }
-      res = JSON.parse(res);
-
-
-      for (const [enStr, translatedStr] of Object.entries(res) as [string, string][]) {
-        const translationsTargeted = translations.filter(t => t[this.enFieldName] === enStr);
-        // might be several with same en_string
-        for (const translation of translationsTargeted) {
-          //translation[this.trFieldNames[lang]] = translatedStr;
-          // process.env.HEAVY_DEBUG && console.log(`🪲translated to ${lang} ${translation.en_string}, ${translatedStr}`)
-          if (!updateStrings[translation[this.primaryKeyFieldName]]) {
-
-            updateStrings[translation[this.primaryKeyFieldName]] = {
-              updates: {},
-              translatedStr,
-              category: translation[this.options.categoryFieldName],
-              strId: translation[this.primaryKeyFieldName],
-            };
-          }
-          updateStrings[
-            translation[this.primaryKeyFieldName]
-          ].updates[this.trFieldNames[lang]] = translatedStr;
-        }
-      }
-
-      return Object.keys(updateStrings);
-    }
 
     const langsInvolved = new Set(Object.keys(needToTranslateByLang));
 
     let totalTranslated = [];
-    await Promise.all(Object.entries(needToTranslateByLang).map(async ([lang, strings]: [LanguageCode, { en_string: string, category: string }[]]) => {
-      // first translate without plurals
-      const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
-      process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals started ${stringsWithoutPlurals.length}`);
-      const noPluralKeys = await translateToLang(lang, stringsWithoutPlurals, false);
-      process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals finished`);
+    process.env.HEAVY_DEBUG && console.log(' 🐛starting Promise.all Object.entries(needToTranslateByLang)');
 
+    await Promise.all(
+      Object.entries(needToTranslateByLang).map(
+        async ([lang, strings]: [LanguageCode, { en_string: string, category: string }[]]) => {
+          // first translate without plurals
+          const stringsWithoutPlurals = strings.filter(s => !s.en_string.includes('|'));
+          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals started ${stringsWithoutPlurals.length}`);
+          const noPluralKeys = await this.translateToLang(lang, stringsWithoutPlurals, false, translations, updateStrings);
+          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} noplurals finished`);
 
-      const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
 
-      process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals started ${stringsWithPlurals.length}`);
-      const pluralKeys = await translateToLang(lang, stringsWithPlurals, true);
-      process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
+          const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
 
-      totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
-    }));
+          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals started ${stringsWithPlurals.length}`);
+          const pluralKeys = await this.translateToLang(lang, stringsWithPlurals, true, translations, updateStrings);
+          process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
+
+          totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
+        }
+      )
+    );
 
-    process.env.HEAVY_DEBUG && console.log('updateStrings were formed', totalTranslated);
+    process.env.HEAVY_DEBUG && console.log('✅ updateStrings were formed', (new Set(totalTranslated)));
 
     await Promise.all(
       Object.entries(updateStrings).map(

package/package.json

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