@adminforth/i18n 1.0.17-next.0 → 1.0.18-next.2

package/dist/index.js

@@ -349,14 +349,15 @@ export default class I18N extends AdminForthPlugin {
             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 0;
+                    return [];
                 }
                 if (strings.length > maxKeysInOneReq) {
-                    let totalTranslated = 0;
+                    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);
-                        totalTranslated += yield translateToLang(langIsoCode, slicedStrings, plurals);
+                        const madeKeys = yield translateToLang(langIsoCode, slicedStrings, plurals);
+                        totalTranslated = totalTranslated.concat(madeKeys);
                     }
                     return totalTranslated;
                 }
@@ -412,16 +413,17 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                         updateStrings[translation[this.primaryKeyFieldName]].updates[this.trFieldNames[lang]] = translatedStr;
                     }
                 }
-                return Object.keys(updateStrings).length;
+                return Object.keys(updateStrings);
             });
             const langsInvolved = new Set(Object.keys(needToTranslateByLang));
-            let totalTranslated = 0;
+            let totalTranslated = [];
             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('|'));
-                totalTranslated += yield translateToLang(lang, stringsWithoutPlurals, false);
+                const noPluralKeys = yield translateToLang(lang, stringsWithoutPlurals, false);
                 const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
-                totalTranslated += yield translateToLang(lang, stringsWithPlurals, true);
+                const pluralKeys = yield translateToLang(lang, stringsWithPlurals, true);
+                totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
             })));
             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
@@ -434,7 +436,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                     this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
                 }
             }
-            return totalTranslated;
+            return new Set(totalTranslated).size;
         });
     }
     processExtractedMessages(adminforth, filePath) {

package/index.ts

@@ -406,17 +406,18 @@ export default class I18N extends AdminForthPlugin {
       translatedStr: string
      }> = {};
 
-    const translateToLang = async (langIsoCode: LanguageCode, strings: { en_string: string, category: string }[], plurals=false): Promise<number> => {
+    const translateToLang = async (langIsoCode: LanguageCode, strings: { en_string: string, category: string }[], plurals=false): Promise<string[]> => {
       if (strings.length === 0) {
-        return 0;
+        return [];
       }
 
       if (strings.length > maxKeysInOneReq) {
-        let totalTranslated = 0;
+        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);
-          totalTranslated += await translateToLang(langIsoCode, slicedStrings, plurals);
+          const madeKeys = await translateToLang(langIsoCode, slicedStrings, plurals);
+          totalTranslated = totalTranslated.concat(madeKeys);
         }
         return totalTranslated;
       }
@@ -490,19 +491,20 @@ ${
         }
       }
 
-      return Object.keys(updateStrings).length;
+      return Object.keys(updateStrings);
     }
 
     const langsInvolved = new Set(Object.keys(needToTranslateByLang));
 
-    let totalTranslated = 0;
+    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('|'));
-      totalTranslated += await translateToLang(lang, stringsWithoutPlurals, false);
+      const noPluralKeys = await translateToLang(lang, stringsWithoutPlurals, false);
 
       const stringsWithPlurals = strings.filter(s => s.en_string.includes('|'));
-      totalTranslated += await translateToLang(lang, stringsWithPlurals, true);
+      const pluralKeys = await translateToLang(lang, stringsWithPlurals, true);
+      totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
     }));    
 
     await Promise.all(
@@ -526,7 +528,7 @@ ${
       }
     }
 
-    return totalTranslated;
+    return new Set(totalTranslated).size;
 
   }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.17-next.0",
+  "version": "1.0.18-next.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/ && npm version patch",
-    "rollout": "npm run build && npm publish --access public",
+    "build": "tsc && rsync -av --exclude 'node_modules' custom dist/",
+    "rollout": "npm run build && npm version patch && npm publish --access public",
     "rollout-next": "npm run build && npm version prerelease --preid=next && npm publish --tag next",
     "prepare": "npm link adminforth"
   },