pols-pdf 1.0.2 → 1.1.1

package/dist/index.d.ts

@@ -74,6 +74,10 @@ export type PFont = {
     size: number;
     color: string;
 };
+export type PFontSize = number | `${number}%`;
+export type PFontParams = Omit<PFont, 'size'> & {
+    size: PFontSize;
+};
 export type PImage = {
     filePath: string | Buffer;
     left?: number;
@@ -113,7 +117,7 @@ export type PRectangle = {
 };
 export type PTextParams = {
     chars: string;
-    font?: Partial<PFont>;
+    font?: Partial<PFontParams>;
 };
 type PLetter = {
     char: string;
@@ -145,7 +149,7 @@ export type PCellParams = {
     left?: number;
     top?: number;
     width?: 'auto' | number;
-    font?: Partial<PFont>;
+    font?: Partial<PFontParams>;
     fillColor?: string;
     padding?: PBoundParams;
     border?: PBorderParams;
@@ -161,7 +165,7 @@ export type PCellParams = {
 } & ({
     height: number;
 } | {
-    autojump: true | undefined;
+    autojump?: boolean;
 });
 export type PRow = {
     cells: Omit<PCell, 'autojump'>[];
@@ -191,7 +195,7 @@ export type PRowParams = {
     padding?: PBoundParams;
     border?: PBorderParams;
     radius?: PRadiusParams;
-    font?: Partial<PFont>;
+    font?: Partial<PFontParams>;
     stroke?: {
         width?: number;
         color?: PBorderColorParams;
@@ -209,7 +213,7 @@ export type PTableParams = {
     padding?: PBoundParams;
     border?: PBorderParams;
     radius?: PRadiusParams;
-    font?: Partial<PFont>;
+    font?: Partial<PFontParams>;
     stroke?: {
         width?: number;
         color?: PBorderColorParams;
@@ -251,7 +255,8 @@ export declare class PPdf {
     private capturedFont?;
     private captureFont;
     private restoreFont;
-    setFont(font: Partial<PFont>): void;
+    private resolveFontSize;
+    setFont(font: Partial<PFontParams>): void;
     constructor(params?: {
         title?: string;
         page?: Partial<PPage>;

package/dist/index.js

@@ -47,13 +47,25 @@ class PPdf {
         if (this.capturedFont)
             this.currentFont = this.capturedFont;
     }
+    /* Resuelve un PFontSize a un número absoluto. Un porcentaje ('x%') se calcula sobre `base`,
+    que es siempre el tamaño de fuente activo (this.currentFont.size) antes de aplicar este tamaño. */
+    resolveFontSize(size, base) {
+        if (size == null)
+            return undefined;
+        if (typeof size == 'number')
+            return size;
+        const match = /^(\d+(?:\.\d+)?)%$/.exec(size);
+        if (!match)
+            throw new Error(`Formato de tamaño de fuente inválido: "${size}"`);
+        return base * (Number(match[1]) / 100);
+    }
     /* Establece en el engine la fuente especificada en currentFont */
     setFont(font) {
         const finalFont = {
             name: font.name ?? this.currentFont.name,
             bold: font.bold ?? this.currentFont.bold,
             oblique: font.oblique ?? this.currentFont.oblique,
-            size: font.size ?? this.currentFont.size,
+            size: this.resolveFontSize(font.size, this.currentFont.size) ?? this.currentFont.size,
             color: font.color ?? this.currentFont.color,
         };
         let fontName = this.currentFont.name;
@@ -193,7 +205,7 @@ class PPdf {
                 top: cursorTop,
                 width: usefulWidth,
                 font: params.font,
-                autojump: (params.autojump ?? true) ? true : undefined
+                autojump: params.autojump ?? true
             });
             if (preparedRow.currentPage.cells.some(cell => cell.letters?.length)) {
                 buffer.rows.push(preparedRow.currentPage);
@@ -293,7 +305,7 @@ class PPdf {
                 top: top + padding.top,
                 width: cellWidth,
                 font: cell.font ?? params.font,
-                autojump: (params.autojump ?? true) ? true : undefined,
+                autojump: params.autojump ?? true,
                 complete: params.complete
             });
             response.currentPage.cells.push(preparedCell.currentPage);
@@ -451,7 +463,7 @@ class PPdf {
                 name: t.font?.name ?? params.font?.name ?? this.currentFont.name,
                 bold: t.font?.bold ?? params.font?.bold ?? this.currentFont.bold,
                 oblique: t.font?.oblique ?? params.font?.oblique ?? this.currentFont.oblique,
-                size: t.font?.size ?? params.font?.size ?? this.currentFont.size,
+                size: this.resolveFontSize(t.font?.size, this.currentFont.size) ?? this.resolveFontSize(params.font?.size, this.currentFont.size) ?? this.currentFont.size,
                 color: t.font?.color ?? params.font?.color ?? this.currentFont.color,
             };
             this.setFont(font);
@@ -566,7 +578,7 @@ class PPdf {
             if (!firstLetterOfLine)
                 continue;
             /* Si la letra se desborda, se crea un nuevo párrafo */
-            if ('autojump' in params && currentParagraph != 'nextPage' && firstLetterOfLine.top + firstLetterOfLine.height + padding.bottom > (this.engine.page.height - this.engine.page.margins.bottom)) {
+            if (!('height' in params) && (params.autojump ?? true) && currentParagraph != 'nextPage' && firstLetterOfLine.top + firstLetterOfLine.height + padding.bottom > (this.engine.page.height - this.engine.page.margins.bottom)) {
                 if (params.complete) {
                     paragraphs.nextPage = paragraphs.currentPage;
                     paragraphs.currentPage = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pols-pdf",
-	"version": "1.0.2",
+	"version": "1.1.1",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {