xw-devtool-cli 1.0.20 → 1.0.21

package/README.md

@@ -10,7 +10,7 @@
 
 - **Base64 工具**：支持字符串与 Base64 互转，支持从剪贴板、文件或手动输入读取。
 - **图片工具**：
-  - **图片格式转换**：支持 PNG、JPG、WebP 格式互转，可调整压缩质量。
+  - **图片格式转换**：支持 PNG、JPG、WebP、ICO 格式互转，可调整压缩质量。生成 ICO 时支持自定义尺寸（逗号分隔），留空则默认生成 `256` 尺寸。输出文件名默认带时间戳，避免覆盖。
   - **图片 ↔ Base64**：支持图片转 Base64 字符串，以及 Base64 还原为图片文件。
   - **占位图生成**：快速生成指定尺寸、颜色、文字的占位图片 (Placeholder Image)。
 - **Mock 数据生成**：
@@ -116,9 +116,10 @@ s. 设置 (语言)
 ### 2. 图片格式转换
 - 选择 `2` 进入。
 - 选择源图片文件。
-- 选择目标格式 (PNG / JPG / WebP)。
+- 选择目标格式 (PNG / JPG / WebP / ICO)。
 - 设置压缩参数（如 JPG 质量 1-100，PNG 压缩等级 0-9）。
 - 生成的新图片将保存在源文件同级目录。
+- 生成 ICO 时可自定义尺寸，留空默认生成 `256` 尺寸；输出文件名包含时间戳。
 
 ### 3. 占位图生成 (Placeholder Image)
 - 选择 `3` 进入。
@@ -287,7 +288,7 @@ Key features include: Base64 encoding/decoding, image format conversion, image <
 
 - **Base64 Tools**: Convert strings to/from Base64, supports reading from clipboard, file, or manual input.
 - **Image Tools**:
-  - **Format Conversion**: Convert between PNG, JPG, WebP, with adjustable compression quality.
+  - **Format Conversion**: Convert between PNG, JPG, WebP, ICO, with adjustable compression quality. For ICO, you can specify sizes (comma-separated); leave empty to generate `256` size by default. Output filenames include timestamps to avoid overwriting.
   - **Image ↔ Base64**: Convert images to Base64 strings and vice versa.
   - **Placeholder Image**: Quickly generate placeholder images with custom size, color, and text.
 - **Mock Data**:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",
@@ -75,6 +75,7 @@
     "qrcode": "^1.5.4",
     "sharp": "^0.33.5",
     "tinycolor2": "^1.6.0",
-    "uuid": "^13.0.0"
+    "uuid": "^13.0.0",
+    "to-ico": "^1.1.5"
   }
 }

package/src/commands/imgConvert.js

@@ -2,6 +2,7 @@ import inquirer from 'inquirer';
 import fs from 'fs';
 import path from 'path';
 import sharp from 'sharp';
+import toIco from 'to-ico';
 import { selectFromMenu } from '../utils/menu.js';
 import { selectFile, saveFile } from '../utils/fileDialog.js';
 import { defaultFileName } from '../utils/output.js';
@@ -15,7 +16,8 @@ function getExt(p) {
 function suggestOutputPath(inputPath, targetExt) {
     const dir = path.dirname(inputPath);
     const base = path.basename(inputPath, path.extname(inputPath));
-    return path.join(dir, `${base}.${targetExt}`);
+    const ts = Date.now();
+    return path.join(dir, `${base}-${ts}.${targetExt}`);
 }
 
 async function pickInputFile() {
@@ -48,7 +50,8 @@ async function pickTargetFormat(currentExt) {
     const options = [
         { name: 'png', value: 'png' },
         { name: 'jpg', value: 'jpg' },
-        { name: 'webp', value: 'webp' }
+        { name: 'webp', value: 'webp' },
+        { name: 'ico', value: 'ico' }
     ].filter(o => o.value !== currentExt);
     return await selectFromMenu('Target format', options);
 }
@@ -69,6 +72,18 @@ async function pickQuality(targetExt) {
             { type: 'number', name: 'quality', message: 'WebP quality (1-100):', default: 80, validate: n => (n >= 1 && n <= 100) ? true : '1-100' }
         ]);
         return { webpQuality: quality };
+    } else if (targetExt === 'ico') {
+        const { sizesStr } = await inquirer.prompt([
+            { type: 'input', name: 'sizesStr', message: 'Enter ICO sizes (comma-separated). Leave empty for default 256:', default: '' }
+        ]);
+        const defaultSizes = [256];
+        const allowed = new Set([16, 24, 32, 48, 64, 128, 256]);
+        const parsed = (sizesStr || '')
+            .split(',')
+            .map(s => parseInt(s.trim()))
+            .filter(n => Number.isFinite(n) && allowed.has(n));
+        const uniq = Array.from(new Set(parsed));
+        return { icoSizes: uniq.length ? uniq : defaultSizes };
     }
     return {};
 }
@@ -82,7 +97,7 @@ export async function imgConvertHandler() {
     console.log(`Target format: ${targetExt}`);
     const opts = await pickQuality(targetExt);
 
-    let outPath = saveFile(suggestOutputPath(inputPath, targetExt), 'Image Files|*.png;*.jpg;*.jpeg;*.webp|All Files|*.*');
+    let outPath = saveFile(suggestOutputPath(inputPath, targetExt), 'Image Files|*.png;*.jpg;*.jpeg;*.webp;*.ico|All Files|*.*');
     if (!outPath) {
         const def = suggestOutputPath(inputPath, targetExt);
         const ans = await inquirer.prompt([
@@ -93,19 +108,27 @@ export async function imgConvertHandler() {
 
     try {
         fs.mkdirSync(path.dirname(outPath), { recursive: true });
-        let pipeline = sharp(inputPath);
-        if (targetExt === 'png') {
-            pipeline = pipeline.png({ compressionLevel: opts.pngCompressionLevel ?? 6 });
-        } else if (targetExt === 'jpg') {
-            pipeline = pipeline.jpeg({ quality: opts.jpegQuality ?? 80 });
-            if (inputExt !== 'jpg') {
-                pipeline = pipeline.flatten({ background: { r: 255, g: 255, b: 255 } });
+        if (targetExt === 'ico') {
+            const basePng = await sharp(inputPath).ensureAlpha().png().toBuffer();
+            const sizes = opts.icoSizes ?? [16, 24, 32, 48, 64, 128, 256];
+            const icoBuffer = await toIco([basePng], { resize: true, sizes });
+            fs.writeFileSync(outPath, icoBuffer);
+            console.log(`Converted to ICO: ${inputPath} -> ${outPath}`);
+        } else {
+            let pipeline = sharp(inputPath);
+            if (targetExt === 'png') {
+                pipeline = pipeline.png({ compressionLevel: opts.pngCompressionLevel ?? 6 });
+            } else if (targetExt === 'jpg') {
+                pipeline = pipeline.jpeg({ quality: opts.jpegQuality ?? 80 });
+                if (inputExt !== 'jpg') {
+                    pipeline = pipeline.flatten({ background: { r: 255, g: 255, b: 255 } });
+                }
+            } else if (targetExt === 'webp') {
+                pipeline = pipeline.webp({ quality: opts.webpQuality ?? 80 });
             }
-        } else if (targetExt === 'webp') {
-            pipeline = pipeline.webp({ quality: opts.webpQuality ?? 80 });
+            await pipeline.toFile(outPath);
+            console.log(`Converted: ${inputPath} -> ${outPath}`);
         }
-        await pipeline.toFile(outPath);
-        console.log(`Converted: ${inputPath} -> ${outPath}`);
     } catch (e) {
         console.error('Conversion error:', e.message);
     }