pdf-lib-extended 1.0.17 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-lib-extended",
-  "version": "1.0.17",
+  "version": "1.0.20",
   "description": "This project extends the capabilities of the pdf-lib JavaScript library by providing a set of helper functions that simplify common PDF manipulation tasks. It includes utilities for drawing and formatting text, images, and shapes within PDF documents, allowing for more advanced customization and automation. The class-based architecture, designed as a toolkit, ensures that developers can easily integrate these enhanced features into their existing workflows. With this extension, users can streamline the creation of dynamic and complex PDFs with minimal effort.",
   "main": "index.js",
   "repository": {

package/src/PDFLibExtended.js

@@ -464,69 +464,69 @@ class PDFLibExtended {
      * @param {import('pdf-lib').RGB} options.color - The color of the text
      * @param {number} options.opacity - The opacity of the text
      */
-    drawParagraph(text, options = {}) {
-        let defaultOptions = {
+    drawParagraph(pdf, text, options = {}) {
+        const defaultOptions = {
             align: "left",
             range: {
-                left: this.getMargin().left,
-                right: this.getCurrentPage().getWidth() - this.getMargin().right
+            left: pdf.getMargin().left,
+            right: pdf.getCurrentPage().getWidth() - pdf.getMargin().right
             },
-            size: this.getTextSize(),
-            color: this.getColor(),
+            size: pdf.getTextSize(),
+            color: pdf.getColor(),
             opacity: 1,
-            padding: 0,
+            padding: 0,          // extra spacing between lines
             wordWrap: true,
             characterWrap: false,
             ...options
         };
-        if(options.range) this.getCurrentPage().moveTo(defaultOptions.range.left, this.getCurrentPage().getY());
-
-        let maxWidth = defaultOptions.range.right - defaultOptions.range.left;
-        let currentWidth = 0;
-        let currentLine = "";
 
-        if(defaultOptions.wordWrap){
-            text = text.split(" ");
-        }else{
-            text = text.split("");
-        }
+        // Always move to paragraph start (left edge of range)
+        pdf.getCurrentPage().moveTo(defaultOptions.range.left, pdf.getCurrentPage().getY());
 
-        text.forEach((string, i) => {
-            let wordWidth = this.getCurrentFont().widthOfTextAtSize(string, defaultOptions.size);
+        const maxWidth = defaultOptions.range.right - defaultOptions.range.left;
 
-            // Check if adding this word would overflow
-            if (currentWidth + wordWidth > maxWidth) {
-                this.drawText(currentLine.trim(), {
-                    size: defaultOptions.size,
-                    color: defaultOptions.color,
-                    opacity: defaultOptions.opacity,
-                    align: defaultOptions.align,
-                    range: defaultOptions.range
-                });
+        // Tokenize
+        const tokens = defaultOptions.wordWrap ? text.split(" ") : text.split("");
 
-                // Move to the next line
-                this.nextLine(defaultOptions.padding);
-                this.getCurrentPage().moveTo(defaultOptions.range.left, this.getCurrentPage().getY());
-                currentLine = "";
-                currentWidth = 0;
-            }
+        let currentLine = "";
+        let currentWidth = 0;
 
-            if(defaultOptions.wordWrap){
-                currentLine += string + " ";
-            }else{
-                currentLine += string;
+        tokens.forEach((tok, i) => {
+            // Build what we would append for this token on this line
+            const needsSpace = defaultOptions.wordWrap && currentLine.length > 0;
+            const piece = needsSpace ? (" " + tok) : tok;
+
+            // Measure exactly what we plan to add
+            const pieceWidth = pdf.getCurrentFont().widthOfTextAtSize(piece, defaultOptions.size);
+
+            // If this piece would overflow, draw current line and move down
+            if (currentLine && (currentWidth + pieceWidth > maxWidth)) {
+            pdf.drawText(currentLine, {
+                size: defaultOptions.size,
+                color: defaultOptions.color,
+                opacity: defaultOptions.opacity,
+                align: defaultOptions.align,
+                range: defaultOptions.range
+            });
+            pdf.nextLine(defaultOptions.padding);
+            pdf.getCurrentPage().moveTo(defaultOptions.range.left, pdf.getCurrentPage().getY());
+            currentLine = tok; // start new line with the token (no leading space)
+            currentWidth = pdf.getCurrentFont().widthOfTextAtSize(tok, defaultOptions.size);
+            } else {
+            // Safe to add to this line
+            currentLine += piece;
+            currentWidth += pieceWidth;
             }
-            currentWidth += wordWidth;
 
-            // If it's the last word, draw the remaining line
-            if (i === text.length - 1) {
-                this.drawText(currentLine.trim(), {
-                    size: defaultOptions.size,
-                    color: defaultOptions.color,
-                    opacity: defaultOptions.opacity,
-                    align: defaultOptions.align,
-                    range: defaultOptions.range
-                });
+            // Last token: flush
+            if (i === tokens.length - 1 && currentLine) {
+            pdf.drawText(currentLine, {
+                size: defaultOptions.size,
+                color: defaultOptions.color,
+                opacity: defaultOptions.opacity,
+                align: defaultOptions.align,
+                range: defaultOptions.range
+            });
             }
         });
     }
@@ -906,16 +906,27 @@ class PDFLibExtended {
      * @param {base64} base64Image
      * @param {number} imageScale
      */
-    async addImage(x, y, base64Image, imageScale = 1) {
+    async addImage(x, y, base64Image, imageScale = 1, options = {}) {
+        let defaultOptions = {
+            width: null,
+            height: null,
+            borderWidth: 2,
+            ...options
+        };
+
         if (base64Image.includes(",")) base64Image = base64Image.split(",")[1];
         let imageBytes = Uint8Array.from(atob(base64Image), c => c.charCodeAt(0));
         let embeddedImage = await this.getPDF().embedPng(imageBytes);
-        let { width, height } = embeddedImage.scale(imageScale);
+        if(defaultOptions.width == null && defaultOptions.height == null){
+           let { width, height } = embeddedImage.scale(imageScale);
+           defaultOptions.width = width;
+           defaultOptions.height = height;
+        }
         this.getCurrentPage().drawImage(embeddedImage, {
             x: x,
             y: y,
-            width: width,
-            height: height,
+            width: defaultOptions.width,
+            height: defaultOptions.height,
         });
     }