i18nsmith 0.4.3 → 0.6.0

package/src/commands/init.ts

@@ -3,7 +3,8 @@ import inquirer from 'inquirer';
 import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
-import { diagnoseWorkspace, I18nConfig, TranslationConfig, ensureGitignore, ProjectIntelligenceService, type ProjectIntelligence, type SuggestedConfig, Scanner, KeyGenerator, LocaleStore, createBackup } from '@i18nsmith/core';
+import { diagnoseWorkspace, I18nConfig, TranslationConfig, ensureGitignore, type ProjectIntelligence, type SuggestedConfig, createBackup } from '@i18nsmith/core';
+import { getServiceContainer } from '../utils/bootstrap.js';
 import { scaffoldTranslationContext, scaffoldI18next } from '../utils/scaffold.js';
 import { hasDependency, readPackageJson } from '../utils/pkg.js';
 import { detectPackageManager, installDependencies } from '../utils/package-manager.js';
@@ -76,9 +77,12 @@ interface InitAnswers {
  */
 async function detectProjectIntelligence(workspaceRoot: string): Promise<ProjectIntelligence | null> {
   try {
-    const service = new ProjectIntelligenceService();
-    const result = await service.analyze({ workspaceRoot });
-    return result;
+    const container = getServiceContainer({ workspaceRoot });
+    const result = await container.projectIntelligence.analyze({ workspaceRoot });
+    if (!result.success) {
+      return null;
+    }
+    return result.data;
   } catch {
     return null;
   }
@@ -112,7 +116,7 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
   let suggestedConfig: SuggestedConfig;
 
   if (intelligence) {
-    const { framework, locales, filePatterns, confidence } = intelligence;
+    const { framework, locales, filePatterns } = intelligence;
     
     // Report detection results
     if (framework.type !== 'unknown') {
@@ -131,8 +135,8 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
 
     // Use template if specified, otherwise use detected config
     if (commandOptions.template) {
-      const service = new ProjectIntelligenceService();
-      suggestedConfig = service.applyTemplate(commandOptions.template, intelligence);
+      const container = getServiceContainer({ workspaceRoot });
+      suggestedConfig = container.projectIntelligence.applyTemplate(commandOptions.template, intelligence);
       console.log(chalk.green(`  ✓ Template: ${commandOptions.template}`));
     } else {
       suggestedConfig = intelligence.suggestedConfig;
@@ -164,7 +168,7 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
     throw new CliError('Project analysis failed. Use --template or run interactively.');
   }
 
-  // Build config from suggested values
+  // Build config from suggested values (now includes all Phase 1-6 features)
   const config: I18nConfig = {
     version: 1 as const,
     sourceLanguage: suggestedConfig.sourceLanguage,
@@ -174,11 +178,31 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
     exclude: suggestedConfig.exclude,
     minTextLength: 1,
     translation: { provider: 'manual' },
+    // Include preset if present
+    ...(suggestedConfig.preset && { preset: suggestedConfig.preset }),
     translationAdapter: {
       module: suggestedConfig.translationAdapter.module,
       hookName: suggestedConfig.translationAdapter.hookName,
+      // Include new options from Phase 4
+      skipUnusedImports: suggestedConfig.translationAdapter.skipUnusedImports,
+      preferGlobalT: suggestedConfig.translationAdapter.preferGlobalT,
+      vueUseGlobalOnly: suggestedConfig.translationAdapter.vueUseGlobalOnly,
+    },
+    // Include enhanced key generation from Phase 1
+    keyGeneration: {
+      namespace: suggestedConfig.keyGeneration.namespace,
+      shortHashLen: suggestedConfig.keyGeneration.shortHashLen,
+      strategy: suggestedConfig.keyGeneration.strategy,
+      maxKeyLength: suggestedConfig.keyGeneration.maxKeyLength,
+      caseStyle: suggestedConfig.keyGeneration.caseStyle,
+      deduplicateByValue: suggestedConfig.keyGeneration.deduplicateByValue,
     },
-    keyGeneration: suggestedConfig.keyGeneration,
+    // Include extraction options from Phase 2
+    extraction: suggestedConfig.extraction,
+    // Include sync options from Phase 3
+    sync: suggestedConfig.sync,
+    // Include merge strategy from Phase 3
+    mergeStrategy: suggestedConfig.mergeStrategy,
     seedTargetLocales: false,
   };
 
@@ -190,6 +214,11 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
       console.log(chalk.dim('  Target languages: ' + config.targetLanguages.join(', ')));
     }
     console.log(chalk.dim('  Adapter: ' + (config.translationAdapter?.module ?? 'react-i18next')));
+    if (config.preset) {
+      console.log(chalk.dim('  Preset: ' + config.preset));
+    }
+    console.log(chalk.dim('  Key strategy: ' + (config.keyGeneration?.strategy ?? 'hash')));
+    console.log(chalk.dim('  Merge strategy: ' + (config.mergeStrategy ?? 'keep-source')));
 
     // Ensure .gitignore has i18nsmith artifacts
     const gitignoreResult = await ensureGitignore(workspaceRoot);
@@ -216,10 +245,14 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
     // Seed source locale with detected keys to avoid immediate "missing-key" diagnostics
     try {
       console.log(chalk.blue('🔍 Scanning for existing hardcoded text...'));
-      const scanner = await Scanner.create(config, { workspaceRoot });
-      const scanResult = await scanner.scan();
+      const container = getServiceContainer({ workspaceRoot });
+      const scanResult = await container.scanner.scan(config);
       
-      if (scanResult.buckets.highConfidence.length > 0) {
+      if (!scanResult.success) {
+        throw new Error(scanResult.error.message);
+      }
+      
+      if (scanResult.data.buckets.highConfidence.length > 0) {
         const sourceLocalePath = path.join(workspaceRoot, config.localesDir || 'locales', `${config.sourceLanguage}.json`);
         
         // Read existing content or create empty object
@@ -231,16 +264,16 @@ async function runNonInteractiveInit(commandOptions: InitCommandOptions): Promis
           // File doesn't exist or is invalid, start with empty
         }
         
-        // Generate keys for high-confidence candidates
-        const keyGenerator = new KeyGenerator({
+        // Generate keys for high-confidence candidates using service with custom options
+        const keyGenOptions = {
           namespace: config.keyGeneration?.namespace || 'common',
           hashLength: config.keyGeneration?.shortHashLen || 6,
           workspaceRoot,
-        });
+        };
         
         let keysAdded = 0;
-        for (const candidate of scanResult.buckets.highConfidence) {
-          const generated = keyGenerator.generate(candidate.text, {
+        for (const candidate of scanResult.data.buckets.highConfidence) {
+          const generated = container.keyGenerator.generateWithOptions(candidate.text, keyGenOptions, {
             filePath: candidate.filePath,
             kind: candidate.kind,
             context: candidate.context,
@@ -510,6 +543,13 @@ export function registerInit(program: Command) {
             return !isNaN(num) && num > 0 ? true : 'Please enter a positive number';
           },
         },
+        {
+          type: 'confirm',
+          name: 'seedTargetLocales',
+          message: 'Seed target locale files with placeholders for missing keys?',
+          when: () => true,
+          default: false,
+        },
       ]);
 
 
@@ -562,9 +602,9 @@ export function registerInit(program: Command) {
       if (answers.setupMode === 'template') {
         // Use template
         console.log(chalk.blue(`📋 Applying ${answers.template} template...`));
-        const service = new ProjectIntelligenceService();
+        const container = getServiceContainer({ workspaceRoot });
         // Uses pre-detected intelligence from outer scope
-        const suggestedConfig = service.applyTemplate(answers.template!, intelligence || {
+        const suggestedConfig = container.projectIntelligence.applyTemplate(answers.template!, intelligence || {
           framework: { type: 'unknown', adapter: 'react-i18next', hookName: 'useTranslation', features: [], confidence: 0, evidence: [] },
           locales: { sourceLanguage: 'en', targetLanguages: [], localesDir: 'locales', format: 'flat', existingFiles: [], existingKeyCount: 0, confidence: 0 },
           filePatterns: { include: ['**/*.{ts,tsx,js,jsx}'], exclude: ['node_modules/**', 'dist/**'], sourceDirectories: [], hasTypeScript: false, hasJsx: false, hasVue: false, hasSvelte: false, sourceFileCount: 0, confidence: 0 },
@@ -645,6 +685,12 @@ export function registerInit(program: Command) {
         };
       }
 
+      // Honor explicit interactive answer for seeding target locales regardless
+      // of which setup mode (auto/template/manual) produced the initial config.
+      if (typeof (answers as InitAnswers).seedTargetLocales === 'boolean' && config) {
+        config.seedTargetLocales = (answers as InitAnswers).seedTargetLocales;
+      }
+
       const mergeDecision = await maybePromptMergeStrategy(config, workspaceRoot, Boolean(commandOptions.merge));
       if (mergeDecision?.aborted) {
         console.log(chalk.yellow('Aborting init to avoid overwriting existing i18n assets. Re-run with --merge to bypass.'));
@@ -787,35 +833,33 @@ async function maybePromptMergeStrategy(
       }
     }
 
-    if (!mergeRequested) {
-      const { proceed } = await inquirer.prompt<{ proceed: boolean }>([
-        {
-          type: 'confirm',
-          name: 'proceed',
-          message: 'Merge with the existing setup instead of overwriting?',
-          default: true,
-        },
-      ]);
-      if (!proceed) {
-        return { strategy: null, aborted: true };
-      }
-    }
+    // Single consolidated prompt for both --merge and interactive flows. When
+    // `--merge` is provided we omit the 'Abort' choice and default to
+    // 'keep-source'; otherwise include an explicit 'Abort' option (last).
+    const baseChoices = [
+      { name: 'Keep source values (append new keys only)', value: 'keep-source' },
+      { name: 'Overwrite with placeholders (backup first)', value: 'overwrite' },
+      { name: 'Prompt during sync to review changes interactively', value: 'interactive' },
+    ];
 
-    const { strategy } = await inquirer.prompt<{ strategy: MergeStrategy }>([
+    const choices = mergeRequested ? baseChoices : [...baseChoices, { name: 'Abort (do not touch existing files)', value: 'abort' }];
+
+    const { strategy } = await inquirer.prompt<{
+      strategy: 'abort' | MergeStrategy;
+    }>([
       {
         type: 'list',
         name: 'strategy',
-        message: 'Choose a merge strategy for existing locale keys',
-        choices: [
-          { name: 'Keep source values (append new keys only)', value: 'keep-source' },
-          { name: 'Overwrite with placeholders (backup first)', value: 'overwrite' },
-          { name: 'Interactive review during sync', value: 'interactive' },
-        ],
+        message: 'Existing i18n assets detected — choose how to proceed',
+        choices,
         default: 'keep-source',
       },
     ]);
 
-    return { strategy, aborted: false };
+    if (strategy === 'abort') {
+      return { strategy: null, aborted: true };
+    }
+    return { strategy: strategy as MergeStrategy, aborted: false };
   } catch (error) {
     console.warn(chalk.gray(`Skipping merge diagnostics: ${(error as Error).message}`));
     return { strategy: null, aborted: false };
@@ -833,7 +877,8 @@ async function applyMergeStrategy(
   }
 
   const localesDirPath = path.join(workspaceRoot, config.localesDir || 'locales');
-  const localeStore = new LocaleStore(localesDirPath, {
+  const container = getServiceContainer({ workspaceRoot });
+  const localeStore = container.localeStoreFactory.create(localesDirPath, {
     format: config.locales?.format ?? 'auto',
     delimiter: config.locales?.delimiter ?? '.',
     sortKeys: config.locales?.sortKeys ?? 'alphabetical',
@@ -841,10 +886,9 @@ async function applyMergeStrategy(
 
   const sourceLocale = config.sourceLanguage ?? 'en';
   let sourceData: Record<string, string> = {};
-  try {
-    sourceData = await localeStore.get(sourceLocale);
-  } catch {
-    sourceData = {};
+  const sourceResult = await localeStore.get(sourceLocale);
+  if (sourceResult.success) {
+    sourceData = sourceResult.data;
   }
 
   const sourceKeys = Object.keys(sourceData);
@@ -888,10 +932,9 @@ async function applyMergeStrategy(
   const seedValue = config.sync?.seedValue ?? '[TODO]';
   for (const locale of localesToOverwrite) {
     let existingData: Record<string, string> = {};
-    try {
-      existingData = await localeStore.get(locale);
-    } catch {
-      existingData = {};
+    const existingResult = await localeStore.get(locale);
+    if (existingResult.success) {
+      existingData = existingResult.data;
     }
     for (const key of Object.keys(existingData)) {
       await localeStore.remove(locale, key);

package/src/commands/rename.ts

@@ -2,10 +2,11 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import path from 'node:path';
 import { promises as fs } from 'node:fs';
-import { loadConfig, KeyRenamer, type KeyRenameSummary, type KeyRenameBatchSummary, type KeyRenameMapping } from '@i18nsmith/core';
+import { loadConfig, type KeyRenameSummary, type KeyRenameBatchSummary, type KeyRenameMapping } from '@i18nsmith/core';
 import { applyPreviewFile, writePreviewFile } from '../utils/preview.js';
 import { runAdapterPreflight } from '../utils/adapter-preflight.js';
 import { CliError, withErrorHandling } from '../utils/errors.js';
+import { getServiceContainer } from '../utils/bootstrap.js';
 
 interface ScanOptions {
   config: string;
@@ -66,12 +67,19 @@ export function registerRename(program: Command): void {
             await runAdapterPreflight();
           }
 
-          const renamer = new KeyRenamer(config);
-          const summary = await renamer.rename(oldKey, newKey, {
+          // Use ServiceContainer for rename service
+          const container = getServiceContainer();
+          const renameResult = await container.keyRenamer.rename(config, oldKey, newKey, {
             write: options.write,
             diff: options.diff || previewMode,
           });
 
+          if (!renameResult.success) {
+            throw new CliError(`Rename failed: ${renameResult.error.message}`);
+          }
+
+          const summary = renameResult.data;
+
           if (previewMode && options.previewOutput) {
             const savedPath = await writePreviewFile('rename-key', summary, options.previewOutput);
             console.log(chalk.green(`Preview written to ${path.relative(process.cwd(), savedPath)}`));
@@ -127,8 +135,19 @@ export function registerRename(program: Command): void {
           }
 
           const mappings = await loadRenameMappings(options.map);
-          const renamer = new KeyRenamer(config);
-          const summary = await renamer.renameBatch(mappings, { write: options.write, diff: options.diff });
+          
+          // Use ServiceContainer for batch rename
+          const container = getServiceContainer();
+          const batchResult = await container.keyRenamer.renameBatch(config, mappings, { 
+            write: options.write, 
+            diff: options.diff 
+          });
+
+          if (!batchResult.success) {
+            throw new CliError(`Batch rename failed: ${batchResult.error.message}`);
+          }
+
+          const summary = batchResult.data;
 
           if (options.report) {
             const outputPath = path.resolve(process.cwd(), options.report);

package/src/commands/review.ts

@@ -3,7 +3,8 @@ import path from 'path';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import type { Command } from 'commander';
-import { loadConfigWithMeta, Scanner, type ScanCandidate, type ScanSummary } from '@i18nsmith/core';
+import { loadConfigWithMeta, type ScanCandidate, type ScanSummary } from '@i18nsmith/core';
+import { getServiceContainer } from '../utils/bootstrap.js';
 import { CliError, withErrorHandling } from '../utils/errors.js';
 
 interface ReviewCommandOptions {
@@ -138,8 +139,14 @@ export function registerReview(program: Command) {
       withErrorHandling(async (options: ReviewCommandOptions) => {
         try {
           const { config, projectRoot, configPath } = await loadConfigWithMeta(options.config);
-          const scanner = await Scanner.create(config, { workspaceRoot: projectRoot });
-          const summary = scanner.scan({ scanCalls: options.scanCalls }) as BucketedScanSummary;
+          const container = getServiceContainer({ workspaceRoot: projectRoot });
+          const result = await container.scanner.scan(config, { scanCalls: options.scanCalls });
+          
+          if (!result.success) {
+            throw new CliError(result.error.message);
+          }
+          
+          const summary = result.data as BucketedScanSummary;
           const buckets = summary.buckets ?? {};
           const needsReview = buckets.needsReview ?? [];
           const skipped = buckets.skipped ?? [];

package/src/commands/scaffold-adapter.ts

@@ -1,7 +1,8 @@
 import { Command } from 'commander';
 import inquirer from 'inquirer';
 import chalk from 'chalk';
-import { diagnoseWorkspace, loadConfig } from '@i18nsmith/core';
+import { loadConfig } from '@i18nsmith/core';
+import { getServiceContainer } from '../utils/bootstrap.js';
 import { scaffoldTranslationContext, scaffoldI18next } from '../utils/scaffold.js';
 import { readPackageJson, hasDependency } from '../utils/pkg.js';
 import { detectPackageManager, installDependencies } from '../utils/package-manager.js';
@@ -233,7 +234,15 @@ export function registerScaffoldAdapter(program: Command) {
 async function detectExistingRuntime(): Promise<string | null> {
   try {
     const config = await loadConfig();
-    const report = await diagnoseWorkspace(config);
+    const container = getServiceContainer();
+    const result = await container.diagnostics.diagnose(config);
+    
+    if (!result.success) {
+      console.warn(chalk.gray(`Skipping adapter detection: ${result.error.message}`));
+      return null;
+    }
+    
+    const report = result.data;
     type AdapterInfo = (typeof report.adapterFiles)[number];
     type ProviderInfo = (typeof report.providerFiles)[number];
 

package/src/commands/scan.ts

@@ -2,9 +2,10 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import type { Command } from 'commander';
-import { loadConfigWithMeta, Scanner } from '@i18nsmith/core';
+import { loadConfigWithMeta } from '@i18nsmith/core';
 import type { ScanCandidate } from '@i18nsmith/core';
 import { CliError, withErrorHandling } from '../utils/errors.js';
+import { getServiceContainer } from '../utils/bootstrap.js';
 
 interface ScanOptions {
   config?: string;
@@ -57,7 +58,14 @@ export function registerScan(program: Command) {
     .option('--exclude <patterns...>', 'Override exclude globs from config (comma or space separated)', collectTargetPatterns, [])
     .action(
       withErrorHandling(async (options: ScanOptions) => {
-        console.log(chalk.blue('Starting scan...'));
+        // When JSON output is requested, avoid human-readable preamble on stdout
+        // so callers can reliably parse the JSON summary. Send banner to stderr
+        // when --json is used.
+        if (options.json) {
+          console.error(chalk.blue('Starting scan...'));
+        } else {
+          console.log(chalk.blue('Starting scan...'));
+        }
 
         try {
           const { config, projectRoot, configPath } = await loadConfigWithMeta(options.config);
@@ -75,11 +83,16 @@ export function registerScan(program: Command) {
           if (options.exclude?.length) {
             config.exclude = options.exclude;
           }
-          // Use factory that registers framework adapters (React/Vue) so
-          // scans include files handled by adapters. Backwards compatible
-          // API: Scanner.create will return a scanner with adapters wired.
-          const scanner = await Scanner.create(config, { workspaceRoot: projectRoot });
-          const summary = scanner.scan();
+
+          // Use ServiceContainer for scanning - provides consistent DI
+          const container = getServiceContainer({ workspaceRoot: projectRoot });
+          const result = await container.scanner.scan(config);
+
+          if (!result.success) {
+            throw new CliError(`Scan failed: ${result.error.message}`);
+          }
+
+          const summary = result.data;
 
           if (options.report) {
             const outputPath = path.resolve(process.cwd(), options.report);