bctranslate 1.0.2 → 1.0.3

package/package.json

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

package/src/generators/locales.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { join, dirname } from 'path';
+import { join } from 'path';
 
 /**
  * Determine the locale directory path based on project type.
@@ -8,6 +8,7 @@ export function getLocaleDir(cwd, project) {
   const candidates = [
     join(cwd, 'src', 'locales'),
     join(cwd, 'src', 'i18n', 'locales'),
+    join(cwd, 'src', 'i18n'),
     join(cwd, 'locales'),
     join(cwd, 'src', 'lang'),
     join(cwd, 'public', 'locales'),
@@ -25,13 +26,53 @@ export function getLocaleDir(cwd, project) {
 }
 
 /**
- * Load an existing locale file, or return empty object.
+ * Flatten a nested JSON object to dot-notation keys.
+ * { home: { notes: 'Notes' } } → { 'home.notes': 'Notes' }
+ */
+function flattenKeys(obj, prefix = '') {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const fullKey = prefix ? `${prefix}.${key}` : key;
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+      Object.assign(result, flattenKeys(value, fullKey));
+    } else {
+      result[fullKey] = value;
+    }
+  }
+  return result;
+}
+
+/**
+ * Unflatten dot-notation keys to a nested JSON object.
+ * { 'home.notes': 'Notes' } → { home: { notes: 'Notes' } }
+ */
+function unflattenKeys(flat) {
+  const result = {};
+  for (const [dotKey, value] of Object.entries(flat)) {
+    const parts = dotKey.split('.');
+    let obj = result;
+    for (let i = 0; i < parts.length - 1; i++) {
+      if (typeof obj[parts[i]] !== 'object' || obj[parts[i]] === null) {
+        obj[parts[i]] = {};
+      }
+      obj = obj[parts[i]];
+    }
+    obj[parts[parts.length - 1]] = value;
+  }
+  return result;
+}
+
+/**
+ * Load an existing locale file and return flat dot-notation keys.
+ * Handles both nested JSON (vue-i18n standard) and legacy flat format.
  */
 export function loadLocale(localeDir, langCode) {
   const filePath = join(localeDir, `${langCode}.json`);
   if (existsSync(filePath)) {
     try {
-      return JSON.parse(readFileSync(filePath, 'utf-8'));
+      const raw = JSON.parse(readFileSync(filePath, 'utf-8'));
+      // Flatten nested objects to dot-notation for internal use
+      return flattenKeys(raw);
     } catch {
       return {};
     }
@@ -41,22 +82,24 @@ export function loadLocale(localeDir, langCode) {
 
 /**
  * Save a locale file, merging with existing keys.
+ * Writes nested JSON (standard for vue-i18n and react-i18next).
  */
-export function saveLocale(localeDir, langCode, newEntries) {
-  mkdirSync(localeDir, { recursive: true });
-
-  const filePath = join(localeDir, `${langCode}.json`);
-  const existing = loadLocale(localeDir, langCode);
-
-  // Merge: new entries take precedence for new keys,
-  // but don't overwrite existing translations (idempotent)
+export function saveLocale(localeDir, langCode, newEntries) {
+  mkdirSync(localeDir, { recursive: true });
+
+  const filePath = join(localeDir, `${langCode}.json`);
+  const existing = loadLocale(localeDir, langCode); // already flat
+
+  // Merge: don't overwrite existing translations
   const merged = { ...existing };
-  for (const [key, value] of Object.entries(newEntries)) {
-    if (!(key in merged)) {
-      merged[key] = value;
-    }
-  }
-
-  writeFileSync(filePath, JSON.stringify(merged, null, 2) + '\n', 'utf-8');
-  return filePath;
-}
+  for (const [key, value] of Object.entries(newEntries)) {
+    if (!(key in merged)) {
+      merged[key] = value;
+    }
+  }
+
+  // Write as nested JSON for i18n library compatibility
+  const nested = unflattenKeys(merged);
+  writeFileSync(filePath, JSON.stringify(nested, null, 2) + '\n', 'utf-8');
+  return filePath;
+}

package/src/index.js

@@ -165,6 +165,9 @@ export async function translateAllFiles(files, opts) {
   const allTranslations = { ...existingTarget, ...newTranslations };
 
   // Phase 4 — write files
+  if (!opts.dryRun) {
+    console.log(`  → Locale dir: ${resolvedLocaleDir}`);
+  }
   const results = [];
   for (const parseResult of parsed) {
     try {
@@ -174,7 +177,7 @@ export async function translateAllFiles(files, opts) {
       });
       results.push(r);
     } catch (err) {
-      if (verbose) console.error(`  Write error ${parseResult.filePath}: ${err.message}`);
+      console.error(`  ✗ Write error ${relative(cwd, parseResult.filePath)}: ${err.message}`);
       results.push({ count: 0, skipped: 0, relativePath: relative(cwd, parseResult.filePath) });
     }
   }

package/src/parsers/vue.js

@@ -155,25 +155,71 @@ function walkTemplate(nodes, s, baseOffset, extracted, filePath, tpl) {
 // ── Script string extractor ───────────────────────────────────────────────────
 
 function extractScriptStrings(scriptContent, s, baseOffset, extracted, filePath, scr) {
-  const patterns = [
+  // Pattern A: alert/confirm/toast/notify calls  →  match[2]=quote, match[3]=text
+  // Pattern B: UI object property string values  →  match[2]=quote, match[3]=text
+  const patternsAB = [
     /\b(alert|confirm|toast|notify|message\.(?:success|error|warning|info))\s*\(\s*(['"`])((?:(?!\2).)+)\2\s*\)/g,
-    /\b(title|label|placeholder|message|text|description|tooltip|hint|caption|header|subtitle|errorMessage|successMessage)\s*:\s*(['"`])((?:(?!\2).)+)\2/g,
+    /\b(title|label|placeholder|message|text|description|tooltip|hint|caption|header|subtitle|errorMessage|successMessage|emptyText|noData|loadingText|buttonText|confirmText|cancelText|successText|failText|warningText|helperText|hintText)\s*:\s*(['"`])((?:(?!\2).)+)\2/g,
   ];
 
-  for (const pattern of patterns) {
+  for (const pattern of patternsAB) {
     let match;
     while ((match = pattern.exec(scriptContent)) !== null) {
       const text = match[3];
-      if (isTranslatable(text) && text.length > 1) {
-        const key       = contextKey(text, filePath);
-        const quoteChar = match[2];
-        const textStart = baseOffset + match.index + match[0].indexOf(quoteChar + text);
-        const textEnd   = textStart + text.length + 2;
-        s.overwrite(textStart, textEnd, scr(key));
-        extracted.push({ key, text, context: 'script' });
-      }
+      if (!isTranslatable(text) || text.length <= 1) continue;
+      const quoteChar = match[2];
+      const relPos = match.index + match[0].indexOf(quoteChar + text);
+      if (isAlreadyWrappedScript(scriptContent, relPos)) continue;
+      const key      = contextKey(text, filePath);
+      const textStart = baseOffset + relPos;
+      const textEnd   = textStart + text.length + 2;
+      s.overwrite(textStart, textEnd, scr(key));
+      extracted.push({ key, text, context: 'script' });
+    }
+  }
+
+  // Pattern C: ref('string') / ref("string")  →  match[1]=quote, match[2]=text
+  const refPattern = /\bref\s*\(\s*(['"`])((?:(?!\1)[^\\]|\\.)+)\1\s*\)/g;
+  {
+    let match;
+    while ((match = refPattern.exec(scriptContent)) !== null) {
+      const text = match[2];
+      if (!isTranslatable(text) || text.length <= 1) continue;
+      const quoteChar = match[1];
+      const innerStr  = quoteChar + text + quoteChar;
+      const relPos    = match.index + match[0].indexOf(innerStr);
+      if (isAlreadyWrappedScript(scriptContent, relPos)) continue;
+      const key      = contextKey(text, filePath);
+      const textStart = baseOffset + relPos;
+      const textEnd   = textStart + innerStr.length;
+      s.overwrite(textStart, textEnd, scr(key));
+      extracted.push({ key, text, context: 'script-ref' });
     }
   }
+
+  // Pattern D: computed(() => 'string')  →  match[1]=quote, match[2]=text
+  const computedPattern = /\bcomputed\s*\(\s*\(\s*\)\s*=>\s*(['"`])((?:(?!\1)[^\\]|\\.)+)\1\s*\)/g;
+  {
+    let match;
+    while ((match = computedPattern.exec(scriptContent)) !== null) {
+      const text = match[2];
+      if (!isTranslatable(text) || text.length <= 1) continue;
+      const quoteChar = match[1];
+      const innerStr  = quoteChar + text + quoteChar;
+      const relPos    = match.index + match[0].indexOf(innerStr);
+      if (isAlreadyWrappedScript(scriptContent, relPos)) continue;
+      const key      = contextKey(text, filePath);
+      const textStart = baseOffset + relPos;
+      const textEnd   = textStart + innerStr.length;
+      s.overwrite(textStart, textEnd, scr(key));
+      extracted.push({ key, text, context: 'script-computed' });
+    }
+  }
+}
+
+function isAlreadyWrappedScript(scriptContent, pos) {
+  const before = scriptContent.slice(Math.max(0, pos - 30), pos);
+  return /\$?t\s*\(\s*$/.test(before);
 }
 
 // ── Helpers ───────────────────────────────────────────────────────────────────