i18ntk 2.1.0 → 2.3.0

package/utils/i18n-helper.js

@@ -1,39 +1,39 @@
 // utils/i18n-helper.js
-const path = require('path');
-const fs = require('fs');
+const path = require('path');
+const fs = require('fs');
 
 // Lazy load SecurityUtils to prevent circular dependencies
 let securityUtils;
-function getSecurityUtils() {
-  if (!securityUtils) {
-    try {
-      securityUtils = require('./security');
-    } catch (error) {
-      // Fallback: use basic fs operations if SecurityUtils is not available
-      return {
-        safeExistsSync: (targetPath) => {
-          try {
-            require('fs').accessSync(targetPath);
-            return true;
-          } catch {
-            return false;
-          }
-        },
-        safeWriteFileSync: (targetPath, data, _basePath, encoding = 'utf8') => {
-          try {
-            return require('fs').writeFileSync(targetPath, data, encoding);
-          } catch {
-            return null;
-          }
-        },
-        safeReadFileSync: (targetPath, _basePath, encoding = 'utf8') => {
-          try {
-            return require('fs').readFileSync(targetPath, encoding);
-          } catch {
-            return null;
-          }
-        }
-      };
+function getSecurityUtils() {
+  if (!securityUtils) {
+    try {
+      securityUtils = require('./security');
+    } catch (error) {
+      // Fallback: use basic fs operations if SecurityUtils is not available
+      return {
+        safeExistsSync: (targetPath) => {
+          try {
+            require('fs').accessSync(targetPath);
+            return true;
+          } catch {
+            return false;
+          }
+        },
+        safeWriteFileSync: (targetPath, data, _basePath, encoding = 'utf8') => {
+          try {
+            return require('fs').writeFileSync(targetPath, data, encoding);
+          } catch {
+            return null;
+          }
+        },
+        safeReadFileSync: (targetPath, _basePath, encoding = 'utf8') => {
+          try {
+            return require('fs').readFileSync(targetPath, encoding);
+          } catch {
+            return null;
+          }
+        }
+      };
     }
   }
   return securityUtils;
@@ -50,105 +50,100 @@ function safeRequireConfig() {
   try { return require('./config-manager'); } catch { return null; }
 }
 
-function stripBOMAndComments(s) {
-  if (s.charCodeAt(0) === 0xFEFF) s = s.slice(1);
-  s = s.replace(/\/\*[\s\S]*?\*\//g, '');
-  s = s.replace(/^\s*\/\/.*$/mg, '');
-  return s;
-}
-
-function getValidationBase(targetPath) {
-  const fallbackBase = path.resolve(__dirname, '..');
-  if (!targetPath || typeof targetPath !== 'string') {
-    return fallbackBase;
-  }
-
-  let current = path.resolve(path.dirname(targetPath));
-  while (true) {
-    try {
-      if (fs.statSync(current).isDirectory()) {
-        return current;
-      }
-    } catch {
-      // Continue upward until we find an existing directory.
-    }
-
-    const parent = path.dirname(current);
-    if (parent === current) {
-      break;
-    }
-    current = parent;
-  }
-
-  return fallbackBase;
-}
-
-function safeReadFile(targetPath, encoding = 'utf8') {
-  const SecurityUtils = getSecurityUtils();
-  return SecurityUtils.safeReadFileSync(targetPath, getValidationBase(targetPath), encoding);
-}
-
-function readJsonSafe(file) {
-  const raw = safeReadFile(file, 'utf8');
-  if (raw === null) {
-    throw new Error(`Unable to read JSON file: ${file}`);
-  }
-  return JSON.parse(stripBOMAndComments(raw));
-}
+function stripBOMAndComments(s) {
+  if (s.charCodeAt(0) === 0xFEFF) s = s.slice(1);
+  s = s.replace(/\/\*[\s\S]*?\*\//g, '');
+  s = s.replace(/^\s*\/\/.*$/mg, '');
+  return s;
+}
+
+function getValidationBase(targetPath) {
+  const fallbackBase = path.resolve(__dirname, '..');
+  if (!targetPath || typeof targetPath !== 'string') {
+    return fallbackBase;
+  }
+
+  let current = path.resolve(path.dirname(targetPath));
+  while (true) {
+    try {
+      if (fs.statSync(current).isDirectory()) {
+        return current;
+      }
+    } catch {
+      // Continue upward until we find an existing directory.
+    }
+
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+
+  return fallbackBase;
+}
+
+function safeReadFile(targetPath, encoding = 'utf8') {
+  const SecurityUtils = getSecurityUtils();
+  return SecurityUtils.safeReadFileSync(targetPath, getValidationBase(targetPath), encoding);
+}
+
+function readJsonSafe(file) {
+  const raw = safeReadFile(file, 'utf8');
+  if (raw === null) {
+    throw new Error(`Unable to read JSON file: ${file}`);
+  }
+  return JSON.parse(stripBOMAndComments(raw));
+}
 
 function pkgUiLocalesDirViaThisFile() {
   return path.resolve(__dirname, '..', 'ui-locales');
 }
 
-function pkgUiLocalesDirViaResolve() {
+function pkgUiLocalesDirViaResolve() {
     try {
         // Try the new correct path first (ui-locales/en.json)
         const enJson = require.resolve('i18ntk/ui-locales/en.json');
         return path.dirname(enJson);
     } catch {
-        try {
-            // Fallback to the old incorrect path for backward compatibility
-            const enJson = require.resolve('i18ntk/resources/i18n/ui-locales/en.json');
-            return path.dirname(enJson);
-        } catch { return null; }
-        }
-    }
-
-function legacyResourcesUiLocalesDir() {
-  return path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales');
-}
-
-function resolveLocalesDirs(preferredDir) {
-  const SecurityUtils = getSecurityUtils();
-  const dirs = [];
-  const addDir = (dir) => {
-    if (typeof dir === 'string' && dir.trim()) {
-      try {
-        const normalized = path.normalize(path.resolve(dir.trim()));
-        const stats = SecurityUtils.safeStatSync(normalized, getValidationBase(normalized));
-        if (stats && stats.isDirectory()) {
-          dirs.push(normalized);
-        }
-      } catch {
-        // Silently ignore invalid paths
-      }
-    }
-  };
-
-  addDir(preferredDir);
-
-  const pkgA = pkgUiLocalesDirViaThisFile();
-  addDir(pkgA);
-
-  const pkgB = pkgUiLocalesDirViaResolve();
-  if (pkgB && pkgB !== pkgA) {
-    addDir(pkgB);
-  }
-
-  const legacyDir = legacyResourcesUiLocalesDir();
-  if (legacyDir !== pkgA && legacyDir !== pkgB) {
-    addDir(legacyDir);
-  }
+        try {
+            // Fallback to the old incorrect path for backward compatibility
+            const enJson = require.resolve('i18ntk/resources/i18n/ui-locales/en.json');
+            return path.dirname(enJson);
+        } catch { return null; }
+        }
+    }
+
+// Removed legacyResourcesUiLocalesDir as resources/i18n/ui-locales is deprecated
+
+function resolveLocalesDirs(preferredDir) {
+  const SecurityUtils = getSecurityUtils();
+  const dirs = [];
+  const addDir = (dir) => {
+    if (typeof dir === 'string' && dir.trim()) {
+      try {
+        const normalized = path.normalize(path.resolve(dir.trim()));
+        const stats = SecurityUtils.safeStatSync(normalized, getValidationBase(normalized));
+        if (stats && stats.isDirectory()) {
+          dirs.push(normalized);
+        }
+      } catch {
+        // Silently ignore invalid paths
+      }
+    }
+  };
+
+  addDir(preferredDir);
+
+  const pkgA = pkgUiLocalesDirViaThisFile();
+  addDir(pkgA);
+
+  const pkgB = pkgUiLocalesDirViaResolve();
+  if (pkgB && pkgB !== pkgA) {
+    addDir(pkgB);
+  }
+
+  // Removed legacy directory fallback
 
   // Deduplicate while preserving order
   const seen = new Set();
@@ -166,9 +161,9 @@ function candidatesForLang(dir, lang) {
   ];
 }
 
-function findLocaleFilesAllDirs(lang, preferredDir) {
-  const SecurityUtils = getSecurityUtils();
-  const dirs = resolveLocalesDirs(preferredDir);
+function findLocaleFilesAllDirs(lang, preferredDir) {
+  const SecurityUtils = getSecurityUtils();
+  const dirs = resolveLocalesDirs(preferredDir);
 
   if (process.env.I18NTK_DEBUG_LOCALES === '1') {
     console.log('🔎 i18ntk locale search dirs:', dirs);
@@ -177,29 +172,29 @@ function findLocaleFilesAllDirs(lang, preferredDir) {
   const files = [];
   const errors = [];
 
-  for (const dir of dirs) {
-    for (const candidate of candidatesForLang(dir, lang)) {
-      try {
-        const stats = SecurityUtils.safeStatSync(candidate, getValidationBase(candidate));
-        if (stats && stats.isFile() && stats.size > 0) {
-            // Validate file is readable and parseable
-            fs.accessSync(candidate, fs.constants.R_OK);
-            // Quick JSON validation
-            const content = safeReadFile(candidate, 'utf8');
-            if (content) {
-              if (content.trim().startsWith('{') || content.trim().startsWith('[')) {
-                files.push(candidate);
-              } else {
-                errors.push({ file: candidate, error: 'Invalid JSON format' });
-              }
-            } else {
-              errors.push({ file: candidate, error: 'Empty or unreadable file' });
-            }
-        }
-      } catch (error) {
-        errors.push({ file: candidate, error: error.message });
-      }
-    }
+  for (const dir of dirs) {
+    for (const candidate of candidatesForLang(dir, lang)) {
+      try {
+        const stats = SecurityUtils.safeStatSync(candidate, getValidationBase(candidate));
+        if (stats && stats.isFile() && stats.size > 0) {
+            // Validate file is readable and parseable
+            fs.accessSync(candidate, fs.constants.R_OK);
+            // Quick JSON validation
+            const content = safeReadFile(candidate, 'utf8');
+            if (content) {
+              if (content.trim().startsWith('{') || content.trim().startsWith('[')) {
+                files.push(candidate);
+              } else {
+                errors.push({ file: candidate, error: 'Invalid JSON format' });
+              }
+            } else {
+              errors.push({ file: candidate, error: 'Empty or unreadable file' });
+            }
+        }
+      } catch (error) {
+        errors.push({ file: candidate, error: error.message });
+      }
+    }
   }
 
   if (process.env.I18NTK_DEBUG_LOCALES === '1' && errors.length > 0) {
@@ -214,7 +209,7 @@ let currentLanguage = 'en';
 let isInitialized = false;
 const missingWarned = new Set();
 
-function loadTranslations(language) {
+function loadTranslations(language) {
   const cfg = safeRequireConfig();
   const settings = cfg?.getConfig?.() || {};
   const configuredLanguage = settings.uiLanguage || settings.language;
@@ -226,10 +221,10 @@ function loadTranslations(language) {
 
   const loadErrors = [];
 
-  const preferredDir = arguments.length > 1 ? arguments[1] : null;
-
-  for (const lang of tryOrder) {
-    const files = findLocaleFilesAllDirs(lang, preferredDir);
+  const preferredDir = arguments.length > 1 ? arguments[1] : null;
+
+  for (const lang of tryOrder) {
+    const files = findLocaleFilesAllDirs(lang, preferredDir);
 
     // Prioritize bundled locales over project ones
       const prioritizedFiles = files.sort((a, b) => Number(isBundledPath(b)) - Number(isBundledPath(a)));
@@ -402,20 +397,20 @@ function getCurrentLanguage() {
 function getAvailableLanguages() {
   const dirs = resolveLocalesDirs();
   const langs = new Set();
-  for (const d of dirs) {
-    try {
-      const SecurityUtils = getSecurityUtils();
-      if (!SecurityUtils.safeExistsSync(d, getValidationBase(d))) continue;
-      for (const f of fs.readdirSync(d)) {
-        if (f.endsWith('.json')) langs.add(path.basename(f, '.json'));
-      }
-      for (const f of fs.readdirSync(d, { withFileTypes: true })) {
-        const nestedPath = path.join(d, f.name, `${f.name}.json`);
-        if (f.isDirectory() && SecurityUtils.safeExistsSync(nestedPath, getValidationBase(nestedPath))) {
-          langs.add(f.name);
-        }
-      }
-    } catch {}
+  for (const d of dirs) {
+    try {
+      const SecurityUtils = getSecurityUtils();
+      if (!SecurityUtils.safeExistsSync(d, getValidationBase(d))) continue;
+      for (const f of fs.readdirSync(d)) {
+        if (f.endsWith('.json')) langs.add(path.basename(f, '.json'));
+      }
+      for (const f of fs.readdirSync(d, { withFileTypes: true })) {
+        const nestedPath = path.join(d, f.name, `${f.name}.json`);
+        if (f.isDirectory() && SecurityUtils.safeExistsSync(nestedPath, getValidationBase(nestedPath))) {
+          langs.add(f.name);
+        }
+      }
+    } catch {}
   }
   return Array.from(langs.size ? langs : new Set(['en']));
 }

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;