td-web-cli 0.1.33 → 0.1.35

package/README.md

@@ -47,6 +47,7 @@ td-web-cli
 - 多语言 JSON 转 Excel 工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/i18n/json2excel.md)
 - 多语言 Excel 转 JSON 及语言检测工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/i18n/excel2json.md)
 - 多语言 JSON 文件合并工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/i18n/jsonMerge.md)
+- 多语言 JSON 文件插入工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/i18n/jsonInsert.md)
 - 图片压缩工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/image/compressImage.md)
 - 节假日查询与提醒工具。[详细功能说明请点击这里](https://github.com/qianyuzzf/td-web-cli/blob/master/docs/tools/getHolidayTime.md)
 

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/extractEntry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2UpC;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,iBAuLlD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/extractEntry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4UpC;;GAEG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,iBA0KlD"}

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

@@ -4,7 +4,7 @@ import fs from 'fs';
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { minimatch } from 'minimatch';
-import { getTimestamp, logger, loggerError, normalizeError, normalizeGitBashPath, } from '../../../utils/index.js';
+import { getTimestamp, logger, loggerError, normalizeError, normalizeGitBashPath, validatePathInput, } from '../../../utils/index.js';
 // AST 解析相关
 import babelParser from '@babel/parser';
 import traverse from '@babel/traverse';
@@ -296,20 +296,7 @@ export async function extractEntry(program) {
     // 1. 输入项目根目录
     const answer = await input({
         message: '请输入项目根目录：',
-        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;
-        },
+        validate: validatePathInput,
     });
     const rootDir = normalizeGitBashPath(answer);
     // 2. 交互式配置忽略模式（支持目录和文件，使用 glob 通配符）

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;AAQpC;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBAiF1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/modules/i18n/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AASpC;;;;GAIG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,OAAO,iBA2F1C"}

package/dist/modules/i18n/index.js

@@ -4,6 +4,7 @@ import { excel2json } from './excel2json/index.js';
 import { json2excel } from './json2excel/index.js';
 import { jsonMerge } from './jsonMerge/index.js';
 import { extractEntry } from './extractEntry/index.js';
+import { jsonInsert } from './jsonInsert/index.js';
 /**
  * 国际化模块主入口
  * 提供多个国际化相关功能的交互式选择
@@ -34,6 +35,11 @@ export async function i18n(program) {
                 value: 'jsonMerge',
                 description: '合并多个JSON格式的词条信息文件',
             },
+            {
+                name: 'JSON插入',
+                value: 'jsonInsert',
+                description: '插入词条信息到JSON文件中',
+            },
         ];
         // 交互式选择需要执行的功能
         const answer = await select({
@@ -74,6 +80,11 @@ export async function i18n(program) {
                 await jsonMerge(program);
                 logger.info(`${selectedModule.name}功能执行完成`);
                 break;
+            case 'jsonInsert':
+                logger.info(`${selectedModule.name}功能开始执行`);
+                await jsonInsert(program);
+                logger.info(`${selectedModule.name}功能执行完成`);
+                break;
             default:
                 logger.warn(`${selectedModule.name}功能暂未实现，程序已退出`);
                 process.exit(0);

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,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+CpC;;;GAGG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAsIhD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/json2excel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgDpC;;;GAGG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAqIhD"}

package/dist/modules/i18n/json2excel/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, normalizeGitBashPath, } from '../../../utils/index.js';
+import { getTimestamp, logger, loggerError, normalizeError, normalizeGitBashPath, validatePathInput, } from '../../../utils/index.js';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 /**
@@ -53,20 +53,7 @@ export async function json2excel(program) {
     // 交互式输入 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;
-        },
+        validate: validatePathInput,
     });
     const rootDir = normalizeGitBashPath(answer);
     try {
@@ -117,14 +104,14 @@ export async function json2excel(program) {
         const header = [];
         // 第一列名称：优先使用默认语言的第一个名称，否则用 defaultKey
         const defaultLangNames = i18nConfig.langs[defaultLang];
-        const firstColName = (defaultLangNames && defaultLangNames.length > 0)
+        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;
+            const colName = names && names.length > 0 ? names[0] : lang;
             header.push(colName);
         }
         // 构建 Excel 数据行

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

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+/**
+ * 主函数：从插入目录按指定 keys 批量插入到被插入目录
+ */
+export declare function jsonInsert(program: Command): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/jsonInsert/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0HpC;;GAEG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,OAAO,iBAoHhD"}

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

@@ -0,0 +1,174 @@
+import fs from 'fs';
+import path from 'path';
+import { input, select, Separator } from '@inquirer/prompts';
+import { logger, loggerError, normalizeGitBashPath, readJsonFile, writeJsonFile, getJsonFilesInLangDir, validatePathInput, } from '../../../utils/index.js';
+/** 获取目录下的一级子文件夹名称 */
+function getSubDirectories(dirPath) {
+    return fs.readdirSync(dirPath).filter((name) => fs.statSync(path.join(dirPath, name)).isDirectory());
+}
+/** 校验 JSON 文件路径输入 */
+function validateJsonFileInput(value) {
+    const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
+    if (!cleaned)
+        return '路径不能为空';
+    const normalized = normalizeGitBashPath(cleaned);
+    if (!fs.existsSync(normalized))
+        return '文件不存在，请输入有效路径';
+    if (!fs.statSync(normalized).isFile())
+        return '请输入 JSON 文件路径';
+    if (!normalized.endsWith('.json'))
+        return '请输入 .json 文件路径';
+    return true;
+}
+/**
+ * 从 JSON 文件中提取待插入的 key 列表
+ * 支持对象（取顶层 key）或字符串数组两种格式
+ */
+function extractKeysFromJsonFile(filePath) {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    let parsed;
+    try {
+        parsed = JSON.parse(content);
+    }
+    catch {
+        throw new Error(`JSON 文件解析失败: ${filePath}`);
+    }
+    if (Array.isArray(parsed)) {
+        const keys = parsed
+            .filter((item) => typeof item === 'string')
+            .map((key) => key.trim())
+            .filter((key) => key.length > 0);
+        return [...new Set(keys)];
+    }
+    if (parsed && typeof parsed === 'object') {
+        return Object.keys(parsed);
+    }
+    throw new Error('JSON 文件格式无效，需为对象或字符串数组');
+}
+/**
+ * 将指定 keys 从插入对象合并到被插入对象
+ */
+async function insertKeysIntoObject(baseObj, insertObj, keys, strategy) {
+    for (const key of keys) {
+        if (!(key in insertObj)) {
+            logger.warn(`键 "${key}" 在插入文件中不存在，已跳过`, true);
+            continue;
+        }
+        const insertVal = insertObj[key];
+        if (!(key in baseObj)) {
+            baseObj[key] = insertVal;
+            logger.info(`新增键: ${key}`, true);
+            continue;
+        }
+        if (baseObj[key] === insertVal) {
+            logger.info(`键 "${key}" 值相同，已跳过`, true);
+            continue;
+        }
+        logger.info(`键 "${key}" 已存在且值不同`, true);
+        if (strategy === 'overwrite') {
+            baseObj[key] = insertVal;
+            logger.info(`已用插入值覆盖键 "${key}"`, true);
+            continue;
+        }
+        const choice = await select({
+            message: `请选择要保留的值：`,
+            choices: [
+                { name: `被插入文件值: ${baseObj[key]}`, value: 'base' },
+                { name: `插入文件值: ${insertVal}`, value: 'insert' },
+                new Separator(),
+            ],
+            default: 'base',
+            loop: true,
+        });
+        if (choice === 'insert') {
+            baseObj[key] = insertVal;
+            logger.info(`已用插入值覆盖键 "${key}"`, true);
+        }
+        else {
+            logger.info(`保留被插入文件值，键 "${key}" 未更改`, true);
+        }
+    }
+    return baseObj;
+}
+/**
+ * 主函数：从插入目录按指定 keys 批量插入到被插入目录
+ */
+export async function jsonInsert(program) {
+    try {
+        const srcDir = await input({
+            message: '请输入被插入 JSON 文件夹路径（含语言子文件夹，如 cn/translate.json）：',
+            validate: validatePathInput,
+        });
+        const insertDir = await input({
+            message: '请输入待插入 JSON 文件夹路径（含语言子文件夹，如 cn/translate.json）：',
+            validate: validatePathInput,
+        });
+        const keysFileInput = await input({
+            message: '请输入 key 来源 JSON 文件路径（从中读取需要插入的 key）：',
+            validate: validateJsonFileInput,
+        });
+        const conflictStrategy = await select({
+            message: '当目标键已存在且值不同时，请选择处理方式：',
+            choices: [
+                { name: '直接覆盖（始终使用插入文件值）', value: 'overwrite' },
+                { name: '手动选择（针对每个冲突键提示）', value: 'manual' },
+                new Separator(),
+            ],
+            default: 'manual',
+            loop: true,
+        });
+        const srcPath = normalizeGitBashPath(srcDir);
+        const insertPath = normalizeGitBashPath(insertDir);
+        const keysFilePath = normalizeGitBashPath(keysFileInput);
+        const keys = extractKeysFromJsonFile(keysFilePath);
+        if (keys.length === 0) {
+            logger.info('key 来源文件中未找到有效 key，操作取消');
+            return;
+        }
+        logger.info(`被插入目录: ${srcPath}`);
+        logger.info(`插入目录: ${insertPath}`);
+        logger.info(`key 来源文件: ${keysFilePath}`);
+        logger.info(`待插入 key: ${keys.join(', ')}`);
+        logger.info(`冲突处理策略: ${conflictStrategy === 'overwrite' ? '直接覆盖' : '手动选择'}`);
+        const commonLangDirs = getSubDirectories(srcPath).filter((lang) => getSubDirectories(insertPath).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 insertLangPath = path.join(insertPath, langKey);
+            const insertJsonFiles = getJsonFilesInLangDir(insertLangPath);
+            const commonJsonFiles = getJsonFilesInLangDir(srcLangPath).filter((file) => insertJsonFiles.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 insertFile = path.join(insertLangPath, jsonFile);
+                const srcJson = readJsonFile(srcFile);
+                const insertJson = readJsonFile(insertFile);
+                logger.info(`被插入文件原有键数: ${Object.keys(srcJson).length}`, true);
+                const updated = await insertKeysIntoObject(srcJson, insertJson, keys, conflictStrategy);
+                logger.info(`插入后键数: ${Object.keys(updated).length}`, true);
+                writeJsonFile(srcFile, updated);
+                logger.info(`文件 ${jsonFile} 已更新`, true);
+            }
+            logger.info(`语言【${langKey}】处理完成`, true);
+        }
+        logger.info(`${'='.repeat(60)}`, true);
+        logger.info(`所有插入操作完成!`, true);
+        logger.info(`被插入目录已更新: ${srcPath}`, true);
+    }
+    catch (error) {
+        loggerError(error, logger);
+        console.error('程序执行时发生异常，已记录日志，程序已退出');
+        process.exit(1);
+    }
+}

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":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsGpC;;;GAGG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,iBA4J/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/i18n/jsonMerge/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAapC;;;GAGG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,iBAkI/C"}

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

@@ -1,87 +1,7 @@
 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',
-                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');
-    });
-}
+import { input } from '@inquirer/prompts';
+import { logger, loggerError, normalizeGitBashPath, readJsonFile, writeJsonFile, mergeJsonObjects, getJsonFilesInLangDir, validatePathInput, } from '../../../utils/index.js';
 /**
  * 主函数：合并两个目录下相同语言文件夹的JSON文件
  * @param program commander命令行实例（暂未使用，可扩展）
@@ -91,32 +11,12 @@ export async function jsonMerge(program) {
         // 交互输入源目录路径
         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;
-            },
+            validate: validatePathInput,
         });
         // 交互输入待合并目录路径
         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;
-            },
+            validate: validatePathInput,
         });
         const srcPath = normalizeGitBashPath(srcDir);
         const mergePath = normalizeGitBashPath(mergeDir);

package/dist/utils/index.d.ts

@@ -172,5 +172,37 @@ export declare function normalizeGitBashPath(inputPath: string): string;
  * @returns 去除引号后的字符串
  */
 export declare function trimQuotes(str: string): string;
+/**
+ * 读取JSON文件内容，返回对象，文件不存在返回空对象
+ * @param filePath JSON文件路径
+ * @returns 解析后的对象，出错或不存在返回空对象
+ */
+export declare function readJsonFile(filePath: string): Record<string, any>;
+/**
+ * 写入JSON文件，格式化缩进2格
+ * @param filePath 写入文件路径
+ * @param data 写入的对象数据
+ */
+export declare function writeJsonFile(filePath: string, data: Record<string, any>): void;
+/**
+ * 合并两个JSON对象，检测重复key，重复时通过交互让用户选择保留哪个值
+ * @param baseObj 源JSON对象（被合并到此对象）
+ * @param mergeObj 待合并JSON对象
+ * @param langKey 当前语言标识，用于日志提示
+ * @returns 合并后的JSON对象
+ */
+export declare function mergeJsonObjects(baseObj: Record<string, any>, mergeObj: Record<string, any>, langKey: string): Promise<Record<string, any>>;
+/**
+ * 获取指定语言文件夹下的所有JSON文件名列表
+ * @param dirPath 语言文件夹路径
+ * @returns JSON文件名数组
+ */
+export declare function getJsonFilesInLangDir(dirPath: string): string[];
+/**
+ * 通用的路径输入验证函数
+ * @param value 用户输入
+ * @returns 验证通过返回 true，否则返回错误信息字符串
+ */
+export declare function validatePathInput(value: string): true | 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

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
+import { select, Separator } from '@inquirer/prompts';
 import { getData, postData } from '../api/index.js';
 import api from '../api/interface.js';
 /**
@@ -315,3 +316,102 @@ export function trimQuotes(str) {
     }
     return str;
 }
+/**
+ * 读取JSON文件内容，返回对象，文件不存在返回空对象
+ * @param filePath JSON文件路径
+ * @returns 解析后的对象，出错或不存在返回空对象
+ */
+export 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 写入的对象数据
+ */
+export 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对象
+ */
+export 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',
+                loop: true,
+            });
+            if (choice === 'merge') {
+                baseObj[key] = val;
+            }
+            // 如果选择保留base，则保持不变
+        }
+        else {
+            // 新键，直接添加
+            baseObj[key] = val;
+        }
+    }
+    return baseObj;
+}
+/**
+ * 获取指定语言文件夹下的所有JSON文件名列表
+ * @param dirPath 语言文件夹路径
+ * @returns JSON文件名数组
+ */
+export 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');
+    });
+}
+/**
+ * 通用的路径输入验证函数
+ * @param value 用户输入
+ * @returns 验证通过返回 true，否则返回错误信息字符串
+ */
+export function validatePathInput(value) {
+    const cleaned = value.trim().replace(/^['"]|['"]$/g, '');
+    if (!cleaned) {
+        return '路径不能为空';
+    }
+    const normalized = normalizeGitBashPath(cleaned);
+    if (!fs.existsSync(normalized)) {
+        return '目录不存在，请输入有效路径';
+    }
+    if (!fs.statSync(normalized).isDirectory()) {
+        return '请输入一个目录路径';
+    }
+    return true;
+}

package/package.json

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

package/setting.json

@@ -2,25 +2,25 @@
   "i18n": {
     "defaultKey": "en",
     "langs": {
-      "cn": ["简体中文"],
-      "zh": ["繁体中文"],
-      "en": ["英语"],
-      "it": ["意大利语"],
-      "brpt": ["巴西葡语"],
-      "uk": ["乌克兰语"],
-      "ru": ["俄语"],
-      "es": ["欧洲西语"],
-      "hu": ["匈牙利语"],
-      "pl": ["波兰语"],
-      "tr": ["土耳其语"],
-      "de": ["德语"],
-      "fr": ["法语"],
-      "ro": ["罗马尼亚语"],
-      "ko": ["韩语"],
-      "cs": ["捷克语"],
-      "laes": ["拉美西语"],
-      "pt": ["欧洲葡语"],
-      "nl": ["荷兰语"]
+      "cn": ["简体中文", "中文简体", "简体", "中文"],
+      "zh": ["繁体中文", "繁体", "繁中", "台湾繁体", "繁體中文", "繁體"],
+      "en": ["英语", "英文"],
+      "it": ["意大利语", "意大利"],
+      "brpt": ["巴西葡语", "巴西葡萄牙语"],
+      "uk": ["乌克兰语", "乌克兰"],
+      "ru": ["俄语", "俄罗斯"],
+      "es": ["欧洲西语", "欧洲西班牙语", "西班牙语", "西班牙"],
+      "hu": ["匈牙利语", "匈牙利"],
+      "pl": ["波兰语", "波兰"],
+      "tr": ["土耳其语", "土耳其"],
+      "de": ["德语", "德国"],
+      "fr": ["法语", "法国"],
+      "ro": ["罗马尼亚语", "罗马尼亚"],
+      "ko": ["韩语", "韩国"],
+      "cs": ["捷克语", "捷克"],
+      "laes": ["拉美西语", "美西"],
+      "pt": ["欧洲葡语", "欧洲葡萄牙语"],
+      "nl": ["荷兰语", "荷兰"]
     },
     "longCodes": {
       "cn": "zh-CN",