td-octopus 0.2.7 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "td-octopus",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "I18N tool",
   "author": "Anthony Li",
   "bin": {

package/src/pop/index.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2024-12-12 15:00:24
  * @LastEditors: 郑泳健
- * @LastEditTime: 2026-02-12 10:40:03
+ * @LastEditTime: 2026-04-20 15:29:52
  */
 const path = require('path');
 const fs = require('fs');
@@ -11,7 +11,7 @@ const { parse } = require('@babel/parser');
 const generate = require('@babel/generator').default;
 const syncLang = require('../utils/syncLang');
 const { flatObject, rewriteFiles, getFileKeyValueList } = require('../utils/translate');
-const { autoImportJSFiles } = require('../utils/index');
+const { autoImportJSFiles, getProjectConfig } = require('../utils/index');
 
 const { ESLint } = require('eslint');
 
@@ -58,6 +58,8 @@ function readJsFiles(folderPath) {
 // 同步不同的语言包
 function main() {
     (async () => {
+        const config = getProjectConfig();
+        const distLangs = config.distLangs || ['en-US'];
         const zhCN = syncLang('zh-CN');
         const zhCNFlat = flatObject(zhCN);
         const totalText = readJsFiles(path.resolve(process.cwd(), 'src'));
@@ -77,33 +79,31 @@ function main() {
             return;
         }
         spinner.start(`查询完毕，共计丢失${lostKey.length}个,开始同步开始`);
-        const zhFromFlat = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../octopus/zh-CN.js'), 'utf-8'));
-        const enFromFlat = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../octopus/en-US.js'), 'utf-8'));
-
-        const enUS = syncLang('en-US');
-        const enUSFlat = flatObject(enUS);
-
-        const zhCNResult = lostKey.reduce((total, item) => {
-            if (zhFromFlat[item.replace('I18N.', '')]) {
-                total[item.replace('I18N.', '')] = zhFromFlat[item.replace('I18N.', '')];
-            }
-            return total;
-        }, zhCNFlat);
-
-        const enCNResult = lostKey.reduce((total, item) => {
-            if (enFromFlat[item.replace('I18N.', '')]) {
-                total[item.replace('I18N.', '')] = enFromFlat[item.replace('I18N.', '')];
-            }
-            return total;
-        }, enUSFlat);
-
-        rewriteFiles(getFileKeyValueList(zhCNResult), 'zh-CN');
-        rewriteFiles(getFileKeyValueList(enCNResult), 'en-US');
-        const cnJSON = fs.readFileSync(path.resolve(process.cwd(), '.octopus/zh-CN/index.js'), 'utf-8');
-        const enJSON = fs.readFileSync(path.resolve(process.cwd(), '.octopus/en-US/index.js'), 'utf-8');
-
-        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/zh-CN'), cnJSON);
-        autoImportJSFiles(path.resolve(process.cwd(), '.octopus/en-US'), enJSON);
+
+        // 所有需要同步的语言，包含 zh-CN 和 distLangs
+        const allLangs = ['zh-CN', ...distLangs];
+        const langDataMap = { 'zh-CN': { data: zhCN, flat: zhCNFlat } };
+
+        // 遍历所有语言进行同步
+        for (const lang of allLangs) {
+            const langFromFlat = JSON.parse(fs.readFileSync(path.resolve(__dirname, `../octopus/${lang}.js`), 'utf-8'));
+            const { data: langData, flat: langFlat } = langDataMap[lang] || (langDataMap[lang] = {
+                data: syncLang(lang),
+                flat: flatObject(syncLang(lang))
+            });
+
+            const langResult = lostKey.reduce((total, item) => {
+                if (langFromFlat[item.replace('I18N.', '')]) {
+                    total[item.replace('I18N.', '')] = langFromFlat[item.replace('I18N.', '')];
+                }
+                return total;
+            }, langFlat);
+
+            rewriteFiles(getFileKeyValueList(langResult), lang);
+            const langJSON = fs.readFileSync(path.resolve(process.cwd(), `.octopus/${lang}/index.js`), 'utf-8');
+            autoImportJSFiles(path.resolve(process.cwd(), `.octopus/${lang}`), langJSON);
+        }
+
         fs.rmSync(path.resolve(__dirname, '../octopus'), { recursive: true, force: true });
         spinner.succeed('同步完成,如果需要重新check，请先执行otp stash');
     })();

package/src/reduce/index.js

@@ -3,7 +3,7 @@
  * @Author: 郑泳健
  * @Date: 2024-12-12 15:00:24
  * @LastEditors: 郑泳健
- * @LastEditTime: 2024-12-12 15:00:33
+ * @LastEditTime: 2026-05-18 15:01:42
  */
 const path = require('path')
 const fs = require('fs')
@@ -12,7 +12,7 @@ const { getSpecifiedFiles, isFile } = require('../utils/file')
 const syncLang = require('../utils/syncLang')
 const { flatObject, rewriteFiles, getFileKeyValueList, getAdjustLangObjAndAddList } = require('../utils/translate');
 const { failInfo, highlightText } = require('../utils/colors');
-const { getProjectConfig } = require('../utils/index')
+const { getProjectConfig, removeUnusedLangFiles } = require('../utils/index')
 const ora = require('ora');
 
 const CONFIG = getProjectConfig();
@@ -58,8 +58,10 @@ function main() {
                 result[i] = zhCNFlat[i]
             }
         }
-        
-        rewriteFiles(getFileKeyValueList(result), 'zh-CN')
+   
+        const fileKeyValueList = getFileKeyValueList(result);
+        removeUnusedLangFiles(fileKeyValueList, 'zh-CN');
+        rewriteFiles(fileKeyValueList, 'zh-CN')
 
         for (const lang of distLang) {
             const currentLangMap = syncLang(lang);
@@ -67,6 +69,7 @@ function main() {
             spinner.start(`正在清理${lang}下多余的key`)
             // 删除掉多余的key，增加新的key，同时提取没有翻译过的key的列表
             const { fileKeyValueList } = await getAdjustLangObjAndAddList({ lang, langObj: langFlat, zhCNObj: result, spinner });
+            removeUnusedLangFiles(fileKeyValueList, lang);
             spinner.succeed(`已完成清理${lang}下多余的key`)
             // 重写文件
             rewriteFiles(fileKeyValueList, lang);

package/src/stash/index.js

@@ -3,29 +3,30 @@
  * @Author: 郑泳健
  * @Date: 2024-12-12 15:00:24
  * @LastEditors: 郑泳健
- * @LastEditTime: 2025-10-13 10:55:39
+ * @LastEditTime: 2026-04-20 15:34:33
  */
 const path = require('path');
 const fs = require('fs');
 const syncLang = require('../utils/syncLang');
 const { flatObject } = require('../utils/translate');
 const ora = require('ora');
-
+const { getProjectConfig } = require('../utils/index');
 const spinner = ora('开始check');
 
 // 同步不同的语言包
 function main() {
     (async () => {
-        const zhCN = syncLang('zh-CN');
-        const zhCNFlat = flatObject(zhCN);
-        const enUS = syncLang('en-US');
-        const enUSFlat = flatObject(enUS);
+        const config = getProjectConfig();
+        const distLangs = config.distLangs || ['en-US'];
         const outpuDir = path.resolve(__dirname, '../octopus');
-
         fs.mkdirSync(outpuDir, { recursive: true });
+        const allLangs = ['zh-CN', ...distLangs];
         spinner.start('开始缓存');
-        fs.writeFileSync(path.resolve(outpuDir, 'zh-CN.js'), JSON.stringify(zhCNFlat, null, 2), 'utf-8');
-        fs.writeFileSync(path.resolve(outpuDir, 'en-US.js'), JSON.stringify(enUSFlat, null, 2), 'utf-8');
+        for (const lang of allLangs) {
+            const syncLangData = syncLang(lang);
+            const syncLangDataFlat = flatObject(syncLangData);
+            fs.writeFileSync(path.resolve(outpuDir, `${lang}.js`), JSON.stringify(syncLangDataFlat, null, 2), 'utf-8');
+        }
         spinner.succeed('缓存完成');
     })();
 }

package/src/utils/index.js

@@ -319,6 +319,57 @@ function prettierFile(fileContent, proType) {
 
 }
 
+/**
+ * 删除语言目录中不在 fileKeyValueList 的多余文件，并清理 index.js 中的引用
+ * @param {Array} fileKeyValueList - [{fileName, value}]
+ * @param {string} lang - 语言目录名，如 'zh-CN'
+ */
+function removeUnusedLangFiles(fileKeyValueList, lang) {
+    const config = getProjectConfig();
+    const otpPath = path.resolve(process.cwd(), config.otpDir);
+    const langDir = path.join(otpPath, lang);
+    if (!fs.existsSync(langDir)) return;
+
+    const keepFileNames = new Set(fileKeyValueList.map(i => i.fileName));
+    const indexFiles = new Set(['index.js', 'index.jsx', 'index.ts', 'index.tsx']);
+    const filesToDelete = fs.readdirSync(langDir).filter(file => {
+        if (indexFiles.has(file)) return false;
+        return !keepFileNames.has(path.basename(file, path.extname(file)));
+    });
+
+    if (filesToDelete.length === 0) return;
+
+    filesToDelete.forEach(file => {
+        fs.unlinkSync(path.join(langDir, file));
+    });
+
+    const indexPath = path.join(langDir, 'index.js');
+    if (!fs.existsSync(indexPath)) return;
+
+    const indexContent = fs.readFileSync(indexPath, 'utf-8');
+    const deleteBaseNames = new Set(filesToDelete.map(file => path.basename(file, path.extname(file))));
+
+    // 检测 Object.assign 块内的缩进风格
+    const indentMatch = indexContent.match(/export default Object\.assign\(\{\},\s*\{[\r\n]+([ \t]+)\w/);
+    const indent = indentMatch ? indentMatch[1] : '  ';
+
+    // 解析现有 import，过滤掉要删除的
+    const importRegex = /^import (\w+) from '\.\/([^']+)';$/gm;
+    const remaining = [];
+    let match;
+    while ((match = importRegex.exec(indexContent)) !== null) {
+        if (!deleteBaseNames.has(match[1])) {
+            remaining.push({ name: match[1], from: match[2] });
+        }
+    }
+
+    if (remaining.length === 0) return;
+
+    const importLines = remaining.map(i => `import ${i.name} from './${i.from}';`).join('\n');
+    const exportKeys = remaining.map(i => `${indent}${i.name},`).join('\n');
+    fs.writeFileSync(indexPath, `${importLines}\n\nexport default Object.assign({}, {\n${exportKeys}\n});\n`, 'utf-8');
+}
+
 module.exports = {
   getOtpDir,
   getLangDir,
@@ -335,5 +386,6 @@ module.exports = {
   translateKeyText,
   spining,
   prettierFile,
-  autoImportJSFiles
+  autoImportJSFiles,
+  removeUnusedLangFiles
 };