i18ntk 2.1.0 → 2.3.0

package/main/i18ntk-backup.js

@@ -2,7 +2,8 @@
 
 'use strict';
 
-const fs = require('fs/promises');
+const fs = require('fs');
+const fsp = fs.promises;
 const path = require('path');
 
 // Simple CLI argument parser
@@ -36,16 +37,15 @@ function parseArgs(args) {
 
   return result;
 }
-const { existsSync } = require('fs');
-const configManager = require('../utils/config-manager');
-const { logger } = require('../utils/logger');
-const { colors } = require('../utils/logger');
+const configManager = require('../utils/config-manager');
+const { logger } = require('../utils/logger');
+const { colors } = require('../utils/logger');
 const prompt = require('../utils/prompt');
 
 // Backup configuration
 const config = configManager.getConfig();
-const backupDir = path.join(process.cwd(), 'i18n-backups');
-const maxBackups = config.backup?.maxBackups || 10;
+const backupDir = path.join(process.cwd(), 'i18ntk-backups');
+const maxBackups = Math.min(Math.max(parseInt(config.backup?.maxBackups, 10) || 1, 1), 3);
 
 // Main function to handle commands
 async function main() {
@@ -121,7 +121,7 @@ async function handleCreate(args) {
 
   // Create backup directory if it doesn't exist
   try {
-    await fs.mkdir(outputDir, { recursive: true });
+    await fsp.mkdir(outputDir, { recursive: true });
     logger.debug(`Created backup directory: ${outputDir}`);
   } catch (err) {
     if (err.code !== 'EEXIST') {
@@ -134,7 +134,7 @@ async function handleCreate(args) {
   // Validate directory
   const sourceDir = path.resolve(dir);
   try {
-    const stats = await fs.stat(sourceDir);
+    const stats = await fsp.stat(sourceDir);
     if (!stats.isDirectory()) {
       throw new Error(`Path exists but is not a directory: ${sourceDir}`);
     }
@@ -149,7 +149,7 @@ async function handleCreate(args) {
   logger.info('\nCreating backup...');
   
   // Read all files in the directory
-  const files = (await fs.readdir(sourceDir, { withFileTypes: true }))
+  const files = (await fsp.readdir(sourceDir, { withFileTypes: true }))
     .filter(dirent => dirent.isFile() && dirent.name.endsWith('.json'))
     .map(dirent => dirent.name);
     
@@ -163,7 +163,7 @@ async function handleCreate(args) {
   for (const file of files) {
     const filePath = path.join(sourceDir, file);
     try {
-      const content = JSON.parse(await fs.readFile(filePath, 'utf8'));
+      const content = JSON.parse(await fsp.readFile(filePath, 'utf8'));
       translations[file] = content;
     } catch (error) {
       logger.error(`Could not read file ${file}: ${error.message}`);
@@ -171,8 +171,8 @@ async function handleCreate(args) {
   }
   
   // Create the backup
-  await fs.writeFile(backupPath, JSON.stringify(translations, null, 2));
-  const stats = await fs.stat(backupPath);
+  await fsp.writeFile(backupPath, JSON.stringify(translations, null, 2));
+  const stats = await fsp.stat(backupPath);
   
   logger.success('Backup created successfully');
   logger.info(`  Location: ${backupPath}`);
@@ -203,12 +203,12 @@ async function handleRestore(args) {
   
   try {
     // Read the backup file
-    const backupData = await fs.readFile(backupPath, 'utf8');
+    const backupData = await fsp.readFile(backupPath, 'utf8');
     const translations = JSON.parse(backupData);
     
     // Create output directory if it doesn't exist
     try {
-      await fs.mkdir(outputDir, { recursive: true });
+      await fsp.mkdir(outputDir, { recursive: true });
     } catch (err) {
       if (err.code !== 'EEXIST') throw err;
     }
@@ -216,7 +216,7 @@ async function handleRestore(args) {
     // Write the restored files
     for (const [file, content] of Object.entries(translations)) {
       const filePath = path.join(outputDir, file);
-      await fs.writeFile(filePath, JSON.stringify(content, null, 2));
+      await fsp.writeFile(filePath, JSON.stringify(content, null, 2));
     }
     
     logger.success('Backup restored successfully');
@@ -230,7 +230,7 @@ async function handleList() {
   try {
     // Ensure backup directory exists
     try {
-      await fs.access(backupDir);
+      await fsp.access(backupDir);
     } catch (err) {
       if (err.code === 'ENOENT') {
         logger.warn('No backups found. The backup directory does not exist yet.');
@@ -240,14 +240,14 @@ async function handleList() {
       return;
     }
 
-    const files = await fs.readdir(backupDir);
+    const files = await fsp.readdir(backupDir);
     const backups = [];
     
     for (const file of files) {
       if (file.startsWith('backup-') && file.endsWith('.json')) {
         try {
           const filePath = path.join(backupDir, file);
-          const stats = await fs.stat(filePath);
+        const stats = await fsp.stat(filePath);
           backups.push({
             name: file,
             path: filePath,
@@ -307,14 +307,14 @@ async function handleVerify(args) {
   logger.info('\nVerifying backup...');
   
   try {
-    const data = await fs.readFile(backupPath, 'utf8');
+    const data = await fsp.readFile(backupPath, 'utf8');
     const content = JSON.parse(data);
     
     if (typeof content === 'object' && content !== null) {
       const fileCount = Object.keys(content).length;
       logger.success('Backup is valid');
       logger.info(`  Contains ${fileCount} translation files`);
-      logger.info(`  Last modified: ${(await fs.stat(backupPath)).mtime.toLocaleString()}`);
+      logger.info(`  Last modified: ${(await fsp.stat(backupPath)).mtime.toLocaleString()}`);
     } else {
       throw new Error('Invalid backup format');
     }
@@ -331,13 +331,13 @@ async function handleCleanup(args) {
   logger.info('\nCleaning up old backups...');
   
   try {
-    const files = await fs.readdir(backupDir);
+    const files = await fsp.readdir(backupDir);
     const backupFiles = files
       .filter(file => file.startsWith('backup-') && file.endsWith('.json'))
       .map(file => ({
         name: file,
         path: path.join(backupDir, file),
-        time: fs.statSync(path.join(backupDir, file)).mtime.getTime()
+        time: fs.statSync(path.join(backupDir, file)).mtime.getTime()
       }))
       .sort((a, b) => b.time - a.time);
     
@@ -352,7 +352,7 @@ async function handleCleanup(args) {
     // Delete old backups
     for (const file of toDelete) {
       try {
-        await fs.unlink(file.path);
+        await fsp.unlink(file.path);
         logger.info(`  - Deleted: ${file.name}`);
       } catch (err) {
         logger.error(`  - Failed to delete ${file.name}: ${err.message}`);
@@ -365,12 +365,10 @@ async function handleCleanup(args) {
   } catch (error) {
     logger.error('Error cleaning up backups:');
     logger.error(`  ${error.message}`);
-    if (process.env.DEBUG) {
-      console.error(error);
-    }
-    process.exit(1);
-  }
-}
+    logger.debug(error.stack || error.message);
+    process.exit(1);
+  }
+}
 
 // Start the application
 // Handle unhandled promise rejections

package/main/i18ntk-complete.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * I18NTK TRANSLATION COMPLETION SCRIPT
  * 
@@ -19,15 +19,15 @@ const { loadTranslations, t } = require('../utils/i18n-helper');
 const { getGlobalReadline, closeGlobalReadline } = require('../utils/cli');
 const SetupEnforcer = require('../utils/setup-enforcer');
 
-// Ensure setup is complete before running, except for help output.
-(async () => {
-  const isHelpRequest = process.argv.slice(2).some(arg => arg === '--help' || arg === '-h');
-  if (isHelpRequest) {
-    return;
-  }
-  try {
-    await SetupEnforcer.checkSetupCompleteAsync();
-  } catch (error) {
+// Ensure setup is complete before running, except for help output.
+(async () => {
+  const isHelpRequest = process.argv.slice(2).some(arg => arg === '--help' || arg === '-h');
+  if (isHelpRequest) {
+    return;
+  }
+  try {
+    await SetupEnforcer.checkSetupCompleteAsync();
+  } catch (error) {
     console.error('Setup check failed:', error.message);
     process.exit(1);
   }
@@ -37,7 +37,7 @@ loadTranslations();
 
 
 
-class I18nCompletionTool {
+class I18nCompletionTool {
   constructor(config = {}) {
     this.config = config;
     this.sourceDir = null;
@@ -109,57 +109,57 @@ class I18nCompletionTool {
           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;
-        }
-      }
-    });
+        } else if (key === 'no-prompt') {
+          parsed.noPrompt = true;
+        } else if (key === 'help' || key === 'h') {
+          parsed.help = true;
+        }
+      }
+    });
     
     return parsed;
   }
 
-  // Get all available languages
-  getAvailableLanguages() {
+  // Get all available languages
+  getAvailableLanguages() {
     if (!SecurityUtils.safeExistsSync(this.sourceDir, this.config.projectRoot)) {
       throw new Error(`Source directory not found: ${this.sourceDir}`);
     }
     
     // Check for monolith JSON files (en.json, es.json, etc.)
-    const files = SecurityUtils.safeReaddirSync(this.sourceDir, this.config.projectRoot);
-    const languagesFromFiles = files
-      .filter(file => file.endsWith('.json'))
-      .map(file => path.basename(file, '.json'))
-      .filter(code => this.isValidLanguageCode(code));
-    
-    // Also check for directory-based structure for backward compatibility
-    const directories = SecurityUtils.safeReaddirSync(this.sourceDir, this.config.projectRoot)
-      .filter(item => {
-        if (this.isExcludedLanguageDirectory(item)) return false;
-        if (!this.isValidLanguageCode(item)) return false;
-        const itemPath = path.join(this.sourceDir, item);
-        const stat = SecurityUtils.safeStatSync(itemPath, this.config.projectRoot);
-        if (!stat || !stat.isDirectory()) return false;
-
-        const localeFiles = SecurityUtils.safeReaddirSync(itemPath, this.config.projectRoot)
-          .filter(name => name.endsWith('.json'));
-        return localeFiles.length > 0;
-      });
-    
-    return [...new Set([...languagesFromFiles, ...directories])];
-  }
-
-  isValidLanguageCode(code) {
-    if (!code || typeof code !== 'string') return false;
-    return /^[a-z]{2}(?:-[A-Za-z0-9]{2,8})*$/i.test(code.trim());
-  }
-
-  isExcludedLanguageDirectory(name) {
-    if (!name || typeof name !== 'string') return true;
-    const lowered = name.toLowerCase();
-    return lowered.startsWith('backup-') || lowered === 'backup' || lowered === 'reports' || lowered === 'i18ntk-reports';
-  }
+    const files = SecurityUtils.safeReaddirSync(this.sourceDir, this.config.projectRoot);
+    const languagesFromFiles = files
+      .filter(file => file.endsWith('.json'))
+      .map(file => path.basename(file, '.json'))
+      .filter(code => this.isValidLanguageCode(code));
+    
+    // Also check for directory-based structure for backward compatibility
+    const directories = SecurityUtils.safeReaddirSync(this.sourceDir, this.config.projectRoot)
+      .filter(item => {
+        if (this.isExcludedLanguageDirectory(item)) return false;
+        if (!this.isValidLanguageCode(item)) return false;
+        const itemPath = path.join(this.sourceDir, item);
+        const stat = SecurityUtils.safeStatSync(itemPath, this.config.projectRoot);
+        if (!stat || !stat.isDirectory()) return false;
+
+        const localeFiles = SecurityUtils.safeReaddirSync(itemPath, this.config.projectRoot)
+          .filter(name => name.endsWith('.json'));
+        return localeFiles.length > 0;
+      });
+    
+    return [...new Set([...languagesFromFiles, ...directories])];
+  }
+
+  isValidLanguageCode(code) {
+    if (!code || typeof code !== 'string') return false;
+    return /^[a-z]{2}(?:-[A-Za-z0-9]{2,8})*$/i.test(code.trim());
+  }
+
+  isExcludedLanguageDirectory(name) {
+    if (!name || typeof name !== 'string') return true;
+    const lowered = name.toLowerCase();
+    return lowered.startsWith('backup-') || lowered === 'backup' || lowered === 'reports' || lowered === 'i18ntk-reports';
+  }
 
   // Get all JSON files from a language directory
   getLanguageFiles(language) {
@@ -481,7 +481,8 @@ class I18nCompletionTool {
       this.config = { ...baseConfig, ...(this.config || {}) };
       
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));this.sourceDir = this.config.sourceDir;
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      this.sourceDir = this.config.sourceDir;
       this.sourceLanguageDir = path.join(this.sourceDir, this.config.sourceLanguage);
     } else {
       await this.initialize();
@@ -552,28 +553,28 @@ class I18nCompletionTool {
       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): ');
-        
-        if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
-          await this.generateReport(allChanges, languages);
+      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): ');
+        
+        if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+          await this.generateReport(allChanges, languages);
         }
       }
       
-      if (!args.dryRun) {
-        console.log('\n' + t("complete.nextStepsTitle"));
-        console.log(t("complete.separator"));
-        console.log('1. Run usage analysis:');
-        console.log('   i18ntk --command=usage');
-        console.log('2. Validate translations:');
-        console.log('   i18ntk --command=validate');
-        console.log('3. Analyze translation status:');
-        console.log('   i18ntk --command=analyze');
-        console.log('\n' + t("complete.allKeysAvailable"));
-      } else {
-        console.log('\n' + t("complete.runWithoutDryRun"));
-      }
+      if (!args.dryRun) {
+        console.log('\n' + t("complete.nextStepsTitle"));
+        console.log(t("complete.separator"));
+        console.log('1. Run usage analysis:');
+        console.log('   i18ntk --command=usage');
+        console.log('2. Validate translations:');
+        console.log('   i18ntk --command=validate');
+        console.log('3. Analyze translation status:');
+        console.log('   i18ntk --command=analyze');
+        console.log('\n' + t("complete.allKeysAvailable"));
+      } else {
+        console.log('\n' + t("complete.runWithoutDryRun"));
+      }
       
       // Only prompt when run from the menu (i.e., when a callback or menu context is present)
       if (typeof this.prompt === "function" && args.fromMenu) {
@@ -605,4 +606,4 @@ if (require.main === module) {
   });
 }
 
-module.exports = I18nCompletionTool;
+module.exports = I18nCompletionTool;

package/main/i18ntk-doctor.js

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-const SecurityUtils = require('../utils/security');
-const fs = require('fs');
-const path = require('path');
-const { getUnifiedConfig, parseCommonArgs, displayHelp } = require('../utils/config-helper');
+const SecurityUtils = require('../utils/security');
+const fs = require('fs');
+const path = require('path');
+const packageJson = require('../package.json');
+const { getUnifiedConfig, parseCommonArgs, displayHelp } = require('../utils/config-helper');
 const SetupEnforcer = require('../utils/setup-enforcer');
 
 // Ensure setup is complete before running (only for standalone execution)
@@ -97,7 +98,7 @@ class I18nDoctor {
       }
     }
 
-    const pkgVersion = require('../package.json').version;
+    const pkgVersion = packageJson.version;
     if (config.version && config.version !== pkgVersion) {
       issues.push(`Config version mismatch: ${config.version} != ${pkgVersion}`);
       exitCode = Math.max(exitCode, ExitCodes.CONFIG_ERROR);
@@ -181,4 +182,4 @@ if (require.main === module) {
   doctor.run();
 }
 
-module.exports = I18nDoctor;
+module.exports = I18nDoctor;

package/main/i18ntk-fixer.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * I18NTK TRANSLATION FIXER SCRIPT
@@ -27,7 +27,7 @@ const SetupEnforcer = require('../utils/setup-enforcer');
   }
 })();
 
-loadTranslations('en', path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+loadTranslations('en', path.resolve(__dirname, '..', 'ui-locales'));
 
 class I18nFixer {
   constructor(config = {}) {
@@ -51,7 +51,7 @@ class I18nFixer {
       this.config = { ...baseConfig, ...(this.config || {}) };
 
       const uiLanguage = (this.config && this.config.uiLanguage) || 'en';
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
 
       this.sourceDir = this.config.sourceDir;
       this.outputDir = this.config.outputDir;

package/main/i18ntk-init.js

@@ -754,7 +754,7 @@ class I18nInitializer {
   }
 
   // Interactive admin PIN setup
-  async promptAdminPinSetup() {
+  async promptAdminPinSetup() {
     const { ask, askHidden, flushStdout } = require('../utils/cli');
 
     console.log('\n' + t('init.adminPinSetupOptional'));
@@ -806,8 +806,31 @@ class I18nInitializer {
       }
     } else {
       console.log(t('init.skippingAdminPinSetup'));
-    }
-  }
+    }
+  }
+
+  async promptBackupConfiguration(skipPrompt = false) {
+    const defaultBackupConfig = { enabled: false, maxBackups: 1, location: './i18ntk-backups' };
+    if (skipPrompt || !isInteractive()) {
+      return null;
+    }
+
+    const { ask } = require('../utils/cli');
+    console.log('\nBackup Settings');
+    console.log('Backups are disabled by default to avoid backup recursion and repo pollution.');
+    const enableAnswer = await ask('Enable automatic backups? (y/N): ');
+    const enabled = ['y', 'yes'].includes(String(enableAnswer || '').trim().toLowerCase());
+
+    if (!enabled) {
+      return defaultBackupConfig;
+    }
+
+    const keepAnswer = await ask('How many backups should be kept automatically (1-3, default 1): ');
+    const parsedKeep = parseInt(String(keepAnswer || '').trim(), 10);
+    const maxBackups = Number.isInteger(parsedKeep) ? Math.min(Math.max(parsedKeep, 1), 3) : 1;
+
+    return { enabled: true, maxBackups, location: './i18ntk-backups' };
+  }
 
   // Interactive language selection
   async selectLanguages(skipPrompt = false) {
@@ -921,11 +944,24 @@ class I18nInitializer {
     // Prompt for admin PIN setup if not already configured
     const securitySettings = configManager.getConfig().security || {};
     
-    if (!securitySettings.adminPinEnabled && securitySettings.adminPinPromptOnInit !== false && !args.noPrompt) {
-      const { flushStdout } = require('../utils/cli');
-      await flushStdout();
-      await this.promptAdminPinSetup();
-    }
+    if (!securitySettings.adminPinEnabled && securitySettings.adminPinPromptOnInit !== false && !args.noPrompt) {
+      const { flushStdout } = require('../utils/cli');
+      await flushStdout();
+      await this.promptAdminPinSetup();
+    }
+
+    const backupSettings = await this.promptBackupConfiguration(args.noPrompt);
+    if (backupSettings) {
+      await configManager.updateConfig({
+        backup: {
+          ...(this.config.backup || {}),
+          ...backupSettings
+        }
+      });
+      this.config.backup = { ...(this.config.backup || {}), ...backupSettings };
+    } else if (!this.config.backup) {
+      this.config.backup = { enabled: false, maxBackups: 1, location: './i18ntk-backups' };
+    }
 
     // Get target languages - use args.languages if provided
     let targetLanguages = args.languages || await this.selectLanguages(args.noPrompt);
@@ -1122,7 +1158,7 @@ class I18nInitializer {
       
       try {
         // Import locale optimizer directly
-        const LocaleOptimizer = require('../scripts/locale-optimizer');
+        const LocaleOptimizer = require('../utils/locale-optimizer');
         
         // First run dry run to show current state
         console.log('\n🔍 Running locale optimization preview...');
@@ -1139,12 +1175,12 @@ class I18nInitializer {
           console.log('\n✅ Package optimization completed!');
         } else {
           console.log('\n💡 You can run locale optimization later with:');
-          console.log('   node scripts/locale-optimizer.js --interactive');
+          console.log('   node utils/locale-optimizer.js --interactive');
         }
       } catch (error) {
         console.log('\n⚠️ Could not offer locale optimization:', error.message);
         console.log('\n💡 You can run locale optimization later with:');
-        console.log('   node scripts/locale-optimizer.js --interactive');
+        console.log('   node utils/locale-optimizer.js --interactive');
       }
     } catch (error) {
       console.log('\n⚠️ Could not offer locale optimization:', error.message);
@@ -1178,7 +1214,7 @@ class I18nInitializer {
         // Load translations for UI messages
       const uiLanguage = this.config.uiLanguage || 'en';
       const { loadTranslations } = require('../utils/i18n-helper');
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       }
       
       // Setup is now handled centrally by config manager
@@ -1261,7 +1297,7 @@ class I18nInitializer {
       // Load translations for UI messages
       const uiLanguage = this.config.uiLanguage || 'en';
       const { loadTranslations } = require('../utils/i18n-helper');
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
       
       // Skip i18n framework check in non-interactive mode
       console.log('Running initialization in non-interactive mode...');

package/main/i18ntk-scanner.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * I18NTK TEXT SCANNER
@@ -47,7 +47,7 @@ class I18nTextScanner {
   }
 
   loadLocale() {
-    const uiLocalesDir = path.join(__dirname, '..', 'resources', 'i18n', 'ui-locales');
+    const uiLocalesDir = path.join(__dirname, '..', 'ui-locales');
     const localeFile = path.join(uiLocalesDir, 'en.json');
 
     try {