i18ntk 2.3.8 → 2.5.0

package/main/manage/commands/FixerCommand.js

@@ -27,21 +27,21 @@ class FixerCommand {
         // Initialize fixer properties
         this.sourceDir = null;
         this.outputDir = null;
-        this.backupDir = null;
-        this.dryRun = false;
-        this.force = false;
-    }
-
-    isExcludedLanguageDirectory(name) {
-        if (!name || typeof name !== 'string') return true;
-        const lowered = name.toLowerCase();
-        return lowered.startsWith('backup-') ||
-               lowered === 'backup' ||
-               lowered === 'backups' ||
-               lowered === 'i18ntk-backups' ||
-               lowered === 'reports' ||
-               lowered === 'i18ntk-reports';
-    }
+        this.backupDir = null;
+        this.dryRun = false;
+        this.force = false;
+    }
+
+    isExcludedLanguageDirectory(name) {
+        if (!name || typeof name !== 'string') return true;
+        const lowered = name.toLowerCase();
+        return lowered.startsWith('backup-') ||
+               lowered === 'backup' ||
+               lowered === 'backups' ||
+               lowered === 'i18ntk-backups' ||
+               lowered === 'reports' ||
+               lowered === 'i18ntk-reports';
+    }
 
     /**
      * Set runtime dependencies for interactive operations
@@ -79,7 +79,7 @@ class FixerCommand {
 
             this.sourceDir = this.config.sourceDir;
             this.outputDir = this.config.outputDir;
-            this.backupDir = path.resolve(this.config.backup?.location || './i18ntk-backups', 'fixer');
+            this.backupDir = path.resolve(this.config.backup?.location || './i18ntk-backups', 'fixer');
 
             // Validate source directory exists
             const { validateSourceDir } = require('../../../utils/config-helper');
@@ -138,15 +138,15 @@ class FixerCommand {
             const languages = [];
 
             // Check for directory-based structure
-            const directories = items
-                .filter(item => item.isDirectory())
-                .map(item => item.name)
-                .filter(name =>
-                    name !== 'node_modules' &&
-                    !name.startsWith('.') &&
-                    name !== this.config.sourceLanguage &&
-                    !this.isExcludedLanguageDirectory(name)
-                );
+            const directories = items
+                .filter(item => item.isDirectory())
+                .map(item => item.name)
+                .filter(name =>
+                    name !== 'node_modules' &&
+                    !name.startsWith('.') &&
+                    name !== this.config.sourceLanguage &&
+                    !this.isExcludedLanguageDirectory(name)
+                );
 
             // Check for monolith files (language.json files)
             const files = items
@@ -158,13 +158,13 @@ class FixerCommand {
 
             // Add monolith files as languages (without .json extension)
             const monolithLanguages = files
-                .map(file => file.replace('.json', ''))
-                .filter(lang =>
-                    !languages.includes(lang) &&
-                    lang !== this.config.sourceLanguage &&
-                    !this.isExcludedLanguageDirectory(lang)
-                );
-            languages.push(...monolithLanguages);
+                .map(file => file.replace('.json', ''))
+                .filter(lang =>
+                    !languages.includes(lang) &&
+                    lang !== this.config.sourceLanguage &&
+                    !this.isExcludedLanguageDirectory(lang)
+                );
+            languages.push(...monolithLanguages);
 
             return [...new Set(languages)].sort();
         } catch (error) {
@@ -299,21 +299,21 @@ class FixerCommand {
     }
 
     // Create backup of translation files
-    async createBackup() {
-        if (this.dryRun) return;
-
-        try {
-            const backupEnabled = this.config?.backup?.enabled === true;
-            if (!backupEnabled) {
-                this.backupDir = null;
-                return;
-            }
-
-            const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-            const backupRoot = path.resolve(this.config?.backup?.location || './i18ntk-backups');
-            this.backupDir = path.join(backupRoot, 'fixer', `backup-${timestamp}`);
-
-            console.log(t('fixer.creatingBackup', { dir: this.backupDir }));
+    async createBackup() {
+        if (this.dryRun) return;
+
+        try {
+            const backupEnabled = this.config?.backup?.enabled === true;
+            if (!backupEnabled) {
+                this.backupDir = null;
+                return;
+            }
+
+            const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+            const backupRoot = path.resolve(this.config?.backup?.location || './i18ntk-backups');
+            this.backupDir = path.join(backupRoot, 'fixer', `backup-${timestamp}`);
+
+            console.log(t('fixer.creatingBackup', { dir: this.backupDir }));
 
             // Ensure backup directory exists
             const dirCreated = SecurityUtils.safeMkdirSync(this.backupDir, process.cwd(), { recursive: true });
@@ -326,8 +326,8 @@ class FixerCommand {
             const languages = this.getAvailableLanguages();
             languages.push(this.config.sourceLanguage); // Include source language
 
-            for (const language of languages) {
-                const languageFiles = this.getLanguageFiles(language);
+            for (const language of languages) {
+                const languageFiles = this.getLanguageFiles(language);
 
                 for (const fileName of languageFiles) {
                     const sourcePath = path.join(this.sourceDir, language, fileName);
@@ -343,42 +343,42 @@ class FixerCommand {
                         SecurityUtils.safeWriteFileSync(backupPath, content, process.cwd(), 'utf8');
                     }
                 }
-            }
-
-            this.cleanupOldBackups();
-
-            console.log(t('fixer.backupCreated'));
-        } catch (error) {
-            console.warn(`Failed to create backup: ${error.message}`);
-        }
-    }
-
-    cleanupOldBackups() {
-        try {
-            const fixerBackupRoot = path.resolve(this.config?.backup?.location || './i18ntk-backups', 'fixer');
-            if (!SecurityUtils.safeExistsSync(fixerBackupRoot, process.cwd())) return;
-
-            const configuredKeep = parseInt(this.config?.backup?.maxBackups, 10);
-            const keepCount = Number.isInteger(configuredKeep) ? Math.min(Math.max(configuredKeep, 1), 3) : 1;
-
-            const backupDirs = SecurityUtils.safeReaddirSync(fixerBackupRoot, process.cwd(), { withFileTypes: true })
-                .filter(entry => entry.isDirectory() && entry.name.startsWith('backup-'))
-                .map(entry => {
-                    const dirPath = path.join(fixerBackupRoot, entry.name);
-                    const stat = SecurityUtils.safeStatSync(dirPath, process.cwd());
-                    return { name: entry.name, path: dirPath, mtimeMs: stat ? stat.mtimeMs : 0 };
-                })
-                .sort((a, b) => b.mtimeMs - a.mtimeMs);
-
-            if (backupDirs.length <= keepCount) return;
-
-            for (const staleDir of backupDirs.slice(keepCount)) {
-                fs.rmSync(staleDir.path, { recursive: true, force: true });
-            }
-        } catch (error) {
-            console.warn(`Failed to clean old backups: ${error.message}`);
-        }
-    }
+            }
+
+            this.cleanupOldBackups();
+
+            console.log(t('fixer.backupCreated'));
+        } catch (error) {
+            console.warn(`Failed to create backup: ${error.message}`);
+        }
+    }
+
+    cleanupOldBackups() {
+        try {
+            const fixerBackupRoot = path.resolve(this.config?.backup?.location || './i18ntk-backups', 'fixer');
+            if (!SecurityUtils.safeExistsSync(fixerBackupRoot, process.cwd())) return;
+
+            const configuredKeep = parseInt(this.config?.backup?.maxBackups, 10);
+            const keepCount = Number.isInteger(configuredKeep) ? Math.min(Math.max(configuredKeep, 1), 3) : 1;
+
+            const backupDirs = SecurityUtils.safeReaddirSync(fixerBackupRoot, process.cwd(), { withFileTypes: true })
+                .filter(entry => entry.isDirectory() && entry.name.startsWith('backup-'))
+                .map(entry => {
+                    const dirPath = path.join(fixerBackupRoot, entry.name);
+                    const stat = SecurityUtils.safeStatSync(dirPath, process.cwd());
+                    return { name: entry.name, path: dirPath, mtimeMs: stat ? stat.mtimeMs : 0 };
+                })
+                .sort((a, b) => b.mtimeMs - a.mtimeMs);
+
+            if (backupDirs.length <= keepCount) return;
+
+            for (const staleDir of backupDirs.slice(keepCount)) {
+                fs.rmSync(staleDir.path, { recursive: true, force: true });
+            }
+        } catch (error) {
+            console.warn(`Failed to clean old backups: ${error.message}`);
+        }
+    }
 
     // Analyze translation issues for fixing
     analyzeIssues(language, fileName) {
@@ -420,7 +420,7 @@ class FixerCommand {
                         type: 'missing_key',
                         key,
                         sourceValue,
-                        fix: () => this.setValueByPath(targetObj, key, sourceValue)
+                        fix: (obj) => this.setValueByPath(obj, key, sourceValue)
                     });
                 } else if (targetValue === '') {
                     // Empty value
@@ -428,7 +428,7 @@ class FixerCommand {
                         type: 'empty_value',
                         key,
                         sourceValue,
-                        fix: () => this.setValueByPath(targetObj, key, sourceValue)
+                        fix: (obj) => this.setValueByPath(obj, key, sourceValue)
                     });
                 } else {
                     const markers = this.config.notTranslatedMarkers || [this.config.notTranslatedMarker];
@@ -438,7 +438,7 @@ class FixerCommand {
                             type: 'untranslated_marker',
                             key,
                             sourceValue,
-                            fix: () => this.setValueByPath(targetObj, key, sourceValue)
+                            fix: (obj) => this.setValueByPath(obj, key, sourceValue)
                         });
                     }
                 }
@@ -486,7 +486,7 @@ class FixerCommand {
 
                         for (const issue of issues) {
                             if (typeof issue.fix === 'function') {
-                                issue.fix();
+                                issue.fix(targetObj);
                                 fixes.files[fileName].fixed++;
                                 fixes.fixedIssues++;
                             }
@@ -494,7 +494,7 @@ class FixerCommand {
 
                         // Write back the fixed content
                         const fixedContent = JSON.stringify(targetObj, null, 2);
-                        SecurityUtils.safeWriteFileSync(targetFilePath, fixedContent, process.cwd(), 'utf8');
+                        SecurityUtils.safeWriteFileSync(targetFilePath, fixedContent, this.sourceDir, 'utf8');
 
                     } catch (error) {
                         console.warn(`Error fixing ${language}/${fileName}: ${error.message}`);
@@ -527,9 +527,9 @@ class FixerCommand {
             }
 
             // Create backup unless disabled
-            if (!args.noBackup && !this.dryRun && this.config?.backup?.enabled === true) {
-                await this.createBackup();
-            }
+            if (!args.noBackup && !this.dryRun && this.config?.backup?.enabled === true) {
+                await this.createBackup();
+            }
 
             const languages = this.getAvailableLanguages();
 
@@ -591,9 +591,9 @@ class FixerCommand {
             console.log(t('fixer.totalIssues', { count: totalIssues }));
             console.log(t('fixer.totalFixed', { count: totalFixed }));
 
-            if (this.backupDir && !args.noBackup && this.config?.backup?.enabled === true) {
-                console.log(t('fixer.backupLocation', { dir: this.backupDir }));
-            }
+            if (this.backupDir && !args.noBackup && this.config?.backup?.enabled === true) {
+                console.log(t('fixer.backupLocation', { dir: this.backupDir }));
+            }
 
             console.log(t('fixer.completed'));
 
@@ -677,4 +677,4 @@ class FixerCommand {
     }
 }
 
-module.exports = FixerCommand;
+module.exports = FixerCommand;

package/main/manage/managers/DebugMenu.js

@@ -3,10 +3,11 @@
  * @module managers/DebugMenu
  */
 
-const path = require('path');
-const fs = require('fs');
-const { t } = require('../../../utils/i18n-helper');
-const cliHelper = require('../../../utils/cli-helper');
+const path = require('path');
+const fs = require('fs');
+const { t } = require('../../../utils/i18n-helper');
+const cliHelper = require('../../../utils/cli-helper');
+const SecurityUtils = require('../../../utils/security');
 
 module.exports = class DebugMenu {
   constructor(manager) {
@@ -22,7 +23,7 @@ module.exports = class DebugMenu {
     const authRequired = await this.adminAuth.isAuthRequiredForScript('debugMenu');
     if (authRequired) {
       console.log(`\n${t('adminPin.protectedAccess')}`);
-      const pin = await cliHelper.promptPin(t('adminPin.enterPin') + ': ');
+      const pin = await cliHelper.promptPin(t('adminPin.enterPin') + ': ');
       const isValid = await this.adminAuth.verifyPin(pin);
 
       if (!isValid) {
@@ -66,7 +67,7 @@ module.exports = class DebugMenu {
     console.log(t('debug.runningDebugTool', { displayName }));
     try {
       const toolPath = path.join(__dirname, '..', '..', 'scripts', 'debug', toolName);
-      if (fs.existsSync(toolPath)) {
+      if (SecurityUtils.safeExistsSync(toolPath, path.dirname(toolPath))) {
         console.log(`Debug tool available: ${toolName}`);
         console.log(`To run this tool manually: node "${toolPath}"`);
         console.log(`Working directory: ${path.join(__dirname, '..', '..')}`);
@@ -90,7 +91,7 @@ module.exports = class DebugMenu {
 
     try {
       const logsDir = path.join(__dirname, '..', '..', 'scripts', 'debug', 'logs');
-      if (fs.existsSync(logsDir)) {
+      if (SecurityUtils.safeExistsSync(logsDir, path.dirname(logsDir))) {
         const files = fs.readdirSync(logsDir)
           .filter(file => file.endsWith('.log') || file.endsWith('.txt'))
           .sort((a, b) => {
@@ -111,7 +112,7 @@ module.exports = class DebugMenu {
           const fileIndex = parseInt(choice) - 1;
 
           if (fileIndex >= 0 && fileIndex < files.length) {
-            const logContent = fs.readFileSync(path.join(logsDir, files[fileIndex]), 'utf8');
+            const logContent = SecurityUtils.safeReadFileSync(path.join(logsDir, files[fileIndex]), logsDir, 'utf8');
             console.log(`\n${t('debug.contentOf', { filename: files[fileIndex] })}:`);
             console.log('============================================================');
             console.log(logContent.slice(-2000)); // Show last 2000 characters
@@ -137,4 +138,4 @@ module.exports = class DebugMenu {
   async show() {
     return this.showDebugMenu();
   }
-};
+};