i18ntk 1.10.2 → 2.0.2

package/main/i18ntk-go.js

@@ -16,7 +16,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 {
@@ -42,14 +42,13 @@ class GoI18nManager {
     this.resourceFormats = ['.json', '.toml', '.yaml', '.yml'];
   }
 
-  async detectFramework(sourceDir) {
-    const goModPath = path.join(sourceDir, 'go.mod');
-    if (fs.existsSync(goModPath)) {
-      const content = fs.readFileSync(goModPath, 'utf8');
-      
-      if (content.includes('go-i18n')) return 'go-i18n';
-      if (content.includes('nicksnyder/go-i18n')) return 'go-i18n-v2';
-      if (content.includes('golang.org/x/text')) return 'golang-text';
+  async detectFramework(sourceDir) {
+    const goModPath = path.join(sourceDir, 'go.mod');
+    if (SecurityUtils.safeExistsSync(goModPath)) {
+      const content = SecurityUtils.safeReadFileSync(goModPath, sourceDir, 'utf8') || '';
+      
+      if (content.includes('go-i18n')) return 'go-i18n-v2';
+      if (/x\/text\b/.test(content)) return 'golang-text';
       
       return 'standard-go';
     }
@@ -69,8 +68,8 @@ class GoI18nManager {
     
     const goFiles = this.findFiles(sourceDir, '.go');
     
-    for (const file of goFiles) {
-      const content = fs.readFileSync(file, 'utf8');
+    for (const file of goFiles) {
+      const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8') || '';
       
       // Extract Go i18n patterns
       const patterns = [
@@ -106,7 +105,7 @@ class GoI18nManager {
       fs.mkdirSync(langDir, { recursive: true });
       
       // Create Go i18n format files
-      fs.writeFileSync(path.join(langDir, 'active.en.toml'), `# Go i18n translations for ${lang}
+      SecurityUtils.safeWriteFileSync(path.join(langDir, 'active.en.toml'), `# Go i18n translations for ${lang}
 [hello]
 other = "Hello, World!"
 
@@ -115,7 +114,7 @@ one = "{{.Count}} item"
 other = "{{.Count}} items"
 `);
       
-      fs.writeFileSync(path.join(langDir, 'active.en.json'), JSON.stringify({
+      SecurityUtils.safeWriteFileSync(path.join(langDir, 'active.en.json'), JSON.stringify({
         hello: "Hello, World!",
         items: {
           one: "{{.Count}} item",
@@ -161,7 +160,7 @@ other = "{{.Count}} items"
     };
     
     const reportPath = path.join(outputDir, 'i18ntk-go-report.json');
-    fs.writeFileSync(reportPath, JSON.stringify(report, null, 2));
+    SecurityUtils.safeWriteFileSync(reportPath, JSON.stringify(report, null, 2));
     
     return reportPath;
   }
@@ -281,4 +280,4 @@ module.exports = { GoI18nManager };
 
 if (require.main === module) {
   program.parse();
-}
+}

package/main/i18ntk-init.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /**
  * I18NTK INITIALIZATION SCRIPT
  * 
@@ -22,7 +22,7 @@ const { detectFramework } = require('../utils/framework-detector');
 const { getFormatAdapter } = require('../utils/format-manager');
 // Ensure UIi18n is available for this initializer class
 const UIi18n = require('./i18ntk-ui');
-loadTranslations(process.env.I18NTK_LANG);
+loadTranslations();
 const { getUnifiedConfig, parseCommonArgs, displayHelp } = require('../utils/config-helper');
 const { showFrameworkWarningOnce } = require('../utils/cli-helper');
 const { createPrompt, isInteractive } = require('../utils/prompt-helper');
@@ -89,13 +89,13 @@ class I18nInitializer {
   async checkI18nDependencies(noPrompt = false) {
     const packageJsonPath = path.resolve('./package.json');
     
-    if (!fs.existsSync(packageJsonPath)) {
+    if (!SecurityUtils.safeExistsSync(packageJsonPath)) {
       console.log(t('errors.noPackageJson'));
       return true; // Allow to continue without framework
     }
     
     try {
-      const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+      const packageJson = JSON.parse(SecurityUtils.safeReadFileSync(packageJsonPath, path.dirname(packageJsonPath), 'utf8'));
       // Include peerDependencies in the check
       const dependencies = { 
         ...packageJson.dependencies, 
@@ -221,7 +221,7 @@ class I18nInitializer {
     
     // Check for existing translation directories
     for (const location of possibleLocations) {
-      if (fs.existsSync(location)) {
+      if (SecurityUtils.safeExistsSync(location)) {
         try {
           const items = fs.readdirSync(location);
           const englishFormats = ['en', 'en-US', 'en-GB', 'english'];
@@ -229,7 +229,7 @@ class I18nInitializer {
           // Check for English directories first
           for (const format of englishFormats) {
             const englishPath = path.join(location, format);
-            if (fs.existsSync(englishPath) && fs.statSync(englishPath).isDirectory()) {
+            if (SecurityUtils.safeExistsSync(englishPath) && fs.statSync(englishPath).isDirectory()) {
               const englishFiles = fs.readdirSync(englishPath).filter(file => file.endsWith(this.format.extension));
               if (englishFiles.length > 0) {
                 // Found English files, prioritize this
@@ -324,7 +324,7 @@ class I18nInitializer {
         if (newDirName && newDirName.trim()) {
           const newDirPath = path.resolve(newDirName.trim());
 
-          if (!fs.existsSync(newDirPath)) {
+          if (!SecurityUtils.safeExistsSync(newDirPath)) {
             fs.mkdirSync(newDirPath, { recursive: true });
             console.log(t('init.createdNewDirectory', { dir: newDirPath }));
           } else {
@@ -332,7 +332,7 @@ class I18nInitializer {
           }
 
           const sourceLangDir = path.join(newDirPath, this.config.sourceLanguage);
-          if (!fs.existsSync(sourceLangDir)) {
+          if (!SecurityUtils.safeExistsSync(sourceLangDir)) {
             fs.mkdirSync(sourceLangDir, { recursive: true });
             console.log(t('init.createdSourceLanguageDirectory', { dir: sourceLangDir }));
             await this.createSampleTranslationFile(sourceLangDir);
@@ -387,10 +387,10 @@ class I18nInitializer {
     }
     
     // Create directories if they do not exist
-    if (!fs.existsSync(validatedSourceDir)) {
+    if (!SecurityUtils.safeExistsSync(validatedSourceDir)) {
       fs.mkdirSync(validatedSourceDir, { recursive: true });
     }
-    if (this.config.structure !== 'single' && !fs.existsSync(validatedSourceLanguageDir)) {
+    if (this.config.structure !== 'single' && !SecurityUtils.safeExistsSync(validatedSourceLanguageDir)) {
       fs.mkdirSync(validatedSourceLanguageDir, { recursive: true });
     }
 
@@ -445,7 +445,7 @@ class I18nInitializer {
     const i18ntkCommonFilePath = path.join(validatedSourceLanguageDir, `i18ntk-common${this.format.extension}`);
     
     let sampleFilePath;
-    if (!fs.existsSync(commonFilePath)) {
+    if (!SecurityUtils.safeExistsSync(commonFilePath)) {
       sampleFilePath = commonFilePath;
     } else {
       sampleFilePath = i18ntkCommonFilePath;
@@ -471,36 +471,80 @@ class I18nInitializer {
   
   // Check if source directory and language exist
   validateSource() {
-    if (!fs.existsSync(this.sourceDir)) {
+    if (!SecurityUtils.safeExistsSync(this.sourceDir)) {
       throw new Error(t('validate.sourceLanguageDirectoryNotFound', { sourceDir: this.sourceDir }) || `Source directory not found: ${this.sourceDir}`);
     }
     
-    if (!fs.existsSync(this.sourceLanguageDir)) {
+    if (!SecurityUtils.safeExistsSync(this.sourceLanguageDir)) {
       throw new Error(t('validate.sourceLanguageDirectoryNotFound', { sourceDir: this.sourceLanguageDir }) || `Source language directory not found: ${this.sourceLanguageDir}`);
     }
     
     return true;
   }
 
+  createBootstrapSourceFile(targetDir) {
+    try {
+      if (!SecurityUtils.safeExistsSync(targetDir)) {
+        fs.mkdirSync(targetDir, { recursive: true });
+      }
+
+      const sampleName = `common${this.format.extension}`;
+      const samplePath = path.join(targetDir, sampleName);
+
+      if (SecurityUtils.safeExistsSync(samplePath)) {
+        return sampleName;
+      }
+
+      const sampleContent = {
+        app: {
+          title: 'Application',
+          description: 'Application description'
+        },
+        common: {
+          yes: 'Yes',
+          no: 'No',
+          save: 'Save',
+          cancel: 'Cancel'
+        }
+      };
+
+      const serializer = typeof this.format?.write === 'function'
+        ? this.format.write.bind(this.format)
+        : (typeof this.format?.serialize === 'function'
+          ? this.format.serialize.bind(this.format)
+          : (data) => JSON.stringify(data, null, 2));
+
+      const serialized = serializer(sampleContent);
+      SecurityUtils.safeWriteFileSync(samplePath, `${serialized}\n`, path.dirname(samplePath), 'utf8');
+      console.log(t('init.createdSampleTranslationFile', { file: samplePath }) || `Created sample translation file: ${samplePath}`);
+
+      return sampleName;
+    } catch {
+      return null;
+    }
+  }
+
   // Get all JSON files from source language directory (supports single/modular)
   getSourceFiles() {
     try {
       if (this.config.structure === 'single') {
-        if (!fs.existsSync(this.sourceDir)) {
+        if (!SecurityUtils.safeExistsSync(this.sourceDir)) {
           throw new Error(t('validate.sourceLanguageDirectoryNotFound', { sourceDir: this.sourceDir }) || `Source directory not found: ${this.sourceDir}`);
         }
         const files = fs.readdirSync(this.sourceDir)
           .filter(file => file.endsWith(this.format.extension) && !this.config.excludeFiles.includes(file));
         if (files.length === 0) {
+          const sampleFile = this.createBootstrapSourceFile(this.sourceDir);
+          if (sampleFile) return [sampleFile];
           throw new Error(t('validate.noJsonFilesFound', { sourceDir: this.sourceDir }) || `No JSON files found in source directory: ${this.sourceDir}`);
         }
         return files;
       }
 
-      if (!fs.existsSync(this.sourceLanguageDir)) {
+      if (!SecurityUtils.safeExistsSync(this.sourceLanguageDir)) {
         // Try to find English files in parent directory or subdirectories
         const parentDir = path.dirname(this.sourceLanguageDir);
-        if (fs.existsSync(parentDir)) {
+        if (SecurityUtils.safeExistsSync(parentDir)) {
           const subdirs = fs.readdirSync(parentDir).filter(item => {
             const fullPath = path.join(parentDir, item);
             return fs.statSync(fullPath).isDirectory();
@@ -509,7 +553,7 @@ class I18nInitializer {
           // Look for English files in any subdirectory
           for (const subdir of subdirs) {
             const englishDir = path.join(parentDir, subdir);
-            if (fs.existsSync(englishDir)) {
+            if (SecurityUtils.safeExistsSync(englishDir)) {
               const files = fs.readdirSync(englishDir);
               const formatFiles = files.filter(file =>
                 file.endsWith(this.format.extension) &&
@@ -533,6 +577,8 @@ class I18nInitializer {
       });
       
       if (files.length === 0) {
+        const sampleFile = this.createBootstrapSourceFile(this.sourceLanguageDir);
+        if (sampleFile) return [sampleFile];
         throw new Error(t('validate.noJsonFilesFound', { sourceDir: this.sourceLanguageDir }) || `No JSON files found in source directory: ${this.sourceLanguageDir}`);
       }
       
@@ -586,7 +632,7 @@ class I18nInitializer {
       } else {
         // Modular: folder per language mirroring source file
         const targetDir = path.join(this.sourceDir, targetLanguage);
-        if (!fs.existsSync(targetDir)) fs.mkdirSync(targetDir, { recursive: true });
+        if (!SecurityUtils.safeExistsSync(targetDir)) fs.mkdirSync(targetDir, { recursive: true });
         targetFilePath = path.join(targetDir, sourceFile);
       }
 
@@ -604,14 +650,14 @@ class I18nInitializer {
       }
       
       // Create target directory if it doesn't exist
-      if (!fs.existsSync(targetDir)) {
+      if (!SecurityUtils.safeExistsSync(targetDir)) {
         fs.mkdirSync(targetDir, { recursive: true });
       }
       
       let targetContent;
       
       // If target file exists, preserve existing translations
-      if (fs.existsSync(validatedTargetPath)) {
+      if (SecurityUtils.safeExistsSync(validatedTargetPath)) {
         try {
           const existingContent = await SecurityUtils.safeReadFile(validatedTargetPath, process.cwd());
           if (existingContent) {
@@ -844,6 +890,9 @@ class I18nInitializer {
   async initialize(hasI18n = true, args = {}) {
     console.log(t('init.initializingProject'));
     
+    // Preserve noPrompt setting in config
+    this.config.noPrompt = args.noPrompt || this.config.noPrompt;
+    
     if (!hasI18n) {
       console.log(t('init.warningProceedingWithoutFramework'));
       console.log(t('init.translationFilesCreatedWarning'));
@@ -1040,7 +1089,7 @@ class I18nInitializer {
   async generateDetailedReport(results, targetLanguages) {
     try {
       const outputDir = this.config.outputDir || path.join(process.cwd(), 'i18ntk-reports');
-      if (!fs.existsSync(outputDir)) {
+      if (!SecurityUtils.safeExistsSync(outputDir)) {
         fs.mkdirSync(outputDir, { recursive: true });
       }
       
@@ -1107,11 +1156,12 @@ class I18nInitializer {
     const fromMenu = options.fromMenu || false;
     
     try {
-      // Parse command line arguments
-      const args = this.parseArgs();
+      // Parse command line arguments and merge with options
+      const cliArgs = this.parseArgs();
+      const args = { ...cliArgs, ...options };  // options override cliArgs
 
       // On first run, prompt user for preferred UI language
-      if (!fs.existsSync(configManager.CONFIG_PATH)) {
+      if (!SecurityUtils.safeExistsSync(configManager.CONFIG_PATH)) {
         const { getGlobalReadline } = require('../utils/cli');
         getGlobalReadline();
         const selectedLang = await this.ui.selectLanguage();
@@ -1128,7 +1178,7 @@ class I18nInitializer {
         // Load translations for UI messages
       const uiLanguage = this.config.uiLanguage || 'en';
       const { loadTranslations } = require('../utils/i18n-helper');
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
       }
       
       // Setup is now handled centrally by config manager
@@ -1211,7 +1261,7 @@ class I18nInitializer {
       // Load translations for UI messages
       const uiLanguage = this.config.uiLanguage || 'en';
       const { loadTranslations } = require('../utils/i18n-helper');
-      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'ui-locales'));
+      loadTranslations(uiLanguage, path.resolve(__dirname, '..', 'resources', 'i18n', 'ui-locales'));
       
       // Skip i18n framework check in non-interactive mode
       console.log('Running initialization in non-interactive mode...');
@@ -1230,6 +1280,7 @@ class I18nInitializer {
 
 module.exports = I18nInitializer;
 
+
 // Run if called directly
 if (require.main === module) {
   async function main() {

package/main/i18ntk-java.js

@@ -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 JavaI18nManager {
   async detectFramework(sourceDir) {
     // Check for Android
     const androidManifest = path.join(sourceDir, 'AndroidManifest.xml');
-    if (fs.existsSync(androidManifest)) {
+    if (SecurityUtils.safeExistsSync(androidManifest)) {
       return 'android';
     }
     
@@ -60,15 +60,15 @@ class JavaI18nManager {
     const pomXml = path.join(sourceDir, 'pom.xml');
     const gradleFile = path.join(sourceDir, 'build.gradle');
     
-    if (fs.existsSync(pomXml)) {
-      const content = fs.readFileSync(pomXml, 'utf8');
+    if (SecurityUtils.safeExistsSync(pomXml)) {
+      const content = SecurityUtils.safeReadFileSync(pomXml, path.dirname(pomXml), 'utf8');
       if (content.includes('spring-boot')) {
         return 'spring-boot';
       }
     }
     
-    if (fs.existsSync(gradleFile)) {
-      const content = fs.readFileSync(gradleFile, 'utf8');
+    if (SecurityUtils.safeExistsSync(gradleFile)) {
+      const content = SecurityUtils.safeReadFileSync(gradleFile, path.dirname(gradleFile), 'utf8');
       if (content.includes('spring-boot')) {
         return 'spring-boot';
       }
@@ -97,7 +97,7 @@ class JavaI18nManager {
     const javaFiles = [...this.findFiles(sourceDir, '.java'), ...this.findFiles(sourceDir, '.kt')];
     
     for (const file of javaFiles) {
-      const content = fs.readFileSync(file, 'utf8');
+      const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8');
       
       // Extract Android string references
       const androidPatterns = [
@@ -131,7 +131,7 @@ class JavaI18nManager {
     const xmlFiles = this.findFiles(sourceDir, '.xml');
     for (const file of xmlFiles) {
       if (file.includes('strings.xml')) {
-        const content = fs.readFileSync(file, 'utf8');
+        const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8') || '';
         const stringPatterns = [
           /<string name="([^"]+)"/g,
           /<string-array name="([^"]+)"/g,
@@ -151,7 +151,7 @@ class JavaI18nManager {
     const propertiesFiles = this.findFiles(sourceDir, '.properties');
     for (const file of propertiesFiles) {
       if (file.includes('messages') || file.includes('i18n')) {
-        const content = fs.readFileSync(file, 'utf8');
+        const content = SecurityUtils.safeReadFileSync(file, path.dirname(file), 'utf8') || '';
         const lines = content.split('\n');
         
         for (const line of lines) {
@@ -181,28 +181,23 @@ class JavaI18nManager {
       
       if (framework === 'android') {
         // Android string resources
-        fs.writeFileSync(path.join(langDir, 'strings.xml'), `<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">My App</string>
-    <string name="hello">Hello, World!</string>
-    <string name="items_count">%d items</string>
-    
-    <plurals name="items">
-        <item quantity="one">%d item</item>
-        <item quantity="other">%d items</item>
-    </plurals>
-</resources>
-`);
-      } else {
-        // Java properties format
-        fs.writeFileSync(path.join(langDir, 'messages.properties'), `# Java i18n properties for ${lang}
-app.name=My Application
-hello.message=Hello, World!
-items.count={0} items
-`);
+        SecurityUtils.safeWriteFileSync(
+          path.join(langDir, 'strings.xml'),
+          `<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">My App</string>
+    <string name="hello">Hello, World!</string>
+    <string name="items_count">%d items</string>
+    <plurals name="items">
+        <item quantity="one">%d item</item>
+        <item quantity="other">%d items</item>
+    </plurals>
+</resources>`,
+          path.dirname(path.join(langDir, 'strings.xml'))
+        );
         
         // JSON format
-        fs.writeFileSync(path.join(langDir, 'messages.json'), JSON.stringify({
+        SecurityUtils.safeWriteFileSync(path.join(langDir, 'messages.json'), JSON.stringify({
           app: { name: "My Application" },
           hello: { message: "Hello, World!" },
           items: { count: "{0} items" }
@@ -217,7 +212,7 @@ items.count={0} items
     const files = [];
     
     function traverse(currentDir) {
-      if (!fs.existsSync(currentDir)) return;
+      if (!SecurityUtils.safeExistsSync(currentDir)) return;
       
       const items = fs.readdirSync(currentDir);
       
@@ -254,7 +249,7 @@ items.count={0} items
     };
     
     const reportPath = path.join(outputDir, 'i18ntk-java-report.json');
-    fs.writeFileSync(reportPath, JSON.stringify(report, null, 2));
+    SecurityUtils.safeWriteFileSync(reportPath, JSON.stringify(report, null, 2));
     
     return reportPath;
   }
@@ -382,4 +377,4 @@ module.exports = { JavaI18nManager };
 
 if (require.main === module) {
   program.parse();
-}
+}