bctranslate 1.0.0 → 1.0.1

package/bin/bctranslate.js

@@ -2,13 +2,13 @@
 
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { resolve, basename, dirname } from 'path';
+import { resolve, basename, dirname } from 'path';
 import { existsSync, statSync } from 'fs';
 import { glob } from 'glob';
-import { translateFile } from '../src/index.js';
+import { translateAllFiles, generateDiff } from '../src/index.js';
 import { detectProject } from '../src/detect.js';
 import { ensureI18nSetup } from '../src/generators/setup.js';
-import { checkPythonBridge } from '../src/bridges/python.js';
+import { checkPythonBridge, installArgostranslate } from '../src/bridges/python.js';
 import { loadConfig, saveConfig } from '../src/config.js';
 
 const program = new Command();
@@ -18,7 +18,7 @@ program
   .description('Transform source files into i18n-ready code with automatic translation')
   .version('1.0.0');
 
-// ── Common languages for init prompts ────────────────────────────────────────
+// ── Language lists ────────────────────────────────────────────────────────────
 const COMMON_LANGUAGES = [
   { name: 'French        (fr)', value: 'fr' },
   { name: 'Spanish       (es)', value: 'es' },
@@ -27,7 +27,7 @@ const COMMON_LANGUAGES = [
   { name: 'Portuguese    (pt)', value: 'pt' },
   { name: 'Dutch         (nl)', value: 'nl' },
   { name: 'Russian       (ru)', value: 'ru' },
-  { name: 'Chinese (zh)', value: 'zh' },
+  { name: 'Chinese       (zh)', value: 'zh' },
   { name: 'Japanese      (ja)', value: 'ja' },
   { name: 'Korean        (ko)', value: 'ko' },
   { name: 'Arabic        (ar)', value: 'ar' },
@@ -43,70 +43,60 @@ const COMMON_LANGUAGES = [
 ];
 
 const SOURCE_LANGUAGES = [
-  { name: 'English   (en)', value: 'en' },
-  { name: 'French    (fr)', value: 'fr' },
-  { name: 'Spanish   (es)', value: 'es' },
-  { name: 'German    (de)', value: 'de' },
-  { name: 'Italian   (it)', value: 'it' },
-  { name: 'Portuguese(pt)', value: 'pt' },
-  { name: 'Chinese   (zh)', value: 'zh' },
+  { name: 'English    (en)', value: 'en' },
+  { name: 'French     (fr)', value: 'fr' },
+  { name: 'Spanish    (es)', value: 'es' },
+  { name: 'German     (de)', value: 'de' },
+  { name: 'Italian    (it)', value: 'it' },
+  { name: 'Portuguese (pt)', value: 'pt' },
+  { name: 'Chinese    (zh)', value: 'zh' },
   { name: 'Other (type below)', value: '__other__' },
 ];
 
 // ── File patterns per project type ───────────────────────────────────────────
 const FILE_PATTERNS = {
-  vue: ['**/*.vue', 'src/**/*.js', 'src/**/*.ts'],
-  react: ['**/*.jsx', '**/*.tsx', 'src/**/*.js', 'src/**/*.ts'],
+  vue:     ['**/*.vue', 'src/**/*.js', 'src/**/*.ts'],
+  react:   ['**/*.jsx', '**/*.tsx', 'src/**/*.js', 'src/**/*.ts'],
   vanilla: ['**/*.html', '**/*.htm', '**/*.js'],
 };
 
 const IGNORE_PATTERNS = [
-  '**/node_modules/**',
-  '**/dist/**',
-  '**/build/**',
-  '**/.git/**',
-  '**/coverage/**',
-  '**/*.min.js',
+  '**/node_modules/**', '**/dist/**', '**/build/**',
+  '**/.git/**', '**/coverage/**', '**/*.min.js',
 ];
 
-// ── Resolve files from a path arg ────────────────────────────────────────────
+// ── File resolution ───────────────────────────────────────────────────────────
 async function resolveFiles(pathArg, cwd, project) {
   const patterns = FILE_PATTERNS[project.type] || FILE_PATTERNS.vanilla;
 
   if (!pathArg) {
     const files = [];
     for (const p of patterns) {
-      const matched = await glob(p, { cwd, absolute: true, ignore: IGNORE_PATTERNS });
-      files.push(...matched);
+      files.push(...await glob(p, { cwd, absolute: true, ignore: IGNORE_PATTERNS }));
     }
     return [...new Set(files)];
   }
 
   const resolved = resolve(cwd, pathArg);
-
   if (existsSync(resolved)) {
     if (statSync(resolved).isDirectory()) {
       const files = [];
       for (const p of patterns) {
-        const matched = await glob(p, { cwd: resolved, absolute: true, ignore: IGNORE_PATTERNS });
-        files.push(...matched);
+        files.push(...await glob(p, { cwd: resolved, absolute: true, ignore: IGNORE_PATTERNS }));
       }
       return [...new Set(files)];
     }
     return [resolved];
   }
-
-  // Treat as glob pattern
   return glob(pathArg, { cwd, absolute: true, ignore: IGNORE_PATTERNS });
 }
 
-// ── Core translation runner ───────────────────────────────────────────────────
+// ── Translation runner — uses global batching (Python spawned once) ───────────
 async function runTranslation({ pathArg, from, to, localesDir, dryRun, outdir, verbose, jsonMode, setup, cwd }) {
   const project = detectProject(cwd);
   console.log(chalk.green(`  ✓ Project type: ${chalk.bold(project.type)}`));
 
   const files = await resolveFiles(pathArg, cwd, project);
-
   if (files.length === 0) {
     console.log(chalk.yellow('  ⚠ No files found to translate.'));
     return { totalStrings: 0, totalFiles: 0 };
@@ -114,44 +104,39 @@ async function runTranslation({ pathArg, from, to, localesDir, dryRun, outdir, v
 
   console.log(chalk.cyan(`  → ${files.length} file(s) [${from} → ${to}]...\n`));
 
-  // Ensure i18n setup (locale files + framework config)
   if (setup !== false) {
     const resolvedLocalesDir = localesDir ? resolve(cwd, localesDir) : undefined;
     await ensureI18nSetup(cwd, project, from, to, resolvedLocalesDir);
   }
 
-  let totalStrings = 0;
-  let totalFiles = 0;
-
-  for (const file of files) {
-    try {
-      const result = await translateFile(file, {
-        from,
-        to,
-        dryRun,
-        outdir,
-        project,
-        cwd,
-        verbose,
-        jsonMode,
-        localesDir: localesDir ? resolve(cwd, localesDir) : undefined,
-      });
+  // Global batch: all files parsed first, ONE Python call, then all writes
+  const results = await translateAllFiles(files, {
+    from,
+    to,
+    dryRun,
+    outdir,
+    project,
+    cwd,
+    verbose,
+    jsonMode,
+    localesDir: localesDir ? resolve(cwd, localesDir) : undefined,
+  });
 
-      if (result.count > 0) {
-        totalFiles++;
-        totalStrings += result.count;
-        const label = dryRun ? chalk.yellow('[DRY RUN]') : chalk.green('[DONE]  ');
-        const skip = result.skipped > 0 ? chalk.gray(` (${result.skipped} already translated)`) : '';
-        console.log(`  ${label} ${chalk.white(result.relativePath)} — ${result.count} new string(s)${skip}`);
-        if (dryRun && verbose && result.diff) {
-          console.log(chalk.gray(result.diff));
-        }
-      } else if (verbose) {
-        console.log(`  ${chalk.gray('[SKIP]  ')} ${result.relativePath} — already up to date`);
+  let totalStrings = 0;
+  let totalFiles   = 0;
+
+  for (const result of results) {
+    if (result.count > 0) {
+      totalFiles++;
+      totalStrings += result.count;
+      const label = dryRun ? chalk.yellow('[DRY RUN]') : chalk.green('[DONE]  ');
+      const skipNote = result.skipped > 0 ? chalk.gray(` (${result.skipped} already done)`) : '';
+      console.log(`  ${label} ${chalk.white(result.relativePath)} — ${result.count} new${skipNote}`);
+      if (result.diff) {
+        console.log(chalk.gray(result.diff));
       }
-    } catch (err) {
-      console.error(chalk.red(`  ✗ ${file}: ${err.message}`));
-      if (verbose) console.error(err.stack);
+    } else if (verbose) {
+      console.log(`  ${chalk.gray('[SKIP]  ')} ${result.relativePath}`);
     }
   }
 
@@ -161,22 +146,18 @@ async function runTranslation({ pathArg, from, to, localesDir, dryRun, outdir, v
 // ── init subcommand ───────────────────────────────────────────────────────────
 program
   .command('init')
-  .description('Interactive setup wizard — configure languages, locales folder, and i18n file')
+  .description('Interactive setup wizard — languages, locales folder, auto-install')
   .action(async () => {
     const { default: inquirer } = await import('inquirer');
-    const cwd = process.cwd();
+    const cwd      = process.cwd();
     const existing = loadConfig(cwd);
-    const project = detectProject(cwd);
+    const project  = detectProject(cwd);
 
-    const defaultLocalesDir =
-      project.type === 'vue' || project.type === 'react' ? './src/locales' : './locales';
-    const defaultI18nFile =
-      project.type === 'vue' || project.type === 'react' ? './src/i18n.js' : './i18n.js';
+    const defaultLocalesDir = project.type === 'vanilla' ? './locales'    : './src/locales';
+    const defaultI18nFile   = project.type === 'vanilla' ? './i18n.js'    : './src/i18n.js';
 
     console.log(chalk.cyan.bold('\n  ⚡ bctranslate init\n'));
-    if (existing) {
-      console.log(chalk.gray(`  Existing config found — press Enter to keep current values.\n`));
-    }
+    if (existing) console.log(chalk.gray('  Existing config found — press Enter to keep values.\n'));
 
     const answers = await inquirer.prompt([
       {
@@ -195,9 +176,9 @@ program
       {
         type: 'input',
         name: 'fromCustom',
-        message: 'Source language code:',
+        message: 'Source language code (e.g. zh-TW):',
         when: (ans) => ans.from === '__other__',
-        validate: (v) => /^[a-z]{2,5}$/.test(v.trim()) || 'Enter a valid BCP 47 code (e.g. en, zh-TW)',
+        validate: (v) => v.trim().length >= 2 || 'Enter a valid BCP 47 code',
       },
       {
         type: 'checkbox',
@@ -205,34 +186,30 @@ program
         message: 'Target language(s) — Space to select, Enter to confirm:',
         choices: COMMON_LANGUAGES,
         default: existing?.to,
-        validate: (v) =>
-          v.length > 0 || 'Select at least one target language (Space to select)',
+        validate: (v) => v.length > 0 || 'Select at least one target language',
       },
       {
         type: 'input',
         name: 'extraTo',
-        message: 'Additional target codes (comma-separated, e.g. zh-TW,sr — leave blank to skip):',
+        message: 'Extra language codes (comma-separated, e.g. zh-TW,sr — blank to skip):',
         default: '',
       },
       {
         type: 'input',
         name: 'i18nFile',
-        message: 'i18n setup file path (will be created if it does not exist):',
+        message: 'i18n setup file path:',
         default: existing?.i18nFile || defaultI18nFile,
       },
     ]);
 
-    // Resolve from language
     const fromLang = answers.from === '__other__' ? answers.fromCustom.trim() : answers.from;
-
-    // Merge checkbox selection + extra codes
-    const extraTo = answers.extraTo
+    const extraTo  = answers.extraTo
       ? answers.extraTo.split(',').map((s) => s.trim()).filter(Boolean)
       : [];
     const toLangs = [...new Set([...answers.to, ...extraTo])].filter((l) => l !== fromLang);
 
     if (toLangs.length === 0) {
-      console.log(chalk.red('\n  ✗ No target languages selected. Aborting.\n'));
+      console.log(chalk.red('\n  ✗ No target languages selected.\n'));
       process.exit(1);
     }
 
@@ -240,17 +217,56 @@ program
       from: fromLang,
       to: toLangs,
       localesDir: answers.localesDir.trim(),
-      i18nFile: answers.i18nFile.trim(),
+      i18nFile:   answers.i18nFile.trim(),
     };
 
     const configPath = saveConfig(config, cwd);
-
     console.log(chalk.green(`\n  ✓ Config saved → ${basename(configPath)}`));
     console.log(chalk.cyan(`\n  Source  : ${chalk.bold(config.from)}`));
     console.log(chalk.cyan(`  Targets : ${chalk.bold(config.to.join(', '))}`));
     console.log(chalk.cyan(`  Locales : ${chalk.bold(config.localesDir)}`));
     console.log(chalk.cyan(`  i18n    : ${chalk.bold(config.i18nFile)}`));
-    console.log(chalk.gray('\n  Run `bctranslate` to start translating your project.\n'));
+
+    // ── Auto-install dependencies ─────────────────────────────────────────────
+    const { installDeps } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'installDeps',
+      message: 'Install/update argostranslate now? (required for offline translation)',
+      default: !existing,
+    }]);
+
+    if (installDeps) {
+      process.stdout.write(chalk.cyan('\n  Installing argostranslate... '));
+      try {
+        await installArgostranslate();
+        console.log(chalk.green('done'));
+      } catch (err) {
+        console.log(chalk.red(`failed\n  ${err.message}`));
+        console.log(chalk.gray('  Run manually: pip install argostranslate'));
+      }
+    }
+
+    // ── Offer to pre-download language models ─────────────────────────────────
+    const { downloadModels } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'downloadModels',
+      message: `Download language models for ${toLangs.join(', ')}? (can take a few minutes, required before first use)`,
+      default: true,
+    }]);
+
+    if (downloadModels) {
+      for (const to of toLangs) {
+        process.stdout.write(chalk.cyan(`  Downloading ${fromLang} → ${to}... `));
+        try {
+          await checkPythonBridge(fromLang, to);
+          console.log(chalk.green('ready'));
+        } catch (err) {
+          console.log(chalk.red(`failed: ${err.message}`));
+        }
+      }
+    }
+
+    console.log(chalk.gray('\n  Run `bctranslate` to start translating.\n'));
   });
 
 // ── Main translation command ──────────────────────────────────────────────────
@@ -259,34 +275,29 @@ program
   .argument('[from]', 'Source language code (e.g. en)')
   .argument('[keyword]', '"to" keyword')
   .argument('[lang]', 'Target language code (e.g. fr)')
-  .option('-t, --to <lang>', 'Target language (alternative to positional syntax, e.g. fr or fr,es)')
+  .option('-t, --to <lang>', 'Target language(s), comma-separated (e.g. fr or fr,es)')
   .option('-d, --dry-run', 'Preview changes without writing files', false)
   .option('-o, --outdir <dir>', 'Output directory for translated files')
   .option('--no-setup', 'Skip i18n setup file generation')
   .option('--json-mode <mode>', 'JSON translation mode: values or full', 'values')
-  .option('-v, --verbose', 'Verbose output', false)
+  .option('-v, --verbose', 'Show per-file diffs and skipped files', false)
   .action(async (pathArg, fromArg, keyword, langArg, opts) => {
     console.log(chalk.cyan.bold('\n  ⚡ bctranslate\n'));
 
-    const invokedCwd = process.cwd();
-    const config = loadConfig(invokedCwd);
-
-    // If the user targets a specific file/dir and there's no config in the current
-    // working directory, treat the target's directory as the project root.
-    let cwd = invokedCwd;
-    if (!config && pathArg) {
-      const resolvedTarget = resolve(invokedCwd, pathArg);
-      if (existsSync(resolvedTarget)) {
-        try {
-          const st = statSync(resolvedTarget);
-          cwd = st.isDirectory() ? resolvedTarget : dirname(resolvedTarget);
-        } catch {
-          cwd = invokedCwd;
-        }
-      }
-    }
-
-    // ── Determine from/to/targets ─────────────────────────────────────────────
+    const invokedCwd = process.cwd();
+    const config     = loadConfig(invokedCwd);
+
+    let cwd = invokedCwd;
+    if (!config && pathArg) {
+      const resolvedTarget = resolve(invokedCwd, pathArg);
+      if (existsSync(resolvedTarget)) {
+        try {
+          const st = statSync(resolvedTarget);
+          cwd = st.isDirectory() ? resolvedTarget : dirname(resolvedTarget);
+        } catch { cwd = invokedCwd; }
+      }
+    }
+
     const hasExplicitArgs = !!(pathArg || fromArg || keyword || langArg);
 
     if (!hasExplicitArgs && !config) {
@@ -297,24 +308,20 @@ program
       process.exit(0);
     }
 
-    // Resolve from language
     const from = fromArg || config?.from || 'en';
 
-    // Resolve target language(s)
     let targets;
     if (keyword === 'to' && langArg) {
-      // bctranslate ./src en to fr  — or  bctranslate ./src en to fr,es
       targets = langArg.split(',').map((s) => s.trim()).filter(Boolean);
     } else if (opts.to) {
-      // --to fr  or  --to fr,es
       targets = opts.to.split(',').map((s) => s.trim()).filter(Boolean);
     } else if (config?.to) {
       targets = Array.isArray(config.to) ? config.to : [config.to];
     } else {
-      targets = ['fr']; // ultimate fallback
+      targets = ['fr'];
     }
 
-    // ── Check Python bridge for all language pairs ────────────────────────────
+    // Check Python + download models for all pairs
     for (const to of targets) {
       try {
         await checkPythonBridge(from, to);
@@ -325,25 +332,22 @@ program
       }
     }
 
-    // ── Run translation for each target language ──────────────────────────────
     let grandTotal = 0;
     let grandFiles = 0;
 
     for (const to of targets) {
-      if (targets.length > 1) {
-        console.log(chalk.cyan.bold(`\n  ── Translating to ${to} ──`));
-      }
+      if (targets.length > 1) console.log(chalk.cyan.bold(`\n  ── Translating to ${to} ──`));
 
       const { totalStrings, totalFiles } = await runTranslation({
         pathArg,
         from,
         to,
         localesDir: config?.localesDir,
-        dryRun: opts.dryRun,
-        outdir: opts.outdir,
-        verbose: opts.verbose,
-        jsonMode: opts.jsonMode,
-        setup: opts.setup,
+        dryRun:     opts.dryRun,
+        outdir:     opts.outdir,
+        verbose:    opts.verbose,
+        jsonMode:   opts.jsonMode,
+        setup:      opts.setup,
         cwd,
       });
 
@@ -352,16 +356,12 @@ program
     }
 
     const langStr = targets.join(', ');
-    console.log(
-      chalk.cyan.bold(
-        `\n  Done: ${grandTotal} new string(s) across ${grandFiles} file(s) [→ ${langStr}]\n`
-      )
-    );
-
-    console.log(chalk.gray('  Summary:'));
-    console.log(chalk.gray(`  Root   : ${cwd}`));
-    console.log(chalk.gray(`  Source : ${from}`));
-    console.log(chalk.gray(`  Target : ${langStr}\n`));
-  });
+    console.log(chalk.cyan.bold(
+      `\n  Done: ${grandTotal} new string(s) in ${grandFiles} file(s) [→ ${langStr}]\n`
+    ));
+    console.log(chalk.gray(`  Root   : ${cwd}`));
+    console.log(chalk.gray(`  Source : ${from}`));
+    console.log(chalk.gray(`  Target : ${langStr}\n`));
+  });
 
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bctranslate",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "CLI to transform source files into i18n-ready code with automatic translation via argostranslate",
   "type": "module",
   "bin": {

package/python/translator.py

@@ -8,8 +8,15 @@ Usage: python translator.py <from_code> <to_code>
 """
 
 import sys
+import io
 import json
 
+# Force UTF-8 on all platforms (critical on Windows where default may be cp1252)
+sys.stdin  = io.TextIOWrapper(sys.stdin.buffer,  encoding='utf-8')
+sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', line_buffering=True)
+sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', line_buffering=True)
+
+
 def ensure_model(from_code, to_code):
     """Ensure the translation model is installed, downloading if needed."""
     import argostranslate.package