i18ntk 2.2.0 → 2.3.0

package/utils/config-helper.js

@@ -9,9 +9,11 @@ const path = require('path');
 const configManager = require('./config-manager');
 const SecurityUtils = require('./security');
 const {loadTranslations} = require('./i18n-helper');
-const SettingsManager = require('../settings/settings-manager');
-const { envManager } = require('./env-manager');
-const settingsManager = new SettingsManager();
+const SettingsManager = require('../settings/settings-manager');
+const { envManager } = require('./env-manager');
+const { checkInitialized } = require('./init-helper');
+const { closeGlobalReadline } = require('./cli');
+const settingsManager = new SettingsManager();
 
 const { ask } = require('./cli');
 
@@ -132,10 +134,15 @@ async function getUnifiedConfig(scriptName, cliArgs = {}) {
       cfg.notTranslatedMarker ||
       cfg.processing?.notTranslatedMarker ||
       'NOT_TRANSLATED';
-    const markerList = Array.isArray(rawMarkers) ? rawMarkers : [rawMarkers];
-
-    const config = {
-      ...cfg,
+    const markerList = Array.isArray(rawMarkers) ? rawMarkers : [rawMarkers];
+    const configuredBackupKeep = parseInt(cfg.backup?.maxBackups, 10);
+    const normalizedBackupMaxBackups = Number.isInteger(configuredBackupKeep)
+      ? Math.min(Math.max(configuredBackupKeep, 1), 3)
+      : 1;
+    const normalizedBackupLocation = cfg.backup?.location || './i18ntk-backups';
+
+    const config = {
+      ...cfg,
       sourceLanguage: cliArgs.sourceLanguage || cfg.sourceLanguage || 'en',
       uiLanguage: cliArgs.uiLanguage || cfg.uiLanguage || 'en',
       notTranslatedMarker: markerList[0],
@@ -144,11 +151,17 @@ async function getUnifiedConfig(scriptName, cliArgs = {}) {
       excludeFiles: cfg.excludeFiles || cfg.processing?.excludeFiles || ['.DS_Store', 'Thumbs.db'],
       excludeDirs: cfg.excludeDirs || cfg.processing?.excludeDirs || ['node_modules', '.next', '.git', 'dist', 'build'],
       strictMode: cliArgs.strictMode || cfg.strictMode || false,
-      backupDir: path.join(settingsDir, 'backups'),
-      tempDir: path.join(settingsDir, 'temp'),
-      cacheDir: path.join(settingsDir, '.cache'),
-      configDir: settingsDir,
-      settings: {
+      backupDir: path.resolve(projectRoot, normalizedBackupLocation),
+      tempDir: path.join(settingsDir, 'temp'),
+      cacheDir: path.join(settingsDir, '.cache'),
+      configDir: settingsDir,
+      backup: {
+        ...(cfg.backup || {}),
+        enabled: cfg.backup?.enabled === true,
+        location: normalizedBackupLocation,
+        maxBackups: normalizedBackupMaxBackups
+      },
+      settings: {
         defaultLanguages: cfg.defaultLanguages || ['de', 'es', 'fr', 'ru'],
         processing: { ...cfg.processing },
         security: { ...cfg.security },
@@ -169,8 +182,8 @@ async function getUnifiedConfig(scriptName, cliArgs = {}) {
  * Get environment-specific configuration
  * @returns {object} Environment configuration
  */
-function getEnvironmentConfig() {
-  const settings = require('../settings/settings-manager').getAllSettings();
+function getEnvironmentConfig() {
+  const settings = settingsManager.getAllSettings();
   return {
     nodeEnv: settings.nodeEnv || 'production',
     isProduction: (settings.nodeEnv || 'production') === 'production',
@@ -425,7 +438,6 @@ function displayPaths(cfg = {}) {
 // Ensure project has been initialized with source language files
 async function ensureInitialized(cfg) {
   try {
-    const { checkInitialized } = require('./init-helper');
     const sourceDir = cfg?.sourceDir || './locales';
     const sourceLanguage = cfg?.sourceLanguage || 'en';
 
@@ -445,7 +457,6 @@ async function ensureInitialized(cfg) {
 
     const langDir = path.join(sourceDir, sourceLanguage);
     const answer = await ask(`Source language files not found in ${langDir}. Run initialization now? (y/N) `);
-    const { closeGlobalReadline } = require('./cli');
     closeGlobalReadline();
 
     if (answer.trim().toLowerCase().startsWith('y')) {

package/utils/config-manager.js

@@ -169,13 +169,14 @@ const DEFAULT_CONFIG = {
     "memoryPooling": true,
     "stringInterning": true
   },
-  "backup": {
-    "enabled": false,
-    "singleFileMode": false,
-    "singleBackupFile": "i18ntk-central-backup.json",
-    "retentionDays": 30,
-    "maxBackups": 100
-  },
+  "backup": {
+    "enabled": false,
+    "location": "./i18ntk-backups",
+    "singleFileMode": false,
+    "singleBackupFile": "i18ntk-central-backup.json",
+    "retentionDays": 30,
+    "maxBackups": 1
+  },
   "security": {
     "adminPinEnabled": false,
     "adminPinPromptOnInit": true,

package/utils/init-helper.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const configManager = require('./config-manager');
 const SecurityUtils = require('./security');
+const packageJson = require('../package.json');
 
 function ensureDirectory(dirPath) {
   if (!dirPath || typeof dirPath !== 'string') return;
@@ -46,7 +47,7 @@ function hasSourceLanguageFiles(sourceDir, sourceLanguage) {
  */
 async function checkInitialized(options = {}) {
   const settings = configManager.getConfig ? configManager.getConfig() : {};
-  const currentVersion = require('../package.json').version;
+  const currentVersion = packageJson.version;
   const projectConfigPath = configManager.CONFIG_PATH || path.join(process.cwd(), '.i18ntk-config');
   const configDir = path.dirname(projectConfigPath);
   
@@ -135,7 +136,7 @@ async function markAsInitialized(config) {
   const projectConfigPath = configManager.CONFIG_PATH || path.join(process.cwd(), '.i18ntk-config');
   const configDir = path.dirname(projectConfigPath);
   const initFilePath = path.join(configDir, 'initialization.json');
-  const currentVersion = require('../package.json').version;
+  const currentVersion = packageJson.version;
   const now = new Date().toISOString();
   const sourceDir = config?.sourceDir || settings.sourceDir || './locales';
   const sourceLanguage = config?.sourceLanguage || settings.sourceLanguage || 'en';

package/utils/json-output.js

@@ -1,6 +1,8 @@
-/**
- * JSON Output Utility for i18ntk commands
- * Provides consistent machine-readable output format for CI/CD integration
+const packageJson = require('../package.json');
+
+/**
+ * JSON Output Utility for i18ntk commands
+ * Provides consistent machine-readable output format for CI/CD integration
  */
 
 class JsonOutput {
@@ -21,12 +23,11 @@ class JsonOutput {
     };
   }
 
-  getPackageVersion() {
-    try {
-      const packageJson = require('../package.json');
-      return packageJson.version;
-    } catch (error) {
-      return '1.8.3';
+  getPackageVersion() {
+    try {
+      return packageJson.version;
+    } catch (error) {
+      return '1.8.3';
     }
   }
 
@@ -96,4 +97,4 @@ class JsonOutput {
   }
 }
 
-module.exports = JsonOutput;
+module.exports = JsonOutput;

package/utils/logger.js

@@ -45,10 +45,10 @@ const logger = {
     logger.log(output, colors.blue);
   },
   
-  // Debug logging (only when DEBUG env var is set or log level is debug)
-  debug: (message) => {
-    const logLevel = envManager.get('I18NTK_LOG_LEVEL');
-    const debugEnabled = process.env.DEBUG || logLevel === 'debug';
+  // Debug logging (only when DEBUG env var is set or log level is debug)
+  debug: (message) => {
+    const logLevel = envManager.get('I18NTK_LOG_LEVEL');
+    const debugEnabled = logLevel === 'debug';
     
     if (debugEnabled) {
       const output = `[DEBUG] ${message}`;

package/utils/safe-json.js

@@ -1,5 +1,5 @@
 // utils/safe-json.js
-const { readFile } = require('fs/promises');
+const fs = require('fs');
 
 function stripBOM(s) {
   if (typeof s === 'string' && s.charCodeAt(0) === 0xFEFF) return s.slice(1);
@@ -13,7 +13,7 @@ function stripBOM(s) {
  * - Single, typed error (no loops)
  */
 async function readJsonSafe(filePath, { maxBytes = 1_000_000 } = {}) {
-  const buf = await readFile(filePath);
+  const buf = await fs.promises.readFile(filePath);
   if (buf.length === 0) {
     const err = new Error('Empty JSON file');
     err.code = 'EJSONEMPTY';
@@ -37,4 +37,4 @@ async function readJsonSafe(filePath, { maxBytes = 1_000_000 } = {}) {
   }
 }
 
-module.exports = { readJsonSafe };
+module.exports = { readJsonSafe };

package/utils/secure-backup.js

@@ -1,5 +1,6 @@
 const crypto = require('crypto');
-const fs = require('fs/promises');
+const fs = require('fs');
+const fsp = fs.promises;
 const path = require('path');
 const zlib = require('zlib');
 const { promisify } = require('util');
@@ -180,7 +181,7 @@ class SecureBackupManager {
       const backupPath = path.join(this.config.backupDir, backupName);
       
       // Write the backup file
-      await fs.writeFile(backupPath, JSON.stringify(backupData, null, 2), 'utf8');
+      await fsp.writeFile(backupPath, JSON.stringify(backupData, null, 2), 'utf8');
       
       // Clean up old backups if we've exceeded the limit
       await this.cleanupOldBackups();
@@ -203,7 +204,7 @@ class SecureBackupManager {
   async restoreBackup(backupPath, password) {
     try {
       // Read the backup file
-      const backupData = JSON.parse(await fs.readFile(backupPath, 'utf8'));
+      const backupData = JSON.parse(await fsp.readFile(backupPath, 'utf8'));
       
       // Validate the backup
       if (backupData.header !== BACKUP_HEADER) {
@@ -236,7 +237,7 @@ class SecureBackupManager {
   async listBackups() {
     try {
       // Read the backup directory
-      const files = (await fs.readdir(this.config.backupDir, { withFileTypes: true }))
+      const files = (await fsp.readdir(this.config.backupDir, { withFileTypes: true }))
       .filter(dirent => dirent.isFile())
       .map(dirent => dirent.name);
       
@@ -247,7 +248,7 @@ class SecureBackupManager {
       const backups = await Promise.all(
         backupFiles.map(async (file) => {
           const filePath = path.join(this.config.backupDir, file);
-          const stat = await fs.stat(filePath);
+          const stat = await fsp.stat(filePath);
           if (stat.isDirectory()) {
             throw new Error('Backup path is a directory');
           }
@@ -290,7 +291,7 @@ class SecureBackupManager {
       const deleted = [];
       for (const backup of toDelete) {
         try {
-          await fs.unlink(backup.path);
+          await fsp.unlink(backup.path);
           deleted.push(backup.name);
         } catch (error) {
           console.error(`Failed to delete backup ${backup.name}:`, error);
@@ -310,7 +311,7 @@ class SecureBackupManager {
   async verifyBackup(backupPath, password) {
     try {
       // Read the backup file
-      const backupData = JSON.parse(await fs.readFile(backupPath, 'utf8'));
+      const backupData = JSON.parse(await fsp.readFile(backupPath, 'utf8'));
       
       // Try to decrypt a small part to verify the password
       const testData = await this.decryptData(backupData, password);

package/utils/setup-enforcer.js

@@ -9,9 +9,25 @@
 
 const { getIcon } = require('./terminal-icons');
 const fs = require('fs');
-const path = require('path');
-const { blue, yellow, gray, cyan, green, red } = require('./colors-new');
-const SecurityUtils = require('./security');
+const path = require('path');
+const { blue, yellow, gray, cyan, green, red } = require('./colors-new');
+const SecurityUtils = require('./security');
+const I18nSetupModule = require('../main/i18ntk-setup');
+
+async function runSetupModule() {
+    if (I18nSetupModule && typeof I18nSetupModule.run === 'function') {
+        return await I18nSetupModule.run();
+    }
+
+    if (typeof I18nSetupModule === 'function') {
+        const setupManager = new I18nSetupModule();
+        if (typeof setupManager.setup === 'function') {
+            return await setupManager.setup();
+        }
+    }
+
+    throw new Error('Setup module does not expose a runnable entrypoint');
+}
 
 class SetupEnforcer {
     static _setupCheckInProgress = false;
@@ -107,39 +123,22 @@ class SetupEnforcer {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    // Import and run setup directly
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (SecurityUtils.safeExistsSync(setupPath)) {
-                        try {
-                            const setup = require(setupPath);
-                            // Use the run function which properly instantiates the class
-                            if (setup && typeof setup.run === 'function') {
-                                await setup.run();
-                            } else {
-                                // Fallback: instantiate the class directly
-                                const I18nSetupManager = require(setupPath);
-                                const setupManager = new I18nSetupManager();
-                                await setupManager.setup();
-                            }
-                            console.log(gray('You can now run your original command.'));
-                            resolve(true);
-                        } catch (error) {
-                            console.error(red(`${getIcon('cross')} Setup failed:`), error.message);
-                            console.error(cyan('   Please try running setup manually:'));
-                            console.error(cyan('   npm run i18ntk-setup'));
-                            process.exit(1);
-                        }
-                    } else {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    console.error(cyan('   npm run i18ntk-setup'));
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    // Import once at module scope and execute the stable entrypoint.
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    console.log(gray('You can now run your original command.'));
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    console.error(cyan('   npm run i18ntk-setup'));
                     process.exit(1);
                 }
             });
@@ -185,37 +184,20 @@ static async handleIncompleteSetup() {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (SecurityUtils.safeExistsSync(setupPath)) {
-                        try {
-                            const setup = require(setupPath);
-                            // Use the run function which properly instantiates the class
-                            if (setup && typeof setup.run === 'function') {
-                                await setup.run();
-                            } else {
-                                // Fallback: instantiate the class directly
-                                const I18nSetupManager = require(setupPath);
-                                const setupManager = new I18nSetupManager();
-                                await setupManager.setup();
-                            }
-                            resolve(true);
-                        } catch (error) {
-                            console.error(red(`${getIcon('cross')} Setup failed:`), error.message);
-                            console.error(cyan('   Please try running setup manually:'));
-                            console.error(cyan('   npm run i18ntk-setup'));
-                            process.exit(1);
-                        }
-                    } else {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    process.exit(1);
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    process.exit(1);
                 }
             });
         });
@@ -260,37 +242,20 @@ static async handleInvalidConfig() {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (SecurityUtils.safeExistsSync(setupPath)) {
-                        try {
-                            const setup = require(setupPath);
-                            // Use the run function which properly instantiates the class
-                            if (setup && typeof setup.run === 'function') {
-                                await setup.run();
-                            } else {
-                                // Fallback: instantiate the class directly
-                                const I18nSetupManager = require(setupPath);
-                                const setupManager = new I18nSetupManager();
-                                await setupManager.setup();
-                            }
-                            resolve(true);
-                        } catch (error) {
-                            console.error(red(`${getIcon('cross')} Setup failed:`), error.message);
-                            console.error(cyan('   Please try running setup manually:'));
-                            console.error(cyan('   npm run i18ntk-setup'));
-                            process.exit(1);
-                        }
-                    } else {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    process.exit(1);
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    process.exit(1);
                 }
             });
         });