@ansstory/hias 1.0.7 → 1.0.9

package/lib/core/translate.js

@@ -288,7 +288,8 @@ function resolveName(options, fallbackPath) {
  * 生成 locale maps (textToKey + 各语言的 map)
  */
 function generateLocaleMaps(name, uniqueTexts, translatedTexts, translationPerformed, targetLocale) {
-  const map = { [name]: {} }
+  const map = { [name]: {} }        // target locale: key -> translated text
+  const sourceMap = { [name]: {} }  // source locale: key -> original Chinese
   const textToKey = new Map()
 
   if (translationPerformed) {
@@ -297,6 +298,7 @@ function generateLocaleMaps(name, uniqueTexts, translatedTexts, translationPerfo
       const subKey = subKeys[index]
       if (!textToKey.has(text)) textToKey.set(text, `${name}.${subKey}`)
       map[name][subKey] = translatedTexts[index]
+      sourceMap[name][subKey] = text
     })
   } else {
     const keyCount = new Map()
@@ -311,10 +313,11 @@ function generateLocaleMaps(name, uniqueTexts, translatedTexts, translationPerfo
       usedFallbackKeys.add(subKey)
       if (!textToKey.has(text)) textToKey.set(text, `${name}.${subKey}`)
       map[name][subKey] = text
+      sourceMap[name][subKey] = text
     })
   }
 
-  return { map, textToKey }
+  return { map, sourceMap, textToKey }
 }
 
 /**
@@ -491,7 +494,7 @@ async function handleTranslateFileAction(filePath, options) {
     // source map 仅第一次写入
     if (!localeMaps[fromLang]) localeMaps[fromLang] = {}
     if (!localeMaps[fromLang][name]) localeMaps[fromLang][name] = {}
-    Object.assign(localeMaps[fromLang][name], result.map[name])
+    Object.assign(localeMaps[fromLang][name], result.sourceMap[name])
     localeMaps[toLang] = result.map
   }
 
@@ -528,7 +531,7 @@ async function handleTranslateFileAction(filePath, options) {
       ? applyJsonTranslation(content, extractions, localeMaps[primaryTarget] || localeMaps[fromLang], name)
       : applyReplacements(content, extractions, name, fileType, settings.i18nCallTemplate)
 
-  await saveBackupSync(name, settings.replaceOriginalFile ? [fullPath] : [], cwd, settings.replaceOriginalFile)
+  await saveBackupSync(name, settings.replaceOriginalFile ? [fullPath] : [], cwd, settings.replaceOriginalFile, settings.outDir)
   writeTranslatedFile(fullPath, translatedContent, outDir, settings)
 
   if (settings.replaceOriginalFile) {
@@ -698,7 +701,7 @@ async function handleTranslateFolderAction(folderPath, options) {
     if (!textToKey) textToKey = result.textToKey
     if (!localeMaps[fromLang]) localeMaps[fromLang] = {}
     if (!localeMaps[fromLang][name]) localeMaps[fromLang][name] = {}
-    Object.assign(localeMaps[fromLang][name], result.map[name])
+    Object.assign(localeMaps[fromLang][name], result.sourceMap[name])
     localeMaps[toLang] = result.map
     if (translationPerformed) anyTranslated = true
   }
@@ -749,7 +752,7 @@ async function handleTranslateFolderAction(folderPath, options) {
 
   // 备份所有原文件用于回滚
   if (fileEntries.length > 0) {
-    await saveBackupSync(name, settings.replaceOriginalFile ? fileEntries.map((e) => e.file) : [], cwd, settings.replaceOriginalFile)
+    await saveBackupSync(name, settings.replaceOriginalFile ? fileEntries.map((e) => e.file) : [], cwd, settings.replaceOriginalFile, settings.outDir)
   }
 
   // 写入每个翻译后的文件
@@ -857,7 +860,7 @@ const BACKUP_ROOT = '.hias/.langbackup'
 /**
  * 备份原文件内容到 .hias/.langbackup/<timestamp>_<name>/manifest.json，保留所有历史
  */
-async function saveBackupSync(name, filePaths, cwd, replaceOriginalFile) {
+async function saveBackupSync(name, filePaths, cwd, replaceOriginalFile, outDir) {
   const now = new Date()
   const ts = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}${String(now.getDate()).padStart(2, '0')}_${String(now.getHours()).padStart(2, '0')}${String(now.getMinutes()).padStart(2, '0')}${String(now.getSeconds()).padStart(2, '0')}`
   const backupDir = path.join(cwd, BACKUP_ROOT, `${ts}_${name}`)
@@ -876,7 +879,7 @@ async function saveBackupSync(name, filePaths, cwd, replaceOriginalFile) {
     timestamp: now.toISOString(),
     replaceOriginalFile,
     files,
-    outputDir: path.join('.hias', 'lang', name).replace(/\\/g, '/'),
+    outputDir: path.join(outDir || '.hias/lang', name).replace(/\\/g, '/'),
   }
 
   await fsp.writeFile(path.join(backupDir, 'manifest.json'), JSON.stringify(manifest, null, 2), 'utf-8')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ansstory/hias",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "private": false,
   "description": "个人自用脚手架内置个人常用功能",
   "author": "AnsStory story <story0809@163.com>",

package/scripts/cleanup-config.js

@@ -3,6 +3,10 @@ const os = require('os')
 const path = require('path')
 const { spawnSync } = require('child_process')
 
+function getNpmCommand(platform = process.platform) {
+  return platform === 'win32' ? 'npm.cmd' : 'npm'
+}
+
 function getConfigDirectory(homeDir = os.homedir()) {
   return path.join(homeDir, '.hias-cli')
 }
@@ -28,9 +32,16 @@ function clearConfigDirectory({ homeDir = os.homedir(), logger = console, dryRun
 function uninstallPackage({ homeDir = os.homedir(), logger = console, runCommand = spawnSync } = {}) {
   clearConfigDirectory({ homeDir, logger })
 
-  const result = runCommand('npm', ['uninstall', '@ansstory/hias', '-g'], {
+  const command = getNpmCommand()
+  const args = ['uninstall', '@ansstory/hias', '-g']
+
+  if (logger) {
+    logger.log(`Running: npm ${args.join(' ')}`)
+  }
+
+  const result = runCommand(command, args, {
     stdio: 'inherit',
-    shell: true,
+    shell: false,
   })
 
   if (typeof result.status === 'number' && result.status !== 0) {
@@ -64,6 +75,7 @@ if (require.main === module) {
 
 module.exports = {
   clearConfigDirectory,
+  getNpmCommand,
   getConfigDirectory,
   uninstallPackage,
   printUsage,

package/test/cleanup-config.test.js

@@ -4,7 +4,7 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 
-const { clearConfigDirectory, getConfigDirectory, uninstallPackage } = require('../scripts/cleanup-config')
+const { clearConfigDirectory, getConfigDirectory, getNpmCommand, uninstallPackage } = require('../scripts/cleanup-config')
 
 test('clearConfigDirectory removes the hias cli config directory', () => {
   const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'hias-clear-'))
@@ -56,6 +56,7 @@ test('uninstallPackage clears config before uninstalling the global package', ()
     homeDir: tempHome,
     logger: null,
     runCommand: (command, args, options) => {
+      assert.equal(fs.existsSync(configDir), false)
       calls.push({ command, args, options })
       return { status: 0 }
     },
@@ -64,9 +65,9 @@ test('uninstallPackage clears config before uninstalling the global package', ()
   assert.equal(fs.existsSync(configDir), false)
   assert.deepEqual(calls, [
     {
-      command: 'npm',
+      command: getNpmCommand(),
       args: ['uninstall', '@ansstory/hias', '-g'],
-      options: { stdio: 'inherit', shell: true },
+      options: { stdio: 'inherit', shell: false },
     },
   ])
 })

package/test/translate.test.js

@@ -507,7 +507,7 @@ test('saveBackupSync creates backup directory with manifest', async () => {
   fs.writeFileSync(testFile, 'content', 'utf-8')
 
   try {
-    await saveBackupSync('testns', [testFile], cwd, true)
+    await saveBackupSync('testns', [testFile], cwd, true, '.hias/lang')
 
     const backupRoot = path.join(cwd, '.hias', '.langbackup')
     assert.ok(fs.existsSync(backupRoot), `backup root should exist at ${backupRoot}`)