template-syncer 1.1.3 → 1.2.0

package/lib/ui/prompts.d.ts

@@ -1,48 +1,16 @@
 import type { FileChange, Recommendation } from '../types';
-/**
- * 交互式提示工具
- */
 export declare const prompts: {
-    /**
-     * 输入模板仓库 URL
-     */
     inputRepo(): Promise<string>;
-    /**
-     * 选择分支
-     */
     selectBranch(branches: string[]): Promise<string>;
-    /**
-     * 选择处理方式
-     */
     selectAction(): Promise<"category" | "individual" | "all" | "cancel">;
-    /**
-     * 按分类选择文件
-     */
     selectByCategory(changes: FileChange[]): Promise<FileChange[]>;
-    /**
-     * 逐一选择文件
-     */
     selectIndividually(changes: FileChange[]): Promise<FileChange[]>;
-    /**
-     * 确认操作
-     */
     confirm(message: string, defaultValue?: boolean): Promise<boolean>;
-    /**
-     * 选择推荐操作
-     */
     selectRecommendations(recommendations: Recommendation[]): Promise<Recommendation[]>;
-    /**
-     * 初始化配置向导
-     */
     initConfig(): Promise<{
         repo: string;
         branch: string;
         ignore: string[];
-        verbose: boolean;
     }>;
-    /**
-     * 显示变更统计
-     */
     showChangeSummary(changes: FileChange[]): void;
 };
-//# sourceMappingURL=prompts.d.ts.map

package/lib/ui/prompts.js

@@ -7,13 +7,12 @@ exports.prompts = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 const tree_1 = require("./tree");
 const chalk = require('chalk');
-/**
- * 交互式提示工具
- */
+const STATUS_TEXT = {
+    new: '新增',
+    modified: '修改',
+    deleted: '删除'
+};
 exports.prompts = {
-    /**
-     * 输入模板仓库 URL
-     */
     async inputRepo() {
         const { repo } = await inquirer_1.default.prompt([{
                 type: 'input',
@@ -23,9 +22,6 @@ exports.prompts = {
             }]);
         return repo;
     },
-    /**
-     * 选择分支
-     */
     async selectBranch(branches) {
         if (branches.length === 0)
             return 'main';
@@ -39,13 +35,10 @@ exports.prompts = {
                     name: b === 'main' || b === 'master' ? `${b} (默认)` : b,
                     value: b
                 })),
-                default: branches.find(b => b === 'main') || branches.find(b => b === 'master') || branches[0]
+                default: branches.find(b => b === 'main') ?? branches.find(b => b === 'master') ?? branches[0]
             }]);
         return branch;
     },
-    /**
-     * 选择处理方式
-     */
     async selectAction() {
         const { action } = await inquirer_1.default.prompt([{
                 type: 'list',
@@ -60,73 +53,61 @@ exports.prompts = {
             }]);
         return action;
     },
-    /**
-     * 按分类选择文件
-     */
+    // 一次 checkbox 选择所有分类，而不是逐个 confirm
     async selectByCategory(changes) {
-        // 按分类分组
         const categories = new Map();
         for (const file of changes) {
-            const list = categories.get(file.category) || [];
+            const list = categories.get(file.category) ?? [];
             list.push(file);
             categories.set(file.category, list);
         }
-        const selected = [];
-        for (const [category, files] of categories) {
+        const choices = Array.from(categories.entries()).map(([category, files]) => {
             const icon = files[0].icon;
+            const parts = [];
             const newCount = files.filter(f => f.status === 'new').length;
             const modCount = files.filter(f => f.status === 'modified').length;
             const delCount = files.filter(f => f.status === 'deleted').length;
-            let stats = `${files.length} 个文件`;
-            const parts = [];
             if (newCount > 0)
-                parts.push(`新增: ${newCount}`);
+                parts.push(chalk.green(`新增 ${newCount}`));
             if (modCount > 0)
-                parts.push(`修改: ${modCount}`);
+                parts.push(chalk.yellow(`修改 ${modCount}`));
             if (delCount > 0)
-                parts.push(`删除: ${delCount}`);
-            if (parts.length > 0)
-                stats += `, ${parts.join(', ')}`;
-            const { include } = await inquirer_1.default.prompt([{
-                    type: 'confirm',
-                    name: 'include',
-                    message: `${icon} ${category} (${stats})`,
-                    default: delCount === 0 // 有删除操作时默认不选中
-                }]);
-            if (include) {
-                selected.push(...files);
-            }
-        }
-        return selected;
+                parts.push(chalk.red(`删除 ${delCount}`));
+            return {
+                name: `${icon} ${category}  ${parts.join('  ')}`,
+                value: category,
+                checked: delCount === 0
+            };
+        });
+        const { selected } = await inquirer_1.default.prompt([{
+                type: 'checkbox',
+                name: 'selected',
+                message: '选择要处理的分类:',
+                choices,
+                pageSize: 15
+            }]);
+        return changes.filter(f => selected.includes(f.category));
     },
-    /**
-     * 逐一选择文件
-     */
     async selectIndividually(changes) {
-        const statusText = (status) => {
-            switch (status) {
-                case 'new': return '新增';
-                case 'modified': return '修改';
-                case 'deleted': return '删除';
-                default: return status;
-            }
-        };
         const { selected } = await inquirer_1.default.prompt([{
                 type: 'checkbox',
                 name: 'selected',
                 message: '选择要处理的文件:',
-                choices: changes.map(file => ({
-                    name: `${file.icon} ${file.path} (${statusText(file.status)})`,
-                    value: file,
-                    checked: file.status !== 'deleted' // 删除操作默认不选中
-                })),
-                pageSize: 15
+                choices: changes.map(file => {
+                    const statusLabel = STATUS_TEXT[file.status] ?? file.status;
+                    const colorFn = file.status === 'new' ? chalk.green
+                        : file.status === 'deleted' ? chalk.red
+                            : chalk.yellow;
+                    return {
+                        name: `${file.icon} ${file.path}  ${colorFn(statusLabel)}`,
+                        value: file,
+                        checked: file.status !== 'deleted'
+                    };
+                }),
+                pageSize: 20
             }]);
         return selected;
     },
-    /**
-     * 确认操作
-     */
     async confirm(message, defaultValue = true) {
         const { confirmed } = await inquirer_1.default.prompt([{
                 type: 'confirm',
@@ -136,28 +117,21 @@ exports.prompts = {
             }]);
         return confirmed;
     },
-    /**
-     * 选择推荐操作
-     */
+    // batch/smart 模式：一次选择推荐组
     async selectRecommendations(recommendations) {
+        const PRIORITY_ICON = { high: '🔴', medium: '🟡', low: '🟢' };
         const { selected } = await inquirer_1.default.prompt([{
                 type: 'checkbox',
                 name: 'selected',
-                message: '选择要执行的操作:',
-                choices: recommendations.map(rec => {
-                    const icon = rec.priority === 'high' ? '🔴' : rec.priority === 'medium' ? '🟡' : '🟢';
-                    return {
-                        name: `${icon} ${rec.title} (${rec.files.length} 个文件)`,
-                        value: rec,
-                        checked: rec.priority === 'high'
-                    };
-                })
+                message: '选择要执行的更新:',
+                choices: recommendations.map(rec => ({
+                    name: `${PRIORITY_ICON[rec.priority]} ${rec.title}  ${chalk.gray(rec.description)}  (${rec.files.length} 个文件)`,
+                    value: rec,
+                    checked: rec.priority === 'high'
+                }))
             }]);
         return selected;
     },
-    /**
-     * 初始化配置向导
-     */
     async initConfig() {
         return inquirer_1.default.prompt([
             {
@@ -177,26 +151,26 @@ exports.prompts = {
                 name: 'ignore',
                 message: '额外忽略的文件:',
                 choices: [
-                    { name: '.env.local', value: '.env.local', checked: false },
-                    { name: 'README.md', value: 'README.md', checked: false },
-                    { name: '.vscode/', value: '.vscode/**', checked: false }
+                    { name: '.env.local', value: '.env.local' },
+                    { name: 'README.md', value: 'README.md' },
+                    { name: '.vscode/', value: '.vscode/**' }
                 ]
-            },
-            {
-                type: 'confirm',
-                name: 'verbose',
-                message: '默认启用详细输出?',
-                default: false
             }
         ]);
     },
-    /**
-     * 显示变更统计
-     */
     showChangeSummary(changes) {
-        console.log(`\n发现 ${chalk.bold(changes.length)} 个文件需要处理:\n`);
+        const newCount = changes.filter(f => f.status === 'new').length;
+        const modCount = changes.filter(f => f.status === 'modified').length;
+        const delCount = changes.filter(f => f.status === 'deleted').length;
+        const parts = [];
+        if (newCount > 0)
+            parts.push(chalk.green(`新增 ${newCount}`));
+        if (modCount > 0)
+            parts.push(chalk.yellow(`修改 ${modCount}`));
+        if (delCount > 0)
+            parts.push(chalk.red(`删除 ${delCount}`));
+        console.log(`\n发现 ${chalk.bold(changes.length)} 个变更  ${parts.join('  ')}\n`);
         console.log((0, tree_1.formatGroupedTree)(changes));
         console.log('');
     }
 };
-//# sourceMappingURL=prompts.js.map

package/lib/ui/tree.d.ts

@@ -7,4 +7,3 @@ export declare function formatFileTree(files: FileChange[]): string;
  * 按分类分组并生成树
  */
 export declare function formatGroupedTree(files: FileChange[]): string;
-//# sourceMappingURL=tree.d.ts.map

package/lib/ui/tree.js

@@ -127,4 +127,3 @@ function formatGroupedTree(files) {
     });
     return lines.join('\n');
 }
-//# sourceMappingURL=tree.js.map

package/lib/utils/categorizer.d.ts

@@ -21,4 +21,3 @@ export declare class Categorizer {
      */
     addRule(rule: CategoryRule): void;
 }
-//# sourceMappingURL=categorizer.d.ts.map

package/lib/utils/categorizer.js

@@ -198,4 +198,3 @@ class Categorizer {
     }
 }
 exports.Categorizer = Categorizer;
-//# sourceMappingURL=categorizer.js.map

package/lib/utils/git.d.ts

@@ -34,4 +34,3 @@ export declare class Git {
      */
     removeGitDir(dir: string): void;
 }
-//# sourceMappingURL=git.d.ts.map

package/lib/utils/git.js

@@ -95,4 +95,3 @@ class Git {
     }
 }
 exports.Git = Git;
-//# sourceMappingURL=git.js.map

package/lib/utils/index.d.ts

@@ -3,4 +3,3 @@ export { Categorizer } from './categorizer';
 export { Merger } from './merger';
 export { Git } from './git';
 export { Scanner } from './scanner';
-//# sourceMappingURL=index.d.ts.map

package/lib/utils/index.js

@@ -11,4 +11,3 @@ var git_1 = require("./git");
 Object.defineProperty(exports, "Git", { enumerable: true, get: function () { return git_1.Git; } });
 var scanner_1 = require("./scanner");
 Object.defineProperty(exports, "Scanner", { enumerable: true, get: function () { return scanner_1.Scanner; } });
-//# sourceMappingURL=index.js.map

package/lib/utils/merger.d.ts

@@ -1,40 +1,15 @@
 import type { MergeStrategy } from '../types';
-/**
- * 文件合并器
- */
 export declare class Merger {
     private strategies;
     constructor(customStrategies?: Record<string, MergeStrategy>);
-    /**
-     * 获取文件的合并策略
-     */
     getStrategy(filePath: string): MergeStrategy;
-    /**
-     * 合并文件
-     */
-    merge(templatePath: string, currentPath: string, targetPath: string): {
+    merge(templatePath: string, currentPath: string, targetPath: string): Promise<{
         success: boolean;
         message: string;
-    };
-    /**
-     * 智能合并
-     */
+    }>;
     private smartMerge;
-    /**
-     * 合并 package.json
-     */
     private mergePackageJson;
-    /**
-     * 合并普通 JSON 文件
-     */
     private mergeJson;
-    /**
-     * 深度合并对象
-     */
     private deepMerge;
-    /**
-     * 设置合并策略
-     */
     setStrategy(pattern: string, strategy: MergeStrategy): void;
 }
-//# sourceMappingURL=merger.d.ts.map

package/lib/utils/merger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merger.d.ts","sourceRoot":"","sources":["../../src/utils/merger.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C;;GAEG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,UAAU,CAAgC;gBAEtC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAM;IAUhE;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa;IAK5C;;OAEG;IACH,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAkB3G;;OAEG;IACH,OAAO,CAAC,UAAU;IA0BlB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAqFxB;;OAEG;IACH,OAAO,CAAC,SAAS;IAwBjB;;OAEG;IACH,OAAO,CAAC,SAAS;IA2BjB;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,GAAG,IAAI;CAG5D"}
+{"version":3,"file":"merger.d.ts","sourceRoot":"","sources":["../../src/utils/merger.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,qBAAa,MAAM;IACjB,OAAO,CAAC,UAAU,CAAgC;gBAEtC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAM;IAShE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa;IAKtC,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;YAY5G,UAAU;YAcV,gBAAgB;YAyDhB,SAAS;IAoBvB,OAAO,CAAC,SAAS;IAajB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,GAAG,IAAI;CAG5D"}

package/lib/utils/merger.js

@@ -34,155 +34,110 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Merger = void 0;
+const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const platform_1 = require("./platform");
-/**
- * 文件合并器
- */
 class Merger {
     constructor(customStrategies = {}) {
         this.strategies = {
-            // 默认智能合并的文件
             'package.json': 'smart',
             'tsconfig.json': 'smart',
             'jsconfig.json': 'smart',
             ...customStrategies
         };
     }
-    /**
-     * 获取文件的合并策略
-     */
     getStrategy(filePath) {
         const fileName = path.basename(filePath);
-        return this.strategies[fileName] || this.strategies[filePath] || 'overwrite';
+        return this.strategies[fileName] ?? this.strategies[filePath] ?? 'overwrite';
     }
-    /**
-     * 合并文件
-     */
-    merge(templatePath, currentPath, targetPath) {
+    async merge(templatePath, currentPath, targetPath) {
         const strategy = this.getStrategy(targetPath);
         const fileName = path.basename(targetPath);
-        switch (strategy) {
-            case 'skip':
-                return { success: false, message: '已跳过' };
-            case 'smart':
-                return this.smartMerge(templatePath, currentPath, targetPath, fileName);
-            case 'overwrite':
-            default:
-                platform_1.platform.copyFile(templatePath, targetPath);
-                return { success: true, message: '已覆盖' };
-        }
+        if (strategy === 'skip')
+            return { success: false, message: '已跳过' };
+        if (strategy === 'smart')
+            return this.smartMerge(templatePath, currentPath, targetPath, fileName);
+        // overwrite
+        platform_1.platform.copyFile(templatePath, targetPath);
+        return { success: true, message: '已覆盖' };
     }
-    /**
-     * 智能合并
-     */
-    smartMerge(templatePath, currentPath, targetPath, fileName) {
-        // 如果当前文件不存在，直接复制
-        if (!require('fs').existsSync(currentPath)) {
+    async smartMerge(templatePath, currentPath, targetPath, fileName) {
+        const exists = await fs.promises.access(currentPath).then(() => true).catch(() => false);
+        if (!exists) {
             platform_1.platform.copyFile(templatePath, targetPath);
             return { success: true, message: '已创建' };
         }
-        // 根据文件类型选择合并方式
-        if (fileName === 'package.json') {
+        if (fileName === 'package.json')
             return this.mergePackageJson(templatePath, currentPath, targetPath);
-        }
-        if (fileName.endsWith('.json')) {
+        if (fileName.endsWith('.json'))
             return this.mergeJson(templatePath, currentPath, targetPath);
-        }
-        // 默认覆盖
         platform_1.platform.copyFile(templatePath, targetPath);
         return { success: true, message: '已覆盖' };
     }
-    /**
-     * 合并 package.json
-     */
-    mergePackageJson(templatePath, currentPath, targetPath) {
+    async mergePackageJson(templatePath, currentPath, targetPath) {
         try {
-            const template = platform_1.platform.readJson(templatePath);
-            const current = platform_1.platform.readJson(currentPath);
+            const [template, current] = await Promise.all([
+                platform_1.platform.readJsonAsync(templatePath),
+                platform_1.platform.readJsonAsync(currentPath)
+            ]);
             if (!template || !current) {
                 platform_1.platform.copyFile(templatePath, targetPath);
                 return { success: true, message: '已覆盖 (无法解析)' };
             }
-            // 智能合并
             const merged = {
-                // 保留当前项目的基本信息
-                name: current.name || template.name,
-                version: current.version || template.version,
-                description: current.description || template.description,
-                author: current.author || template.author,
-                license: current.license || template.license,
-                repository: current.repository || template.repository,
-                homepage: current.homepage || template.homepage,
-                bugs: current.bugs || template.bugs,
-                keywords: current.keywords || template.keywords,
-                // 使用模板的配置
-                type: template.type || current.type,
-                main: template.main || current.main,
-                module: template.module || current.module,
-                types: template.types || current.types,
-                exports: template.exports || current.exports,
-                bin: template.bin || current.bin,
-                files: template.files || current.files,
-                engines: template.engines || current.engines,
-                // 合并脚本 (模板优先)
-                scripts: {
-                    ...(current.scripts || {}),
-                    ...(template.scripts || {})
-                },
-                // 合并依赖 (模板版本优先)
-                dependencies: {
-                    ...(current.dependencies || {}),
-                    ...(template.dependencies || {})
-                },
-                devDependencies: {
-                    ...(current.devDependencies || {}),
-                    ...(template.devDependencies || {})
-                },
-                peerDependencies: {
-                    ...(current.peerDependencies || {}),
-                    ...(template.peerDependencies || {})
-                },
-                optionalDependencies: {
-                    ...(current.optionalDependencies || {}),
-                    ...(template.optionalDependencies || {})
-                }
+                name: current.name ?? template.name,
+                version: current.version ?? template.version,
+                description: current.description ?? template.description,
+                author: current.author ?? template.author,
+                license: current.license ?? template.license,
+                repository: current.repository ?? template.repository,
+                homepage: current.homepage ?? template.homepage,
+                bugs: current.bugs ?? template.bugs,
+                keywords: current.keywords ?? template.keywords,
+                type: template.type ?? current.type,
+                main: template.main ?? current.main,
+                module: template.module ?? current.module,
+                types: template.types ?? current.types,
+                exports: template.exports ?? current.exports,
+                bin: template.bin ?? current.bin,
+                files: template.files ?? current.files,
+                engines: template.engines ?? current.engines,
+                scripts: { ...(current.scripts ?? {}), ...(template.scripts ?? {}) },
+                dependencies: { ...(current.dependencies ?? {}), ...(template.dependencies ?? {}) },
+                devDependencies: { ...(current.devDependencies ?? {}), ...(template.devDependencies ?? {}) },
+                peerDependencies: { ...(current.peerDependencies ?? {}), ...(template.peerDependencies ?? {}) },
+                optionalDependencies: { ...(current.optionalDependencies ?? {}), ...(template.optionalDependencies ?? {}) }
             };
-            // 复制其他字段
             for (const key of Object.keys(template)) {
-                if (!(key in merged)) {
+                if (!(key in merged))
                     merged[key] = template[key];
-                }
             }
             // 清理空对象
             for (const key of Object.keys(merged)) {
-                const value = merged[key];
-                if (value && typeof value === 'object' && Object.keys(value).length === 0) {
+                const v = merged[key];
+                if (v && typeof v === 'object' && !Array.isArray(v) && Object.keys(v).length === 0) {
                     delete merged[key];
                 }
             }
             platform_1.platform.writeJson(targetPath, merged);
             return { success: true, message: '已智能合并' };
         }
-        catch (error) {
+        catch {
             platform_1.platform.copyFile(templatePath, targetPath);
             return { success: true, message: '已覆盖 (合并失败)' };
         }
     }
-    /**
-     * 合并普通 JSON 文件
-     */
-    mergeJson(templatePath, currentPath, targetPath) {
+    async mergeJson(templatePath, currentPath, targetPath) {
         try {
-            const template = platform_1.platform.readJson(templatePath);
-            const current = platform_1.platform.readJson(currentPath);
+            const [template, current] = await Promise.all([
+                platform_1.platform.readJsonAsync(templatePath),
+                platform_1.platform.readJsonAsync(currentPath)
+            ]);
             if (!template || !current) {
                 platform_1.platform.copyFile(templatePath, targetPath);
                 return { success: true, message: '已覆盖' };
             }
-            // 深度合并
-            const merged = this.deepMerge(current, template);
-            platform_1.platform.writeJson(targetPath, merged);
+            platform_1.platform.writeJson(targetPath, this.deepMerge(current, template));
             return { success: true, message: '已合并' };
         }
         catch {
@@ -190,34 +145,21 @@ class Merger {
             return { success: true, message: '已覆盖' };
         }
     }
-    /**
-     * 深度合并对象
-     */
     deepMerge(target, source) {
         const result = { ...target };
         for (const key of Object.keys(source)) {
-            const sourceValue = source[key];
-            const targetValue = target[key];
-            if (sourceValue &&
-                typeof sourceValue === 'object' &&
-                !Array.isArray(sourceValue) &&
-                targetValue &&
-                typeof targetValue === 'object' &&
-                !Array.isArray(targetValue)) {
-                result[key] = this.deepMerge(targetValue, sourceValue);
+            const s = source[key], t = target[key];
+            if (s && typeof s === 'object' && !Array.isArray(s) && t && typeof t === 'object' && !Array.isArray(t)) {
+                result[key] = this.deepMerge(t, s);
             }
             else {
-                result[key] = sourceValue;
+                result[key] = s;
             }
         }
         return result;
     }
-    /**
-     * 设置合并策略
-     */
     setStrategy(pattern, strategy) {
         this.strategies[pattern] = strategy;
     }
 }
 exports.Merger = Merger;
-//# sourceMappingURL=merger.js.map