@zhaoshijun/compress 1.0.2 → 1.0.4

package/bin/compress.js

@@ -12,13 +12,16 @@ import { loadConfig } from '../src/config/loader.js';
 import { compressImage } 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';
+const require = createRequire(import.meta.url);
+const packageJson = require('../package.json');
 
 const program = new Command();
 
 program
   .name('compress')
   .description('Image compression CLI tool')
-  .version('1.0.0');
+  .version(packageJson.version);
 
 program
   .option('-c, --config <path>', '配置文件路径')

package/package.json

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

package/src/core/compressor.js

@@ -65,7 +65,7 @@ export async function compressImage(input, options, filePath) {
   let result = await instance.toBuffer();
 
   if (options.watermark && options.watermark.text) {
-    result = await addWatermark(result, options.watermark);
+    result = await addWatermark(result, options.watermark, format, options);
   }
 
   return result;

package/src/core/watermark.js

@@ -117,9 +117,11 @@ async function createTiledWatermark(width, height, text, options) {
  * @param {number} [watermarkOptions.density=3] - 水印密度 (1-10)
  * @param {string} [watermarkOptions.color='#ffffff'] - 水印颜色
  * @param {number} [watermarkOptions.fontSize=24] - 字体大小
+ * @param {string} originalFormat - 原始图片格式
+ * @param {Object} compressOptions - 压缩选项
  * @returns {Promise<Buffer>} 添加水印后的图片 Buffer
  */
-export async function addWatermark(input, watermarkOptions) {
+export async function addWatermark(input, watermarkOptions, originalFormat, compressOptions) {
   const { text, opacity = 0.5, density = 3, color = '#ffffff', fontSize = 24 } = watermarkOptions;
   
   if (!text) {
@@ -144,9 +146,31 @@ export async function addWatermark(input, watermarkOptions) {
     { opacity, density, color, fontSize }
   );
   
-  const result = await image
+  let result = await image
     .composite([{ input: watermarkBuffer, blend: 'over' }])
     .toBuffer();
   
+  // 根据原始格式重新压缩，避免 PNG 水印导致体积增大
+  if (originalFormat && originalFormat !== metadata.format) {
+    const sharpInstance = sharp(result);
+    
+    switch (originalFormat) {
+      case 'jpeg':
+      case 'jpg':
+        result = await sharpInstance.jpeg({ quality: compressOptions?.quality || 88 }).toBuffer();
+        break;
+      case 'webp':
+        result = await sharpInstance.webp({ quality: compressOptions?.quality || 88 }).toBuffer();
+        break;
+      case 'png':
+        result = await sharpInstance.png({
+          compressionLevel: compressOptions?.pngOptions?.compressionLevel ?? 9,
+          palette: compressOptions?.pngOptions?.palette ?? true,
+          quality: compressOptions?.quality
+        }).toBuffer();
+        break;
+    }
+  }
+  
   return result;
 }