i18ntk 4.5.2 → 4.5.4

package/main/i18ntk-summary.js

@@ -56,11 +56,14 @@ class I18nSummaryReporter {
       const uiLanguage = this.config.uiLanguage || 'en';
       loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
 
-      this.sourceDir = this.config.sourceDir;
-
-      // Validate source directory
-      const { validateSourceDir } = require('../utils/config-helper');
-      validateSourceDir(this.sourceDir, 'i18ntk-summary');
+      this.sourceDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
+      this.config.sourceDir = this.sourceDir;
+
+      if (!SecurityUtils.safeExistsSync(this.sourceDir, process.cwd())) {
+        const err = new Error(`Locale directory not found: ${this.sourceDir}`);
+        err.exitCode = 2;
+        throw err;
+      }
     } catch (error) {
       console.error(`Error initializing summary reporter: ${error.message}`);
       throw error;
@@ -523,7 +526,10 @@ class I18nSummaryReporter {
     report.push(t('summary.languagesCount', {count: this.stats.languages.length}));
     report.push(t('summary.totalFiles', {count: this.stats.totalFiles}));
     report.push(t('summary.totalKeys', {count: this.stats.totalKeys}));
-    report.push(t('summary.avgKeysPerLanguage', {count: Math.round(this.stats.totalKeys / this.stats.languages.length)}));
+    const averageKeysPerLanguage = this.stats.languages.length > 0
+      ? Math.round(this.stats.totalKeys / this.stats.languages.length)
+      : 0;
+    report.push(t('summary.avgKeysPerLanguage', {count: averageKeysPerLanguage}));
     
     // Calculate total size
     const totalSize = Object.values(this.stats.folderSizes).reduce((sum, size) => sum + size, 0);
@@ -666,8 +672,13 @@ class I18nSummaryReporter {
         }
         report.push('');
       }
-    } else {
-      report.push(t('summary.noIssuesFound'));
+    } else if (this.stats.languages.length === 0) {
+      report.push('⚠️  NO LOCALE LANGUAGES FOUND');
+      report.push('='.repeat(30));
+      report.push('No locale language files or directories were found in the selected locale root.');
+      report.push('');
+    } else {
+      report.push(t('summary.noIssuesFound'));
       report.push('='.repeat(30));
       report.push(t('summary.allFilesConsistent'));
       report.push('');
@@ -795,13 +806,20 @@ class I18nSummaryReporter {
     const args = process.argv.slice(2);
     const parsed = {};
     
-    args.forEach(arg => {
-      if (arg.startsWith('--')) {
-        const [key, value] = arg.substring(2).split('=');
-        if (key === 'source-dir') {
-          parsed.sourceDir = value;
-        } else if (key === 'source-language') {
-          parsed.sourceLanguage = value;
+    for (let i = 0; i < args.length; i++) {
+      const arg = args[i];
+      if (arg.startsWith('--')) {
+        const [key, rawValue] = arg.substring(2).split('=');
+        const value = rawValue !== undefined
+          ? rawValue
+          : (args[i + 1] && !args[i + 1].startsWith('--') ? args[++i] : true);
+        if (key === 'source-dir' || key === 'locales-dir' || key === 'i18n-dir') {
+          parsed.sourceDir = value;
+          parsed.i18nDir = value;
+        } else if (key === 'source-language' || key === 'source-locale') {
+          parsed.sourceLanguage = value;
+        } else if (key === 'code-dir' || key === 'source-code-dir') {
+          parsed.codeDir = value;
         } else if (key === 'output-file') {
           parsed.outputFile = value;
         } else if (key === 'verbose') {
@@ -813,10 +831,10 @@ class I18nSummaryReporter {
         } else if (key === 'no-prompt') {
           parsed.noPrompt = true;
         } else if (key === 'help') {
-          parsed.help = true;
-        }
-      }
-    });
+          parsed.help = true;
+        }
+      }
+    }
     
     return parsed;
   }
@@ -827,14 +845,16 @@ class I18nSummaryReporter {
     const { fromMenu = false, noPrompt = false } = options;
     
     // Always use unified configuration to respect settings
-    const baseConfig = await getUnifiedConfig('summary', args);
-    this.config = { ...this.config, ...baseConfig };
+    const baseConfig = await getUnifiedConfig('summary', args);
+    this.config = { ...this.config, ...baseConfig };
     
     const uiLanguage = this.config.uiLanguage || 'en';
     loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
-    if (!this.config.sourceDir) {
-      this.config.sourceDir = this.detectI18nDirectory();
-    }
+    if (!this.config.sourceDir) {
+      this.config.sourceDir = this.detectI18nDirectory();
+    }
+    this.config.sourceDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
+    this.sourceDir = this.config.sourceDir;
     
     if (!fromMenu) {
       // Check admin authentication for sensitive operations (only when called directly)
@@ -866,10 +886,10 @@ class I18nSummaryReporter {
       }
       
       // Validate source directory exists
-      if (!SecurityUtils.safeExistsSync(this.config.sourceDir, this.config.sourceDir)) {
-        console.error(t('summary.sourceDirectoryDoesNotExist', { sourceDir: this.config.sourceDir }));
-        process.exit(1);
-      }
+      if (!SecurityUtils.safeExistsSync(this.config.sourceDir, process.cwd())) {
+        console.error(t('summary.sourceDirectoryDoesNotExist', { sourceDir: this.config.sourceDir }));
+        process.exit(2);
+      }
     }
     
     console.log(t('summary.i18nSummaryReportGenerator'));
@@ -992,17 +1012,19 @@ class I18nSummaryReporter {
       
       if (totalIssues > 0) {
         console.log(t('summary.foundIssues', {count: totalIssues}));
-      } else {
-        console.log(t('summary.noIssuesConsole'));
-      }
+      } else if (this.stats.languages.length === 0) {
+        console.log('⚠️  No locale languages found in the selected locale root.');
+      } else {
+        console.log(t('summary.noIssuesConsole'));
+      }
       
     } catch (error) {
       console.error(t('summary.errorDuringAnalysis', { error: error.message }));
       if (args.verbose) {
         console.error(error.stack);
       }
-      process.exit(1);
-    }
+      process.exit(error.exitCode || 1);
+    }
     process.exit(0);
   }
 }
@@ -1014,10 +1036,10 @@ if (require.main === module) {
     await reporter.initialize();
     await reporter.run();
   }
-  main().catch(error => {
-    console.error('Error in i18ntk-summary:', error.message);
-    process.exit(1);
-  });
-}
+  main().catch(error => {
+    console.error('Error in i18ntk-summary:', error.message);
+    process.exit(error.exitCode || 1);
+  });
+}
 
-module.exports = I18nSummaryReporter;
+module.exports = I18nSummaryReporter;

package/main/i18ntk-usage.js

@@ -46,6 +46,7 @@ const JsonOutput = require('../utils/json-output');
 const SetupEnforcer = require('../utils/setup-enforcer');
 const { resolveUsageSourceDir } = require('../utils/usage-source');
 const { analyzeSourceForUsageInsights } = require('../utils/usage-insights');
+const { isInteractive } = require('../utils/prompt-helper');
 
 // Ensure setup is complete before running
 (async () => {
@@ -195,7 +196,7 @@ class I18nUsageAnalyzer {
         this.config.excludeDirs = ['node_modules', '.git'];
       }
       if (!Array.isArray(this.config.includeExtensions) && !Array.isArray(this.config.supportedExtensions)) {
-        this.config.includeExtensions = ['.js', '.jsx', '.ts', '.tsx', '.py', '.pyx', '.pyi'];
+        this.config.includeExtensions = ['.js', '.jsx', '.ts', '.tsx', '.vue', '.svelte', '.py', '.pyx', '.pyi'];
       }
       
       await SecurityUtils.logSecurityEvent(t('usage.analyzerInitialized'), 'info', { component: 'i18ntk-usage' });
@@ -207,9 +208,10 @@ class I18nUsageAnalyzer {
 
   // Normalize CLI arguments to handle both camelCase and hyphenated flags
   normalizeArgs(a) {
-    return {
-      sourceDir: a.sourceDir ?? a['source-dir'],
-      i18nDir: a.i18nDir ?? a['i18n-dir'],
+    return {
+      sourceDir: a.sourceDir ?? a['source-dir'] ?? a['code-dir'] ?? a['source-code-dir'],
+      i18nDir: a.i18nDir ?? a['i18n-dir'] ?? a['locales-dir'],
+      sourceLanguage: a.sourceLanguage ?? a['source-language'] ?? a['source-locale'],
       outputReport: a.outputReport ?? a['output-report'],
       outputDir: a.outputDir ?? a['output-dir'],
       uiLanguage: a.uiLanguage ?? a['ui-language'],
@@ -231,11 +233,18 @@ class I18nUsageAnalyzer {
     const args = process.argv.slice(2);
     const parsed = {};
     
-    for (const arg of args) {
-      if (arg.startsWith('--')) {
-        const [key, value] = arg.substring(2).split('=');
-        if (value !== undefined) {
-          parsed[key] = value;
+    for (let i = 0; i < args.length; i++) {
+      const arg = args[i];
+      if (arg.startsWith('--')) {
+        let [key, value] = arg.substring(2).split('=');
+        if (value === undefined && args[i + 1] && !args[i + 1].startsWith('-')) {
+          value = args[++i];
+        }
+        if (key === 'code-dir' || key === 'source-code-dir') key = 'source-dir';
+        if (key === 'locales-dir') key = 'i18n-dir';
+        if (key === 'source-locale') key = 'source-language';
+        if (value !== undefined) {
+          parsed[key] = value;
         } else {
           parsed[key] = true;
         }
@@ -513,11 +522,15 @@ class I18nUsageAnalyzer {
         this.sourceDir = path.resolve(args.sourceDir);
       }
       
-      if (args.i18nDir) {
-        this.config.i18nDir = args.i18nDir;
-        this.i18nDir = path.resolve(args.i18nDir);
-        this.sourceLanguageDir = path.join(this.i18nDir, this.config.sourceLanguage);
-      }
+      if (args.i18nDir) {
+        this.config.i18nDir = args.i18nDir;
+        this.i18nDir = path.resolve(args.i18nDir);
+        this.sourceLanguageDir = path.join(this.i18nDir, this.config.sourceLanguage);
+      }
+      if (args.sourceLanguage) {
+        this.config.sourceLanguage = args.sourceLanguage;
+        this.sourceLanguageDir = path.join(this.i18nDir, this.config.sourceLanguage);
+      }
       
       if (this.sourceDir || this.i18nDir) {
         await configManager.updateConfig({
@@ -722,9 +735,9 @@ class I18nUsageAnalyzer {
       
       console.log('\n' + t('usage.analysisCompletedSuccessfully'));
     
-      if (require.main === module && !args.noPrompt) {
-        await this.prompt('\nPress Enter to continue...');
-      }
+      if (require.main === module && isInteractive(args)) {
+        await this.prompt('\nPress Enter to continue...');
+      }
       this.closeReadline();
       
     } catch (error) {

package/main/i18ntk-validate.js

@@ -43,8 +43,9 @@ const configManager = require('../utils/config-manager');
 const SecurityUtils = require('../utils/security');
 const AdminCLI = require('../utils/admin-cli');
 const watchLocales = require('../utils/watch-locales');
-const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
-const { getUnifiedConfig, parseCommonArgs, displayHelp, validateSourceDir, displayPaths } = require('../utils/config-helper');
+const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
+const { getUnifiedConfig, parseCommonArgs, displayHelp, validateSourceDir, displayPaths } = require('../utils/config-helper');
+const { isInteractive } = require('../utils/prompt-helper');
 const I18nInitializer = require('./i18ntk-init');
 const JsonOutput = require('../utils/json-output');
 const ExitCodes = require('../utils/exit-codes');
@@ -105,14 +106,21 @@ class I18nValidator {
       );
       
       // Use the i18n directory for language files
-      this.sourceDir = this.config.i18nDir || this.config.sourceDir;
-      this.i18nDir = this.config.i18nDir || this.config.sourceDir;
+      this.sourceDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
+      this.i18nDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
       this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
       
-      try {
-        validateSourceDir(this.sourceDir, 'i18ntk-validate');
-      } catch (err) {
-        console.log(t('init.requiredTitle'));
+      try {
+        if (!SecurityUtils.safeExistsSync(this.sourceDir, process.cwd())) {
+          const err = new Error(`Locale directory not found: ${this.sourceDir}`);
+          err.exitCode = 2;
+          throw err;
+        }
+      } catch (err) {
+        if (!isInteractive(args)) {
+          throw err;
+        }
+        console.log(t('init.requiredTitle'));
         console.log(t('init.requiredBody'));
         const answer = await this.prompt(t('init.promptRunNow'));
         if (answer.trim().toLowerCase() === 'y') {
@@ -827,11 +835,13 @@ class I18nValidator {
       if (args.uiLanguage) {
         loadTranslations(args.uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));}
       
-      if (args.sourceDir) {
-        this.config.sourceDir = args.sourceDir;
-        this.sourceDir = path.resolve(this.config.sourceDir);
-        this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
-      }
+      const localeDirArg = args.i18nDir || (!args.i18nDir && args.sourceDir ? args.sourceDir : null);
+      if (localeDirArg) {
+        this.config.i18nDir = localeDirArg;
+        this.sourceDir = path.resolve(localeDirArg);
+        this.i18nDir = this.sourceDir;
+        this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
+      }
       if (args.strictMode) {
         this.config.strictMode = true;
       }
@@ -1131,14 +1141,18 @@ class I18nValidator {
         { message: 'Starting validation run' }
       );
 
-      const result = await this.validate();
-
-      console.log(t('validate.validationProcessCompletedSuccessfully'));
-      SecurityUtils.logSecurityEvent(
-        t('validate.runCompleted'),
-        'info',
-        { message: 'Validation run completed successfully' }
-      );
+      const result = await this.validate();
+
+      if (result.success) {
+        console.log(t('validate.validationProcessCompletedSuccessfully'));
+      } else {
+        console.log('❌ Validation failed.');
+      }
+      SecurityUtils.logSecurityEvent(
+        result.success ? t('validate.runCompleted') : t('validate.runError'),
+        result.success ? 'info' : 'error',
+        { message: result.success ? 'Validation run completed successfully' : 'Validation run failed' }
+      );
       return result;
     };
 
@@ -1234,8 +1248,8 @@ if (require.main === module) {
           timestamp: new Date().toISOString()
         });
 
-        process.exit(result.success ? ExitCodes.SUCCESS : ExitCodes.VALIDATION_FAILED);
-      }
+        process.exit(result.success ? ExitCodes.SUCCESS : ExitCodes.VALIDATION_FAILED);
+      }
     } catch (error) {
       console.error(t('validate.fatalValidationError', { error: error.message }));
       console.error(t('validate.stackTrace', { stack: error.stack }));
@@ -1245,7 +1259,7 @@ if (require.main === module) {
         timestamp: new Date().toISOString()
       });
 
-      process.exit(ExitCodes.CONFIG_ERROR);
+      process.exit(error.exitCode || ExitCodes.CONFIG_ERROR);
     }
   })();
 }

package/main/manage/commands/AnalyzeCommand.js

@@ -80,10 +80,17 @@ class AnalyzeCommand {
             const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
             loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
-            this.sourceDir = this.config.sourceDir;
+            this.sourceDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
             this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
             this.outputDir = this.config.outputDir;
 
+            const explicitLocaleDir = args.i18nDir || (!args.i18nDir && args.sourceDir ? args.sourceDir : null);
+            if (explicitLocaleDir && !SecurityUtils.safeExistsSync(this.sourceDir, process.cwd())) {
+                const err = new Error(`Locale directory not found: ${this.sourceDir}`);
+                err.exitCode = 2;
+                throw err;
+            }
+
             // Validate source directory exists and is readable/writable
             this.validateSourceDirWithFallback(this.sourceDir);
 
@@ -766,12 +773,34 @@ class AnalyzeCommand {
         }
     }
 
-    // Show help message
-    showHelp() {
-        console.log(t('analyze.help_message'));
-    }
-
-    // Main analyze method
+    // Show help message
+    showHelp() {
+        console.log(t('analyze.help_message'));
+    }
+
+    provideSetupGuidance() {
+        return [
+            'Setup guidance:',
+            `- Ensure the locale root exists: ${this.sourceDir}`,
+            `- Ensure the source locale exists: ${path.join(this.sourceDir, this.config.sourceLanguage)}`,
+            '- Add at least one target locale, for example de/common.json or de.json.',
+            '- Prefer --locales-dir for locale files. Use --code-dir for application source files.'
+        ].join('\n');
+    }
+
+    detectStructureType() {
+        const sourceLocaleDir = path.join(this.sourceDir, this.config.sourceLanguage);
+        const sourceLocaleFile = path.join(this.sourceDir, `${this.config.sourceLanguage}.json`);
+        if (SecurityUtils.safeExistsSync(sourceLocaleFile, this.sourceDir)) {
+            return { type: 'monolith' };
+        }
+        if (SecurityUtils.safeExistsSync(sourceLocaleDir, this.sourceDir)) {
+            return { type: 'directory' };
+        }
+        return { type: 'unknown' };
+    }
+
+    // Main analyze method
     async analyze() {
         try {
             const results = [];
@@ -806,11 +835,11 @@ class AnalyzeCommand {
                     });
                     console.log(JSON.stringify(jsonOutput.data, null, args.indent || 2));
                     return;
-                }
-                console.log(error);
-                console.log('\n' + guidance);
-                return;
-            }
+                }
+                console.log(error);
+                console.log('\n' + guidance);
+                return { success: true, warnings: 1, message: error };
+            }
 
             if (!args.json) {
                 console.log(t('analyze.foundLanguages', { count: languages.length, languages: languages.join(', ') }) || `📋 Found ${languages.length} languages to analyze: ${languages.join(', ')}`);
@@ -829,8 +858,11 @@ class AnalyzeCommand {
                 const report = this.generateLanguageReport(analysis);
 
                 // Save report
-                const reportPath = await this.saveReport(language, report);
-                const processedCount = results.length + 1;
+                const reportPath = await this.saveReport(language, report);
+                if (!reportPath) {
+                    throw new Error(`Failed to save analysis report for ${language}`);
+                }
+                const processedCount = results.length + 1;
 
                 if (!args.json) {
                     console.log(t('analyze.completed', { language }) || `✅ Analysis completed for ${language}`);
@@ -898,9 +930,9 @@ class AnalyzeCommand {
             console.log(t('analyze.finished') || '\n✅ Analysis completed successfully!');
 
             // Only prompt for input if running standalone and not in no-prompt mode
-            if (require.main === module && !this.noPrompt) {
-                await this.prompt('\nPress Enter to continue...');
-            }
+            if (require.main === module && !this.noPrompt && process.env.CI !== 'true' && process.stdin.isTTY && process.stdout.isTTY) {
+                await this.prompt('\nPress Enter to continue...');
+            }
             this.closeReadline();
 
             return results;
@@ -937,7 +969,7 @@ class AnalyzeCommand {
                 const uiLanguage = this.config.uiLanguage || 'en';
                 loadTranslations(uiLanguage, path.resolve(__dirname, '../../../ui-locales'));
 
-                this.sourceDir = this.config.sourceDir;
+                this.sourceDir = this.config.localesDir || this.config.i18nDir || this.config.sourceDir;
                 this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
                 this.outputDir = this.config.outputDir;
             }
@@ -975,19 +1007,20 @@ class AnalyzeCommand {
                 loadTranslations(args.uiLanguage, path.resolve(__dirname, '../../../ui-locales'));}
 
             // Update config if source directory is provided
-            if (args.sourceDir) {
-                this.config.sourceDir = args.sourceDir;
-                this.sourceDir = path.resolve(PROJECT_ROOT, this.config.sourceDir);
-                this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
-            }
+            const localeDirArg = args.i18nDir || (!args.i18nDir && args.sourceDir ? args.sourceDir : null);
+            if (localeDirArg) {
+                this.config.i18nDir = localeDirArg;
+                this.sourceDir = path.resolve(PROJECT_ROOT, localeDirArg);
+                this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
+            }
 
             if (args.outputDir) {
                 this.config.outputDir = args.outputDir;
                 this.outputDir = path.resolve(this.config.outputDir);
             }
-            const execute = async () => {
-                await this.analyze();
-            };
+            const execute = async () => {
+                return await this.analyze();
+            };
 
             if (args.watch) {
                 await execute();
@@ -1003,19 +1036,21 @@ class AnalyzeCommand {
                 });
                 console.log('��� Watching for translation changes. Press Ctrl+C to exit.');
             } else {
-                await execute();
-                if (!fromMenu && require.main === module) {
-                    process.exit(0);
-                }
-            }
+                const result = await execute();
+                if (!fromMenu && require.main === module) {
+                    process.exit(0);
+                }
+                return result;
+            }
         } catch (error) {
             console.error(t('analyze.error') || '❌ Analysis failed:', error.message);
             this.closeReadline();
-            if (!fromMenu && require.main === module) {
-                process.exit(1);
-            }
-        }
-    }
+            if (!fromMenu && require.main === module) {
+                process.exit(1);
+            }
+            throw error;
+        }
+    }
 
     async runSetupWizard() {
         console.log('Translation Analysis Setup Wizard');
@@ -1132,14 +1167,14 @@ class AnalyzeCommand {
     /**
      * Execute the analyze command
      */
-    async execute(options = {}) {
-        try {
-            await this.initialize();
-            await this.run(options);
-            return { success: true, command: 'analyze' };
-        } catch (error) {
-            console.error(`Analyze command failed: ${error.message}`);
-            throw error;
+    async execute(options = {}) {
+        try {
+            await this.initialize();
+            const result = await this.run(options);
+            return result && result.success === false ? result : { success: true, command: 'analyze', result };
+        } catch (error) {
+            console.error(`Analyze command failed: ${error.message}`);
+            throw error;
         }
     }
 

package/main/manage/commands/ScannerCommand.js

@@ -122,9 +122,11 @@ class ScannerCommand {
                 const value = valueParts.join('=');
 
                 switch (key) {
-                    case 'source-dir':
-                        parsed.sourceDir = value || '';
-                        break;
+                    case 'source-dir':
+                    case 'code-dir':
+                    case 'source-code-dir':
+                        parsed.sourceDir = value || '';
+                        break;
                     case 'framework':
                         parsed.framework = value || '';
                         break;
@@ -146,9 +148,13 @@ class ScannerCommand {
                     case 'output-report':
                         parsed.outputReport = true;
                         break;
-                    case 'include-tests':
-                        parsed.includeTests = true;
-                        break;
+                    case 'include-tests':
+                        parsed.includeTests = true;
+                        break;
+                    case 'source-language':
+                    case 'source-locale':
+                        parsed.sourceLanguage = value || '';
+                        break;
                     case 'help':
                     case 'h':
                         parsed.help = true;
@@ -669,4 +675,4 @@ class ScannerCommand {
     }
 }
 
-module.exports = ScannerCommand;
+module.exports = ScannerCommand;