i18ntk 1.10.2 → 2.0.2

package/main/i18ntk-ui.js

@@ -6,6 +6,7 @@
 const fs = require('fs');
 const path = require('path');
 const SettingsManager = require('../settings/settings-manager');
+const SecurityUtils = require('../utils/security');
 const legacyConfigManager = require('../utils/config-manager');
 const { getIcon, isUnicodeSupported } = require('../utils/terminal-icons');
 const configManager = new SettingsManager();
@@ -14,7 +15,7 @@ class UIi18n {
     constructor() {
         this.currentLanguage = 'en';
 this.translations = {};
-        this.uiLocalesDir = path.resolve(__dirname, '..', 'ui-locales');
+        this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
         this.availableLanguages = [];
         this.configFile = path.resolve(configManager.configFile);
         
@@ -29,7 +30,7 @@ this.translations = {};
             const config = configManager.loadSettings ? configManager.loadSettings() : configManager.getConfig ? configManager.getConfig() : {};
             
             // Use safe defaults if config is not available
-            this.uiLocalesDir = path.resolve(__dirname, '..', 'ui-locales');
+            this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
             this.availableLanguages = this.detectAvailableLanguages();
             
 
@@ -43,7 +44,7 @@ this.translations = {};
             }
         } catch (error) {
             console.warn('UIi18n: Failed to initialize with config, using defaults:', error.message);
-            this.uiLocalesDir = path.resolve(__dirname, '..', 'ui-locales');
+            this.uiLocalesDir = path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
             this.availableLanguages = this.detectAvailableLanguages();
             this.loadLanguage('en');
         }
@@ -57,7 +58,7 @@ this.translations = {};
         const all = ['en', 'de', 'es', 'fr', 'ru', 'ja', 'zh'];
         return all.filter(lang => {
             const filePath = path.join(this.uiLocalesDir, `${lang}.json`);
-            return fs.existsSync(filePath);
+            return SecurityUtils.safeExistsSync(filePath);
         });
     }
 
@@ -93,9 +94,9 @@ this.translations = {};
             // Primary: Use monolith JSON file (en.json, de.json, etc.)
             const monolithTranslationFile = path.join(this.uiLocalesDir, `${language}.json`);
             
-            if (fs.existsSync(monolithTranslationFile)) {
+            if (SecurityUtils.safeExistsSync(monolithTranslationFile)) {
                 try {
-                    const content = fs.readFileSync(monolithTranslationFile, 'utf8');
+                    const content = SecurityUtils.safeReadFileSync(monolithTranslationFile, path.dirname(monolithTranslationFile), 'utf8');
                     const fullTranslations = JSON.parse(content);
                     
                     // Flatten the nested structure for easier key access
@@ -113,7 +114,7 @@ this.translations = {};
                 // Fallback: Use folder-based structure if monolith file doesn't exist
                 const langDir = path.join(this.uiLocalesDir, language);
                 
-                if (fs.existsSync(langDir) && fs.statSync(langDir).isDirectory()) {
+                if (SecurityUtils.safeExistsSync(langDir) && fs.statSync(langDir).isDirectory()) {
                     const files = fs.readdirSync(langDir).filter(file => file.endsWith('.json'));
                     if (debugEnabled) {
                         console.log(`UI: Found files in ${langDir}: ${files.join(', ')}`);
@@ -122,7 +123,7 @@ this.translations = {};
                     for (const file of files) {
                         const filePath = path.join(langDir, file);
                         try {
-                            const content = fs.readFileSync(filePath, 'utf8');
+                            const content = SecurityUtils.safeReadFileSync(filePath, path.dirname(filePath), 'utf8');
                             const fileTranslations = JSON.parse(content);
                             const moduleName = path.basename(file, '.json');
                             this.translations[moduleName] = this.deepMerge(this.translations[moduleName] || {}, fileTranslations);
@@ -383,8 +384,8 @@ this.translations = {};
     getEnglishFallback(keyPath, replacements = {}) {
         try {
             const englishFile = path.join(this.uiLocalesDir, 'en.json');
-            if (fs.existsSync(englishFile)) {
-                const englishContent = fs.readFileSync(englishFile, 'utf8');
+            if (SecurityUtils.safeExistsSync(englishFile)) {
+                const englishContent = SecurityUtils.safeReadFileSync(englishFile, path.dirname(englishFile), 'utf8');
                 const englishTranslations = JSON.parse(englishContent);
                 
                 // Use the same flattening approach for consistency

package/main/i18ntk-usage.js

@@ -55,7 +55,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'ui-locales'));
+loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
 
 async function getConfig() {
   return await getUnifiedConfig('usage');
@@ -120,7 +120,7 @@ class I18nUsageAnalyzer {
       
       // Load translations for UI
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
       const projectRoot = path.resolve(this.config.projectRoot || '.');
             const detected = detectFramework(projectRoot);
       if (detected) {
@@ -136,7 +136,7 @@ class I18nUsageAnalyzer {
       this.i18nDir = this.config.i18nDir;
       this.sourceLanguageDir = path.join(this.i18nDir, this.config.sourceLanguage);
 
-      if (!fs.existsSync(this.i18nDir)) {
+      if (!SecurityUtils.safeExistsSync(this.i18nDir, process.cwd())) {
         console.warn(t('usage.i18nDirectoryNotFound', { i18nDir: this.i18nDir }));
         this.i18nDir = this.sourceDir;
         this.config.i18nDir = this.i18nDir;
@@ -222,7 +222,7 @@ class I18nUsageAnalyzer {
         const absoluteDir = path.resolve(currentDir);
         const validatedPath = SecurityUtils.validatePath(absoluteDir, process.cwd());
         
-        if (!validatedPath || !fs.existsSync(validatedPath)) {
+        if (!validatedPath || !SecurityUtils.safeExistsSync(validatedPath)) {
           return;
         }
         
@@ -312,7 +312,7 @@ class I18nUsageAnalyzer {
         const absoluteDir = path.resolve(currentDir);
         const validatedPath = SecurityUtils.validatePath(absoluteDir, process.cwd());
         
-        if (!validatedPath || !fs.existsSync(validatedPath)) {
+        if (!validatedPath || !SecurityUtils.safeExistsSync(validatedPath)) {
           return;
         }
         
@@ -393,7 +393,7 @@ class I18nUsageAnalyzer {
         this.config = { ...baseConfig, ...(this.config || {}) };
         
         const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-        loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+        loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
         if (!Array.isArray(this.config.translationPatterns)) {
           this.config.translationPatterns = [
             /t\(['"`]([^'"`]+)['"`]/g,
@@ -482,7 +482,7 @@ class I18nUsageAnalyzer {
         
         for (const dir of possibleSourceDirs) {
           const testPath = path.resolve(projectRoot, dir);
-          if (fs.existsSync(testPath)) {
+          if (SecurityUtils.safeExistsSync(testPath)) {
             this.config.sourceDir = testPath;
             this.sourceDir = testPath;
             break;
@@ -501,7 +501,7 @@ class I18nUsageAnalyzer {
         const fallback = path.resolve(this.config.projectRoot || '.', 'src');
         console.warn(t('usage.sourceEqualsI18nWarn') ||
           `⚠️ sourceDir equals i18nDir (${this.sourceDir}). Falling back to ${fallback} for source scanning.`);
-        if (fs.existsSync(fallback)) {
+        if (SecurityUtils.safeExistsSync(fallback)) {
           this.sourceDir = fallback;
         } else {
           console.warn(`⚠️ Fallback directory ${fallback} does not exist. Using project root for source scanning.`);
@@ -682,7 +682,7 @@ Analysis Features (v1.8.3):
           await SecurityUtils.validatePath(fileInfo.filePath);
           
           // Check if file exists and is readable
-          if (!fs.existsSync(fileInfo.filePath)) {
+          if (!SecurityUtils.safeExistsSync(fileInfo.filePath)) {
             if (isDebug || isStrict) {
               console.warn(`⚠️  File not found: ${path.basename(fileInfo.filePath)}`);
             }
@@ -804,7 +804,7 @@ Analysis Features (v1.8.3):
   // Extract translation keys from source code with enhanced patterns
   extractKeysFromFile(filePath) {
     try {
-      const content = SecurityUtils.safeReadFileSync(filePath);
+      const content = SecurityUtils.safeReadFileSync(filePath, path.dirname(filePath), 'utf8');
       if (!content) return [];
       
       // Skip JSON files entirely to prevent scanning translation files
@@ -827,7 +827,7 @@ Analysis Features (v1.8.3):
       console.log(t('usage.checkUsage.analyzing_source_files'));
       
       // Check if source directory exists
-      if (!fs.existsSync(this.sourceDir)) {
+      if (!SecurityUtils.safeExistsSync(this.sourceDir)) {
         throw new Error(this.t('usage.sourceDirectoryDoesNotExist', { dir: this.sourceDir }) || `Source directory not found: ${this.sourceDir}`);
       }
       
@@ -898,7 +898,7 @@ Analysis Features (v1.8.3):
       const isStrict = process.argv.includes('--strict');
       
       // Check if i18n directory exists
-      if (!fs.existsSync(this.i18nDir)) {
+      if (!SecurityUtils.safeExistsSync(this.i18nDir, process.cwd())) {
         console.warn(t('usage.i18nDirectoryNotFound', { i18nDir: this.i18nDir }));
         return;
       }
@@ -912,7 +912,7 @@ Analysis Features (v1.8.3):
           .filter(item => {
             try {
               const itemPath = path.join(this.i18nDir, item);
-              return fs.existsSync(itemPath) && fs.statSync(itemPath).isDirectory();
+              return SecurityUtils.safeExistsSync(itemPath) && fs.statSync(itemPath).isDirectory();
             } catch (error) {
               return false;
             }
@@ -951,7 +951,7 @@ Analysis Features (v1.8.3):
           
           for (const fileInfo of translationFiles) {
             try {
-              if (!fs.existsSync(fileInfo.filePath)) {
+              if (!SecurityUtils.safeExistsSync(fileInfo.filePath)) {
                 if (isDebug || isStrict) {
                   console.warn(`⚠️  File not found: ${path.basename(fileInfo.filePath)}`);
                 }
@@ -1353,7 +1353,7 @@ Analysis Features (v1.8.3):
   async saveReport(report, outputDir = './i18ntk-reports/usage') {
     try {
       // Ensure output directory exists
-      if (!fs.existsSync(outputDir)) {
+      if (!SecurityUtils.safeExistsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
       }
       
@@ -1578,12 +1578,12 @@ Analysis Features (v1.8.3):
       await SecurityUtils.validatePath(this.sourceDir);
       await SecurityUtils.validatePath(this.i18nDir);
       
-      if (!fs.existsSync(this.sourceDir)) {
+      if (!SecurityUtils.safeExistsSync(this.sourceDir)) {
         throw new Error(this.t('usage.sourceDirectoryDoesNotExist', { dir: this.sourceDir }) || `Source directory not found: ${this.sourceDir}`);
 
       }
       
-      if (!fs.existsSync(this.i18nDir)) {
+      if (!SecurityUtils.safeExistsSync(this.i18nDir, process.cwd())) {
         throw new Error(this.t('usage.i18nDirectoryDoesNotExist', { dir: this.i18nDir }) || `I18n directory not found: ${this.i18nDir}`);
       }
       
@@ -1801,4 +1801,40 @@ if (require.main === module) {
   }
 }
 
-module.exports = I18nUsageAnalyzer;
+module.exports = I18nUsageAnalyzer;
+
+// Run if called directly
+if (require.main === module) {
+  async function main() {
+    try {
+      const cliArgs = parseCommonArgs(process.argv.slice(2));
+
+      if (cliArgs.help) {
+        displayHelp('usage');
+        process.exit(0);
+      }
+
+      // Let run() handle full initialization to avoid duplicate setup output
+      const analyzer = new I18nUsageAnalyzer();
+      await analyzer.run();
+    } catch (error) {
+      console.error('Error:', error.message);
+      process.exit(1);
+    }
+  }
+
+  // Check if we're being called from the menu system (stdin has data)
+  const hasStdinData = !process.stdin.isTTY;
+
+  if (hasStdinData) {
+    // When called from menu, consume stdin data and run with defaults
+    process.stdin.resume();
+    process.stdin.on('data', () => {});
+    process.stdin.on('end', () => {
+      main();
+    });
+  } else {
+    // Normal direct execution
+    main();
+  }
+}

package/main/i18ntk-validate.js

@@ -60,7 +60,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'ui-locales'));
+loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
 
 class I18nValidator {
   constructor(config = {}) {
@@ -87,7 +87,7 @@ class I18nValidator {
       this.config = { ...baseConfig, ...(this.config || {}) };
       
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
       
       SecurityUtils.logSecurityEvent(
         'I18n validator initializing',
@@ -112,7 +112,7 @@ class I18nValidator {
         } else {
           console.warn(t('config.dirFallbackWarning', { dir: this.sourceDir, fallback: this.sourceLanguageDir }) ||
             `Warning: Directory ${this.sourceDir} not found. Using ${this.sourceLanguageDir}.`);
-          if (!fs.existsSync(this.sourceLanguageDir)) {
+          if (!SecurityUtils.safeExistsSync(this.sourceLanguageDir)) {
             fs.mkdirSync(this.sourceLanguageDir, { recursive: true });
           }
         }
@@ -189,7 +189,7 @@ class I18nValidator {
   // Get all available languages
   getAvailableLanguages() {
     try {
-      if (!fs.existsSync(this.sourceDir)) {
+      if (!SecurityUtils.safeExistsSync(this.sourceDir)) {
         throw new Error(`Source directory not found: ${this.sourceDir}`);
       }
       
@@ -211,7 +211,7 @@ class I18nValidator {
       const sanitizedLanguage = SecurityUtils.sanitizeInput(language);
       const languageDir = path.join(this.sourceDir, sanitizedLanguage);
       
-      if (!fs.existsSync(languageDir)) {
+      if (!SecurityUtils.safeExistsSync(languageDir)) {
         return [];
       }
       
@@ -265,7 +265,7 @@ class I18nValidator {
   // Validate JSON file syntax
   async validateJsonSyntax(filePath) {
     try {
-      const content = fs.readFileSync(filePath, 'utf8');
+      const content = SecurityUtils.safeReadFileSync(filePath, path.dirname(filePath), 'utf8');
       const parsed = SecurityUtils.safeParseJSON(content);
       
       SecurityUtils.logSecurityEvent(
@@ -481,7 +481,7 @@ class I18nValidator {
       };
       
       // Check for missing language directory
-      if (!fs.existsSync(languageDir)) {
+      if (!SecurityUtils.safeExistsSync(languageDir)) {
         this.addError(
           `Language directory missing: ${sanitizedLanguage}`,
           { language: sanitizedLanguage, expectedPath: languageDir }
@@ -495,7 +495,7 @@ class I18nValidator {
       const targetFilePath = path.join(languageDir, fileName);
       
       // Check if source file exists
-      if (!fs.existsSync(sourceFilePath)) {
+      if (!SecurityUtils.safeExistsSync(sourceFilePath)) {
         this.addWarning(
           `Source file missing: ${this.config.sourceLanguage}/${fileName}`,
           { fileName, language: this.config.sourceLanguage }
@@ -504,7 +504,7 @@ class I18nValidator {
       }
       
       // Check if target file exists
-      if (!fs.existsSync(targetFilePath)) {
+      if (!SecurityUtils.safeExistsSync(targetFilePath)) {
         this.addError(
           `Translation file missing: ${language}/${fileName}`,
           { fileName, language, expectedPath: targetFilePath }
@@ -639,7 +639,7 @@ class I18nValidator {
         const reportPath = path.join(process.cwd(), 'validation-report.txt');
         SecurityUtils.validatePath(reportPath);
         
-        if (fs.existsSync(reportPath)) {
+        if (SecurityUtils.safeExistsSync(reportPath)) {
           fs.unlinkSync(reportPath);
           console.log(t('validate.deletedOldReport'));
           
@@ -672,7 +672,7 @@ class I18nValidator {
       // Validate source language directory exists
       SecurityUtils.validatePath(this.sourceLanguageDir);
       
-      if (!fs.existsSync(this.sourceLanguageDir)) {
+      if (!SecurityUtils.safeExistsSync(this.sourceLanguageDir)) {
         const error = t('validate.sourceLanguageDirectoryNotFound', { sourceDir: this.sourceLanguageDir }) || 'Source language directory not found';
         this.addError(error, { sourceLanguage: this.config.sourceLanguage });
         
@@ -892,7 +892,7 @@ class I18nValidator {
       this.config = { ...baseConfig, ...(this.config || {}) };
       
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));this.sourceDir = this.config.sourceDir;
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));this.sourceDir = this.config.sourceDir;
         this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
       } else {
         await this.initialize();
@@ -983,7 +983,7 @@ if (require.main === module) {
       // Initialize translations for CLI usage
       const config = configManager.getConfig();
       const uiLanguage = config.language || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
       
       SecurityUtils.logSecurityEvent(t('validate.scriptExecution'), 'info', {
         script: 'i18ntk-validate.js',