package.json

@@ -1,6 +1,6 @@
 {
     "name": "image-speech-bubble-transformer",
-    "version": "1.1.0",
+    "version": "1.0.3",
     "description": "TypeScript library for applying speech bubble effects to images",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

src/index.ts

@@ -1,8 +1,8 @@
-import { mkdir, writeFile } from "fs/promises";
+import { PathLike } from "fs";
-import * as path from "path";
+import fs from "fs/promises";
+import path from "path";
 import sharp from "sharp";
 
-// Supported image formats
 const SUPPORTED_FORMATS = [
   ".png",
   ".jpg",
@@ -13,7 +13,6 @@ const SUPPORTED_FORMATS = [
   ".tiff",
 ];
 
-// Orientation types
 export enum Orientation {
   TOP = 1,
   LEFT = 2,
@@ -21,7 +20,6 @@ export enum Orientation {
   RIGHT = 4,
 }
 
-// Interface for library options
 export interface SpeechBubbleOptions {
   mirror?: boolean;
   orientation?: Orientation;
@@ -87,44 +85,44 @@ export class ImageSpeechBubbleTransformer {
     inputBuffer: Buffer,
     options: SpeechBubbleOptions = {}
   ): Promise<Buffer> {
-    // Validate input
     if (!inputBuffer) {
       throw new Error("Input buffer is required");
     }
 
-    // Use default speech bubble path if not provided
     const speechBubblePath =
       options.speechBubblePath || this.defaultSpeechBubblePath;
 
-    // Check file formats
     this.checkFileFormat(speechBubblePath);
 
-    // Get input image metadata
+    const speechBubbleBuffer = await sharp(speechBubblePath).toBuffer();
-    const inputMetadata = await sharp(inputBuffer).metadata();
 
-    // Read and resize speech bubble to match input image
-    const speechBubbleBuffer = await sharp(speechBubblePath)
-      .resize({
-        width: inputMetadata.width,
-        height: inputMetadata.height,
-        fit: sharp.fit.cover,
-        position: sharp.strategy.entropy,
-      })
-      .toBuffer();
-
-    // Process main image
     const processedImage = await sharp(inputBuffer)
-      .ensureAlpha() // Ensure alpha channel
+      .ensureAlpha()
-      .composite([
+      .metadata()
-        {
+      .then(async (metadata) => {
-          input: await this.transformImage(speechBubbleBuffer, {
+        // match image size
+        const resizedSpeechBubble = await sharp(speechBubbleBuffer)
+          .resize(metadata.width, metadata.height)
+          .toBuffer();
+
+        const transformedSpeechBubble = await this.transformImage(
+          resizedSpeechBubble,
+          {
             mirror: options.mirror,
             orientation: options.orientation,
-          }),
+          }
-          blend: "xor",
+        );
-        },
+
-      ])
+        // subtract speech bubble
-      .toBuffer();
+        return sharp(inputBuffer)
+          .composite([
+            {
+              input: transformedSpeechBubble,
+              blend: "difference",
+            },
+          ])
+          .toBuffer();
+      });
 
     return processedImage;
   }
@@ -134,11 +132,10 @@ export class ImageSpeechBubbleTransformer {
    */
   async processAndSave(
     inputBuffer: Buffer,
-    outputPath: string,
+    outputPath: PathLike,
     options: SpeechBubbleOptions = {}
   ): Promise<void> {
-    // Check output file format
+    this.checkFileFormat(outputPath.toString());
-    this.checkFileFormat(outputPath);
 
     // Process image
     const processedBuffer = await this.processSpeechBubble(
@@ -146,17 +143,13 @@ export class ImageSpeechBubbleTransformer {
       options
     );
 
-    // Ensure output directory exists
+    const outputDir = path.dirname(outputPath.toString());
-    const outputDir = path.dirname(outputPath);
+    await fs.mkdir(outputDir, { recursive: true });
-    await mkdir(outputDir, { recursive: true });
 
-    // Save processed image
+    await sharp(processedBuffer).toFile(outputPath.toString());
-    await writeFile(outputPath, processedBuffer);
-    console.log(`Image saved at ${path.resolve(outputPath)}`);
   }
 }
 
-// Example usage
 export function createSpeechBubbleTransformer(assetsDir?: string) {
   return new ImageSpeechBubbleTransformer(assetsDir);
 }