@adminforth/i18n 1.0.14 → 1.0.17-next.0

package/dist/index.js

@@ -277,19 +277,23 @@ export default class I18N extends AdminForthPlugin {
                     confirm: 'Are you sure you want to translate selected items?',
                     state: 'selected',
                     action: (_j) => __awaiter(this, [_j], void 0, function* ({ selectedIds, tr }) {
+                        let translatedCount = 0;
                         try {
-                            yield this.bulkTranslate({ selectedIds });
+                            translatedCount = yield this.bulkTranslate({ selectedIds });
                         }
                         catch (e) {
                             if (e instanceof AiTranslateError) {
+                                process.env.HEAVY_DEBUG && console.error('🪲⛔ bulkTranslate error', e);
                                 return { ok: false, error: e.message };
                             }
                         }
-                        console.log('🪲bulkTranslate done', selectedIds);
+                        process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', selectedIds);
                         this.updateUntranslatedMenuBadge();
                         return {
                             ok: true, error: undefined,
-                            successMessage: yield tr(`Translated {count} items`, 'backend', { count: selectedIds.length }),
+                            successMessage: yield tr(`Translated {count} items`, 'backend', {
+                                count: translatedCount,
+                            }),
                         };
                     })
                 });
@@ -351,7 +355,7 @@ export default class I18N extends AdminForthPlugin {
                     let totalTranslated = 0;
                     for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
                         const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
-                        console.log('🪲🔪slicedStrings ', slicedStrings);
+                        process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
                         totalTranslated += yield translateToLang(langIsoCode, slicedStrings, plurals);
                     }
                     return totalTranslated;
@@ -370,10 +374,10 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 }, {}), null, 2)}
 \`\`\`
 `;
-                process.env.HEAVY_DEBUG && console.log('llm prompt', prompt);
+                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);
+                process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
                 if (resp.error) {
                     throw new AiTranslateError(resp.error);
                 }
@@ -388,7 +392,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 }
                 catch (e) {
                     console.error('error in parsing OpenAI', resp);
-                    return;
+                    throw new AiTranslateError('Error in parsing OpenAI response');
                 }
                 res = JSON.parse(res);
                 for (const [enStr, translatedStr] of Object.entries(res)) {
@@ -408,7 +412,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                         updateStrings[translation[this.primaryKeyFieldName]].updates[this.trFieldNames[lang]] = translatedStr;
                     }
                 }
-                return res.length;
+                return Object.keys(updateStrings).length;
             });
             const langsInvolved = new Set(Object.keys(needToTranslateByLang));
             let totalTranslated = 0;

package/index.ts

@@ -318,18 +318,22 @@ export default class I18N extends AdminForthPlugin {
           confirm: 'Are you sure you want to translate selected items?',
           state: 'selected',
           action: async ({ selectedIds, tr }) => {
+            let translatedCount = 0;
             try {
-              await this.bulkTranslate({ selectedIds });
+              translatedCount = await this.bulkTranslate({ selectedIds });
             } catch (e) {
               if (e instanceof AiTranslateError) {
+                process.env.HEAVY_DEBUG && console.error('🪲⛔ bulkTranslate error', e);
                 return { ok: false, error: e.message };
               }
             }
-            console.log('🪲bulkTranslate done', selectedIds);
+            process.env.HEAVY_DEBUG && console.log('🪲bulkTranslate done', selectedIds);
             this.updateUntranslatedMenuBadge();
             return { 
               ok: true, error: undefined, 
-              successMessage: await tr(`Translated {count} items`, 'backend', {count: selectedIds.length}),
+              successMessage: await tr(`Translated {count} items`, 'backend', {
+                count: translatedCount,
+              }),
             };
           }
         }
@@ -411,7 +415,7 @@ export default class I18N extends AdminForthPlugin {
         let totalTranslated = 0;
         for (let i = 0; i < strings.length; i += maxKeysInOneReq) {
           const slicedStrings = strings.slice(i, i + maxKeysInOneReq);
-          console.log('🪲🔪slicedStrings ', slicedStrings);
+          process.env.HEAVY_DEBUG && console.log('🪲🔪slicedStrings len', slicedStrings.length);
           totalTranslated += await translateToLang(langIsoCode, slicedStrings, plurals);
         }
         return totalTranslated;
@@ -435,7 +439,7 @@ ${
 \`\`\`
 `;
 
-      process.env.HEAVY_DEBUG && console.log('llm prompt', prompt);
+      process.env.HEAVY_DEBUG && console.log('🧠 llm prompt', prompt);
 
       // call OpenAI
       const resp = await this.options.completeAdapter.complete(
@@ -444,7 +448,7 @@ ${
         300,
       );
 
-      process.env.HEAVY_DEBUG && console.log('llm resp', resp);
+      process.env.HEAVY_DEBUG && console.log('🧠 llm resp', resp);
 
       if (resp.error) {
         throw new AiTranslateError(resp.error);
@@ -460,7 +464,7 @@ ${
         res = resp.content.split("```json")[1].split("```")[0];
       } catch (e) {
         console.error('error in parsing OpenAI', resp);
-        return;
+        throw new AiTranslateError('Error in parsing OpenAI response');
       }
       res = JSON.parse(res);
 
@@ -486,7 +490,7 @@ ${
         }
       }
 
-      return res.length;
+      return Object.keys(updateStrings).length;
     }
 
     const langsInvolved = new Set(Object.keys(needToTranslateByLang));

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.14",
+  "version": "1.0.17-next.0",
   "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",
+    "rollout-next": "npm run build && npm version prerelease --preid=next && npm publish --tag next",
     "prepare": "npm link adminforth"
   },
   "keywords": [],