i18ntk 2.0.3 → 2.1.0

package/main/manage/index.js

@@ -151,13 +151,40 @@ class I18nManager {
         }
     }
 
-    // Check if i18n framework is installed - configuration-based check without prompts
-    async checkI18nDependencies() {
-        const packageJsonPath = path.resolve('./package.json');
-
-        if (!SecurityUtils.safeExistsSync(packageJsonPath)) {
-            console.log(this.ui ? this.ui.t('errors.noPackageJson') : 'No package.json found');
-            return false; // Treat as no framework detected
+    // Check if i18n framework is installed - configuration-based check without prompts
+    async checkI18nDependencies() {
+        const markInternalFrameworkDetected = () => {
+            const cfg = configManager.loadSettings ? configManager.loadSettings() : (configManager.getConfig ? configManager.getConfig() : {});
+            cfg.framework = cfg.framework || {};
+            cfg.framework.detected = true;
+            cfg.framework.preference = cfg.framework.preference || 'i18ntk';
+            const existing = Array.isArray(cfg.framework.installed) ? cfg.framework.installed : [];
+            if (!existing.includes('i18ntk')) {
+                cfg.framework.installed = [...existing, 'i18ntk'];
+            }
+            if (configManager.saveSettings) {
+                configManager.saveSettings(cfg);
+            } else if (configManager.saveConfig) {
+                configManager.saveConfig(cfg);
+            }
+        };
+
+        try {
+            const { checkInitialized } = require('../../utils/init-helper');
+            const initStatus = await checkInitialized();
+            if (initStatus?.initialized || initStatus?.config?.setup?.completed) {
+                markInternalFrameworkDetected();
+                return true;
+            }
+        } catch (_) {
+            // Continue with package.json detection.
+        }
+
+        const packageJsonPath = path.resolve('./package.json');
+
+        if (!SecurityUtils.safeExistsSync(packageJsonPath)) {
+            console.log(this.ui ? this.ui.t('errors.noPackageJson') : 'No package.json found');
+            return false; // Treat as no framework detected
         }
 
         try {
@@ -174,11 +201,12 @@ class I18nManager {
                 'vue-i18n',
                 'angular-i18n',
                 'i18next',
-                'next-i18next',
-                'svelte-i18n',
-                '@nuxtjs/i18n',
-                'i18ntk-runtime'
-            ];
+                'next-i18next',
+                'svelte-i18n',
+                '@nuxtjs/i18n',
+                'i18ntk-runtime',
+                'i18ntk'
+            ];
 
             const installedFrameworks = i18nFrameworks.filter(framework => dependencies[framework]);
 
@@ -484,21 +512,39 @@ class I18nManager {
         const settings = configManager.loadSettings ? configManager.loadSettings() : (configManager.getConfig ? configManager.getConfig() : {});
 
         // Ensure framework configuration exists with all required fields
-        if (!settings.framework) {
-            settings.framework = {
-                detected: false,
-                preference: null,
-                prompt: 'always',
+        if (!settings.framework) {
+            settings.framework = {
+                detected: false,
+                preference: null,
+                prompt: 'always',
                 lastPromptedVersion: null,
                 installed: [],
-                version: '1.0' // Schema version for future compatibility
-            };
-        }
-
-        // Check if we need to prompt for framework detection
-        if (!settings.framework.detected &&
-            settings.framework.prompt !== 'suppress' &&
-            settings.framework.lastPromptedVersion !== pkg.version) {
+                version: '1.0' // Schema version for future compatibility
+            };
+        }
+
+        const setupCompleted = Boolean(config?.setup?.completed || settings?.setup?.completed);
+        if (setupCompleted) {
+            settings.framework.detected = true;
+            settings.framework.preference = settings.framework.preference || 'i18ntk';
+            settings.framework.installed = Array.isArray(settings.framework.installed)
+                ? Array.from(new Set([...settings.framework.installed, 'i18ntk']))
+                : ['i18ntk'];
+            settings.framework.lastDetected = new Date().toISOString();
+
+            if (configManager.saveSettings) {
+                await configManager.saveSettings(settings);
+            } else if (configManager.saveConfig) {
+                await configManager.saveConfig(settings);
+            }
+
+            return { ...config, ...settings };
+        }
+
+        // Check if we need to prompt for framework detection
+        if (!settings.framework.detected &&
+            settings.framework.prompt !== 'suppress' &&
+            settings.framework.lastPromptedVersion !== pkg.version) {
 
             console.log('\nWe noticed you haven\'t set up an i18n framework yet.');
             console.log('Would you like to detect your i18n framework automatically?');
@@ -557,11 +603,11 @@ class I18nManager {
         return { ...config, ...settings };
     }
 
-    async detectEnvironmentAndFramework() {
-        // Defensive check to ensure SecurityUtils is available
-        if (!SecurityUtils) {
-            throw new Error('SecurityUtils is not available. This may indicate a module loading issue.');
-        }
+    async detectEnvironmentAndFramework() {
+        // Defensive check to ensure SecurityUtils is available
+        if (!SecurityUtils) {
+            throw new Error('SecurityUtils is not available. This may indicate a module loading issue.');
+        }
         const fs = require('fs');
         const path = require('path');
 
@@ -572,13 +618,23 @@ class I18nManager {
         const pomPath = path.join(process.cwd(), 'pom.xml');
         const composerPath = path.join(process.cwd(), 'composer.json');
 
-        let detectedLanguage = 'generic';
-        let detectedFramework = 'generic';
-
-        if (SecurityUtils.safeExistsSync(packageJsonPath)) {
-            detectedLanguage = 'javascript';
-            try {
-                const packageJson = JSON.parse(SecurityUtils.safeReadFileSync(packageJsonPath, path.dirname(packageJsonPath), 'utf8'));
+        let detectedLanguage = 'generic';
+        let detectedFramework = 'generic';
+
+        try {
+            const { checkInitialized } = require('../../utils/init-helper');
+            const initStatus = await checkInitialized();
+            if (initStatus?.initialized || initStatus?.config?.setup?.completed) {
+                return { detectedLanguage: 'javascript', detectedFramework: 'i18ntk' };
+            }
+        } catch (_) {
+            // Continue with filesystem/package detection.
+        }
+
+        if (SecurityUtils.safeExistsSync(packageJsonPath)) {
+            detectedLanguage = 'javascript';
+            try {
+                const packageJson = JSON.parse(SecurityUtils.safeReadFileSync(packageJsonPath, path.dirname(packageJsonPath), 'utf8'));
                 const deps = {
                     ...(packageJson.dependencies || {}),
                     ...(packageJson.devDependencies || {}),
@@ -586,13 +642,18 @@ class I18nManager {
                 };
 
                 // Check for i18ntk-runtime first (check both package names)
-                const hasI18nTkRuntime = deps['i18ntk-runtime'] || deps['i18ntk/runtime'];
-
-                // Check for common i18n patterns in source code if not found in package.json
-                if (!hasI18nTkRuntime) {
-                    const i18nPatterns = [
-                        /i18n\.t\(['\"`]/,
-                        /useI18n\(/,
+                const hasI18nTkRuntime = deps['i18ntk-runtime'] || deps['i18ntk/runtime'];
+                const hasI18nTkToolkit = Boolean(deps['i18ntk']);
+
+                if (hasI18nTkToolkit) {
+                    detectedFramework = 'i18ntk';
+                }
+
+                // Check for common i18n patterns in source code if not found in package.json
+                if (!hasI18nTkRuntime && detectedFramework !== 'i18ntk') {
+                    const i18nPatterns = [
+                        /i18n\.t\(['\"`]/,
+                        /useI18n\(/,
                         /from ['\"]i18ntk[\/\\]runtime['\"]/,
                         /require\(['\"]i18ntk[\/\\]runtime['\"]\)/
                     ];
@@ -614,9 +675,9 @@ class I18nManager {
                             continue;
                         }
                     }
-                } else {
-                    detectedFramework = 'i18ntk-runtime';
-                }
+                } else if (hasI18nTkRuntime) {
+                    detectedFramework = 'i18ntk-runtime';
+                }
 
                 // Only check other frameworks if i18ntk-runtime wasn't detected
                 if (detectedFramework !== 'i18ntk-runtime') {
@@ -850,27 +911,34 @@ class I18nManager {
         const choice = await this.prompt('\n' + t('menu.selectOptionPrompt'));
 
         switch (choice.trim()) {
-            case '1':
-                await this.executeCommand('init', {fromMenu: true});
-                break;
-            case '2':
-                await this.executeCommand('analyze', {fromMenu: true});
-                break;
-            case '3':
-                await this.executeCommand('validate', {fromMenu: true});
-                break;
-            case '4':
-                await this.executeCommand('usage', {fromMenu: true});
-                break;
-            case '5':
-                await this.executeCommand('complete', {fromMenu: true});
-                break;
-            case '6':
-                await this.executeCommand('sizing', {fromMenu: true});
-                break;
-            case '7':
-                await this.executeCommand('fix', {fromMenu: true});
-                break;
+            case '1':
+                await this.executeCommand('init', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '2':
+                await this.executeCommand('analyze', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '3':
+                await this.executeCommand('validate', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '4':
+                await this.executeCommand('usage', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '5':
+                await this.executeCommand('complete', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '6':
+                await this.executeCommand('sizing', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
+            case '7':
+                await this.executeCommand('fix', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
             case '8':
                 // Check for PIN protection
                 const authRequired = await this.adminAuth.isAuthRequiredForScript('summaryReports');
@@ -943,9 +1011,10 @@ class I18nManager {
             case '12':
                 await this.showLanguageMenu();
                 break;
-            case '13':
-                await this.executeCommand('scanner', {fromMenu: true});
-                break;
+            case '13':
+                await this.executeCommand('scanner', {fromMenu: true});
+                await this.showInteractiveMenu();
+                return;
             case '0':
                 console.log(t('menu.goodbye'));
                 this.safeClose();