i18ntk 1.10.2 → 2.0.2

package/utils/cli-helper.js

@@ -145,9 +145,9 @@ function showFrameworkWarningOnce(ui) {
       try {
         const path = require('path');
         const fs = require('fs');
-        const localePath = path.join(__dirname, '..', 'ui-locales', 'en.json');
-        if (fs.existsSync(localePath)) {
-          const translations = JSON.parse(fs.readFileSync(localePath, 'utf8'));
+        const localePath = path.join(__dirname, '..', 'resources', 'i18n', 'ui-locales', 'en.json');
+        if (SecurityUtils.safeExistsSync(localePath)) {
+          const translations = JSON.parse(SecurityUtils.safeReadFileSync(localePath, path.dirname(localePath), 'utf8'));
           t = (key) => {
             const keys = key.split('.');
             let result = translations;
@@ -170,9 +170,9 @@ function showFrameworkWarningOnce(ui) {
           const settings = settingsManager.loadSettings();
           const currentLang = settings.uiLanguage || 'en';
           
-          const localePath = path.join(__dirname, '..', 'ui-locales', `${currentLang}.json`);
-          if (fs.existsSync(localePath)) {
-            const translations = JSON.parse(fs.readFileSync(localePath, 'utf8'));
+          const localePath = path.join(__dirname, '..', 'resources', 'i18n', 'ui-locales', `${currentLang}.json`);
+          if (SecurityUtils.safeExistsSync(localePath)) {
+            const translations = JSON.parse(SecurityUtils.safeReadFileSync(localePath, path.dirname(localePath), 'utf8'));
             t = (key) => {
               const keys = key.split('.');
               let result = translations;
@@ -183,9 +183,9 @@ function showFrameworkWarningOnce(ui) {
             };
           } else {
             // Fallback to English
-            const enLocalePath = path.join(__dirname, '..', 'ui-locales', 'en.json');
-            if (fs.existsSync(enLocalePath)) {
-              const translations = JSON.parse(fs.readFileSync(enLocalePath, 'utf8'));
+            const enLocalePath = path.join(__dirname, '..', 'resources', 'i18n', 'ui-locales', 'en.json');
+            if (SecurityUtils.safeExistsSync(enLocalePath)) {
+              const translations = JSON.parse(SecurityUtils.safeReadFileSync(enLocalePath, path.dirname(enLocalePath), 'utf8'));
               t = (key) => {
                 const keys = key.split('.');
                 let result = translations;

package/utils/config-helper.js

@@ -4,11 +4,11 @@
  * Configuration is managed through settings files only
  */
 
-const fs = require('fs');
-const path = require('path');
-const configManager = require('./config-manager');
-const SecurityUtils = require('./security');
-const {loadTranslations} = require('./i18n-helper');
+const fs = require('fs');
+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();
@@ -49,7 +49,7 @@ async function getUnifiedConfig(scriptName, cliArgs = {}) {
       }
       settingsDir = safeConfigDir;
       const configFile = path.join(settingsDir, 'i18ntk-config.json');
-      cfg = fs.existsSync(configFile) ? JSON.parse(fs.readFileSync(configFile, 'utf8')) : {};
+      cfg = SecurityUtils.safeExistsSync(configFile) ? JSON.parse(SecurityUtils.safeReadFileSync(configFile, settingsDir, 'utf8')) : {};
       projectRoot = settingsDir;
       cfg.projectRoot = projectRoot;
       cfg.sourceDir = path.resolve(projectRoot, toStr(cfg.sourceDir) || './locales');
@@ -108,7 +108,7 @@ async function getUnifiedConfig(scriptName, cliArgs = {}) {
       }
 
       // Auto-fix i18nDir if missing but sourceDir exists
-      if (!fs.existsSync(cfg.i18nDir) && fs.existsSync(cfg.sourceDir)) {
+      if (!SecurityUtils.safeExistsSync(cfg.i18nDir) && SecurityUtils.safeExistsSync(cfg.sourceDir)) {
         await configManager.updateConfig({ i18nDir: configManager.toRelative(cfg.sourceDir) });
         cfg.i18nDir = cfg.sourceDir;
       }
@@ -289,7 +289,7 @@ function parseCommonArgs(args) {
   }
   
   if (!parsed.uiLanguage) {
-    const envLang = envManager.get('I18NTK_LANG');
+    const envLang = envManager.get('I18NTK_UI_LANGUAGE');
     if (envLang && envLang !== 'en') {
       parsed.uiLanguage = envLang;
     }
@@ -371,7 +371,7 @@ function displayHelp(scriptName, additionalOptions = {}) {
   console.log(`\nEnvironment Variables:`);
   console.log(`  I18NTK_LOG_LEVEL     Logging level (error, warn, info, debug, silent)`);
   console.log(`  I18NTK_OUTDIR        Output directory for reports`);
-  console.log(`  I18NTK_LANG          UI language (en, de, es, fr, ru, ja, zh)`);
+  console.log(`  I18NTK_UI_LANGUAGE  UI language (en, de, es, fr, ru, ja, zh)`);
   console.log(`  I18NTK_SILENT        Run in silent mode (true/false)`);
   console.log(`  I18NTK_DEBUG_LOCALES Enable debug logging for locale loading`);
   console.log(`  I18NTK_SOURCE_DIR    Source directory for scanning`);
@@ -397,7 +397,11 @@ function displayHelp(scriptName, additionalOptions = {}) {
  * @param {string} dirPath - Directory path
  */
 function ensureDirectory(dirPath) {
-  if (!fs.existsSync(dirPath)) {
+  if (!dirPath || typeof dirPath !== 'string') {
+    // Silently handle undefined or invalid paths to prevent security errors
+    return;
+  }
+  if (!SecurityUtils.safeExistsSync(dirPath)) {
     fs.mkdirSync(dirPath, { recursive: true });
   }
 }
@@ -419,83 +423,35 @@ function displayPaths(cfg = {}) {
 }
 
 // Ensure project has been initialized with source language files
-async function ensureInitialized(cfg) {
-  try {
-    // Check if initialization has been marked as complete
-    const configPath = path.join(path.dirname(require.main.filename), '..', 'settings', 'initialization.json');
-    let initStatus = { initialized: false, version: null, timestamp: null };
-    
-    if (fs.existsSync(configPath)) {
-      try {
-        initStatus = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-        // If initialized and version matches current, skip further checks
-        if (initStatus.initialized && initStatus.version === '1.8.3') {
-          return true;
-        }
-      } catch (e) {
-        // Invalid initialization file, proceed with normal check
-      }
-    }
-
-    const sourceDir = cfg.sourceDir;
-    const sourceLanguage = cfg.sourceLanguage || 'en';
-    const langDir = path.join(sourceDir, sourceLanguage);
-
-    const hasLanguageFiles = fs.existsSync(langDir) &&
-      fs.readdirSync(langDir).some(f => f.endsWith('.json'));
-    
-    // If language files exist and we're upgrading, mark as initialized
-    if (hasLanguageFiles) {
-      const initDir = path.dirname(configPath);
-      ensureDirectory(initDir);
-      fs.writeFileSync(configPath, JSON.stringify({
-        initialized: true,
-        version: '1.8.3',
-        timestamp: new Date().toISOString(),
-        sourceDir: sourceDir,
-        sourceLanguage: sourceLanguage
-      }, null, 2));
-      return true;
-    }
-
-    const nonInteractive = !process.stdin.isTTY;
-
-    if (nonInteractive) {
-      console.warn(`Missing source language files in ${langDir}. Running initialization...`);
-      await initializeSourceFiles(sourceDir, sourceLanguage);
-      
-      // Mark initialization as complete
-      const initDir = path.dirname(configPath);
-      ensureDirectory(initDir);
-      fs.writeFileSync(configPath, JSON.stringify({
-        initialized: true,
-        version: '1.8.3',
-        timestamp: new Date().toISOString(),
-        sourceDir: sourceDir,
-        sourceLanguage: sourceLanguage
-      }, null, 2));
-      return true;
-    }
-
-    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')) {
-      await initializeSourceFiles(sourceDir, sourceLanguage);
-      
-      // Mark initialization as complete
-      const initDir = path.dirname(configPath);
-      ensureDirectory(initDir);
-      fs.writeFileSync(configPath, JSON.stringify({
-        initialized: true,
-        version: '1.8.3',
-        timestamp: new Date().toISOString(),
-        sourceDir: sourceDir,
-        sourceLanguage: sourceLanguage
-      }, null, 2));
-      return true;
-    }
+async function ensureInitialized(cfg) {
+  try {
+    const { checkInitialized } = require('./init-helper');
+    const sourceDir = cfg?.sourceDir || './locales';
+    const sourceLanguage = cfg?.sourceLanguage || 'en';
+
+    const { initialized } = await checkInitialized({ sourceDir, sourceLanguage });
+    if (initialized) {
+      return true;
+    }
+
+    const nonInteractive = !process.stdin.isTTY;
+
+    if (nonInteractive) {
+      const langDir = path.join(sourceDir, sourceLanguage);
+      console.warn(`Missing source language files in ${langDir}. Running initialization...`);
+      await initializeSourceFiles(sourceDir, sourceLanguage);
+      return true;
+    }
+
+    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')) {
+      await initializeSourceFiles(sourceDir, sourceLanguage);
+      return true;
+    }
     return false;
   } catch (err) {
     console.error(`Initialization check failed: ${err.message}`);
@@ -532,36 +488,49 @@ async function initializeSourceFiles(sourceDir, sourceLang) {
   ensureDirectory(sourceDir);
   
   // Write the default source language file
-  fs.writeFileSync(sourceFile, JSON.stringify(defaultContent, null, 2));
+  SecurityUtils.safeWriteFileSync(sourceFile, JSON.stringify(defaultContent, null, 2));
   
   // Create directories for supported languages
   const supportedLanguages = ['es', 'fr', 'de', 'ja', 'ru', 'zh', 'pt'];
   
   supportedLanguages.forEach(lang => {
     const langFile = path.join(sourceDir, `${lang}.json`);
-    if (!fs.existsSync(langFile)) {
+    if (!SecurityUtils.safeExistsSync(langFile)) {
       // Create empty object structure for each language
       const emptyStructure = {
         app: {},
         common: {},
         navigation: {}
       };
-      fs.writeFileSync(langFile, JSON.stringify(emptyStructure, null, 2));
+      SecurityUtils.safeWriteFileSync(langFile, JSON.stringify(emptyStructure, null, 2));
     }
   });
   
-  // Create i18ntk-config.json if it doesn't exist
-  const configFile = 'i18ntk-config.json';
-  if (!fs.existsSync(configFile)) {
-    const defaultConfig = {
-      version: "1.8.3",
-      sourceDir: sourceDir,
-      outputDir: "./i18ntk-reports",
-      defaultLanguage: sourceLang,
-      supportedLanguages: [sourceLang, 'es', 'fr', 'de', 'ja', 'ru', 'zh', 'pt'],
-      security: {
-        adminPinEnabled: true,
-        sessionTimeout: 1800000,
+  // Create v2 project config if it doesn't exist
+  const configFile = '.i18ntk-config';
+  if (!SecurityUtils.safeExistsSync(configFile)) {
+    const version = (() => {
+      try {
+        return require('../package.json').version;
+      } catch {
+        return '2.0.0';
+      }
+    })();
+    const defaultConfig = {
+      version,
+      sourceDir: sourceDir,
+      outputDir: "./i18ntk-reports",
+      defaultLanguage: sourceLang,
+      supportedLanguages: [sourceLang, 'es', 'fr', 'de', 'ja', 'ru', 'zh', 'pt'],
+      setup: {
+        completed: true,
+        completedAt: new Date().toISOString(),
+        version,
+        setupId: `setup_${Date.now()}`
+      },
+      security: {
+        adminPinEnabled: true,
+        sessionTimeout: 1800000,
         maxFailedAttempts: 3
       },
       performance: {
@@ -570,7 +539,7 @@ async function initializeSourceFiles(sourceDir, sourceLang) {
         batchSize: 1000
       }
     };
-    fs.writeFileSync(configFile, JSON.stringify(defaultConfig, null, 2));
+    SecurityUtils.safeWriteFileSync(configFile, JSON.stringify(defaultConfig, null, 2));
   }
 }
 
@@ -586,4 +555,4 @@ module.exports = {
   displayPaths,
   ensureInitialized,
 
-};
+};