i18ntk 1.10.2 → 2.0.3

package/main/i18ntk-php.js

@@ -2,7 +2,7 @@
 
 /**
  * i18ntk-php.js - PHP Language I18n Management Command
- * 
+ *
  * Supports:
  * - Laravel i18n
  * - Symfony translations
@@ -19,7 +19,7 @@ const SecurityUtils = require(path.join(__dirname, '../utils/security'));
 const { getConfig, saveConfig } = require(path.join(__dirname, '../utils/config-helper'));
 const I18nHelper = require(path.join(__dirname, '../utils/i18n-helper'));
 const SetupEnforcer = require(path.join(__dirname, '../utils/setup-enforcer'));
-const { program } = require('commander');
+const { program } = require('../utils/mini-commander');
 
 (async () => {
   try {
@@ -52,7 +52,7 @@ class PhpI18nManager {
       'ngettext(',
       'gettext('
     ];
-    
+
     this.fileExtensions = ['.php', '.blade.php', '.twig', '.phtml', '.module', '.theme'];
     this.resourceFormats = ['.php', '.json', '.yml', '.yaml', '.po', '.mo'];
   }
@@ -60,46 +60,46 @@ class PhpI18nManager {
   async detectFramework(sourceDir) {
     // Check for Laravel
     const composerJson = path.join(sourceDir, 'composer.json');
-    if (fs.existsSync(composerJson)) {
-      const content = fs.readFileSync(composerJson, 'utf8');
-      const composer = JSON.parse(content);
-      
+    if (SecurityUtils.safeExistsSync(composerJson, sourceDir)) {
+      const content = SecurityUtils.safeReadFileSync(composerJson, sourceDir, 'utf8');
+      const composer = SecurityUtils.safeParseJSON(content);
+
       if (composer.require && composer.require['laravel/framework']) {
         return 'laravel';
       }
-      
+
       if (composer.require && composer.require['symfony/framework-bundle']) {
         return 'symfony';
       }
-      
+
       if (composer.require && composer.require['yiisoft/yii2']) {
         return 'yii2';
       }
-      
+
       if (composer.require && composer.require['wordpress/wordpress']) {
         return 'wordpress';
       }
     }
-    
+
     // Check for WordPress
     const wpConfig = path.join(sourceDir, 'wp-config.php');
-    if (fs.existsSync(wpConfig)) {
+    if (SecurityUtils.safeExistsSync(wpConfig, sourceDir)) {
       return 'wordpress';
     }
-    
+
     // Check for standard PHP
     const phpFiles = this.findFiles(sourceDir, '.php');
     if (phpFiles.length > 0) {
       return 'standard-php';
     }
-    
+
     return 'generic';
   }
 
   async extractTranslations(sourceDir, options = {}) {
     const framework = await this.detectFramework(sourceDir);
     const translations = new Set();
-    
+
     // Process PHP files
     const phpFiles = [
       ...this.findFiles(sourceDir, '.php'),
@@ -107,10 +107,10 @@ class PhpI18nManager {
       ...this.findFiles(sourceDir, '.twig'),
       ...this.findFiles(sourceDir, '.phtml')
     ];
-    
+
     for (const file of phpFiles) {
-      const content = fs.readFileSync(file, 'utf8');
-      
+      const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8');
+
       // Extract PHP i18n patterns
       const patterns = [
         /__\(\s*["']([^"']+)["']/g,
@@ -127,14 +127,14 @@ class PhpI18nManager {
         /ngettext\(\s*["']([^"']+)["']/g,
         /dngettext\(\s*["']([^"']+)["']/g
       ];
-      
+
       for (const pattern of patterns) {
         let match;
         while ((match = pattern.exec(content)) !== null) {
           translations.add(match[1]);
         }
       }
-      
+
       // Blade template patterns
       const bladePatterns = [
         /@lang\(['"]([^'"]+)['"]\)/g,
@@ -142,7 +142,7 @@ class PhpI18nManager {
         /{{\s*__\(['"]([^'"]+)['"]\)\s*}}/g,
         /{{\s*trans\(['"]([^'"]+)['"]\)\s*}}/g
       ];
-      
+
       for (const pattern of bladePatterns) {
         let match;
         while ((match = pattern.exec(content)) !== null) {
@@ -150,7 +150,7 @@ class PhpI18nManager {
         }
       }
     }
-    
+
     // Process translation files
     const translationFiles = [
       ...this.findFiles(sourceDir, '.php'),
@@ -158,12 +158,12 @@ class PhpI18nManager {
       ...this.findFiles(sourceDir, '.yml'),
       ...this.findFiles(sourceDir, '.yaml')
     ];
-    
+
     for (const file of translationFiles) {
       if (file.includes('lang') || file.includes('translations') || file.includes('i18n')) {
         try {
-          const content = fs.readFileSync(file, 'utf8');
-          
+          const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8');
+
           if (file.endsWith('.php')) {
             // PHP array translations
             const arrayPattern = /'([^']+)'\s*=>/g;
@@ -173,7 +173,7 @@ class PhpI18nManager {
             }
           } else if (file.endsWith('.json')) {
             // JSON translations
-            const data = JSON.parse(content);
+            const data = SecurityUtils.safeParseJSON(content);
             const keys = this.extractKeysFromObject(data);
             keys.forEach(key => translations.add(key));
           } else if (file.endsWith('.yml') || file.endsWith('.yaml')) {
@@ -194,7 +194,7 @@ class PhpI18nManager {
         }
       }
     }
-    
+
     return {
       framework,
       translations: Array.from(translations),
@@ -205,29 +205,29 @@ class PhpI18nManager {
 
   extractKeysFromObject(obj, prefix = '') {
     const keys = [];
-    
+
     for (const [key, value] of Object.entries(obj)) {
       const fullKey = prefix ? `${prefix}.${key}` : key;
       keys.push(fullKey);
-      
+
       if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
         keys.push(...this.extractKeysFromObject(value, fullKey));
       }
     }
-    
+
     return keys;
   }
 
   async createLocaleStructure(outputDir, languages = ['en'], framework = 'standard-php') {
     const localesDir = path.join(outputDir, 'locales');
-    
+
     for (const lang of languages) {
       const langDir = path.join(localesDir, lang);
       fs.mkdirSync(langDir, { recursive: true });
-      
+
       if (framework === 'laravel') {
         // Laravel structure
-        fs.writeFileSync(path.join(langDir, 'messages.php'), `<?php
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'messages.php'), `<?php
 // Laravel i18n for ${lang}
 return [
     'hello' => 'Hello, World!',
@@ -237,34 +237,34 @@ return [
     ],
     'welcome' => 'Welcome to our application'
 ];
-`);
-        
-        fs.writeFileSync(path.join(langDir, 'validation.php'), `<?php
+`, path.dirname(langDir));
+
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'validation.php'), `<?php
 // Laravel validation messages for ${lang}
 return [
     'required' => 'The :attribute field is required.',
     'email' => 'The :attribute must be a valid email address.',
     'unique' => 'The :attribute has already been taken.'
 ];
-`);
+`, path.dirname(localesDir));
       } else if (framework === 'symfony') {
         // Symfony structure
-        fs.writeFileSync(path.join(langDir, 'messages.yml'), `# Symfony i18n for ${lang}
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'messages.yml'), `# Symfony i18n for ${lang}
 hello: "Hello, World!"
 items:
   one: "%count% item"
   other: "%count% items"
 welcome: "Welcome to our application"
-`);
-        
-        fs.writeFileSync(path.join(langDir, 'validators.yml'), `# Symfony validation for ${lang}
+`, path.dirname(localesDir));
+
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'validators.yml'), `# Symfony validation for ${lang}
 required: "The {{ field }} field is required."
 email: "The {{ field }} must be a valid email address."
 unique: "The {{ field }} has already been taken."
-`);
+`, path.dirname(localesDir));
       } else {
         // Standard PHP
-        fs.writeFileSync(path.join(langDir, 'messages.php'), `<?php
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'messages.php'), `<?php
 // PHP i18n for ${lang}
 return [
     'hello' => 'Hello, World!',
@@ -274,36 +274,36 @@ return [
     ],
     'welcome' => 'Welcome to our application'
 ];
-`);
-        
-        fs.writeFileSync(path.join(langDir, 'messages.json'), JSON.stringify({
+`, path.dirname(langDir));
+
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'messages.json'), JSON.stringify({
           hello: "Hello, World!",
           items: {
             one: "{0} item",
             other: "{0} items"
           },
           welcome: "Welcome to our application"
-        }, null, 2));
+        }, null, 2), path.dirname(langDir));
       }
     }
-    
+
     return localesDir;
   }
 
   findFiles(dir, extension) {
     const files = [];
-    
+
     function traverse(currentDir) {
-      if (!fs.existsSync(currentDir)) return;
-      
+      if (!SecurityUtils.safeExistsSync(currentDir, path.dirname(currentDir))) return;
+
       const items = fs.readdirSync(currentDir);
-      
+
       for (const item of items) {
         const fullPath = path.join(currentDir, item);
         try {
           const stat = fs.statSync(fullPath);
-          
-          if (stat.isDirectory() && !item.startsWith('.') && 
+
+          if (stat.isDirectory() && !item.startsWith('.') &&
               !['node_modules', 'vendor', 'cache', 'storage'].includes(item)) {
             traverse(fullPath);
           } else if (stat.isFile() && path.extname(item) === extension) {
@@ -314,7 +314,7 @@ return [
         }
       }
     }
-    
+
     traverse(dir);
     return files;
   }
@@ -329,32 +329,32 @@ return [
       patterns: results.patterns,
       recommendations: this.getRecommendations(results)
     };
-    
+
     const reportPath = path.join(outputDir, 'i18ntk-php-report.json');
-    fs.writeFileSync(reportPath, JSON.stringify(report, null, 2));
-    
+    SecurityUtils.safeWriteFileSync(reportPath, JSON.stringify(report, null, 2), outputDir);
+
     return reportPath;
   }
 
   getRecommendations(results) {
     const recommendations = [];
-    
+
     if (results.translations.length === 0) {
       recommendations.push('No translations found. Check your PHP i18n patterns');
     }
-    
+
     if (results.files === 0) {
       recommendations.push('No PHP files found in source directory');
     }
-    
+
     if (results.framework === 'generic') {
       recommendations.push('Consider using Laravel or Symfony for better i18n support');
     }
-    
+
     if (results.framework === 'wordpress') {
       recommendations.push('Use WordPress i18n functions (__(), _e(), _n()) for consistency');
     }
-    
+
     return recommendations;
   }
 }
@@ -376,13 +376,13 @@ program
     try {
       const manager = new PhpI18nManager();
       const languages = options.languages.split(',');
-      
+
       const localesDir = await manager.createLocaleStructure(options.outputDir, languages, options.framework);
-      
+
       console.log(`✅ PHP i18n structure initialized in: ${localesDir}`);
       console.log(`📊 Languages: ${languages.join(', ')}`);
       console.log(`🎯 Framework: ${options.framework}`);
-      
+
     } catch (error) {
       console.error('❌ Error initializing PHP i18n:', error.message);
       process.exit(1);
@@ -398,19 +398,19 @@ program
   .action(async (options) => {
     try {
       SecurityUtils.validatePath(options.sourceDir);
-      
+
       const manager = new PhpI18nManager();
       const results = await manager.extractTranslations(options.sourceDir);
-      
+
       console.log(`🔍 Framework detected: ${results.framework}`);
       console.log(`📊 Files processed: ${results.files}`);
       console.log(`📝 Translations found: ${results.translations.length}`);
-      
+
       if (!options.dryRun) {
         const reportPath = await manager.generateReport(results, options.outputDir);
         console.log(`📄 Report saved: ${reportPath}`);
       }
-      
+
     } catch (error) {
       console.error('❌ Error analyzing PHP i18n:', error.message);
       process.exit(1);
@@ -427,16 +427,16 @@ program
   .action(async (options) => {
     try {
       SecurityUtils.validatePath(options.sourceDir);
-      
+
       const manager = new PhpI18nManager();
       const results = await manager.extractTranslations(options.sourceDir);
-      
+
       await manager.createLocaleStructure(options.outputDir, options.languages.split(','), options.framework);
-      
+
       console.log(`✅ Extracted ${results.translations.length} translations`);
       console.log(`📁 Locale structure created in: ${options.outputDir}`);
       console.log(`🎯 Framework: ${options.framework}`);
-      
+
     } catch (error) {
       console.error('❌ Error extracting PHP translations:', error.message);
       process.exit(1);
@@ -459,4 +459,4 @@ module.exports = { PhpI18nManager };
 
 if (require.main === module) {
   program.parse();
-}
+}

package/main/i18ntk-py.js

@@ -3,19 +3,18 @@
 /**
  * i18ntk Python Command
  * Specialized command for Python i18n management
- * 
+ *
  * Usage: i18ntk-py [options]
  */
 
 const fs = require('fs');
 const path = require('path');
 
-const SecurityUtils = require(path.join(__dirname, '../utils/security'));
-const { getConfig, saveConfig } = require(path.join(__dirname, '../utils/config-helper'));
-const I18nHelper = require(path.join(__dirname, '../utils/i18n-helper'));
-const I18ntkCore = require(path.join(__dirname, '../framework/i18ntk-core.js'));
-const SetupEnforcer = require(path.join(__dirname, '../utils/setup-enforcer'));
-const { program } = require('commander');
+const SecurityUtils = require(path.join(__dirname, '../utils/security'));
+const { getConfig, saveConfig } = require(path.join(__dirname, '../utils/config-helper'));
+const I18nHelper = require(path.join(__dirname, '../utils/i18n-helper'));
+const SetupEnforcer = require(path.join(__dirname, '../utils/setup-enforcer'));
+const { program } = require('../utils/mini-commander');
 
 (async () => {
   try {
@@ -42,7 +41,7 @@ class I18ntkPythonCommand {
 
   async init() {
     console.log('🔧 Initializing i18ntk Python command...');
-    
+
     program
       .name('i18ntk-py')
       .description('i18ntk specialized for Python applications')
@@ -61,13 +60,13 @@ class I18ntkPythonCommand {
     this.options = program.opts();
     this.sourceDir = path.resolve(this.options.sourceDir);
     this.localesDir = path.resolve(this.options.localesDir);
-    
+
     await this.validateSourceDir();
     await this.loadConfig();
   }
 
   async validateSourceDir() {
-    if (!fs.existsSync(this.sourceDir)) {
+    if (!SecurityUtils.safeExistsSync(this.sourceDir, path.dirname(this.sourceDir))) {
       console.error(`❌ Source directory not found: ${this.sourceDir}`);
       process.exit(1);
     }
@@ -93,9 +92,9 @@ class I18ntkPythonCommand {
     if (this.options.django) return 'django';
     if (this.options.flask) return 'flask';
     if (this.options.generic) return 'generic';
-    
+
     console.log('🔍 Detecting Python framework...');
-    
+
     // Check for Django
     const djangoIndicators = [
       'manage.py',
@@ -116,8 +115,8 @@ class I18ntkPythonCommand {
     try {
       // Check requirements.txt
       const requirementsPath = path.join(this.sourceDir, 'requirements.txt');
-      if (fs.existsSync(requirementsPath)) {
-        const requirements = fs.readFileSync(requirementsPath, 'utf8');
+      if (SecurityUtils.safeExistsSync(requirementsPath, this.sourceDir)) {
+        const requirements = SecurityUtils.safeReadFileSync(requirementsPath, this.sourceDir, 'utf8');
         if (requirements.includes('Django')) framework = 'django';
         else if (requirements.includes('Flask')) framework = 'flask';
       }
@@ -150,15 +149,15 @@ class I18ntkPythonCommand {
 
   findFiles(pattern) {
     const results = [];
-    
+
     function scanDir(dir) {
-      if (!fs.existsSync(dir)) return;
-      
+      if (!SecurityUtils.safeExistsSync(dir, path.dirname(dir))) return;
+
       const items = fs.readdirSync(dir);
       for (const item of items) {
         const fullPath = path.join(dir, item);
         const stat = fs.statSync(fullPath);
-        
+
         if (stat.isDirectory() && !item.startsWith('.') && item !== 'node_modules') {
           scanDir(fullPath);
         } else if (item.includes(pattern) || fullPath.includes(pattern)) {
@@ -166,33 +165,33 @@ class I18ntkPythonCommand {
         }
       }
     }
-    
+
     scanDir(this.sourceDir);
     return results;
   }
 
   async extractTranslations() {
     console.log('📦 Extracting Python translations...');
-    
+
     const pythonFiles = this.findFiles('.py');
     const translations = new Set();
-    
+
     for (const file of pythonFiles) {
       try {
-        const content = fs.readFileSync(file, 'utf8');
-        
+        const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8');
+
         for (const pattern of this.pythonPatterns) {
           let match;
           while ((match = pattern.exec(content)) !== null) {
             translations.add(match[1]);
           }
         }
-        
+
         // Reset regex state for next file
         for (const pattern of this.pythonPatterns) {
           pattern.lastIndex = 0;
         }
-        
+
       } catch (error) {
         if (this.options.debug) {
           console.error(`Error reading ${file}:`, error.message);
@@ -205,46 +204,46 @@ class I18ntkPythonCommand {
   }
 
   async createLocaleStructure() {
-    if (!fs.existsSync(this.localesDir)) {
+    if (!SecurityUtils.safeExistsSync(this.localesDir, path.dirname(this.localesDir))) {
       if (this.options.dryRun) {
         console.log(`📁 Would create directory: ${this.localesDir}`);
         return;
       }
-      
+
       fs.mkdirSync(this.localesDir, { recursive: true });
       console.log(`📁 Created locales directory: ${this.localesDir}`);
     }
 
     const languages = ['en', 'es', 'fr', 'de', 'ja', 'ru', 'zh'];
-    
+
     for (const lang of languages) {
       const langDir = path.join(this.localesDir, lang);
-      if (!fs.existsSync(langDir)) {
+      if (!SecurityUtils.safeExistsSync(langDir, this.localesDir)) {
         if (this.options.dryRun) {
           console.log(`📁 Would create directory: ${langDir}`);
           continue;
         }
-        
+
         fs.mkdirSync(langDir, { recursive: true });
-        
+
         // Create basic translation files
-        const commonFile = path.join(langDir, 'common.json');
-        const initialContent = {
-          "python": {
-            "welcome": `Welcome to Python (${lang})`,
-            "framework_detected": `Framework detected: ${framework}`,
-            "files_processed": `Processed ${count} files`
-          }
-        };
-        
-        fs.writeFileSync(commonFile, JSON.stringify(initialContent, null, 2));
+        const commonFile = path.join(langDir, 'common.json');
+        const initialContent = {
+          "python": {
+            "welcome": `Welcome to Python (${lang})`,
+            "framework_detected": "Framework detected: {framework}",
+            "files_processed": "Processed {count} files"
+          }
+        };
+
+        SecurityUtils.safeWriteFileSync(commonFile, JSON.stringify(initialContent, null, 2), this.localesDir);
       }
     }
   }
 
   async analyzeFramework(framework) {
     console.log(`🔍 Analyzing ${framework} project...`);
-    
+
     const analysis = {
       framework,
       files: {
@@ -280,14 +279,14 @@ class I18ntkPythonCommand {
     // Analyze patterns
     for (const file of pythonFiles) {
       try {
-        const content = fs.readFileSync(file, 'utf8');
-        
+        const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8');
+
         if (content.includes('gettext(')) analysis.patterns.gettext++;
         if (content.includes('gettext_lazy(')) analysis.patterns.gettext_lazy++;
         if (content.includes('ngettext(')) analysis.patterns.ngettext++;
         if (content.includes('django')) analysis.patterns.django++;
         if (content.includes('flask')) analysis.patterns.flask++;
-        
+
       } catch (error) {
         // Skip unreadable files
       }
@@ -297,7 +296,7 @@ class I18ntkPythonCommand {
     if (framework === 'django' && analysis.patterns.gettext === 0) {
       analysis.recommendations.push('Consider adding Django gettext for i18n support');
     }
-    
+
     if (framework === 'flask' && analysis.patterns.gettext === 0) {
       analysis.recommendations.push('Consider adding Flask-Babel for i18n support');
     }
@@ -325,12 +324,12 @@ class I18ntkPythonCommand {
     };
 
     const reportPath = path.join(this.sourceDir, 'i18ntk-py-report.json');
-    
+
     if (this.options.dryRun) {
       console.log(`📊 Would create report: ${reportPath}`);
       console.log('📋 Report contents:', JSON.stringify(report, null, 2));
     } else {
-      fs.writeFileSync(reportPath, JSON.stringify(report, null, 2));
+      SecurityUtils.safeWriteFileSync(reportPath, JSON.stringify(report, null, 2), this.sourceDir);
       console.log(`📊 Report saved: ${reportPath}`);
     }
 
@@ -339,19 +338,19 @@ class I18ntkPythonCommand {
 
   async run() {
     try {
-      console.log('🚀 i18ntk Python Command v1.10.1');
-      console.log('=' * 50);
-      
+      console.log('🚀 i18ntk Python Command v1.10.1');
+      console.log('='.repeat(50));
+
       await this.init();
-      
+
       const framework = await this.detectFramework();
       const translations = await this.extractTranslations();
-      
+
       if (!this.options.extractOnly) {
         await this.createLocaleStructure();
         const analysis = await this.analyzeFramework(framework);
         const report = await this.generateReport(analysis, translations);
-        
+
         console.log('\n✅ Analysis complete!');
         console.log(`📊 Framework: ${framework}`);
         console.log(`📄 Python files: ${analysis.files.python}`);
@@ -360,7 +359,7 @@ class I18ntkPythonCommand {
       } else {
         console.log(`📦 Extracted ${translations.length} translation keys`);
       }
-      
+
     } catch (error) {
       console.error('❌ Error:', error.message);
       if (this.options.debug) {
@@ -377,4 +376,4 @@ if (require.main === module) {
   cmd.run();
 }
 
-module.exports = I18ntkPythonCommand;
+module.exports = I18ntkPythonCommand;