@zhaoshijun/compress 1.2.4 → 1.3.0

package/bin/compress.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { Command } from 'commander';
 import chalk from 'chalk';
@@ -9,7 +9,7 @@ import fg from 'fast-glob';
 import prettyBytes from 'pretty-bytes';
 import { MultiBar, Presets } from 'cli-progress';
 import { loadConfig } from '../src/config/loader.js';
-import { compressImage } from '../src/core/compressor.js';
+import { compressImage, addWatermarkOnly } from '../src/core/compressor.js';
 import { DEFAULT_EXCLUDES } from '../src/utils/constants.js';
 import { isSupportedImage as isSupported } from '../src/utils/file-utils.js';
 import { createRequire } from 'module';
@@ -29,21 +29,6 @@ program
   .option('--dry-run', '仅列出将处理的文件，不写入磁盘')
   .option('-q, --quiet', '静默模式，仅输出错误')
   .option('-w, --watermark', '启用水印')
-  .option('--watermark-text <text>', '水印文本')
-  .option('--watermark-opacity <opacity>', '水印透明度 (0-1)', parseFloat)
-  .option('--watermark-density <density>', '水印密度 (1-10)', parseInt)
-  .option('--watermark-color <color>', '水印颜色 (hex 或 rgba)')
-  .option('--watermark-mode <mode>', '水印模式 (text/image/tiled)')
-  .option('--watermark-image <path>', '水印图片路径')
-  .option('--watermark-x <x>', '水印 X 坐标', parseInt)
-  .option('--watermark-y <y>', '水印 Y 坐标', parseInt)
-  .option('--watermark-width <width>', '水印宽度', parseInt)
-  .option('--watermark-height <height>', '水印高度', parseInt)
-  .option('--watermark-position <position>', '水印位置 (top-left/top-right/bottom-left/bottom-right/center)')
-  .option('--watermark-padding <padding>', '水印边距', parseInt)
-  .option('--watermark-angle <angle>', '水印倾斜角度', parseInt)
-  .option('--watermark-spacing-x <spacingX>', '水印水平间隔', parseInt)
-  .option('--watermark-spacing-y <spacingY>', '水印垂直间隔', parseInt)
   .action(async (options) => {
     try {
       const startTime = Date.now();
@@ -54,26 +39,6 @@ program
       // 合并命令行选项
       if (options.backup !== undefined) config.backup = options.backup;
       
-      // 合并水印选项
-      if (options.watermark) {
-        config.watermark = config.watermark || {};
-        if (options.watermarkText) config.watermark.text = options.watermarkText;
-        if (options.watermarkOpacity !== undefined) config.watermark.opacity = options.watermarkOpacity;
-        if (options.watermarkDensity !== undefined) config.watermark.density = options.watermarkDensity;
-        if (options.watermarkColor) config.watermark.color = options.watermarkColor;
-        if (options.watermarkMode) config.watermark.mode = options.watermarkMode;
-        if (options.watermarkImage) config.watermark.imagePath = options.watermarkImage;
-        if (options.watermarkX !== undefined) config.watermark.x = options.watermarkX;
-        if (options.watermarkY !== undefined) config.watermark.y = options.watermarkY;
-        if (options.watermarkWidth !== undefined) config.watermark.width = options.watermarkWidth;
-        if (options.watermarkHeight !== undefined) config.watermark.height = options.watermarkHeight;
-        if (options.watermarkPosition) config.watermark.position = options.watermarkPosition;
-        if (options.watermarkPadding !== undefined) config.watermark.padding = options.watermarkPadding;
-        if (options.watermarkAngle !== undefined) config.watermark.angle = options.watermarkAngle;
-        if (options.watermarkSpacingX !== undefined) config.watermark.spacingX = options.watermarkSpacingX;
-        if (options.watermarkSpacingY !== undefined) config.watermark.spacingY = options.watermarkSpacingY;
-      }
-      
       // 确定输入源
       // 如果 config.input 未定义，则默认为当前目录 '**/*.{jpg,jpeg,png,webp}'
       // 需要结合排除规则
@@ -251,17 +216,25 @@ program
     console.log(chalk.green('Created compress.config.js'));
   });
 
-program.parse();
-
 // Watermark command
 program
   .command('watermark')
   .description('给图片添加水印（不压缩）')
   .option('-c, --config <path>', '配置文件路径')
+  .option('--watermark-mode <mode>', '水印模式 (text/image/tiled)', 'text')
   .option('--watermark-text <text>', '水印文本')
+  .option('--watermark-image <path>', '水印图片路径')
   .option('--watermark-opacity <opacity>', '水印透明度 (0-1)', parseFloat)
   .option('--watermark-density <density>', '水印密度 (1-10)', parseInt)
   .option('--watermark-color <color>', '水印颜色 (hex 或 rgba)')
+  .option('--watermark-font-size <size>', '水印字体大小', parseInt)
+  .option('--watermark-width <width>', '水印图片宽度', parseInt)
+  .option('--watermark-height <height>', '水印图片高度', parseInt)
+  .option('--watermark-position <position>', '水印位置 (top-left/top-right/bottom-left/bottom-right/center/custom)')
+  .option('--watermark-padding <padding>', '水印边距', parseInt)
+  .option('--watermark-angle <angle>', '水印倾斜角度', parseInt)
+  .option('--watermark-spacing-x <spacing>', '水印水平间隔', parseInt)
+  .option('--watermark-spacing-y <spacing>', '水印垂直间隔', parseInt)
   .option('--output <dir>', '输出目录（默认为 ./watermarked）')
   .action(async (options) => {
     try {
@@ -271,13 +244,30 @@ program
       const config = await loadConfig(options.config);
       
       // 合并水印选项
+      if (options.watermarkMode) config.watermark.mode = options.watermarkMode;
       if (options.watermarkText) config.watermark.text = options.watermarkText;
+      if (options.watermarkImage) config.watermark.imagePath = options.watermarkImage;
       if (options.watermarkOpacity !== undefined) config.watermark.opacity = options.watermarkOpacity;
       if (options.watermarkDensity !== undefined) config.watermark.density = options.watermarkDensity;
       if (options.watermarkColor) config.watermark.color = options.watermarkColor;
+      if (options.watermarkFontSize) config.watermark.fontSize = options.watermarkFontSize;
+      if (options.watermarkWidth) config.watermark.width = options.watermarkWidth;
+      if (options.watermarkHeight) config.watermark.height = options.watermarkHeight;
+      if (options.watermarkPosition) config.watermark.position = options.watermarkPosition;
+      if (options.watermarkPadding) config.watermark.padding = options.watermarkPadding;
+      if (options.watermarkAngle) config.watermark.angle = options.watermarkAngle;
+      if (options.watermarkSpacingX) config.watermark.spacingX = options.watermarkSpacingX;
+      if (options.watermarkSpacingY) config.watermark.spacingY = options.watermarkSpacingY;
       
-      if (!config.watermark.text) {
-        console.error(chalk.red('Error: Watermark text is required. Use --watermark-text option or set it in config file.'));
+      // 验证水印配置
+      const mode = config.watermark.mode || 'text';
+      if (mode === 'text' && !config.watermark.text) {
+        console.error(chalk.red('Error: Watermark text is required for text mode. Use --watermark-text option or set it in config file.'));
+        process.exit(1);
+      }
+      
+      if ((mode === 'image' || mode === 'tiled') && !config.watermark.imagePath) {
+        console.error(chalk.red('Error: Watermark image path is required for image/tiled mode. Use --watermark-image option or set it in config file.'));
         process.exit(1);
       }
       
@@ -334,7 +324,7 @@ program
           const outDir = path.join(outputDir, relDir);
           const outFilePath = path.join(outDir, fileName);
           
-          const watermarkedBuffer = await compressImage(file, config, file);
+          const watermarkedBuffer = await addWatermarkOnly(file, config, file);
           
           // 写入文件
           await fs.ensureDir(outDir);
@@ -371,3 +361,5 @@ program
       process.exit(1);
     }
   });
+
+program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhaoshijun/compress",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "Image compression CLI and Vite plugin",
   "type": "module",
   "bin": {

package/src/config/defaults.js

@@ -30,7 +30,7 @@ export const defaultConfig = {
   watermark: {
     mode: 'text',
     text: '',
-    opacity: 0.5,
+    opacity: 1,
     density: 3,
     color: '#ffffff',
     fontSize: 24,

package/src/core/compressor.js

@@ -2,6 +2,57 @@ import sharp from 'sharp';
 import path from 'path';
 import { addWatermark, addImageWatermark, addTiledImageWatermark } from './watermark.js';
 
+/**
+ * 只添加水印（不压缩）
+ * @param {string|Buffer} input - 图片路径或 Buffer
+ * @param {Object} options - 水印配置
+ * @param {string} [filePath] - 原始文件路径 (用于判断格式)
+ * @returns {Promise<Buffer>} 添加水印后的 Buffer
+ */
+export async function addWatermarkOnly(input, options, filePath) {
+  // 初始化 sharp 实例
+  let instance = sharp(input);
+  const metadata = await instance.metadata();
+  
+  // 添加水印
+  if (options.watermark) {
+    // 文本水印
+    if (options.watermark.mode === 'text' || (options.watermark.text && options.watermark.text.trim() !== '')) {
+      const watermarkedBuffer = await addWatermark(instance, options.watermark, metadata);
+      instance = sharp(watermarkedBuffer);
+    }
+    // 单个图片水印
+    else if (options.watermark.mode === 'image' || (options.watermark.imagePath && options.watermark.mode !== 'tiled')) {
+      const watermarkedBuffer = await addImageWatermark(instance, options.watermark);
+      instance = sharp(watermarkedBuffer);
+    }
+    // 平铺图片水印
+    else if (options.watermark.mode === 'tiled' || (options.watermark.imagePath && options.watermark.mode === 'tiled')) {
+      const watermarkedBuffer = await addTiledImageWatermark(instance, options.watermark, metadata);
+      instance = sharp(watermarkedBuffer);
+    }
+  }
+  
+  // 保持原始格式，不进行压缩
+  const format = metadata.format;
+  switch (format) {
+    case 'jpeg':
+    case 'jpg':
+      instance = instance.jpeg({ quality: 100 });
+      break;
+    case 'png':
+      instance = instance.png({ compressionLevel: 0 });
+      break;
+    case 'webp':
+      instance = instance.webp({ quality: 100 });
+      break;
+    default:
+      throw new Error(`Unsupported format: ${format}`);
+  }
+  
+  return instance.toBuffer();
+}
+
 /**
  * 压缩图片
  * @param {string|Buffer} input - 图片路径或 Buffer