@zhaoshijun/compress 1.1.2 → 1.1.4

package/package.json

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

package/src/core/compressor.js

@@ -36,8 +36,8 @@ export async function compressImage(input, options, filePath) {
   const format = resizedMetadata.format;
   
   // 先添加水印（如果需要）
-  if (options.watermark && options.watermark.text) {
-    const watermarkedBuffer = await addWatermark(instance, options.watermark);
+  if (options.watermark && options.watermark.text && options.watermark.text.trim() !== '') {
+    const watermarkedBuffer = await addWatermark(instance, options.watermark, resizedMetadata);
     instance = sharp(watermarkedBuffer);
   }
 

package/src/core/watermark.js

@@ -101,10 +101,15 @@ async function createTiledWatermark(width, height, text, options) {
     }
   })
   .composite(composites)
-  .extract({ left: 0, top: 0, width, height })
+  .extract({ left: 0, top: 0, width: Math.min(tiledWidth, width), height: Math.min(tiledHeight, height) })
   .png()
   .toBuffer();
   
+  const finalMeta = await sharp(tiledWatermark).metadata();
+  if (finalMeta.width !== width || finalMeta.height !== height) {
+    console.error(`Watermark size mismatch: expected ${width}x${height}, got ${finalMeta.width}x${finalMeta.height}`);
+  }
+  
   return tiledWatermark;
 }
 
@@ -117,9 +122,10 @@ 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 {Object} [providedMetadata] - 提供的 metadata（避免重复获取）
  * @returns {Promise<Buffer>} 添加水印后的图片 Buffer
  */
-export async function addWatermark(sharpInstance, watermarkOptions) {
+export async function addWatermark(sharpInstance, watermarkOptions, providedMetadata) {
   const { text, opacity = 0.5, density = 3, color = '#ffffff', fontSize = 24 } = watermarkOptions;
   
   if (!text) {
@@ -134,7 +140,7 @@ export async function addWatermark(sharpInstance, watermarkOptions) {
     throw new Error('Density must be between 1 and 10');
   }
   
-  const metadata = await sharpInstance.metadata();
+  const metadata = providedMetadata || await sharpInstance.metadata();
   
   const watermarkBuffer = await createTiledWatermark(
     metadata.width,