i18ntk 2.4.0 → 2.5.1

package/utils/setup-enforcer.js

@@ -9,25 +9,26 @@
 
 const { getIcon } = require('./terminal-icons');
 const fs = require('fs');
-const path = require('path');
-const { blue, yellow, gray, cyan, green, red } = require('./colors-new');
-const SecurityUtils = require('./security');
-const I18nSetupModule = require('../main/i18ntk-setup');
-
-async function runSetupModule() {
-    if (I18nSetupModule && typeof I18nSetupModule.run === 'function') {
-        return await I18nSetupModule.run();
-    }
-
-    if (typeof I18nSetupModule === 'function') {
-        const setupManager = new I18nSetupModule();
-        if (typeof setupManager.setup === 'function') {
-            return await setupManager.setup();
-        }
-    }
-
-    throw new Error('Setup module does not expose a runnable entrypoint');
-}
+const path = require('path');
+const { blue, yellow, gray, cyan, green, red } = require('./colors-new');
+const SecurityUtils = require('./security');
+const I18nSetupModule = require('../main/i18ntk-setup');
+const { envManager } = require('./env-manager');
+
+async function runSetupModule() {
+    if (I18nSetupModule && typeof I18nSetupModule.run === 'function') {
+        return await I18nSetupModule.run();
+    }
+
+    if (typeof I18nSetupModule === 'function') {
+        const setupManager = new I18nSetupModule();
+        if (typeof setupManager.setup === 'function') {
+            return await setupManager.setup();
+        }
+    }
+
+    throw new Error('Setup module does not expose a runnable entrypoint');
+}
 
 class SetupEnforcer {
     static _setupCheckInProgress = false;
@@ -40,30 +41,30 @@ class SetupEnforcer {
     static isNonInteractive() {
         return !process.stdout.isTTY ||
                !process.stdin.isTTY ||
-               process.env.CI === 'true' ||
-               process.env.CONTINUOUS_INTEGRATION === 'true' ||
-               process.env.NODE_ENV === 'test' ||
-               process.env.npm_lifecycle_event === 'test' ||
-               Boolean(process.env.NO_INTERACTIVE);
+               envManager.getBoolean('CI') ||
+               envManager.getBoolean('CONTINUOUS_INTEGRATION') ||
+               envManager.get('NODE_ENV') === 'test' ||
+               envManager.get('npm_lifecycle_event') === 'test' ||
+               envManager.getBoolean('NO_INTERACTIVE');
     }
 
-    static checkSetupComplete() {
-         // Avoid circular dependency - use direct path resolution
-         const path = require('path');
-         const configPath = path.join(process.cwd(), '.i18ntk-config');
-        const exists = SecurityUtils.safeExistsSync(configPath);
-        if (!exists) {
-            this.handleMissingSetup();
-            return;
+    static checkSetupComplete() {
+         // Avoid circular dependency - use direct path resolution
+         const path = require('path');
+         const configPath = path.join(process.cwd(), '.i18ntk-config');
+        const exists = SecurityUtils.safeExistsSync(configPath);
+        if (!exists) {
+            this.handleMissingSetup();
+            return;
         }
 
         try {
-            const configRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
-            const config = SecurityUtils.safeParseJSON(configRaw);
-            if (!config || typeof config !== 'object') {
-                this.handleInvalidConfig();
-                return;
-            }
+            const configRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
+            const config = SecurityUtils.safeParseJSON(configRaw);
+            if (!config || typeof config !== 'object') {
+                this.handleInvalidConfig();
+                return;
+            }
             
             // Check if setup has been explicitly marked as completed
             if (config.setup && config.setup.completed === true) {
@@ -123,22 +124,22 @@ class SetupEnforcer {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    // Import once at module scope and execute the stable entrypoint.
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (!SecurityUtils.safeExistsSync(setupPath)) {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                    await runSetupModule();
-                    console.log(gray('You can now run your original command.'));
-                    resolve(true);
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    console.error(cyan('   npm run i18ntk-setup'));
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    // Import once at module scope and execute the stable entrypoint.
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    console.log(gray('You can now run your original command.'));
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    console.error(cyan('   npm run i18ntk-setup'));
                     process.exit(1);
                 }
             });
@@ -184,20 +185,20 @@ static async handleIncompleteSetup() {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (!SecurityUtils.safeExistsSync(setupPath)) {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                    await runSetupModule();
-                    resolve(true);
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    process.exit(1);
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    process.exit(1);
                 }
             });
         });
@@ -242,20 +243,20 @@ static async handleInvalidConfig() {
                     process.exit(0);
                 }
 
-                console.log(green(`${getIcon('rocket')} Running setup...`));
-
-                try {
-                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
-                    if (!SecurityUtils.safeExistsSync(setupPath)) {
-                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
-                        console.error(cyan('   npm run i18ntk-setup'));
-                        process.exit(1);
-                    }
-                    await runSetupModule();
-                    resolve(true);
-                } catch (error) {
-                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
-                    process.exit(1);
+                console.log(green(`${getIcon('rocket')} Running setup...`));
+
+                try {
+                    const setupPath = path.join(__dirname, '..', 'main', 'i18ntk-setup.js');
+                    if (!SecurityUtils.safeExistsSync(setupPath)) {
+                        console.error(red(`${getIcon('cross')} Setup script not found. Please run:`));
+                        console.error(cyan('   npm run i18ntk-setup'));
+                        process.exit(1);
+                    }
+                    await runSetupModule();
+                    resolve(true);
+                } catch (error) {
+                    console.error(red(`${getIcon('cross')} Error running setup:`), error.message);
+                    process.exit(1);
                 }
             });
         });
@@ -273,28 +274,28 @@ static async handleInvalidConfig() {
         SetupEnforcer._setupCheckPromise = new Promise(async (resolve, reject) => {
              try {
                  // Avoid circular dependency - use direct path resolution
-                 const path = require('path');
-                 const configPath = path.join(process.cwd(), '.i18ntk-config');
-                const exists = SecurityUtils.safeExistsSync(configPath);
-                if (!exists) {
-                    await SetupEnforcer.handleMissingSetup();
-                    // After setup is done, re-check the config
-                    const existsAfter = SecurityUtils.safeExistsSync(configPath);
-                    if (existsAfter) {
-                        resolve(true);
-                    } else {
+                 const path = require('path');
+                 const configPath = path.join(process.cwd(), '.i18ntk-config');
+                const exists = SecurityUtils.safeExistsSync(configPath);
+                if (!exists) {
+                    await SetupEnforcer.handleMissingSetup();
+                    // After setup is done, re-check the config
+                    const existsAfter = SecurityUtils.safeExistsSync(configPath);
+                    if (existsAfter) {
+                        resolve(true);
+                    } else {
                         process.exit(0);
                     }
                     return;
                 }
 
                 try {
-                    const configRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
-                    const config = SecurityUtils.safeParseJSON(configRaw);
-                    if (!config || typeof config !== 'object') {
-                        await SetupEnforcer.handleInvalidConfig();
-                        process.exit(0);
-                    }
+                    const configRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
+                    const config = SecurityUtils.safeParseJSON(configRaw);
+                    if (!config || typeof config !== 'object') {
+                        await SetupEnforcer.handleInvalidConfig();
+                        process.exit(0);
+                    }
                     
                     // Check if setup has been explicitly marked as completed
                     if (config.setup && config.setup.completed === true) {
@@ -306,11 +307,11 @@ static async handleInvalidConfig() {
                     if (!config.version || !config.sourceDir || (!config.detectedFramework && !(config.framework && config.framework.detected !== false))) {
                         await SetupEnforcer.handleIncompleteSetup();
                         // After setup is done, re-check the config
-                        const newConfigRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
-                        const newConfig = SecurityUtils.safeParseJSON(newConfigRaw);
-                        if (!newConfig || typeof newConfig !== 'object') {
-                            process.exit(0);
-                        }
+                        const newConfigRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
+                        const newConfig = SecurityUtils.safeParseJSON(newConfigRaw);
+                        if (!newConfig || typeof newConfig !== 'object') {
+                            process.exit(0);
+                        }
                         if (newConfig.setup && newConfig.setup.completed === true) {
                             resolve(true);
                         } else if (newConfig.version && newConfig.sourceDir && (newConfig.detectedFramework || (newConfig.framework && newConfig.framework.detected !== false))) {
@@ -326,11 +327,11 @@ static async handleInvalidConfig() {
                     await SetupEnforcer.handleInvalidConfig();
                     // After setup is done, re-check the config
                     try {
-                        const newConfigRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
-                        const newConfig = SecurityUtils.safeParseJSON(newConfigRaw);
-                        if (!newConfig || typeof newConfig !== 'object') {
-                            process.exit(0);
-                        }
+                        const newConfigRaw = SecurityUtils.safeReadFileSync(configPath, path.dirname(configPath), 'utf8');
+                        const newConfig = SecurityUtils.safeParseJSON(newConfigRaw);
+                        if (!newConfig || typeof newConfig !== 'object') {
+                            process.exit(0);
+                        }
                         if (newConfig.setup && newConfig.setup.completed === true) {
                             resolve(true);
                         } else if (newConfig.version && newConfig.sourceDir && (newConfig.detectedFramework || (newConfig.framework && newConfig.framework.detected !== false))) {
@@ -353,4 +354,4 @@ static async handleInvalidConfig() {
     }
 }
 
-module.exports = SetupEnforcer;
+module.exports = SetupEnforcer;

package/utils/terminal-icons.js

@@ -1,163 +1,164 @@
-/**
- * Terminal Icons Utility
- *
- * Provides Unicode emoji support with fallbacks for terminals that don't support them.
- * Automatically detects terminal capabilities and provides appropriate symbols.
- */
-
-const os = require('os');
-
-
-// Detect if terminal supports Unicode/emoji
-function supportsUnicode() {
-    // Check if we're on Windows
-    if (os.platform() !== 'win32') {
-        return true; // Assume Unix-like systems support Unicode
-    }
-
-    // Check if we're in a TTY
-    if (!process.stdout.isTTY) {
-        return false;
-    }
-
-    try {
-        // Try to detect Windows Terminal, VS Code terminal, or other modern terminals
-        const terminal = process.env.TERM_PROGRAM || process.env.WT_SESSION || '';
-
-        // Modern terminals that support Unicode
-        const unicodeTerminals = [
-            'vscode',           // VS Code integrated terminal
-            'hyper',            // Hyper terminal
-            'tabby',            // Tabby terminal
-            'fluent-terminal',  // Fluent Terminal
-            'windows-terminal', // Windows Terminal
-            'wt'                // Windows Terminal (WT_SESSION)
-        ];
-
-        if (unicodeTerminals.some(term => terminal.toLowerCase().includes(term))) {
-            return true;
-        }
-
-        // Check for Windows Terminal environment variable
-        if (process.env.WT_SESSION) {
-            return true;
-        }
-
-        // Check for modern PowerShell or pwsh
-        if (process.env.PSModulePath || process.env.POWERSHELL_EDITION) {
-            return true;
-        }
-
-        // Default to false for older Windows terminals
-        return false;
-
-    } catch (error) {
-        // If detection fails, default to safe option
-        return false;
-    }
-}
-
-// Icon definitions with fallbacks
-const ICONS = {
-    // Setup and configuration
-    wrench: { emoji: '🔧', fallback: '[SETUP]' },
-    gear: { emoji: '⚙️', fallback: '[CONFIG]' },
-    checkmark: { emoji: '✅', fallback: '[OK]' },
-    cross: { emoji: '❌', fallback: '[ERROR]' },
-    warning: { emoji: '⚠️', fallback: '[WARN]' },
-    info: { emoji: 'ℹ️', fallback: '[INFO]' },
-
-    // Actions
-    rocket: { emoji: '🚀', fallback: '[START]' },
-    search: { emoji: '🔍', fallback: '[SEARCH]' },
-    analyze: { emoji: '📊', fallback: '[ANALYZE]' },
-    fix: { emoji: '🔧', fallback: '[FIX]' },
-    complete: { emoji: '🎉', fallback: '[DONE]' },
-    clean: { emoji: '🧹', fallback: '[CLEAN]' },
-
-    // Status
-    success: { emoji: '✅', fallback: '[SUCCESS]' },
-    error: { emoji: '❌', fallback: '[ERROR]' },
-    pending: { emoji: '⏳', fallback: '[PENDING]' },
-    processing: { emoji: '⚙️', fallback: '[WORKING]' },
-
-    // Files and directories
-    file: { emoji: '📄', fallback: '[FILE]' },
-    folder: { emoji: '📁', fallback: '[DIR]' },
-    report: { emoji: '📊', fallback: '[REPORT]' },
-    backup: { emoji: '💾', fallback: '[BACKUP]' },
-
-    // Languages and frameworks
-    javascript: { emoji: '🟨', fallback: '[JS]' },
-    python: { emoji: '🐍', fallback: '[PY]' },
-    java: { emoji: '☕', fallback: '[JAVA]' },
-    php: { emoji: '🐘', fallback: '[PHP]' },
-    go: { emoji: '🐹', fallback: '[GO]' },
-    react: { emoji: '⚛️', fallback: '[REACT]' },
-    vue: { emoji: '💚', fallback: '[VUE]' },
-    angular: { emoji: '🅰️', fallback: '[ANGULAR]' },
-
-    // UI elements
-    bullet: { emoji: '•', fallback: '-' },
-    arrow: { emoji: '→', fallback: '->' },
-    separator: { emoji: '═', fallback: '=' },
-    corner: { emoji: '╔', fallback: '+' },
-    line: { emoji: '║', fallback: '|' },
-    end: { emoji: '╚', fallback: '+' }
-};
-
-// Cache the Unicode support detection
-const _supportsUnicode = supportsUnicode();
-
-/**
- * Get the appropriate icon for the current terminal
- * @param {string} iconName - Name of the icon from ICONS
- * @returns {string} - The icon or fallback text
- */
-function getIcon(iconName) {
-    const icon = ICONS[iconName];
-    if (!icon) {
-        return `[${iconName.toUpperCase()}]`;
-    }
-
-    return _supportsUnicode ? icon.emoji : icon.fallback;
-}
-
-/**
- * Get all available icon names
- * @returns {string[]} - Array of icon names
- */
-function getAvailableIcons() {
-    return Object.keys(ICONS);
-}
-
-/**
- * Check if terminal supports Unicode
- * @returns {boolean} - True if Unicode is supported
- */
-function isUnicodeSupported() {
-    return _supportsUnicode;
-}
-
-/**
- * Force enable/disable Unicode support (for testing)
- * @param {boolean} enabled - Whether to enable Unicode
- */
-function setUnicodeSupport(enabled) {
-    // This is mainly for testing purposes
-    // In production, detection should be automatic
-    if (typeof enabled === 'boolean') {
-        // Note: This won't actually change terminal capabilities,
-        // just the detection result for this module
-        console.warn('Warning: setUnicodeSupport() only affects this module\'s detection, not actual terminal capabilities');
-    }
-}
-
-// Export functions
-module.exports = {
-    getIcon,
-    getAvailableIcons,
-    isUnicodeSupported,
-    setUnicodeSupport,
-    ICONS
-};
+/**
+ * Terminal Icons Utility
+ *
+ * Provides Unicode emoji support with fallbacks for terminals that don't support them.
+ * Automatically detects terminal capabilities and provides appropriate symbols.
+ */
+
+const os = require('os');
+const { envManager } = require('./env-manager');
+
+
+// Detect if terminal supports Unicode/emoji
+function supportsUnicode() {
+    // Check if we're on Windows
+    if (os.platform() !== 'win32') {
+        return true; // Assume Unix-like systems support Unicode
+    }
+
+    // Check if we're in a TTY
+    if (!process.stdout.isTTY) {
+        return false;
+    }
+
+    try {
+        // Try to detect Windows Terminal, VS Code terminal, or other modern terminals
+        const terminal = envManager.get('TERM_PROGRAM') || envManager.get('WT_SESSION') || '';
+
+        // Modern terminals that support Unicode
+        const unicodeTerminals = [
+            'vscode',           // VS Code integrated terminal
+            'hyper',            // Hyper terminal
+            'tabby',            // Tabby terminal
+            'fluent-terminal',  // Fluent Terminal
+            'windows-terminal', // Windows Terminal
+            'wt'                // Windows Terminal (WT_SESSION)
+        ];
+
+        if (unicodeTerminals.some(term => terminal.toLowerCase().includes(term))) {
+            return true;
+        }
+
+        // Check for Windows Terminal environment variable
+        if (envManager.get('WT_SESSION')) {
+            return true;
+        }
+
+        // Check for modern PowerShell or pwsh
+        if (envManager.get('PSModulePath') || envManager.get('POWERSHELL_EDITION')) {
+            return true;
+        }
+
+        // Default to false for older Windows terminals
+        return false;
+
+    } catch (error) {
+        // If detection fails, default to safe option
+        return false;
+    }
+}
+
+// Icon definitions with fallbacks
+const ICONS = {
+    // Setup and configuration
+    wrench: { emoji: '🔧', fallback: '[SETUP]' },
+    gear: { emoji: '⚙️', fallback: '[CONFIG]' },
+    checkmark: { emoji: '✅', fallback: '[OK]' },
+    cross: { emoji: '❌', fallback: '[ERROR]' },
+    warning: { emoji: '⚠️', fallback: '[WARN]' },
+    info: { emoji: 'ℹ️', fallback: '[INFO]' },
+
+    // Actions
+    rocket: { emoji: '🚀', fallback: '[START]' },
+    search: { emoji: '🔍', fallback: '[SEARCH]' },
+    analyze: { emoji: '📊', fallback: '[ANALYZE]' },
+    fix: { emoji: '🔧', fallback: '[FIX]' },
+    complete: { emoji: '🎉', fallback: '[DONE]' },
+    clean: { emoji: '🧹', fallback: '[CLEAN]' },
+
+    // Status
+    success: { emoji: '✅', fallback: '[SUCCESS]' },
+    error: { emoji: '❌', fallback: '[ERROR]' },
+    pending: { emoji: '⏳', fallback: '[PENDING]' },
+    processing: { emoji: '⚙️', fallback: '[WORKING]' },
+
+    // Files and directories
+    file: { emoji: '📄', fallback: '[FILE]' },
+    folder: { emoji: '📁', fallback: '[DIR]' },
+    report: { emoji: '📊', fallback: '[REPORT]' },
+    backup: { emoji: '💾', fallback: '[BACKUP]' },
+
+    // Languages and frameworks
+    javascript: { emoji: '🟨', fallback: '[JS]' },
+    python: { emoji: '🐍', fallback: '[PY]' },
+    java: { emoji: '☕', fallback: '[JAVA]' },
+    php: { emoji: '🐘', fallback: '[PHP]' },
+    go: { emoji: '🐹', fallback: '[GO]' },
+    react: { emoji: '⚛️', fallback: '[REACT]' },
+    vue: { emoji: '💚', fallback: '[VUE]' },
+    angular: { emoji: '🅰️', fallback: '[ANGULAR]' },
+
+    // UI elements
+    bullet: { emoji: '•', fallback: '-' },
+    arrow: { emoji: '→', fallback: '->' },
+    separator: { emoji: '═', fallback: '=' },
+    corner: { emoji: '╔', fallback: '+' },
+    line: { emoji: '║', fallback: '|' },
+    end: { emoji: '╚', fallback: '+' }
+};
+
+// Cache the Unicode support detection
+const _supportsUnicode = supportsUnicode();
+
+/**
+ * Get the appropriate icon for the current terminal
+ * @param {string} iconName - Name of the icon from ICONS
+ * @returns {string} - The icon or fallback text
+ */
+function getIcon(iconName) {
+    const icon = ICONS[iconName];
+    if (!icon) {
+        return `[${iconName.toUpperCase()}]`;
+    }
+
+    return _supportsUnicode ? icon.emoji : icon.fallback;
+}
+
+/**
+ * Get all available icon names
+ * @returns {string[]} - Array of icon names
+ */
+function getAvailableIcons() {
+    return Object.keys(ICONS);
+}
+
+/**
+ * Check if terminal supports Unicode
+ * @returns {boolean} - True if Unicode is supported
+ */
+function isUnicodeSupported() {
+    return _supportsUnicode;
+}
+
+/**
+ * Force enable/disable Unicode support (for testing)
+ * @param {boolean} enabled - Whether to enable Unicode
+ */
+function setUnicodeSupport(enabled) {
+    // This is mainly for testing purposes
+    // In production, detection should be automatic
+    if (typeof enabled === 'boolean') {
+        // Note: This won't actually change terminal capabilities,
+        // just the detection result for this module
+        console.warn('Warning: setUnicodeSupport() only affects this module\'s detection, not actual terminal capabilities');
+    }
+}
+
+// Export functions
+module.exports = {
+    getIcon,
+    getAvailableIcons,
+    isUnicodeSupported,
+    setUnicodeSupport,
+    ICONS
+};