@adminforth/i18n 1.0.18-next.4 → 1.0.18-next.6

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,
@@ -419,6 +422,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             });
             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('|'));
@@ -431,7 +435,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 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', 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;
@@ -515,6 +519,9 @@ ${JSON.stringify(strings.reduce((acc, s) => {
     validateConfigAfterDiscover(adminforth, resourceConfig) {
         // optional method where you can safely check field types after database discovery was performed
         // ensure each trFieldName (apart from enFieldName) is nullable column of type string
+        if (this.options.completeAdapter) {
+            this.options.completeAdapter.validate();
+        }
         for (const lang of this.options.supportedLanguages) {
             if (lang === 'en') {
                 continue;

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, 
@@ -500,24 +505,30 @@ ${
     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 translateToLang(lang, stringsWithoutPlurals, false);
+          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 translateToLang(lang, stringsWithPlurals, true);
+          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', totalTranslated);
 
     await Promise.all(
       Object.entries(updateStrings).map(
@@ -607,12 +618,10 @@ ${
     });
     w.on('change', () => {
       process.env.HEAVY_DEBUG && console.log('🪲🔔messagesFile change', messagesFile);
-
       this.processExtractedMessages(adminforth, messagesFile);
     });
     w.on('add', () => {
       process.env.HEAVY_DEBUG && console.log('🪲🔔messagesFile add', messagesFile);
-
       this.processExtractedMessages(adminforth, messagesFile);
     });
 
@@ -621,6 +630,10 @@ ${
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     // optional method where you can safely check field types after database discovery was performed
     // ensure each trFieldName (apart from enFieldName) is nullable column of type string
+    if (this.options.completeAdapter) {
+      this.options.completeAdapter.validate();
+    }
+
     for (const lang of this.options.supportedLanguages) {
       if (lang === 'en') {
         continue;

package/package.json

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