@adminforth/i18n 1.0.12 → 1.0.14

package/Changelog.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [1.0.14]
+
+### Fixed
+
+- Add `ignoreInitial` for watch to prevent initial messages loading
+- Add locking mechanism to prevent initial messages loading call in parallel (just in case)
+
+## [1.0.13]
+
+- Deduplicate frontend strings before creating translations 
+
+
 ## [1.0.12]
 
 ### Fixed

package/dist/index.js

@@ -12,6 +12,8 @@ import iso6391 from 'iso-639-1';
 import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
+import { AsyncQueue } from '@sapphire/async-queue';
+const processFrontendMessagesQueue = new AsyncQueue();
 const SLAVIC_PLURAL_EXAMPLES = {
     uk: 'яблук | Яблуко | Яблука | Яблук', // zero | singular | 2-4 | 5+
     bg: 'ябълки | ябълка | ябълки | ябълки', // zero | singular | 2-4 | 5+
@@ -433,6 +435,7 @@ ${JSON.stringify(strings.reduce((acc, s) => {
     }
     processExtractedMessages(adminforth, filePath) {
         return __awaiter(this, void 0, void 0, function* () {
+            yield processFrontendMessagesQueue.wait();
             // messages file is in i18n-messages.json
             let messages;
             try {
@@ -444,7 +447,13 @@ ${JSON.stringify(strings.reduce((acc, s) => {
                 return;
             }
             // loop over missingKeys[i].path and add them to database if not exists
-            yield Promise.all(messages.missingKeys.map((missingKey) => __awaiter(this, void 0, void 0, function* () {
+            const missingKeysDeduplicated = messages.missingKeys.reduce((acc, missingKey) => {
+                if (!acc.find((a) => a.path === missingKey.path)) {
+                    acc.push(missingKey);
+                }
+                return acc;
+            }, []);
+            yield Promise.all(missingKeysDeduplicated.map((missingKey) => __awaiter(this, void 0, void 0, function* () {
                 const key = missingKey.path;
                 const file = missingKey.file;
                 const category = 'frontend';
@@ -472,15 +481,20 @@ ${JSON.stringify(strings.reduce((acc, s) => {
             const serveDir = adminforth.codeInjector.getServeDir();
             // messages file is in i18n-messages.json
             const messagesFile = path.join(serveDir, 'i18n-messages.json');
-            console.log('🪲messagesFile', messagesFile);
+            process.env.HEAVY_DEBUG && console.log('🪲🔔messagesFile read started', messagesFile);
             this.processExtractedMessages(adminforth, messagesFile);
             // we use watcher because file can't be yet created when we start - bundleNow can be done in build time or can be done now
             // that is why we make attempt to process it now and then watch for changes
-            const w = chokidar.watch(messagesFile, { persistent: true });
+            const w = chokidar.watch(messagesFile, {
+                persistent: true,
+                ignoreInitial: true, // don't trigger 'add' event for existing file on start
+            });
             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);
             });
         });

package/index.ts

@@ -5,6 +5,9 @@ import iso6391, { LanguageCode } from 'iso-639-1';
 import path from 'path';
 import fs from 'fs-extra';
 import chokidar from 'chokidar';
+import  { AsyncQueue } from '@sapphire/async-queue';
+
+const processFrontendMessagesQueue = new AsyncQueue();
 
 const SLAVIC_PLURAL_EXAMPLES = {
   uk: 'яблук | Яблуко | Яблука | Яблук', // zero | singular | 2-4 | 5+
@@ -524,6 +527,7 @@ ${
   }
 
   async processExtractedMessages(adminforth: IAdminForth, filePath: string) {
+    await processFrontendMessagesQueue.wait();
     // messages file is in i18n-messages.json
     let messages;
     try {
@@ -535,7 +539,15 @@ ${
       return;
     }
     // loop over missingKeys[i].path and add them to database if not exists
-    await Promise.all(messages.missingKeys.map(async (missingKey: any) => {
+    
+    const missingKeysDeduplicated = messages.missingKeys.reduce((acc: any[], missingKey: any) => {
+      if (!acc.find((a) => a.path === missingKey.path)) {
+        acc.push(missingKey);
+      }
+      return acc;
+    }, []);
+
+    await Promise.all(missingKeysDeduplicated.map(async (missingKey: any) => {
       const key = missingKey.path;
       const file = missingKey.file;
       const category = 'frontend';
@@ -567,15 +579,22 @@ ${
     const serveDir = adminforth.codeInjector.getServeDir();
     // messages file is in i18n-messages.json
     const messagesFile = path.join(serveDir, 'i18n-messages.json');
-    console.log('🪲messagesFile', messagesFile);
+    process.env.HEAVY_DEBUG && console.log('🪲🔔messagesFile read started', messagesFile);
     this.processExtractedMessages(adminforth, messagesFile);
     // we use watcher because file can't be yet created when we start - bundleNow can be done in build time or can be done now
     // that is why we make attempt to process it now and then watch for changes
-    const w = chokidar.watch(messagesFile, { persistent: true });
+    const w = chokidar.watch(messagesFile, { 
+      persistent: true,
+      ignoreInitial: true, // don't trigger 'add' event for existing file on start
+    });
     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);
     });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/i18n",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
@@ -15,6 +15,7 @@
   "description": "",
   "dependencies": {
     "@aws-sdk/client-ses": "^3.654.0",
+    "@sapphire/async-queue": "^1.5.5",
     "chokidar": "^4.0.1",
     "iso-639-1": "^3.1.3"
   },