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

package/dist/index.js

@@ -422,20 +422,25 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             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);
+                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);
+                process.env.HEAVY_DEBUG && console.log(`🔗  ${lang} plurals finished`);
                 totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
             })));
+            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;
                 yield this.adminforth.resource(this.resourceConfig.resourceId).update(strId, Object.assign(Object.assign({}, updates), { [this.options.completedFieldName]: futureCompletedFieldValue }));
             })));
             for (const lang of langsInvolved) {
-                this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+                yield this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
                 for (const [enStr, { category }] of Object.entries(updateStrings)) {
-                    this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
+                    yield this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
                 }
             }
             return new Set(totalTranslated).size;
@@ -510,6 +515,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

@@ -503,12 +503,21 @@ ${
     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`);
+
       totalTranslated = totalTranslated.concat(noPluralKeys, pluralKeys);
-    }));    
+    }));
+
+    process.env.HEAVY_DEBUG && console.log('updateStrings were formed', totalTranslated);
 
     await Promise.all(
       Object.entries(updateStrings).map(
@@ -525,9 +534,9 @@ ${
     );
 
     for (const lang of langsInvolved) {
-      this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
+      await this.cache.clear(`${this.resourceConfig.resourceId}:frontend:${lang}`);
       for (const [enStr, { category }] of Object.entries(updateStrings)) {
-        this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
+        await this.cache.clear(`${this.resourceConfig.resourceId}:${category}:${lang}:${enStr}`);
       }
     }
 
@@ -598,12 +607,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);
     });
 
@@ -612,6 +619,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.3",
+  "version": "1.0.18-next.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",