@umituz/web-localization 1.0.6 → 1.1.0

package/dist/infrastructure/services/cli.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.service.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/services/cli.service.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,UAAU;IACf,IAAI,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsD9C,SAAS,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAsD1D;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
+{"version":3,"file":"cli.service.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/services/cli.service.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,UAAU;IACf,IAAI,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D9C,SAAS,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAsD1D;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}

package/dist/infrastructure/services/cli.service.js

@@ -34,7 +34,8 @@ export class CLIService {
                         result[key] = syncObject(source[key], target[key] || {});
                     }
                     else if (target[key] === undefined) {
-                        result[key] = source[key];
+                        // Let empty string indicate untranslated state
+                        result[key] = typeof source[key] === "string" ? "" : source[key];
                     }
                 }
                 // Remove extra keys

package/dist/infrastructure/services/google-translate.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"google-translate.service.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/services/google-translate.service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,0DAA0D,CAAC;AAalE,cAAM,sBAAuB,YAAW,mBAAmB;IACzD,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,WAAW,CAA4B;IAE/C,UAAU,CAAC,MAAM,EAAE,wBAAwB,GAAG,IAAI;IASlD,aAAa,IAAI,OAAO;IAIxB,OAAO,CAAC,iBAAiB;IAQnB,SAAS,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsDpE,cAAc,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyDzE,eAAe,CACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,cAAc,EAAE,MAAM,EACtB,IAAI,SAAK,EACT,KAAK,GAAE,gBAMN,EACD,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,GAC5D,OAAO,CAAC,IAAI,CAAC;YA6DF,gBAAgB;CAuC/B;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"google-translate.service.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/services/google-translate.service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,0DAA0D,CAAC;AAalE,cAAM,sBAAuB,YAAW,mBAAmB;IACzD,OAAO,CAAC,MAAM,CAAyC;IACvD,OAAO,CAAC,WAAW,CAA4B;IAE/C,UAAU,CAAC,MAAM,EAAE,wBAAwB,GAAG,IAAI;IASlD,aAAa,IAAI,OAAO;IAIxB,OAAO,CAAC,iBAAiB;IAQnB,SAAS,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAsDpE,cAAc,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyDzE,eAAe,CACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,cAAc,EAAE,MAAM,EACtB,IAAI,SAAK,EACT,KAAK,GAAE,gBAMN,EACD,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,IAAI,GAC5D,OAAO,CAAC,IAAI,CAAC;YA6DF,gBAAgB;CAkF/B;AAED,eAAO,MAAM,sBAAsB,wBAA+B,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/infrastructure/services/google-translate.service.js

@@ -169,33 +169,71 @@ class GoogleTranslateService {
             }
         }
     }
-    async callTranslateAPI(text, targetLanguage, sourceLanguage) {
+    async callTranslateAPI(text, targetLanguage, sourceLanguage, retries = 3, backoffMs = 2000) {
+        // 1. Variable Protection (Extract {{variables}})
+        const varMap = new Map();
+        let counter = 0;
+        // Find all {{something}} patterns
+        let safeText = text.replace(/\{\{([^}]+)\}\}/g, (match) => {
+            const placeholder = `_VAR${counter}_`; // Using a simple token less likely to be split
+            varMap.set(placeholder, match);
+            counter++;
+            return placeholder;
+        });
         const timeout = this.config?.timeout || DEFAULT_TIMEOUT;
-        const encodedText = encodeURIComponent(text);
+        const encodedText = encodeURIComponent(safeText);
         const url = `${GOOGLE_TRANSLATE_API_URL}?client=gtx&sl=${sourceLanguage}&tl=${targetLanguage}&dt=t&q=${encodedText}`;
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), timeout);
-        try {
-            const response = await fetch(url, {
-                signal: controller.signal,
-            });
-            if (!response.ok) {
-                throw new Error(`API request failed: ${response.status}`);
+        for (let attempt = 0; attempt <= retries; attempt++) {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), timeout);
+            try {
+                const response = await fetch(url, {
+                    signal: controller.signal,
+                });
+                if (!response.ok) {
+                    if (response.status === 429 || response.status >= 500) {
+                        if (attempt < retries) {
+                            clearTimeout(timeoutId);
+                            // Exponential backoff
+                            const delay = backoffMs * Math.pow(2, attempt);
+                            await new Promise(resolve => setTimeout(resolve, delay));
+                            continue;
+                        }
+                    }
+                    throw new Error(`API request failed: ${response.status}`);
+                }
+                const data = await response.json();
+                let translatedStr = safeText;
+                if (Array.isArray(data) &&
+                    data.length > 0 &&
+                    Array.isArray(data[0]) &&
+                    data[0].length > 0 &&
+                    typeof data[0][0][0] === "string") {
+                    translatedStr = data[0].map((item) => item[0]).join('');
+                }
+                // 2. Re-inject Variables
+                if (varMap.size > 0) {
+                    // Sometimes Google adds spaces, like _VAR0_ -> _ VAR0 _
+                    for (const [placeholder, originalVar] of varMap.entries()) {
+                        const regex = new RegExp(placeholder.split('').join('\\s*'), 'g');
+                        translatedStr = translatedStr.replace(regex, originalVar);
+                    }
+                }
+                return translatedStr;
+            }
+            catch (error) {
+                clearTimeout(timeoutId);
+                if (attempt === retries) {
+                    throw error;
+                }
+                const delay = backoffMs * Math.pow(2, attempt);
+                await new Promise(resolve => setTimeout(resolve, delay));
             }
-            const data = await response.json();
-            if (Array.isArray(data) &&
-                data.length > 0 &&
-                Array.isArray(data[0]) &&
-                data[0].length > 0 &&
-                Array.isArray(data[0][0]) &&
-                typeof data[0][0][0] === "string") {
-                return data[0][0][0];
+            finally {
+                clearTimeout(timeoutId);
             }
-            return text;
-        }
-        finally {
-            clearTimeout(timeoutId);
         }
+        return text;
     }
 }
 export const googleTranslateService = new GoogleTranslateService();

package/dist/infrastructure/utils/file.util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.util.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/utils/file.util.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoB7E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAajG"}
+{"version":3,"file":"file.util.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/utils/file.util.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoB7E;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAajG"}

package/dist/infrastructure/utils/text-validator.util.js

@@ -26,9 +26,8 @@ export function shouldSkipWord(text) {
 export function needsTranslation(targetValue, sourceValue) {
     if (typeof targetValue !== "string")
         return true;
-    if (targetValue.trim().length === 0)
-        return true;
-    if (targetValue === sourceValue && !/^\d+$/.test(sourceValue))
-        return true;
+    if (targetValue.length === 0)
+        return true; // Empty string means untranslated
+    // Do NOT return true if target === source anymore, to avoid infinite translations for words that are identical in both languages
     return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/web-localization",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Google Translate integrated localization package for web applications",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -35,16 +35,17 @@
     "access": "public"
   },
   "dependencies": {
-    "commander": "^12.0.0",
     "chalk": "^5.3.0",
-    "dotenv": "^16.4.5"
+    "commander": "^12.0.0",
+    "dotenv": "^16.4.5",
+    "ts-morph": "^27.0.2"
   },
   "devDependencies": {
     "@types/node": "^20.12.7",
-    "typescript": "^5.4.5",
-    "eslint": "^8.57.0",
+    "@typescript-eslint/eslint-plugin": "^7.7.0",
     "@typescript-eslint/parser": "^7.7.0",
-    "@typescript-eslint/eslint-plugin": "^7.7.0"
+    "eslint": "^8.57.0",
+    "typescript": "^5.4.5"
   },
   "files": [
     "src",

package/src/infrastructure/services/cli.service.ts

@@ -52,7 +52,8 @@ export class CLIService {
               (target[key] as Record<string, unknown>) || {}
             );
           } else if (target[key] === undefined) {
-            result[key] = source[key];
+             // Let empty string indicate untranslated state
+            result[key] = typeof source[key] === "string" ? "" : source[key];
           }
         }
         // Remove extra keys

package/src/infrastructure/services/google-translate.service.ts

@@ -237,41 +237,84 @@ class GoogleTranslateService implements ITranslationService {
   private async callTranslateAPI(
     text: string,
     targetLanguage: string,
-    sourceLanguage: string
+    sourceLanguage: string,
+    retries = 3,
+    backoffMs = 2000
   ): Promise<string> {
+    // 1. Variable Protection (Extract {{variables}})
+    const varMap = new Map<string, string>();
+    let counter = 0;
+    
+    // Find all {{something}} patterns
+    let safeText = text.replace(/\{\{([^}]+)\}\}/g, (match) => {
+      const placeholder = `_VAR${counter}_`; // Using a simple token less likely to be split
+      varMap.set(placeholder, match);
+      counter++;
+      return placeholder;
+    });
+
     const timeout = this.config?.timeout || DEFAULT_TIMEOUT;
-    const encodedText = encodeURIComponent(text);
+    const encodedText = encodeURIComponent(safeText);
     const url = `${GOOGLE_TRANSLATE_API_URL}?client=gtx&sl=${sourceLanguage}&tl=${targetLanguage}&dt=t&q=${encodedText}`;
 
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
+    for (let attempt = 0; attempt <= retries; attempt++) {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), timeout);
+
+      try {
+        const response = await fetch(url, {
+          signal: controller.signal,
+        });
+
+        if (!response.ok) {
+          if (response.status === 429 || response.status >= 500) {
+            if (attempt < retries) {
+              clearTimeout(timeoutId);
+              // Exponential backoff
+              const delay = backoffMs * Math.pow(2, attempt);
+              await new Promise(resolve => setTimeout(resolve, delay));
+              continue;
+            }
+          }
+          throw new Error(`API request failed: ${response.status}`);
+        }
 
-    try {
-      const response = await fetch(url, {
-        signal: controller.signal,
-      });
+        const data = await response.json();
 
-      if (!response.ok) {
-        throw new Error(`API request failed: ${response.status}`);
-      }
+        let translatedStr = safeText;
+        if (
+          Array.isArray(data) &&
+          data.length > 0 &&
+          Array.isArray(data[0]) &&
+          data[0].length > 0 &&
+        typeof data[0][0][0] === "string"
+        ) {
+          translatedStr = data[0].map((item: any) => item[0]).join('');
+        }
 
-      const data = await response.json();
+        // 2. Re-inject Variables
+        if (varMap.size > 0) {
+          // Sometimes Google adds spaces, like _VAR0_ -> _ VAR0 _
+          for (const [placeholder, originalVar] of varMap.entries()) {
+            const regex = new RegExp(placeholder.split('').join('\\s*'), 'g');
+            translatedStr = translatedStr.replace(regex, originalVar);
+          }
+        }
 
-      if (
-        Array.isArray(data) &&
-        data.length > 0 &&
-        Array.isArray(data[0]) &&
-        data[0].length > 0 &&
-        Array.isArray(data[0][0]) &&
-        typeof data[0][0][0] === "string"
-      ) {
-        return data[0][0][0];
+        return translatedStr;
+      } catch (error) {
+        clearTimeout(timeoutId);
+        if (attempt === retries) {
+          throw error;
+        }
+        const delay = backoffMs * Math.pow(2, attempt);
+        await new Promise(resolve => setTimeout(resolve, delay));
+      } finally {
+        clearTimeout(timeoutId);
       }
-
-      return text;
-    } finally {
-      clearTimeout(timeoutId);
     }
+    
+    return text;
   }
 }
 

package/src/infrastructure/utils/text-validator.util.ts

@@ -25,7 +25,7 @@ export function shouldSkipWord(text: string): boolean {
  */
 export function needsTranslation(targetValue: unknown, sourceValue: string): boolean {
   if (typeof targetValue !== "string") return true;
-  if (targetValue.trim().length === 0) return true;
-  if (targetValue === sourceValue && !/^\d+$/.test(sourceValue)) return true;
+  if (targetValue.length === 0) return true; // Empty string means untranslated
+  // Do NOT return true if target === source anymore, to avoid infinite translations for words that are identical in both languages
   return false;
 }