td-web-cli 0.1.22 → 0.1.24

package/dist/modules/i18n/excel2json/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/excel2json/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6MpC;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAuVhD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/excel2json/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiLpC;;;;;;GAMG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAqWhD"}

package/dist/modules/i18n/excel2json/index.js

@@ -3,7 +3,7 @@ import XLSX from 'xlsx';
 import fs from 'fs';
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { getTimestamp, logger, loggerError, normalizeError, languageToolCheck, getLanguageTool, formatKey, } from '../../../utils/index.js';
+import { getTimestamp, logger, loggerError, normalizeError, languageToolCheck, getLanguageTool, formatKey, normalizeGitBashPath, trimQuotes, } from '../../../utils/index.js';
 // 获取当前文件目录
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -41,8 +41,9 @@ function loadConfig(configPath) {
  * @returns 匹配到的语言KEY，未匹配返回null
  */
 function matchLangKey(colName, langs) {
-    if (!colName)
+    if (!colName) {
         return null;
+    }
     const colNameLower = colName.toLowerCase();
     // 先尝试匹配语言KEY
     for (const langKey of Object.keys(langs)) {
@@ -58,33 +59,6 @@ function matchLangKey(colName, langs) {
     }
     return null;
 }
-/**
- * 去除字符串首尾的单引号或双引号
- * @param str 输入字符串
- * @returns 去除引号后的字符串
- */
-function trimQuotes(str) {
-    if ((str.startsWith('"') && str.endsWith('"')) ||
-        (str.startsWith("'") && str.endsWith("'"))) {
-        return str.slice(1, -1);
-    }
-    return str;
-}
-/**
- * 将Git Bash风格的路径（如 /d/...）转换成Windows风格路径（D:/...）
- * @param inputPath 用户输入的路径
- * @returns 转换后的绝对路径
- */
-function normalizeGitBashPath(inputPath) {
-    let cleaned = inputPath.trim().replace(/^['"]|['"]$/g, '');
-    // 如果路径是 /d/... 格式，转换成 D:/...
-    if (/^\/[a-zA-Z]\//.test(cleaned)) {
-        cleaned = cleaned.replace(/^\/([a-zA-Z])\//, '$1:/');
-    }
-    // 使用 path.resolve 转成绝对路径（相对于当前工作目录）
-    const absolutePath = path.resolve(process.cwd(), cleaned);
-    return absolutePath;
-}
 /**
  * 批量检测词条文本，返回所有检测结果
  * @param texts 词条数组
@@ -133,8 +107,9 @@ function parseCheckResultPerEntry(checkResult, texts) {
         const errorOffset = match.offset;
         // 找出错误所在的词条索引
         const idx = positions.findIndex((range) => errorOffset >= range.start && errorOffset < range.end);
-        if (idx === -1)
+        if (idx === -1) {
             continue;
+        }
         // 生成错误信息字符串
         const errMsg = `错误: ${match.message}\n出错句子: ${match.sentence}\n建议替换: ${match.replacements
             .map((r) => r.value)
@@ -208,14 +183,17 @@ export async function excel2json(program) {
         message: '请输入Excel文件路径：',
         validate: (value) => {
             const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
-            if (cleaned.length === 0)
+            if (cleaned.length === 0) {
                 return '路径不能为空';
+            }
             // 这里调用路径转换确保校验时路径正确
             const normalizedPath = normalizeGitBashPath(cleaned);
-            if (!fs.existsSync(normalizedPath))
+            if (!fs.existsSync(normalizedPath)) {
                 return '文件不存在，请输入有效路径';
-            if (!/\.(xls|xlsx)$/i.test(normalizedPath))
+            }
+            if (!/\.(xls|xlsx)$/i.test(normalizedPath)) {
                 return '请输入有效的Excel文件路径（.xls或.xlsx）';
+            }
             return true;
         },
     });
@@ -280,13 +258,15 @@ export async function excel2json(program) {
         for (let i = 1; i < rows.length; i++) {
             const row = rows[i];
             let keyCell = row[defaultColNum];
-            if (keyCell === undefined || keyCell === null || keyCell === '')
+            if (keyCell === undefined || keyCell === null || keyCell === '') {
                 continue;
+            }
             let key = String(keyCell).trim();
             key = trimQuotes(key); // 去除引号
             // 跳过空KEY，避免写入无效数据
-            if (key.length === 0)
+            if (key.length === 0) {
                 continue;
+            }
             // 判断默认语言KEY是否重复，若重复则重新编码
             if (langKeySets[defaultLang].has(key)) {
                 key = formatKey(key);
@@ -298,8 +278,9 @@ export async function excel2json(program) {
             // 其他语言词条
             for (const [colIdxStr, langKey] of Object.entries(colIndexToLangKey)) {
                 const colIdx = Number(colIdxStr);
-                if (langKey === defaultLang)
+                if (langKey === defaultLang) {
                     continue;
+                }
                 const valCell = row[colIdx];
                 if (valCell !== undefined && valCell !== null && valCell !== '') {
                     const valStr = String(valCell);
@@ -370,8 +351,9 @@ export async function excel2json(program) {
         logger.info(`开始生成语言文件，输出目录：${outputRoot}`, true);
         // 按语言生成对应的JSON文件，默认语言的KEY=VALUE不生成文件
         for (const [langKey, translations] of Object.entries(langTranslations)) {
-            if (Object.keys(translations).length === 0)
+            if (Object.keys(translations).length === 0) {
                 continue;
+            }
             if (langKey === defaultLang) {
                 logger.info(`跳过默认语言(${langKey})的JSON文件生成`, true);
                 continue; // 跳过默认语言文件生成

package/dist/modules/i18n/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modules/i18n/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBAmE1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modules/i18n/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBA6E1C"}

package/dist/modules/i18n/index.js

@@ -1,6 +1,8 @@
 import { select, Separator } from '@inquirer/prompts';
 import { logger, loggerError } from '../../utils/index.js';
 import { excel2json } from './excel2json/index.js';
+import { json2excel } from './json2excel/index.js';
+import { jsonMerge } from './jsonMerge/index.js';
 /**
  * 国际化模块主入口
  * 提供多个国际化相关功能的交互式选择
@@ -57,6 +59,16 @@ export async function i18n(program) {
                 await excel2json(program);
                 logger.info(`${selectedModule.name}功能执行完成`);
                 break;
+            case 'json2excel':
+                logger.info(`${selectedModule.name}功能开始执行`);
+                await json2excel(program);
+                logger.info(`${selectedModule.name}功能执行完成`);
+                break;
+            case 'jsonMerge':
+                logger.info(`${selectedModule.name}功能开始执行`);
+                await jsonMerge(program);
+                logger.info(`${selectedModule.name}功能执行完成`);
+                break;
             default:
                 logger.warn(`${selectedModule.name}功能暂未实现，程序已退出`);
                 process.exit(0);

package/dist/modules/i18n/json2excel/index.d.ts

@@ -1,2 +1,7 @@
-export declare function run(): void;
+import { Command } from 'commander';
+/**
+ * JSON 转 Excel 主函数
+ * 将多语言 JSON 文件合并为一个 Excel 文件，表头使用语言名称（从配置的 langs 中取第一个）
+ */
+export declare function json2excel(program: Command): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/modules/i18n/json2excel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/json2excel/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAElB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/json2excel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+CpC;;;GAGG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAsIhD"}

package/dist/modules/i18n/json2excel/index.js

@@ -1,3 +1,157 @@
-export function run() {
-    console.log('JSON转Excel');
+import { input } from '@inquirer/prompts';
+import XLSX from 'xlsx';
+import fs from 'fs';
+import { fileURLToPath } from 'url';
+import path from 'path';
+import { getTimestamp, logger, loggerError, normalizeError, normalizeGitBashPath, } from '../../../utils/index.js';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+/**
+ * 读取并解析配置文件（同 excel2json）
+ */
+function loadConfig(configPath) {
+    if (!fs.existsSync(configPath)) {
+        throw new Error(`配置文件不存在：${configPath}`);
+    }
+    const content = fs.readFileSync(configPath, { encoding: 'utf-8' });
+    const json = JSON.parse(content);
+    if (!json.i18n) {
+        throw new Error('配置文件格式错误，缺少i18n');
+    }
+    if (!json.i18n.defaultKey) {
+        throw new Error('配置文件格式错误，缺少i18n.defaultKey');
+    }
+    if (!json.i18n.langs) {
+        throw new Error('配置文件格式错误，缺少i18n.langs');
+    }
+    if (!json.i18n.longCodes) {
+        throw new Error('配置文件格式错误，缺少i18n.longCodes');
+    }
+    return json.i18n;
+}
+/**
+ * JSON 转 Excel 主函数
+ * 将多语言 JSON 文件合并为一个 Excel 文件，表头使用语言名称（从配置的 langs 中取第一个）
+ */
+export async function json2excel(program) {
+    var _a;
+    // 配置文件默认路径
+    const configPath = path.join(__dirname, '../../../../setting.json');
+    let i18nConfig;
+    // 加载配置文件
+    try {
+        logger.info(`开始加载配置文件：${configPath}`, true);
+        i18nConfig = loadConfig(configPath);
+        logger.info('配置文件加载成功', true);
+    }
+    catch (error) {
+        const msg = `读取配置文件失败：${normalizeError(error).stack}，程序已退出`;
+        logger.error(msg);
+        console.error('程序执行时发生异常，已记录日志，程序已退出');
+        process.exit(1);
+    }
+    // 交互式输入 JSON 根目录
+    const answer = await input({
+        message: '请输入存放多语言 JSON 的根目录：',
+        validate: (value) => {
+            const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
+            if (cleaned.length === 0) {
+                return '路径不能为空';
+            }
+            const normalizedPath = normalizeGitBashPath(cleaned);
+            if (!fs.existsSync(normalizedPath)) {
+                return '目录不存在，请输入有效路径';
+            }
+            if (!fs.statSync(normalizedPath).isDirectory()) {
+                return '请输入一个目录路径';
+            }
+            return true;
+        },
+    });
+    const rootDir = normalizeGitBashPath(answer);
+    try {
+        logger.info(`开始扫描目录：${rootDir}`, true);
+        // 获取根目录下所有子目录（作为语言 KEY）
+        const subDirs = fs.readdirSync(rootDir).filter((name) => {
+            const fullPath = path.join(rootDir, name);
+            return fs.statSync(fullPath).isDirectory();
+        });
+        // 加载每个语言的翻译
+        const translations = {};
+        const availableLangs = [];
+        for (const langKey of subDirs) {
+            const jsonPath = path.join(rootDir, langKey, 'translate.json');
+            if (!fs.existsSync(jsonPath)) {
+                logger.warn(`跳过 ${langKey}，不存在 translate.json`, true);
+                continue;
+            }
+            try {
+                const content = fs.readFileSync(jsonPath, 'utf-8');
+                const data = JSON.parse(content);
+                translations[langKey] = data;
+                availableLangs.push(langKey);
+                logger.info(`已加载语言：${langKey}，词条数量：${Object.keys(data).length}`, true);
+            }
+            catch (err) {
+                logger.error(`读取 ${langKey} 的 translate.json 失败：${normalizeError(err).message}`, true);
+                process.exit(1);
+            }
+        }
+        if (availableLangs.length === 0) {
+            logger.error('未找到任何有效的 translate.json 文件，程序退出', true);
+            process.exit(1);
+        }
+        // 默认语言
+        const defaultLang = i18nConfig.defaultKey;
+        if (!availableLangs.includes(defaultLang)) {
+            logger.warn(`默认语言 ${defaultLang} 不存在于已加载的语言中，将使用所有语言的 KEY 并集作为基准`, true);
+        }
+        // 收集所有 KEY 的并集（作为 Excel 第一列）
+        const allKeysSet = new Set();
+        for (const lang of availableLangs) {
+            Object.keys(translations[lang]).forEach((key) => allKeysSet.add(key));
+        }
+        const sortedKeys = Array.from(allKeysSet).sort();
+        logger.info(`共收集到 ${sortedKeys.length} 个唯一 KEY`, true);
+        // 构建表头：第一列使用默认语言的名称（从配置中获取），后面列使用其他语言的名称
+        const header = [];
+        // 第一列名称：优先使用默认语言的第一个名称，否则用 defaultKey
+        const defaultLangNames = i18nConfig.langs[defaultLang];
+        const firstColName = (defaultLangNames && defaultLangNames.length > 0)
+            ? defaultLangNames[0]
+            : defaultLang;
+        header.push(firstColName);
+        const nonDefaultLangs = availableLangs.filter((lang) => lang !== defaultLang);
+        for (const lang of nonDefaultLangs) {
+            const names = i18nConfig.langs[lang];
+            const colName = (names && names.length > 0) ? names[0] : lang;
+            header.push(colName);
+        }
+        // 构建 Excel 数据行
+        const rows = [header];
+        for (const key of sortedKeys) {
+            const row = [key]; // 第一列是 KEY
+            for (const lang of nonDefaultLangs) {
+                const val = (_a = translations[lang]) === null || _a === void 0 ? void 0 : _a[key];
+                row.push(val !== undefined ? val : null); // 无翻译时留空
+            }
+            rows.push(row);
+        }
+        // 生成 Excel 文件
+        const timestamp = getTimestamp();
+        const outputFileName = `lang_merged_${timestamp}.xlsx`;
+        const outputPath = path.join(rootDir, outputFileName);
+        const wb = XLSX.utils.book_new();
+        const ws = XLSX.utils.aoa_to_sheet(rows);
+        XLSX.utils.book_append_sheet(wb, ws, 'Translations');
+        XLSX.writeFile(wb, outputPath);
+        logger.info(`Excel 文件已生成：${outputPath}`, true);
+        logger.info(`共处理语言：${availableLangs.join(', ')}`, true);
+        logger.info('转换完成', true);
+    }
+    catch (error) {
+        loggerError(error, logger);
+        console.error('程序执行时发生异常，已记录日志，程序已退出');
+        process.exit(1);
+    }
 }

package/dist/modules/i18n/jsonMerge/config.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 进度显示管理器
+ * 用于在同一行显示进度，避免被其他日志干扰
+ */
+export declare class ProgressDisplay {
+    private isActive;
+    /**
+     * 更新进度显示
+     */
+    update(progressBar: string, current: number, total: number, key: string): void;
+    /**
+     * 完成进度显示
+     */
+    complete(progressBar: string): void;
+    /**
+     * 强制清除当前行
+     */
+    clearLine(): void;
+}
+//# sourceMappingURL=config.d.ts.map

package/dist/modules/i18n/jsonMerge/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/jsonMerge/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAkB;IAElC;;OAEG;IACH,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAWvE;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM;IAW5B;;OAEG;IACH,SAAS;CAMV"}

package/dist/modules/i18n/jsonMerge/config.js

@@ -0,0 +1,40 @@
+/**
+ * 进度显示管理器
+ * 用于在同一行显示进度，避免被其他日志干扰
+ */
+export class ProgressDisplay {
+    constructor() {
+        this.isActive = false;
+    }
+    /**
+     * 更新进度显示
+     */
+    update(progressBar, current, total, key) {
+        const message = `  ${progressBar} 正在处理: ${key}`;
+        if (this.isActive) {
+            process.stdout.write('\x1b[2K\r'); // 清除整行，回到行首
+        }
+        process.stdout.write(message);
+        this.isActive = true;
+    }
+    /**
+     * 完成进度显示
+     */
+    complete(progressBar) {
+        const message = `  ${progressBar} 处理完成`;
+        if (this.isActive) {
+            process.stdout.write('\x1b[2K\r');
+        }
+        console.log(message); // 换行显示完成信息
+        this.isActive = false;
+    }
+    /**
+     * 强制清除当前行
+     */
+    clearLine() {
+        if (this.isActive) {
+            process.stdout.write('\x1b[2K\r');
+            this.isActive = false;
+        }
+    }
+}

package/dist/modules/i18n/jsonMerge/index.d.ts

@@ -1,2 +1,7 @@
-export declare function run(): void;
+import { Command } from 'commander';
+/**
+ * 主函数：合并两个目录下相同语言文件夹的JSON文件
+ * @param program commander命令行实例（暂未使用，可扩展）
+ */
+export declare function jsonMerge(program: Command): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/modules/i18n/jsonMerge/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/jsonMerge/index.ts"],"names":[],"mappings":"AAAA,wBAAgB,GAAG,SAElB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/jsonMerge/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuGpC;;;GAGG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,iBA4J/C"}

package/dist/modules/i18n/jsonMerge/index.js

@@ -1,3 +1,196 @@
-export function run() {
-    console.log('JSON合并');
+import fs from 'fs';
+import path from 'path';
+import { input, select, Separator } from '@inquirer/prompts';
+import { logger, loggerError, normalizeError, normalizeGitBashPath, } from '../../../utils/index.js';
+/**
+ * 读取JSON文件内容，返回对象，文件不存在返回空对象
+ * @param filePath JSON文件路径
+ * @returns 解析后的对象，出错或不存在返回空对象
+ */
+function readJsonFile(filePath) {
+    if (!fs.existsSync(filePath)) {
+        return {};
+    }
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch (error) {
+        logger.error(`读取JSON文件失败: ${filePath}，错误: ${normalizeError(error).message}`);
+        return {};
+    }
+}
+/**
+ * 写入JSON文件，格式化缩进2格
+ * @param filePath 写入文件路径
+ * @param data 写入的对象数据
+ */
+function writeJsonFile(filePath, data) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, JSON.stringify(data, null, 2), 'utf-8');
+}
+/**
+ * 合并两个JSON对象，检测重复key，重复时通过交互让用户选择保留哪个值
+ * @param baseObj 源JSON对象（被合并到此对象）
+ * @param mergeObj 待合并JSON对象
+ * @param langKey 当前语言标识，用于日志提示
+ * @returns 合并后的JSON对象
+ */
+async function mergeJsonObjects(baseObj, mergeObj, langKey) {
+    const entries = Object.entries(mergeObj);
+    for (const [key, val] of entries) {
+        if (key in baseObj) {
+            if (baseObj[key] === val) {
+                // 值相同，无需处理，继续下一个键
+                continue;
+            }
+            // 值不同，需要用户交互选择保留哪个值
+            logger.info(`发现冲突: 键【${key}】`, true);
+            const choice = await select({
+                message: `请选择要保留的值：`,
+                choices: [
+                    { name: `源文件值: ${baseObj[key]}`, value: 'base' },
+                    { name: `合并文件值: ${val}`, value: 'merge' },
+                    new Separator(),
+                ],
+                default: 'base',
+                pageSize: 10,
+                loop: true,
+            });
+            if (choice === 'merge') {
+                baseObj[key] = val;
+            }
+            // 如果选择保留base，则保持不变
+        }
+        else {
+            // 新键，直接添加
+            baseObj[key] = val;
+        }
+    }
+    return baseObj;
+}
+/**
+ * 获取指定语言文件夹下的所有JSON文件名列表
+ * @param dirPath 语言文件夹路径
+ * @returns JSON文件名数组
+ */
+function getJsonFilesInLangDir(dirPath) {
+    if (!fs.existsSync(dirPath)) {
+        return [];
+    }
+    return fs.readdirSync(dirPath).filter((fileName) => {
+        const fullPath = path.join(dirPath, fileName);
+        return fs.statSync(fullPath).isFile() && fileName.endsWith('.json');
+    });
+}
+/**
+ * 主函数：合并两个目录下相同语言文件夹的JSON文件
+ * @param program commander命令行实例（暂未使用，可扩展）
+ */
+export async function jsonMerge(program) {
+    try {
+        // 交互输入源目录路径
+        const srcDir = await input({
+            message: '请输入源JSON文件夹路径（含语言子文件夹，如cn/translate.json）：',
+            validate: (value) => {
+                const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
+                if (cleaned.length === 0) {
+                    return '路径不能为空';
+                }
+                const normalizedPath = normalizeGitBashPath(cleaned);
+                if (!fs.existsSync(normalizedPath)) {
+                    return '文件不存在，请输入有效路径';
+                }
+                return true;
+            },
+        });
+        // 交互输入待合并目录路径
+        const mergeDir = await input({
+            message: '请输入待合并JSON文件夹路径（含语言子文件夹，如cn/translate.json）：',
+            validate: (value) => {
+                const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
+                if (cleaned.length === 0) {
+                    return '路径不能为空';
+                }
+                const normalizedPath = normalizeGitBashPath(cleaned);
+                if (!fs.existsSync(normalizedPath)) {
+                    return '文件不存在，请输入有效路径';
+                }
+                return true;
+            },
+        });
+        const srcPath = normalizeGitBashPath(srcDir);
+        const mergePath = normalizeGitBashPath(mergeDir);
+        logger.info(`源目录: ${srcPath}`);
+        logger.info(`合并目录: ${mergePath}`);
+        // 获取两个目录下的一级语言子文件夹列表
+        const srcLangDirs = fs.readdirSync(srcPath).filter((f) => {
+            const fullPath = path.join(srcPath, f);
+            return fs.statSync(fullPath).isDirectory();
+        });
+        const mergeLangDirs = fs.readdirSync(mergePath).filter((f) => {
+            const fullPath = path.join(mergePath, f);
+            return fs.statSync(fullPath).isDirectory();
+        });
+        // 找出两个目录下都存在的语言文件夹
+        const commonLangDirs = srcLangDirs.filter((lang) => mergeLangDirs.includes(lang));
+        if (commonLangDirs.length === 0) {
+            logger.info('没有发现相同语言文件夹，无需合并');
+            return;
+        }
+        logger.info(`发现 ${commonLangDirs.length} 个共同语言文件夹: ${commonLangDirs.join(', ')}`, true);
+        // 遍历每个共同语言文件夹进行合并
+        for (const langKey of commonLangDirs) {
+            logger.info(`${'='.repeat(60)}`, true);
+            logger.info(`处理语言: ${langKey}`, true);
+            const srcLangPath = path.join(srcPath, langKey);
+            const mergeLangPath = path.join(mergePath, langKey);
+            const srcJsonFiles = getJsonFilesInLangDir(srcLangPath);
+            const mergeJsonFiles = getJsonFilesInLangDir(mergeLangPath);
+            // 找出两个语言文件夹中共同存在的JSON文件
+            const commonJsonFiles = srcJsonFiles.filter((file) => mergeJsonFiles.includes(file));
+            if (commonJsonFiles.length === 0) {
+                logger.info(`语言【${langKey}】下没有共同的JSON文件，跳过`, true);
+                continue;
+            }
+            logger.info(`发现 ${commonJsonFiles.length} 个共同JSON文件: ${commonJsonFiles.join(', ')}`, true);
+            // 逐个文件合并
+            for (const jsonFile of commonJsonFiles) {
+                logger.info(`处理文件: ${jsonFile}`, true);
+                const srcFile = path.join(srcLangPath, jsonFile);
+                const mergeFile = path.join(mergeLangPath, jsonFile);
+                if (!fs.existsSync(srcFile)) {
+                    logger.warn(`源目录语言文件缺失: ${srcFile}，跳过`, true);
+                    continue;
+                }
+                if (!fs.existsSync(mergeFile)) {
+                    logger.warn(`合并目录语言文件缺失: ${mergeFile}，跳过`, true);
+                    continue;
+                }
+                logger.info(`开始合并文件 ${jsonFile}...`, true);
+                const srcJson = readJsonFile(srcFile);
+                const mergeJson = readJsonFile(mergeFile);
+                // 打印合并前后键数量
+                const srcKeyCount = Object.keys(srcJson).length;
+                const mergeKeyCount = Object.keys(mergeJson).length;
+                logger.info(`源文件键数: ${srcKeyCount}, 合并文件键数: ${mergeKeyCount}`, true);
+                const merged = await mergeJsonObjects(srcJson, mergeJson, langKey);
+                const finalKeyCount = Object.keys(merged).length;
+                logger.info(`合并后键数: ${finalKeyCount}`, true);
+                writeJsonFile(srcFile, merged);
+                logger.info(`文件 ${jsonFile} 合并完成`, true);
+            }
+            logger.info(`语言【${langKey}】全部处理完成`, true);
+        }
+        logger.info(`${'='.repeat(60)}`, true);
+        logger.info(`所有合并操作完成!`, true);
+        logger.info(`源目录: ${srcPath}`, true);
+        logger.info(`合并目录: ${mergePath}`, true);
+        logger.info(`所有修改已写回源目录`, true);
+    }
+    catch (error) {
+        loggerError(error, logger);
+        console.error('程序执行时发生异常，已记录日志，程序已退出');
+        process.exit(1);
+    }
 }

package/dist/modules/tools/getHolidayTime/index.js

@@ -29,7 +29,7 @@ function getNearestHolidays(data, count = 3) {
             // 初始化第一个节日组
             currentGroup = {
                 name: h.name,
-                daysUntil: Math.floor((hd.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)),
+                daysUntil: Math.ceil((hd.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)),
                 holidayDates: [h.date],
                 hasTransferWorkday: false,
                 transferWorkdays: [],
@@ -47,7 +47,7 @@ function getNearestHolidays(data, count = 3) {
                 grouped.push(currentGroup);
                 currentGroup = {
                     name: h.name,
-                    daysUntil: Math.floor((hd.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)),
+                    daysUntil: Math.ceil((hd.getTime() - today.getTime()) / (1000 * 60 * 60 * 24)),
                     holidayDates: [h.date],
                     hasTransferWorkday: false,
                     transferWorkdays: [],

package/dist/utils/index.d.ts

@@ -160,5 +160,17 @@ export declare function formatKey(key: string): string;
  * @returns 去除特殊编码前缀后的字符串
  */
 export declare function decodeKey(key: string): string;
+/**
+ * 将Git Bash风格的路径（如 /d/...）转换成Windows风格路径（D:/...）
+ * @param inputPath 用户输入的路径
+ * @returns 转换后的绝对路径
+ */
+export declare function normalizeGitBashPath(inputPath: string): string;
+/**
+ * 去除字符串首尾的单引号或双引号
+ * @param str 输入字符串
+ * @returns 去除引号后的字符串
+ */
+export declare function trimQuotes(str: string): string;
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}

package/dist/utils/index.js

@@ -288,3 +288,30 @@ export function decodeKey(key) {
     // 去除前缀
     return key.replace(prefixRegex, '');
 }
+/**
+ * 将Git Bash风格的路径（如 /d/...）转换成Windows风格路径（D:/...）
+ * @param inputPath 用户输入的路径
+ * @returns 转换后的绝对路径
+ */
+export function normalizeGitBashPath(inputPath) {
+    let cleaned = inputPath.trim().replace(/^['"]|['"]$/g, '');
+    // 如果路径是 /d/... 格式，转换成 D:/...
+    if (/^\/[a-zA-Z]\//.test(cleaned)) {
+        cleaned = cleaned.replace(/^\/([a-zA-Z])\//, '$1:/');
+    }
+    // 使用 path.resolve 转成绝对路径（相对于当前工作目录）
+    const absolutePath = path.resolve(process.cwd(), cleaned);
+    return absolutePath;
+}
+/**
+ * 去除字符串首尾的单引号或双引号
+ * @param str 输入字符串
+ * @returns 去除引号后的字符串
+ */
+export function trimQuotes(str) {
+    if ((str.startsWith('"') && str.endsWith('"')) ||
+        (str.startsWith("'") && str.endsWith("'"))) {
+        return str.slice(1, -1);
+    }
+    return str;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "td-web-cli",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "A CLI tool for efficiency",
   "main": "dist/index.js",
   "type": "module",