i18ntk 1.10.1 → 2.0.2

package/main/i18ntk-sizing.js

@@ -33,7 +33,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const { performance } = require('perf_hooks');
 const { loadTranslations, t } = require('../utils/i18n-helper');
 const configManager = require('../settings/settings-manager');
 const SecurityUtils = require('../utils/security');
@@ -51,7 +50,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations(process.env.I18NTK_LANG);
+loadTranslations();
 
 // Get configuration from settings manager
 function getConfig() {
@@ -84,7 +83,7 @@ class I18nSizingAnalyzer {
     
     // Initialize i18n with UI language from config
     const uiLanguage = options.uiLanguage || config.uiLanguage || 'en';
-    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
     this.stats = {
       files: {},
       languages: {},
@@ -116,23 +115,24 @@ class I18nSizingAnalyzer {
       throw new Error(t("sizing.invalidSourceDirectoryError", { sourceDir: this.sourceDir }));
     }
 
-    if (!fs.existsSync(validatedSourceDir)) {
+    if (!SecurityUtils.safeExistsSync(validatedSourceDir)) {
       throw new Error(t("sizing.sourceDirectoryNotFoundError", { sourceDir: validatedSourceDir }));
     }
 
     const files = [];
-    const items = fs.readdirSync(validatedSourceDir);
+    const items = SecurityUtils.safeReaddirSync(validatedSourceDir);
     
     // Check for nested language directories
     for (const item of items) {
       const itemPath = SecurityUtils.validatePath(path.join(validatedSourceDir, item), process.cwd());
       if (!itemPath) continue;
       
-      const stat = fs.statSync(itemPath);
+      const stat = SecurityUtils.safeStatSync(itemPath);
+      if (!stat) continue;
       
       if (stat.isDirectory()) {
         // This is a language directory, combine all JSON files
-        const langFiles = fs.readdirSync(itemPath)
+        const langFiles = SecurityUtils.safeReaddirSync(itemPath)
           .filter(file => file.endsWith('.json'))
           .map(file => SecurityUtils.validatePath(path.join(itemPath, file), process.cwd()))
           .filter(file => file !== null);
@@ -165,7 +165,7 @@ class I18nSizingAnalyzer {
 
   // Analyze file sizes
   analyzeFileSizes(files) {
-    console.log(t("sizing.analyzing_file_sizes"));
+    SecurityUtils.debugLog('info', t("sizing.analyzing_file_sizes"));
     
     files.forEach(({ language, file, path: filePath, files: langFiles }) => {
       if (langFiles) {
@@ -176,8 +176,10 @@ class I18nSizingAnalyzer {
         let lastModified = new Date(0);
         
         langFiles.forEach(langFile => {
-          const stats = fs.statSync(langFile);
-          let content = SecurityUtils.safeReadFileSync(langFile, process.cwd());
+          const stats = SecurityUtils.safeStatSync(langFile, process.cwd());
+          if (!stats) return;
+          
+          let content = SecurityUtils.safeReadFileSync(langFile, process.cwd(), 'utf8');
           if (typeof content !== "string") content = "";
           totalSize += stats.size;
           totalLines += content.split('\n').length;
@@ -198,8 +200,10 @@ class I18nSizingAnalyzer {
         };
       } else {
         // Handle single file structure
-        const stats = fs.statSync(filePath);
-        let content = SecurityUtils.safeReadFileSync(filePath, process.cwd());
+        const stats = SecurityUtils.safeStatSync(filePath, process.cwd());
+        if (!stats) return;
+        
+        let content = SecurityUtils.safeReadFileSync(filePath, process.cwd(), 'utf8');
         if (typeof content !== "string") content = "";
         this.stats.files[language] = {
           file,
@@ -216,7 +220,7 @@ class I18nSizingAnalyzer {
 
   // Analyze translation content
   analyzeTranslationContent(files) {
-    console.log(t("sizing.analyzing_translation_content"));
+    SecurityUtils.debugLog('info', t("sizing.analyzing_translation_content"));
     
     files.forEach(({ language, path: filePath, files: langFiles }) => {
       try {
@@ -225,7 +229,7 @@ class I18nSizingAnalyzer {
         if (langFiles) {
           // Handle nested directory structure - combine all JSON files
           langFiles.forEach(langFile => {
-            const rawContent = SecurityUtils.safeReadFileSync(langFile, process.cwd());
+            const rawContent = SecurityUtils.safeReadFileSync(langFile, process.cwd(), 'utf8');
             const fileContent = SecurityUtils.safeParseJSON(rawContent);
             if (fileContent) {
               const fileName = path.basename(langFile, '.json');
@@ -234,7 +238,7 @@ class I18nSizingAnalyzer {
           });
         } else {
           // Handle single file structure
-          const rawContent = SecurityUtils.safeReadFileSync(filePath, process.cwd());
+          const rawContent = SecurityUtils.safeReadFileSync(filePath, process.cwd(), 'utf8');
           combinedContent = SecurityUtils.safeParseJSON(rawContent) || {};
         }
         
@@ -262,7 +266,7 @@ class I18nSizingAnalyzer {
         });
         
       } catch (error) {
-        console.error(t("sizing.failed_to_parse_language_error", { language, errorMessage: error.message }));
+        SecurityUtils.debugLog('error', t("sizing.failed_to_parse_language_error", { language, errorMessage: error.message }));
       }
     });
   }
@@ -312,13 +316,13 @@ class I18nSizingAnalyzer {
 
   // Generate size comparison analysis
   generateSizeComparison() {
-    console.log(t("sizing.generating_size_comparisons"));
+    SecurityUtils.debugLog('info', t("sizing.generating_size_comparisons"));
     
     const languages = Object.keys(this.stats.languages);
     const baseLanguage = languages[0]; // Use first language as baseline
     
     if (!baseLanguage) {
-      console.warn(t("sizing.no_languages_found_for_comparison"));
+      SecurityUtils.debugLog('warn', t("sizing.no_languages_found_for_comparison"));
       return;
     }
     
@@ -491,7 +495,7 @@ class I18nSizingAnalyzer {
   async generateHumanReadableReport() {
     if (!this.outputReport) return;
     
-    console.log(t("sizing.generating_detailed_report"));
+    SecurityUtils.debugLog('info', t("sizing.generating_detailed_report"));
     
     const validatedOutputDir = SecurityUtils.validatePath(this.outputDir, process.cwd());
     if (!validatedOutputDir) {
@@ -499,8 +503,8 @@ class I18nSizingAnalyzer {
     }
 
     // Ensure output directory exists
-    if (!fs.existsSync(validatedOutputDir)) {
-      fs.mkdirSync(validatedOutputDir, { recursive: true });
+    if (!SecurityUtils.safeExistsSync(validatedOutputDir)) {
+      SecurityUtils.safeMkdirSync(validatedOutputDir, { recursive: true });
     }
     
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
@@ -514,7 +518,7 @@ class I18nSizingAnalyzer {
     let textReport = this.generateTextReport(timestamp);
     const textSuccess = await SecurityUtils.safeWriteFile(textReportPath, textReport, process.cwd());
     if (textSuccess) {
-      console.log(t("sizing.human_report_saved", { reportPath: textReportPath }));
+      SecurityUtils.debugLog('info', t("sizing.human_report_saved", { reportPath: textReportPath }));
     }
     
     // Generate JSON for programmatic access
@@ -660,7 +664,7 @@ Generated: ${new Date().toISOString()}
     
     const success = await SecurityUtils.safeWriteFile(csvPath, csvContent, process.cwd());
     if (success) {
-      console.log(t("sizing.csv_report_saved_to", { csvPath }));
+      SecurityUtils.debugLog('info', t("sizing.csv_report_saved_to", { csvPath }));
       SecurityUtils.logSecurityEvent('CSV report saved', 'info', { csvPath });
     } else {
       throw new Error(t("sizing.failedToSaveCsvError"));
@@ -669,20 +673,21 @@ Generated: ${new Date().toISOString()}
 
   // Main analysis method
   async analyze() {
-    const startTime = performance.now();
+    const perfTimer = SecurityUtils.getPerformanceTimer();
+    const startTime = perfTimer.now();
     
     try {
-      console.log(t("sizing.starting_i18n_sizing_analysis"));
-      console.log(t("sizing.source_directory", { sourceDir: this.sourceDir }));
+      SecurityUtils.debugLog('info', t("sizing.starting_i18n_sizing_analysis"));
+      SecurityUtils.debugLog('info', t("sizing.source_directory", { sourceDir: this.sourceDir }));
       
       const files = this.getLanguageFiles();
       
       if (files.length === 0) {
-        console.log(t("sizing.no_translation_files_found"));
+        SecurityUtils.debugLog('warn', t("sizing.no_translation_files_found"));
         return;
       }
       
-      console.log(t("sizing.found_languages", { languages: files.map(f => f.language).join(', ') }));
+      SecurityUtils.debugLog('info', t("sizing.found_languages", { languages: files.map(f => f.language).join(', ') }));
       
       this.analyzeFileSizes(files);
       this.analyzeTranslationContent(files);
@@ -691,16 +696,16 @@ Generated: ${new Date().toISOString()}
       if (this.format === 'table') {
         this.displayFolderResults();
       } else if (this.format === 'json') {
-        console.log(t("sizing.analysisStats", { stats: JSON.stringify(this.stats, null, 2) }));
+        SecurityUtils.debugLog('info', t("sizing.analysisStats", { stats: JSON.stringify(this.stats, null, 2) }));
       }
       
       await this.generateHumanReadableReport();
       
-      const endTime = performance.now();
-      console.log(t("sizing.analysis_completed", { duration: (endTime - startTime).toFixed(2) }));
+      const endTime = perfTimer.now();
+      SecurityUtils.debugLog('info', t("sizing.analysis_completed", { duration: (endTime - startTime).toFixed(2) }));
       
     } catch (error) {
-      console.error(t("sizing.analysis_failed", { errorMessage: error.message }));
+      SecurityUtils.debugLog('error', t("sizing.analysis_failed", { errorMessage: error.message }));
       process.exit(1);
     }
   }
@@ -901,19 +906,20 @@ Options:
   // Main analysis method
   async analyze() {
     try {
-      console.log(t("sizing.starting_analysis"));
-      console.log(t("sizing.source_directory", { sourceDir: this.sourceDir }));
+      SecurityUtils.debugLog('info', t("sizing.starting_analysis"));
+      SecurityUtils.debugLog('info', t("sizing.source_directory", { sourceDir: this.sourceDir }));
       
-      const startTime = performance.now();
+      const perfTimer = SecurityUtils.getPerformanceTimer();
+      const startTime = perfTimer.now();
       
       // Get language files
       const files = this.getLanguageFiles();
       if (files.length === 0) {
-        console.warn(t("sizing.no_translation_files_found"));
+        SecurityUtils.debugLog('warn', t("sizing.no_translation_files_found"));
         return { success: false, error: "No translation files found" };
       }
       
-      console.log(t("sizing.found_files", { count: files.length }));
+      SecurityUtils.debugLog('info', t("sizing.found_files", { count: files.length }));
       
       // Analyze file sizes
       this.analyzeFileSizes(files);
@@ -930,15 +936,15 @@ Options:
       // Generate reports if requested
       await this.generateHumanReadableReport();
       
-      const endTime = performance.now();
+      const endTime = perfTimer.now();
       const duration = ((endTime - startTime) / 1000).toFixed(2);
       
-      console.log(t("sizing.analysis_completed", { duration }));
+      SecurityUtils.debugLog('info', t("sizing.analysis_completed", { duration }));
       
       return { success: true, stats: this.stats };
       
     } catch (error) {
-      console.error(t("sizing.analysis_failed", { errorMessage: error.message }));
+      SecurityUtils.debugLog('error', t("sizing.analysis_failed", { errorMessage: error.message }));
       return { success: false, error: error.message };
     }
   }

package/main/i18ntk-summary.js

@@ -19,7 +19,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations( 'en', path.resolve(__dirname, '..', 'ui-locales'));
+loadTranslations( 'en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
 
 
 class I18nSummaryReporter {
@@ -54,7 +54,7 @@ class I18nSummaryReporter {
       this.config = baseConfig;
 
       const uiLanguage = this.config.uiLanguage || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
 
       this.sourceDir = this.config.sourceDir;
 
@@ -112,12 +112,12 @@ class I18nSummaryReporter {
 
   // Get all available languages
   getAvailableLanguages() {
-    if (!fs.existsSync(this.config.sourceDir)) {
+    if (!SecurityUtils.safeExistsSync(this.config.sourceDir, this.config.sourceDir)) {
       return [];
     }
 
     // Check for monolith JSON files (en.json, es.json, etc.)
-    const files = fs.readdirSync(this.config.sourceDir);
+    const files = SecurityUtils.safeReaddirSync(this.config.sourceDir, this.config.sourceDir) || [];
     const languages = files
       .filter(file => file.endsWith('.json'))
       .map(file => path.basename(file, '.json'));
@@ -126,7 +126,8 @@ class I18nSummaryReporter {
     const directories = fs.readdirSync(this.config.sourceDir)
       .filter(item => {
         const itemPath = path.join(this.config.sourceDir, item);
-        return fs.statSync(itemPath).isDirectory() && 
+        const stats = SecurityUtils.safeStatSync(itemPath, this.config.sourceDir);
+         return stats && stats.isDirectory() && 
                !item.startsWith('.') &&
                item !== 'node_modules';
       });
@@ -138,11 +139,11 @@ class I18nSummaryReporter {
   getLanguageFiles(language) {
     const languageDir = path.join(this.config.sourceDir, language);
     
-    if (!fs.existsSync(languageDir)) {
+    if (!SecurityUtils.safeExistsSync(languageDir, this.config.sourceDir)) {
       return [];
     }
 
-    return fs.readdirSync(languageDir)
+    return SecurityUtils.safeReaddirSync(languageDir, this.config.sourceDir) || []
       .filter(file => {
         return this.config.supportedExtensions.some(ext => file.endsWith(ext)) &&
                !this.config.excludeFiles.includes(file);
@@ -153,7 +154,7 @@ class I18nSummaryReporter {
   // Get file size information
   getFileSize(filePath) {
     try {
-      const stats = fs.statSync(filePath);
+      const stats = SecurityUtils.safeStatSync(filePath, this.config.sourceDir);
       return {
         size: stats.size,
         sizeFormatted: this.formatFileSize(stats.size),
@@ -177,10 +178,10 @@ class I18nSummaryReporter {
   calculateFolderSize(folderPath) {
     let totalSize = 0;
     try {
-      const items = fs.readdirSync(folderPath);
+      const items = SecurityUtils.safeReaddirSync(folderPath, this.config.sourceDir) || [];
       for (const item of items) {
         const itemPath = path.join(folderPath, item);
-        const stats = fs.statSync(itemPath);
+        const stats = SecurityUtils.safeStatSync(itemPath, this.config.sourceDir);
         if (stats.isDirectory()) {
           totalSize += this.calculateFolderSize(itemPath);
         } else {
@@ -340,7 +341,7 @@ class I18nSummaryReporter {
     // Calculate folder sizes for each language
     for (const language of this.stats.languages) {
       const languageDir = path.join(this.config.sourceDir, language);
-      if (fs.existsSync(languageDir)) {
+      if (SecurityUtils.safeExistsSync(languageDir, this.config.sourceDir)) {
         this.stats.folderSizes[language] = this.calculateFolderSize(languageDir);
       }
     }
@@ -830,7 +831,7 @@ class I18nSummaryReporter {
     this.config = { ...this.config, ...baseConfig };
     
     const uiLanguage = this.config.uiLanguage || 'en';
-    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+    loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
     if (!this.config.sourceDir) {
       this.config.sourceDir = this.detectI18nDirectory();
     }
@@ -865,7 +866,7 @@ class I18nSummaryReporter {
       }
       
       // Validate source directory exists
-      if (!fs.existsSync(this.config.sourceDir)) {
+      if (!SecurityUtils.safeExistsSync(this.config.sourceDir, this.config.sourceDir)) {
         console.error(t('summary.sourceDirectoryDoesNotExist', { sourceDir: this.config.sourceDir }));
         process.exit(1);
       }
@@ -898,7 +899,7 @@ class I18nSummaryReporter {
         
         // Create output directory if it doesn't exist
         const outputDir = path.resolve(process.cwd(), 'i18ntk-reports');
-        if (!fs.existsSync(outputDir)) {
+        if (!SecurityUtils.safeExistsSync(outputDir)) {
           fs.mkdirSync(outputDir, { recursive: true });
         }
         
@@ -923,7 +924,7 @@ class I18nSummaryReporter {
       if (args.outputFile) {
         // Always save summary reports to i18ntk-reports
         const reportsDir = path.resolve(process.cwd(), 'i18ntk-reports');
-        if (!fs.existsSync(reportsDir)) {
+        if (!SecurityUtils.safeExistsSync(reportsDir)) {
           fs.mkdirSync(reportsDir, { recursive: true });
         }
         const outputFileName = args.outputFile ? path.basename(args.outputFile) : `summary-report-${new Date().toISOString().slice(0,10)}.txt`;
@@ -943,8 +944,8 @@ class I18nSummaryReporter {
         console.log(t('summary.cleaningUpReportFiles'));
         try {
           const reportsDir = path.join(this.config.sourceDir, 'scripts', 'i18n', 'reports');
-          if (fs.existsSync(reportsDir)) {
-            const files = fs.readdirSync(reportsDir);
+          if (SecurityUtils.safeExistsSync(reportsDir)) {
+            const files = SecurityUtils.safeReaddirSync(reportsDir, this.config.sourceDir) || [];
             const reportFiles = files.filter(file => 
               (file.endsWith('.txt') || file.endsWith('.json') || file.endsWith('.log')) &&
               file !== path.basename(args.outputFile || '')
@@ -953,7 +954,9 @@ class I18nSummaryReporter {
             let deletedCount = 0;
             for (const file of reportFiles) {
               try {
-                fs.unlinkSync(path.join(reportsDir, file));
+                // Note: Using direct fs.unlinkSync as SecurityUtils.safeUnlinkSync doesn't exist yet
+                 // This should be replaced with a secure version when available
+                 fs.unlinkSync(path.join(reportsDir, file));
                 deletedCount++;
               } catch (error) {
                 console.log(t('summary.couldNotDelete', { file, error: error.message }));

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