@tuhama/translation-manager 0.3.0 → 0.4.0

package/src/core/Storage.js

@@ -1,82 +1,82 @@
-const fs = require('fs-extra');
-const path = require('path');
-
-/**
- * Interface-like class for managing translation file storage.
- * Defaults to JSON files on local filesystem.
- */
-class Storage {
-    constructor(targetDir, config = {}) {
-        this.targetDir = targetDir;
-        this.config = config;
-        this.defaultPaths = [
-            'public/locales',
-            'src/locales',
-            'src/i18n',
-            'locales'
-        ];
-    }
-
-    /**
-     * Finds and returns the path to the locales directory.
-     */
-    async getLocalesDir() {
-        let localesDir = this.config.path;
-
-        if (!localesDir) {
-            for (const p of this.defaultPaths) {
-                const fullPath = path.resolve(this.targetDir, p);
-                if (await fs.pathExists(fullPath) && (await fs.stat(fullPath)).isDirectory()) {
-                    return fullPath;
-                }
-            }
-        } else {
-            localesDir = path.resolve(this.targetDir, localesDir);
-        }
-
-        if (!localesDir || !(await fs.pathExists(localesDir))) {
-            throw new Error('Could not find translation directory. Please specify it in the config or ensure it exists.');
-        }
-
-        return localesDir;
-    }
-
-    /**
-     * Reads all translation files from the locales directory.
-     */
-    async readAll() {
-        const localesDir = await this.getLocalesDir();
-        const files = await fs.readdir(localesDir);
-        const jsonFiles = files.filter(f => f.endsWith('.json'));
-
-        const translations = {};
-        for (const file of jsonFiles) {
-            const lang = path.basename(file, '.json');
-            const content = await fs.readJson(path.join(localesDir, file));
-            translations[lang] = content;
-        }
-
-        return translations;
-    }
-
-    /**
-     * Writes a single translation file (or all of them).
-     */
-    async write(lang, content) {
-        const localesDir = await this.getLocalesDir();
-        const filePath = path.join(localesDir, `${lang}.json`);
-        await fs.writeJson(filePath, content, { spaces: 2 });
-    }
-
-    /**
-     * Writes all translations.
-     */
-    async writeAll(translations) {
-        const languages = Object.keys(translations);
-        for (const lang of languages) {
-            await this.write(lang, translations[lang]);
-        }
-    }
-}
-
-module.exports = Storage;
+const fs = require('fs-extra');
+const path = require('path');
+
+/**
+ * Interface-like class for managing translation file storage.
+ * Defaults to JSON files on local filesystem.
+ */
+class Storage {
+    constructor(targetDir, config = {}) {
+        this.targetDir = targetDir;
+        this.config = config;
+        this.defaultPaths = [
+            'public/locales',
+            'src/locales',
+            'src/i18n',
+            'locales'
+        ];
+    }
+
+    /**
+     * Finds and returns the path to the locales directory.
+     */
+    async getLocalesDir() {
+        let localesDir = this.config.path;
+
+        if (!localesDir) {
+            for (const p of this.defaultPaths) {
+                const fullPath = path.resolve(this.targetDir, p);
+                if (await fs.pathExists(fullPath) && (await fs.stat(fullPath)).isDirectory()) {
+                    return fullPath;
+                }
+            }
+        } else {
+            localesDir = path.resolve(this.targetDir, localesDir);
+        }
+
+        if (!localesDir || !(await fs.pathExists(localesDir))) {
+            throw new Error('Could not find translation directory. Please specify it in the config or ensure it exists.');
+        }
+
+        return localesDir;
+    }
+
+    /**
+     * Reads all translation files from the locales directory.
+     */
+    async readAll() {
+        const localesDir = await this.getLocalesDir();
+        const files = await fs.readdir(localesDir);
+        const jsonFiles = files.filter(f => f.endsWith('.json'));
+
+        const translations = {};
+        for (const file of jsonFiles) {
+            const lang = path.basename(file, '.json');
+            const content = await fs.readJson(path.join(localesDir, file));
+            translations[lang] = content;
+        }
+
+        return translations;
+    }
+
+    /**
+     * Writes a single translation file (or all of them).
+     */
+    async write(lang, content) {
+        const localesDir = await this.getLocalesDir();
+        const filePath = path.join(localesDir, `${lang}.json`);
+        await fs.writeJson(filePath, content, { spaces: 2 });
+    }
+
+    /**
+     * Writes all translations.
+     */
+    async writeAll(translations) {
+        const languages = Object.keys(translations);
+        for (const lang of languages) {
+            await this.write(lang, translations[lang]);
+        }
+    }
+}
+
+module.exports = Storage;

package/src/core/TranslatorManager.js

@@ -113,7 +113,18 @@ class TranslatorManager {
      * Translates a specific text into target language.
      */
     async translateSingle(text, targetLang, sourceLang = 'en') {
-        const translator = new GoogleTranslator(this.config.googleTranslateApiKey);
+        // Support both old and new config formats for backward compatibility
+        let translatorConfig;
+        if (this.config.googleTranslateApiKey) {
+            // Legacy v2 config - provide migration guidance
+            throw new Error('Google Translate API v2 is deprecated. Please update your configuration to use v3 with projectId and keyFilename in the googleTranslate object.');
+        } else if (this.config.googleTranslate) {
+            translatorConfig = this.config.googleTranslate;
+        } else {
+            throw new Error('Google Translate configuration is missing. Please add googleTranslate.projectId and googleTranslate.keyFilename in Settings.');
+        }
+
+        const translator = new GoogleTranslator(translatorConfig);
         return await translator.translate(text, targetLang, sourceLang);
     }
 
@@ -123,7 +134,7 @@ class TranslatorManager {
     async getBulkTranslateReport(sourceLang) {
         const { languages, translations, allKeys } = await this.scan();
         const report = {};
-        
+
         languages.forEach(lang => {
             if (lang === sourceLang) return;
             const missing = allKeys.filter(key => {
@@ -148,14 +159,26 @@ class TranslatorManager {
     async bulkTranslate(sourceLang) {
         const report = await this.getBulkTranslateReport(sourceLang);
         const translations = await this.storage.readAll();
-        const translator = new GoogleTranslator(this.config.googleTranslateApiKey);
-        
+
+        // Support both old and new config formats for backward compatibility
+        let translatorConfig;
+        if (this.config.googleTranslateApiKey) {
+            // Legacy v2 config - provide migration guidance
+            throw new Error('Google Translate API v2 is deprecated. Please update your configuration to use v3 with projectId and keyFilename in the googleTranslate object.');
+        } else if (this.config.googleTranslate) {
+            translatorConfig = this.config.googleTranslate;
+        } else {
+            throw new Error('Google Translate configuration is missing. Please add googleTranslate.projectId and googleTranslate.keyFilename in Settings.');
+        }
+
+        const translator = new GoogleTranslator(translatorConfig);
+
         const preview = {};
 
         for (const lang in report) {
             const keys = report[lang].keys;
             const sourceTexts = keys.map(key => lodash.get(translations[sourceLang], key));
-            
+
             // Filter out keys that don't have source text
             const validIndices = sourceTexts.map((text, idx) => text ? idx : null).filter(idx => idx !== null);
             const textsToTranslate = validIndices.map(idx => sourceTexts[idx]);

package/src/core/Utilities.js

@@ -1,55 +1,55 @@
-const lodash = require('lodash');
-
-/**
- * Utility functions for object manipulation.
- */
-class Utilities {
-    /**
-     * Recursively sorts object keys alphabetically.
-     */
-    static sortObject(obj) {
-        if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
-            return obj;
-        }
-
-        const sorted = {};
-        Object.keys(obj).sort().forEach(key => {
-            sorted[key] = Utilities.sortObject(obj[key]);
-        });
-        return sorted;
-    }
-
-    /**
-     * Flattens a nested object into a set of dot-notated keys.
-     */
-    static flattenKeys(obj, prefix = '', keySet = new Set()) {
-        Object.keys(obj).forEach(key => {
-            const fullKey = prefix ? `${prefix}.${key}` : key;
-            if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
-                Utilities.flattenKeys(obj[key], fullKey, keySet);
-            } else {
-                keySet.add(fullKey);
-            }
-        });
-        return keySet;
-    }
-
-    /**
-     * Normalizes translation keys across all languages.
-     */
-    static syncKeys(translations, allKeys) {
-        const languages = Object.keys(translations);
-        languages.forEach(lang => {
-            const content = translations[lang];
-            allKeys.forEach(key => {
-                if (lodash.get(content, key) === undefined) {
-                    lodash.set(content, key, '');
-                }
-            });
-            translations[lang] = Utilities.sortObject(content);
-        });
-        return translations;
-    }
-}
-
-module.exports = Utilities;
+const lodash = require('lodash');
+
+/**
+ * Utility functions for object manipulation.
+ */
+class Utilities {
+    /**
+     * Recursively sorts object keys alphabetically.
+     */
+    static sortObject(obj) {
+        if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
+            return obj;
+        }
+
+        const sorted = {};
+        Object.keys(obj).sort().forEach(key => {
+            sorted[key] = Utilities.sortObject(obj[key]);
+        });
+        return sorted;
+    }
+
+    /**
+     * Flattens a nested object into a set of dot-notated keys.
+     */
+    static flattenKeys(obj, prefix = '', keySet = new Set()) {
+        Object.keys(obj).forEach(key => {
+            const fullKey = prefix ? `${prefix}.${key}` : key;
+            if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
+                Utilities.flattenKeys(obj[key], fullKey, keySet);
+            } else {
+                keySet.add(fullKey);
+            }
+        });
+        return keySet;
+    }
+
+    /**
+     * Normalizes translation keys across all languages.
+     */
+    static syncKeys(translations, allKeys) {
+        const languages = Object.keys(translations);
+        languages.forEach(lang => {
+            const content = translations[lang];
+            allKeys.forEach(key => {
+                if (lodash.get(content, key) === undefined) {
+                    lodash.set(content, key, '');
+                }
+            });
+            translations[lang] = Utilities.sortObject(content);
+        });
+        return translations;
+    }
+}
+
+module.exports = Utilities;

package/src/core/services/GoogleTranslator.js

@@ -1,12 +1,30 @@
-const axios = require('axios');
+const { Translate } = require('@google-cloud/translate').v3;
 
 /**
- * Service for interacting with Google Cloud Translation API.
+ * Service for interacting with Google Cloud Translation API v3.
  */
 class GoogleTranslator {
-    constructor(apiKey) {
-        this.apiKey = apiKey;
-        this.baseUrl = 'https://translation.googleapis.com/language/translate/v2';
+    constructor(config) {
+        // Support both old API key format and new v3 config
+        if (typeof config === 'string') {
+            // Legacy API key - throw error to guide migration
+            throw new Error('Google Translate API v2 is deprecated. Please update your configuration to use v3 with projectId and keyFilename.');
+        }
+
+        this.projectId = config.projectId;
+        this.keyFilename = config.keyFilename;
+
+        if (!this.projectId) {
+            throw new Error('Google Cloud Project ID is required for Translate API v3. Please add it in Settings.');
+        }
+
+        // Initialize the translate client
+        const clientConfig = { projectId: this.projectId };
+        if (this.keyFilename) {
+            clientConfig.keyFilename = this.keyFilename;
+        }
+
+        this.translate = new Translate(clientConfig);
     }
 
     /**
@@ -16,8 +34,8 @@ class GoogleTranslator {
      * @param {string} sourceLang - Source language code (e.g. 'en')
      */
     async translate(text, targetLang, sourceLang = 'en') {
-        if (!this.apiKey) {
-            throw new Error('Google Translate API Key is missing. Please add it in Settings.');
+        if (!this.projectId) {
+            throw new Error('Google Cloud Project ID is missing. Please add it in Settings.');
         }
 
         if (!text || (Array.isArray(text) && text.length === 0)) {
@@ -25,24 +43,24 @@ class GoogleTranslator {
         }
 
         try {
-            const response = await axios.post(
-                `${this.baseUrl}?key=${this.apiKey}`,
-                {
-                    q: text,
-                    target: targetLang,
-                    source: sourceLang,
-                    format: 'text'
-                }
-            );
-
-            const translations = response.data.data.translations;
-            
+            const location = 'global';
+            const request = {
+                parent: `projects/${this.projectId}/locations/${location}`,
+                contents: Array.isArray(text) ? text : [text],
+                mimeType: 'text/plain',
+                sourceLanguageCode: sourceLang,
+                targetLanguageCode: targetLang,
+            };
+
+            const [response] = await this.translate.translateText(request);
+            const translations = response.translations.map(t => t.translatedText);
+
             if (Array.isArray(text)) {
-                return translations.map(t => t.translatedText);
+                return translations;
             }
-            return translations[0].translatedText;
+            return translations[0];
         } catch (error) {
-            const message = error.response?.data?.error?.message || error.message;
+            const message = error.message || 'Unknown translation error';
             throw new Error(`Google Translate Error: ${message}`);
         }
     }