xw-devtool-cli 1.0.41 → 1.0.42

package/README.md

@@ -13,6 +13,7 @@
   - **图片格式转换**：支持 PNG、JPG、WebP、ICO 格式互转，可调整压缩质量。生成 ICO 时支持自定义尺寸（逗号分隔），留空则默认生成 `256` 尺寸。输出文件名默认带时间戳，避免覆盖。
   - **图片 ↔ Base64**：支持图片转 Base64 字符串，以及 Base64 还原为图片文件。
   - **图片分割**：支持网格等分（自定义行/列数）或自定义分割线（像素/百分比），自动生成分割后的图片文件。
+  - **图片拼接**：支持“选择目录”或“选择多张图片”两种输入方式；在对话框中可一次多选多张图片，可选**水平拼接**或**垂直拼接**，输出支持选择指定目录（对话框或手动输入），默认输出文件名带时间戳并自动复制输出路径。
   - **图片主色识别**：提取图片主色调（Hex/RGB/HSL/HSV），默认复制 Hex 到剪贴板，支持保存详细信息到文件。
   - **颜色吸取**：从图片中吸取单像素颜色或区域平均颜色，支持 px/% 坐标输入，结果显示颜色条并自动复制 Hex/Hex8。
   - **屏幕取色**：实时显示鼠标所在位置的颜色值（Hex/RGB）。

package/README_EN.md

@@ -13,6 +13,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
   - **Format Conversion**: Convert between PNG, JPG, WebP, with adjustable compression quality.
   - **Image ↔ Base64**: Convert images to Base64 strings and vice versa.
   - **Image Splitter**: Split images into grid (rows/cols) or custom split lines (pixels/percentage).
+  - **Image Merger**: Supports two input modes (folder or multiple images); the dialog mode supports selecting multiple images at once. You can choose **horizontal** or **vertical** merge, and choose a specific output directory (dialog or manual input). Default output filename includes timestamp, and output path is copied to clipboard.
   - **Placeholder Image**: Quickly generate placeholder images with custom size, color, and text.
   - **Color Picker**: Pick a single pixel color or area average from an image; supports px/% coordinates; shows preview bar and auto-copies Hex/Hex8.
   - **Screen Picker**: Pick color directly from the screen at the mouse position; move the cursor and press Enter to sample; supports alpha preview.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",
@@ -54,6 +54,9 @@
     "screen-mark",
     "pixel-distance",
     "image-compress",
+    "image-merge",
+    "merge-images",
+    "image-stitch",
     "png-compress",
     "jpg-compress",
     "webp-compress",

package/src/commands/imgMerge.js

@@ -0,0 +1,285 @@
+import fs from 'fs';
+import path from 'path';
+import inquirer from 'inquirer';
+import sharp from 'sharp';
+import i18next from '../i18n.js';
+import { selectFromMenu } from '../utils/menu.js';
+import { selectFiles, selectFolder } from '../utils/fileDialog.js';
+import { copy } from '../utils/clipboard.js';
+import { defaultFileName } from '../utils/output.js';
+
+const SUPPORTED_EXT = new Set(['.png', '.jpg', '.jpeg', '.webp', '.bmp', '.tif', '.tiff', '.gif']);
+
+function isImageFile(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    return SUPPORTED_EXT.has(ext);
+}
+
+function listImagesInDir(dir) {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    return entries
+        .filter((entry) => entry.isFile() && isImageFile(entry.name))
+        .map((entry) => path.join(dir, entry.name))
+        .sort((a, b) => path.basename(a).localeCompare(path.basename(b), undefined, { numeric: true, sensitivity: 'base' }));
+}
+
+function parseManualImagePaths(input) {
+    return Array.from(new Set(
+        input
+            .split(/[\r\n,]+/)
+            .map((p) => p.trim())
+            .filter(Boolean)
+    ));
+}
+
+async function pickFolderPath() {
+    const method = await selectFromMenu(
+        i18next.t('imgMerge.inputMethod'),
+        [
+            { name: i18next.t('imgMerge.folderDialog'), value: 'dialog' },
+            { name: i18next.t('imgMerge.folderManual'), value: 'manual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (method === '__BACK__') return null;
+
+    if (method === 'dialog') {
+        const selected = selectFolder();
+        if (!selected) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickFolderPath();
+        }
+        return selected;
+    }
+
+    const { folderPath } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'folderPath',
+            message: i18next.t('imgMerge.enterFolderPath'),
+            validate: (input) => {
+                if (!fs.existsSync(input)) return i18next.t('imgMerge.notExist');
+                if (!fs.statSync(input).isDirectory()) return i18next.t('imgMerge.notDirectory');
+                return true;
+            }
+        }
+    ]);
+    return folderPath;
+}
+
+async function pickMultiImageFiles() {
+    const method = await selectFromMenu(
+        i18next.t('imgMerge.inputMethod'),
+        [
+            { name: i18next.t('imgMerge.multiDialog'), value: 'dialog' },
+            { name: i18next.t('imgMerge.multiManual'), value: 'manual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (method === '__BACK__') return null;
+
+    if (method === 'dialog') {
+        const files = selectFiles('Image Files|*.png;*.jpg;*.jpeg;*.webp;*.bmp;*.tif;*.tiff;*.gif|All Files|*.*');
+        if (!files || files.length === 0) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickMultiImageFiles();
+        }
+        return Array.from(new Set(files));
+    }
+
+    const { filesInput } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'filesInput',
+            message: i18next.t('imgMerge.enterImagePaths')
+        }
+    ]);
+    return parseManualImagePaths(filesInput);
+}
+
+async function pickOutputPath(baseDir) {
+    const outputMethod = await selectFromMenu(
+        i18next.t('imgMerge.selectOutput'),
+        [
+            { name: i18next.t('imgMerge.outputDefault'), value: 'default' },
+            { name: i18next.t('imgMerge.outputFolderDialog'), value: 'folderDialog' },
+            { name: i18next.t('imgMerge.outputFolderManual'), value: 'folderManual' },
+            { name: i18next.t('imgMerge.outputFileManual'), value: 'fileManual' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (outputMethod === '__BACK__') return null;
+
+    if (outputMethod === 'default') {
+        return path.join(baseDir, defaultFileName('img-merge', 'png'));
+    }
+
+    if (outputMethod === 'folderDialog') {
+        const selected = selectFolder();
+        if (!selected) {
+            console.log(i18next.t('imgMerge.dialogFail'));
+            return await pickOutputPath(baseDir);
+        }
+        return path.join(selected, defaultFileName('img-merge', 'png'));
+    }
+
+    if (outputMethod === 'folderManual') {
+        const { outputDir } = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'outputDir',
+                message: i18next.t('imgMerge.enterOutputDir'),
+                default: baseDir,
+                validate: (input) => {
+                    const dir = input.trim();
+                    if (!dir) return i18next.t('imgMerge.outputPathRequired');
+                    if (fs.existsSync(dir) && !fs.statSync(dir).isDirectory()) {
+                        return i18next.t('imgMerge.notDirectory');
+                    }
+                    return true;
+                }
+            }
+        ]);
+        return path.join(outputDir.trim(), defaultFileName('img-merge', 'png'));
+    }
+
+    const defaultPath = path.join(baseDir, defaultFileName('img-merge', 'png'));
+    const { outputPath } = await inquirer.prompt([
+        {
+            type: 'input',
+            name: 'outputPath',
+            message: i18next.t('imgMerge.outputPathPrompt'),
+            default: defaultPath,
+            validate: (input) => input.trim() ? true : i18next.t('imgMerge.outputPathRequired')
+        }
+    ]);
+    return outputPath.trim();
+}
+
+function validateImageFiles(files) {
+    if (!files || files.length < 2) {
+        return i18next.t('imgMerge.needAtLeastTwo');
+    }
+    for (const filePath of files) {
+        if (!fs.existsSync(filePath)) {
+            return `${i18next.t('imgMerge.notExist')}: ${filePath}`;
+        }
+        if (!fs.statSync(filePath).isFile()) {
+            return `${i18next.t('imgMerge.notFile')}: ${filePath}`;
+        }
+        if (!isImageFile(filePath)) {
+            return `${i18next.t('imgMerge.notImage')}: ${filePath}`;
+        }
+    }
+    return true;
+}
+
+async function mergeImages(files, direction, outputPath) {
+    const metas = await Promise.all(files.map(async (filePath) => {
+        const image = sharp(filePath).rotate();
+        const metadata = await image.metadata();
+        const buffer = await image.toBuffer();
+        return { filePath, metadata, buffer };
+    }));
+
+    const widths = metas.map((m) => m.metadata.width || 0);
+    const heights = metas.map((m) => m.metadata.height || 0);
+    if (widths.some((w) => w <= 0) || heights.some((h) => h <= 0)) {
+        throw new Error(i18next.t('imgMerge.invalidImageSize'));
+    }
+
+    const isHorizontal = direction === 'horizontal';
+    const canvasWidth = isHorizontal ? widths.reduce((sum, w) => sum + w, 0) : Math.max(...widths);
+    const canvasHeight = isHorizontal ? Math.max(...heights) : heights.reduce((sum, h) => sum + h, 0);
+
+    let offsetX = 0;
+    let offsetY = 0;
+    const composite = metas.map((meta, index) => {
+        const item = {
+            input: meta.buffer,
+            left: offsetX,
+            top: offsetY
+        };
+        if (isHorizontal) {
+            offsetX += widths[index];
+        } else {
+            offsetY += heights[index];
+        }
+        return item;
+    });
+
+    fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+
+    await sharp({
+        create: {
+            width: canvasWidth,
+            height: canvasHeight,
+            channels: 4,
+            background: { r: 255, g: 255, b: 255, alpha: 1 }
+        }
+    })
+        .composite(composite)
+        .png()
+        .toFile(outputPath);
+}
+
+export async function imgMergeHandler() {
+    const sourceType = await selectFromMenu(
+        i18next.t('imgMerge.selectSource'),
+        [
+            { name: i18next.t('imgMerge.sourceFolder'), value: 'folder' },
+            { name: i18next.t('imgMerge.sourceMulti'), value: 'multi' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (sourceType === '__BACK__') return;
+
+    let files = [];
+    let baseDir = process.cwd();
+    if (sourceType === 'folder') {
+        const folderPath = await pickFolderPath();
+        if (!folderPath) return;
+        baseDir = folderPath;
+        files = listImagesInDir(folderPath);
+    } else {
+        const selectedFiles = await pickMultiImageFiles();
+        if (!selectedFiles) return;
+        files = selectedFiles;
+        if (files.length > 0) {
+            baseDir = path.dirname(files[0]);
+        }
+    }
+
+    const validationResult = validateImageFiles(files);
+    if (validationResult !== true) {
+        console.log(validationResult);
+        return;
+    }
+
+    const direction = await selectFromMenu(
+        i18next.t('imgMerge.selectDirection'),
+        [
+            { name: i18next.t('imgMerge.horizontal'), value: 'horizontal' },
+            { name: i18next.t('imgMerge.vertical'), value: 'vertical' }
+        ],
+        true,
+        i18next.t('common.back')
+    );
+    if (direction === '__BACK__') return;
+
+    const outputPath = await pickOutputPath(baseDir);
+    if (!outputPath) return;
+
+    try {
+        await mergeImages(files, direction, outputPath);
+        console.log(i18next.t('imgMerge.success', { outputPath }));
+        await copy(outputPath);
+        console.log(i18next.t('imgMerge.copied', { outputPath }));
+    } catch (error) {
+        console.error(i18next.t('imgMerge.error', { message: error.message }));
+    }
+}

package/src/index.js

@@ -11,6 +11,7 @@ import { unicodeHandler } from './commands/unicode.js';
 import { imgBase64Handler } from './commands/imgBase64.js';
 import { imgConvertHandler } from './commands/imgConvert.js';
 import { imgSplitHandler } from './commands/imgSplit.js';
+import { imgMergeHandler } from './commands/imgMerge.js';
 import { timeFormatHandler } from './commands/timeFormat.js';
 import { timeCalcHandler } from './commands/timeCalc.js';
 import { mockHandler } from './commands/mock.js';
@@ -58,6 +59,7 @@ function getFeatures() {
         { name: i18next.t('menu.features.imgBase64'), value: 'imgBase64' },
         { name: i18next.t('menu.features.imgConvert'), value: 'imgConvert' },
         { name: i18next.t('menu.features.imgSplit'), value: 'imgSplit' },
+        { name: i18next.t('menu.features.imgMerge'), value: 'imgMerge' },
         { name: i18next.t('menu.features.dominantColor'), value: 'dominantColor' },
         { name: i18next.t('menu.features.colorPick'), value: 'colorPick' },
         { name: i18next.t('menu.features.crosshair'), value: 'crosshair' },
@@ -282,6 +284,9 @@ async function handleAction(action) {
         case 'imgSplit':
             await imgSplitHandler();
             break;
+        case 'imgMerge':
+            await imgMergeHandler();
+            break;
         case 'dominantColor':
             await dominantColorHandler();
             break;

package/src/locales/en.js

@@ -41,6 +41,7 @@ export default {
             imgBase64: 'Image <-> Base64',
             imgConvert: 'Image Format Convert',
             imgSplit: 'Image Splitter',
+            imgMerge: 'Image Merger',
             dominantColor: 'Image Dominant Color',
             colorPick: 'Color Picker',
             crosshair: 'Screen Crosshair',
@@ -156,6 +157,42 @@ export default {
         vLines: 'Vertical split lines (e.g. 10 20 30 or 10% 20%):',
         success: 'Successfully split image into {{count}} parts. Saved to {{path}}'
     },
+    imgMerge: {
+        selectSource: 'Select image source',
+        sourceFolder: 'Use images from a folder',
+        sourceMulti: 'Select multiple images',
+        inputMethod: 'Select input method',
+        folderDialog: 'Select folder (dialog)',
+        folderManual: 'Enter folder path manually',
+        multiDialog: 'Select multiple images (dialog)',
+        multiManual: 'Enter multiple image paths manually',
+        continueAdd: 'Continue adding images?',
+        yes: 'Yes',
+        no: 'No',
+        enterFolderPath: 'Enter image folder path:',
+        enterImagePaths: 'Enter image paths (comma or newline separated):',
+        notExist: 'Path does not exist',
+        notDirectory: 'The path is not a folder',
+        notFile: 'The path is not a file',
+        notImage: 'The file is not a supported image format',
+        needAtLeastTwo: 'At least 2 images are required for merging.',
+        dialogFail: 'Dialog is unavailable or canceled. Please retry or use manual input.',
+        selectDirection: 'Select merge direction',
+        horizontal: 'Horizontal merge (left to right)',
+        vertical: 'Vertical merge (top to bottom)',
+        selectOutput: 'Select output mode',
+        outputDefault: 'Default output to input directory',
+        outputFolderDialog: 'Select output directory (dialog)',
+        outputFolderManual: 'Enter output directory manually',
+        outputFileManual: 'Enter full output file path manually',
+        enterOutputDir: 'Enter output directory path:',
+        outputPathPrompt: 'Enter output file path:',
+        outputPathRequired: 'Output file path cannot be empty.',
+        invalidImageSize: 'One or more images have invalid dimensions.',
+        success: 'Merge completed. Output saved to: {{outputPath}}',
+        copied: 'Output path copied to clipboard: {{outputPath}}',
+        error: 'Merge failed: {{message}}'
+    },
     imgCompress: {
         selectSource: 'Select input method',
         sourceFileDialog: 'Select file (dialog)',

package/src/locales/zh.js

@@ -41,6 +41,7 @@ export default {
             imgBase64: '图片 <-> Base64',
             imgConvert: '图片格式转换',
             imgSplit: '图片分割工具',
+            imgMerge: '图片拼接工具',
             dominantColor: '图片主色识别',
             colorPick: '颜色吸取',
             crosshair: '全屏十字辅助线',
@@ -156,6 +157,42 @@ export default {
         vLines: '垂直分割线 (例如 10 20 30 或 10% 20%):',
         success: '成功将图片分割为 {{count}} 份。保存至 {{path}}'
     },
+    imgMerge: {
+        selectSource: '选择图片来源',
+        sourceFolder: '选择目录中的图片',
+        sourceMulti: '选择多张图片',
+        inputMethod: '选择输入方式',
+        folderDialog: '选择文件夹（对话框）',
+        folderManual: '手动输入文件夹路径',
+        multiDialog: '多选图片（对话框）',
+        multiManual: '手动输入多张图片路径',
+        continueAdd: '是否继续添加图片',
+        yes: '是',
+        no: '否',
+        enterFolderPath: '请输入图片目录路径:',
+        enterImagePaths: '请输入图片路径（可用逗号或换行分隔）:',
+        notExist: '路径不存在',
+        notDirectory: '输入路径不是文件夹',
+        notFile: '输入路径不是文件',
+        notImage: '文件不是支持的图片格式',
+        needAtLeastTwo: '至少需要 2 张图片才能拼接。',
+        dialogFail: '对话框不可用或已取消，请重试或改用手动输入。',
+        selectDirection: '选择拼接方向',
+        horizontal: '水平拼接（从左到右）',
+        vertical: '垂直拼接（从上到下）',
+        selectOutput: '选择输出方式',
+        outputDefault: '默认输出到输入目录',
+        outputFolderDialog: '选择输出目录（对话框）',
+        outputFolderManual: '手动输入输出目录',
+        outputFileManual: '手动输入完整输出文件路径',
+        enterOutputDir: '请输入输出目录路径:',
+        outputPathPrompt: '请输入输出文件路径:',
+        outputPathRequired: '输出文件路径不能为空。',
+        invalidImageSize: '存在无法读取尺寸的图片文件。',
+        success: '拼接完成，已输出到：{{outputPath}}',
+        copied: '输出路径已复制到剪贴板：{{outputPath}}',
+        error: '拼接失败：{{message}}'
+    },
     imgCompress: {
         selectSource: '选择输入方式',
         sourceFileDialog: '选择文件（对话框）',

package/src/utils/fileDialog.js

@@ -16,6 +16,21 @@ export function selectFile(filter = 'All Files|*.*') {
     }
 }
 
+export function selectFiles(filter = 'All Files|*.*') {
+    if (!isWindows()) return null;
+    try {
+        const cmd = `powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; $fd = New-Object System.Windows.Forms.OpenFileDialog; $fd.Filter='${filter.replace(/"/g, '\\"')}'; $fd.Multiselect=$true; if($fd.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK){ $json = ConvertTo-Json @($fd.FileNames) -Compress; $bytes = [System.Text.Encoding]::UTF8.GetBytes($json); Write-Output ([Convert]::ToBase64String($bytes)) }"`;
+        const buf = execSync(cmd, { stdio: ['pipe', 'pipe', 'ignore'] });
+        const output = Buffer.isBuffer(buf) ? buf.toString('utf8').trim() : String(buf).trim();
+        if (!output) return null;
+        const parsed = JSON.parse(Buffer.from(output, 'base64').toString('utf8'));
+        if (!Array.isArray(parsed)) return null;
+        return parsed;
+    } catch {
+        return null;
+    }
+}
+
 export function saveFile(defaultName = 'output.txt', filter = 'All Files|*.*') {
     if (!isWindows()) return null;
     try {