i18ntk 4.5.3 → 4.6.0

package/main/i18ntk-analyze.js

@@ -71,9 +71,16 @@ class I18nAnalyzer {
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
       loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       
-      this.sourceDir = this.config.sourceDir;
-      this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
-      this.outputDir = this.config.outputDir;
+      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
       const { validateSourceDir } = require('../utils/config-helper');
@@ -710,10 +717,32 @@ try {
     }
   }
 
-  // Show help message
-  showHelp() {
-    console.log(t('analyze.help_message'));
-  }
+  // 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() {
@@ -737,9 +766,9 @@ try {
       
       const languages = this.getAvailableLanguages();
       
-      if (languages.length === 0) {
-        const error = t('analyze.noLanguages') || '⚠️  No target languages found.';
-        const guidance = this.provideSetupGuidance();
+      if (languages.length === 0) {
+        const error = t('analyze.noLanguages') || '⚠️  No target languages found.';
+        const guidance = this.provideSetupGuidance();
         
         if (args.json) {
           jsonOutput.setStatus('error', error);
@@ -751,10 +780,10 @@ try {
           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(', ')}`);
@@ -773,8 +802,11 @@ try {
           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}`);
@@ -842,9 +874,9 @@ try {
       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;
@@ -881,8 +913,8 @@ try {
         const uiLanguage = this.config.uiLanguage || 'en';
         loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
         
-        this.sourceDir = this.config.sourceDir;
-        this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
+        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;
       }
       
@@ -921,19 +953,20 @@ try {
         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();
@@ -949,19 +982,21 @@ try {
         });
         console.log('��� Watching for translation changes. Press Ctrl+C to exit.');
       } else {
-        await execute();
-        if (!fromMenu && require.main === module) {
-          process.exit(0);
-        }
-      }
-    } catch (error) {
-      console.error(t('analyze.error') || '❌ Analysis failed:', error.message);
-      this.closeReadline();
-      if (!fromMenu && require.main === module) {
-        process.exit(1);
-      }
-    }
-  }
+        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);
+      }
+      throw error;
+    }
+  }
   
   async runSetupWizard() {
     console.log('Translation Analysis Setup Wizard');

package/main/i18ntk-complete.js

@@ -16,9 +16,10 @@ const path = require('path');
 const fs = require('fs');
 const SecurityUtils = require('../utils/security');
 const { loadTranslations, t } = require('../utils/i18n-helper');
-const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
-const SetupEnforcer = require('../utils/setup-enforcer');
-const { getUnifiedConfig } = require('../utils/config-helper');
+const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
+const SetupEnforcer = require('../utils/setup-enforcer');
+const { getUnifiedConfig, displayHelp } = require('../utils/config-helper');
+const { isInteractive } = require('../utils/prompt-helper');
 
 // Ensure setup is complete before running, except for help output.
 (async () => {
@@ -64,7 +65,7 @@ class I18nCompletionTool {
       
       const baseConfig = await getUnifiedConfig('complete', args);
       this.config = { ...baseConfig, ...(this.config || {}) };
-      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);
       
       // Validate source directory exists
@@ -99,24 +100,31 @@ class I18nCompletionTool {
     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;
-        } else if (key === 'auto-translate') {
+    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 === 'auto-translate') {
           parsed.autoTranslate = true;
         } else if (key === 'dry-run') {
           parsed.dryRun = true;
         } else if (key === 'no-prompt') {
           parsed.noPrompt = true;
         } else if (key === 'help' || key === 'h') {
-          parsed.help = true;
-        }
-      }
-    });
+          parsed.help = true;
+        }
+      }
+    }
     
     return parsed;
   }
@@ -567,22 +575,24 @@ class I18nCompletionTool {
       
       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);
     } else {
       await this.initialize();
       
-      if (args.sourceDir) {
-        const resolvedSourceDir = path.resolve(args.sourceDir);
-        const validatedSourceDir = SecurityUtils.validatePath(resolvedSourceDir, process.cwd());
-        if (!validatedSourceDir) {
-          console.error(t("complete.invalidSourceDir", { sourceDir: args.sourceDir }));
-          console.error(`Path validation failed — source directory is outside the allowed project boundary.`);
-          process.exit(1);
-        }
-        this.config.sourceDir = resolvedSourceDir;
-        this.sourceDir = validatedSourceDir;
-      }
+      const localesDirArg = args.i18nDir || args.sourceDir;
+      if (localesDirArg) {
+        const resolvedSourceDir = path.resolve(localesDirArg);
+        const validatedSourceDir = SecurityUtils.validatePath(resolvedSourceDir, process.cwd());
+        if (!validatedSourceDir) {
+          console.error(t("complete.invalidSourceDir", { sourceDir: localesDirArg }));
+          console.error(`Path validation failed — source directory is outside the allowed project boundary.`);
+          process.exit(1);
+        }
+        this.config.sourceDir = resolvedSourceDir;
+        this.config.i18nDir = resolvedSourceDir;
+        this.sourceDir = validatedSourceDir;
+      }
       
       if (args.sourceLanguage) {
         this.config.sourceLanguage = SecurityUtils.sanitizeInput(args.sourceLanguage, { 
@@ -643,15 +653,24 @@ class I18nCompletionTool {
       }
       
       console.log('\n');
-      console.log(t("complete.summaryTitle"));
-      console.log(t("complete.separator"));
-      console.log(t("complete.totalChanges", { totalChanges }));
-      console.log(t("complete.languagesProcessed", { languagesProcessed: languages.length }));
-      console.log(t("complete.missingKeysAdded", { missingKeysAdded: missingKeys.length }));
-      
-      if (!args.dryRun && allChanges.length > 0 && !args.noPrompt) {
-        const rl = this.rl || this.initReadline();
-        const answer = await this.prompt('\n' + t('complete.generateReportPrompt') + ' (Y/N): ');
+      console.log(t("complete.summaryTitle"));
+      console.log(t("complete.separator"));
+      const targetLocalesChanged = allChanges.length;
+      const filesModified = new Set(allChanges.flatMap(lang => lang.changes.map(change => `${lang.language}/${change.file}`))).size;
+      const filesSkipped = Math.max(0, targetLanguages.length - targetLocalesChanged);
+      console.log(`Locales scanned: ${languages.length}`);
+      console.log(`Target locales changed: ${targetLocalesChanged}`);
+      console.log(`Unique source keys added: ${missingKeys.length}`);
+      console.log(`Total key insertions: ${totalChanges}`);
+      console.log(`Files modified: ${args.dryRun ? 0 : filesModified}`);
+      console.log(`Files skipped: ${filesSkipped}`);
+      if (args.dryRun) {
+        console.log('Dry run only. No files were modified.');
+      }
+      
+      if (!args.dryRun && allChanges.length > 0 && isInteractive(args)) {
+        const rl = this.rl || this.initReadline();
+        const answer = await this.prompt('\n' + t('complete.generateReportPrompt') + ' (Y/N): ');
         
         if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
           await this.generateReport(allChanges, languages);

package/main/i18ntk-report.js

@@ -22,23 +22,32 @@ function parseArgs(argv = process.argv.slice(2)) {
     help: false,
   };
 
-  for (const raw of argv) {
+  for (let i = 0; i < argv.length; i++) {
+    const raw = argv[i];
     const arg = raw === 'report' ? '' : raw;
     if (!arg) continue;
+    const nextValue = () => {
+      if (i + 1 < argv.length && !String(argv[i + 1]).startsWith('--')) {
+        return argv[++i];
+      }
+      return null;
+    };
     if (arg === '--help' || arg === '-h') args.help = true;
     else if (arg === '--json') args.json = true;
     else if (arg === '--markdown' || arg === '--md') args.markdown = true;
     else if (arg === '--html') args.html = true;
     else if (arg.startsWith('--out=')) args.out = arg.slice('--out='.length);
-    else if (arg === '--out') args.expectOut = true;
-    else if (args.expectOut) {
-      args.out = arg;
-      args.expectOut = false;
-    } else if (arg.startsWith('--source-dir=')) args.sourceDir = arg.slice('--source-dir='.length);
+    else if (arg === '--out') args.out = nextValue();
+    else if (arg.startsWith('--source-dir=')) args.sourceDir = arg.slice('--source-dir='.length);
+    else if (arg.startsWith('--code-dir=')) args.sourceDir = arg.slice('--code-dir='.length);
+    else if (arg.startsWith('--source-code-dir=')) args.sourceDir = arg.slice('--source-code-dir='.length);
+    else if (arg === '--source-dir' || arg === '--code-dir' || arg === '--source-code-dir') args.sourceDir = nextValue();
     else if (arg.startsWith('--i18n-dir=')) args.i18nDir = arg.slice('--i18n-dir='.length);
     else if (arg.startsWith('--locales-dir=')) args.i18nDir = arg.slice('--locales-dir='.length);
+    else if (arg === '--i18n-dir' || arg === '--locales-dir') args.i18nDir = nextValue();
     else if (arg.startsWith('--source-language=')) args.sourceLocale = arg.slice('--source-language='.length);
     else if (arg.startsWith('--source-locale=')) args.sourceLocale = arg.slice('--source-locale='.length);
+    else if (arg === '--source-language' || arg === '--source-locale') args.sourceLocale = nextValue();
   }
 
   if (!args.json && !args.markdown && !args.html) {
@@ -107,9 +116,13 @@ Options:
   --markdown                Print/write Markdown report output
   --html                    Print/write HTML report output
   --out <dir>               Write selected report formats into a directory
-  --source-dir=<dir>        Source code directory to scan
-  --i18n-dir=<dir>          Locale directory
-  --source-language=<code>  Source locale code (default: en)
+  --code-dir=<dir>          Source code directory to scan
+  --source-code-dir=<dir>   Alias for --code-dir
+  --source-dir=<dir>        Legacy alias for --code-dir
+  --locales-dir=<dir>       Locale directory
+  --i18n-dir=<dir>          Alias for --locales-dir
+  --source-locale=<code>    Source locale code (default: en)
+  --source-language=<code>  Legacy alias for --source-locale
 `;
 }