pols-pdf 1.1.1 → 1.1.3

package/dist/index.d.ts

@@ -1,27 +1,16 @@
+import pdfkit from 'pdfkit';
 export type PBoundParams = number | {
     top?: number;
     bottom?: number;
     left?: number;
     right?: number;
 };
-export type PBound = {
-    top: number;
-    bottom: number;
-    left: number;
-    right: number;
-};
 export type PRadiusParams = number | {
     leftTop?: number;
     rightTop?: number;
     rightBottom?: number;
     leftBottom?: number;
 };
-export type PRadius = {
-    leftTop: number;
-    rightTop: number;
-    rightBottom: number;
-    leftBottom: number;
-};
 export type PBorderParams = boolean | {
     leftTop?: boolean;
     top?: boolean;
@@ -32,16 +21,6 @@ export type PBorderParams = boolean | {
     leftBottom?: boolean;
     left?: boolean;
 };
-export type PBorder = {
-    leftTop: boolean;
-    top: boolean;
-    rightTop: boolean;
-    right: boolean;
-    rightBottom: boolean;
-    bottom: boolean;
-    leftBottom: boolean;
-    left: boolean;
-};
 export type PBorderColorParams = string | {
     top?: string;
     rightTop?: string;
@@ -52,16 +31,6 @@ export type PBorderColorParams = string | {
     left?: string;
     leftTop?: string;
 };
-export type PBorderColor = {
-    top: string;
-    rightTop: string;
-    right: string;
-    rightBottom: string;
-    bottom: string;
-    leftBottom: string;
-    left: string;
-    leftTop: string;
-};
 export type PPage = {
     size: 'A4' | 'LETTER';
     layout: 'portrait' | 'landscape';
@@ -119,31 +88,6 @@ export type PTextParams = {
     chars: string;
     font?: Partial<PFontParams>;
 };
-type PLetter = {
-    char: string;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    font: PFont;
-};
-export type PCell = {
-    letters: PLetter[];
-    left: number;
-    top: number;
-    height: number;
-    width: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-    hAlign?: 'left' | 'center' | 'right';
-    vAlign?: 'top' | 'center' | 'bottom';
-};
 export type PCellParams = {
     text: null | undefined | number | string | PTextParams | PTextParams[];
     left?: number;
@@ -167,22 +111,6 @@ export type PCellParams = {
 } | {
     autojump?: boolean;
 });
-export type PRow = {
-    cells: Omit<PCell, 'autojump'>[];
-    gap?: number;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-};
 export type PRowParams = {
     cells: (Omit<PCellParams, 'width' | 'left' | 'top' | 'height' | 'autojump'> & ({
         width: number;
@@ -222,28 +150,12 @@ export type PTableParams = {
     width?: 'full' | 'auto' | number;
     autojump?: boolean;
 };
-export type PTable = {
-    rows: PRow[];
-    gap?: number;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-};
 export declare class PPdf {
     private static readonly charWidthCache;
     private static readonly lineHeightCache;
     private cursor;
     private configPage;
-    private engine;
+    engine: typeof pdfkit;
     template?: () => void;
     private currentFont;
     get title(): string;
@@ -290,5 +202,4 @@ export declare class PPdf {
     private prepareBorderValues;
     private prepareBorderColorValues;
 }
-export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -6,6 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PPdf = void 0;
 const pdfkit_1 = __importDefault(require("pdfkit"));
 const pols_utils_1 = require("pols-utils");
+const calculateWidth = ({ width, left, pdf }) => {
+    if (width == null || width == 'auto') {
+        return pdf.engine.page.width - pdf.engine.page.margins.right - (left ?? pdf.getCursorLeftPosition());
+    }
+    else if (width == 'full') {
+        return pdf.engine.page.width - pdf.engine.page.margins.right - pdf.engine.page.margins.left;
+    }
+    else {
+        return width;
+    }
+};
 class PPdf {
     /* Cachés de métricas de fuente, compartidas por todas las instancias: widthOfString/heightOfString
     de pdfkit son funciones puras de (fuente, carácter) — el mismo par siempre da el mismo resultado —,
@@ -168,17 +179,11 @@ class PPdf {
         return this.engine;
     }
     table(params) {
-        const width = (() => {
-            if (params.width == null || params.width == 'auto') {
-                return this.engine.page.width - this.engine.page.margins.right - (params.left ?? this.cursor.left);
-            }
-            else if (params.width == 'full') {
-                return this.engine.page.width - this.engine.page.margins.right - this.engine.page.margins.left;
-            }
-            else {
-                return params.width;
-            }
-        })();
+        const width = calculateWidth({
+            width: params.width,
+            left: params.left,
+            pdf: this,
+        });
         const left = params.left ?? this.cursor.left;
         const top = params.top ?? this.cursor.top;
         const padding = this.prepareBoundValues(params.padding);
@@ -204,7 +209,7 @@ class PPdf {
                 left: left + padding.left,
                 top: cursorTop,
                 width: usefulWidth,
-                font: params.font,
+                font: { ...params.font, ...rowToDraw.font },
                 autojump: params.autojump ?? true
             });
             if (preparedRow.currentPage.cells.some(cell => cell.letters?.length)) {
@@ -304,7 +309,7 @@ class PPdf {
                 left: cursorLeft,
                 top: top + padding.top,
                 width: cellWidth,
-                font: cell.font ?? params.font,
+                font: { ...params.font, ...cell.font },
                 autojump: params.autojump ?? true,
                 complete: params.complete
             });
@@ -673,7 +678,12 @@ class PPdf {
         this.setCursorTopPosition(params.top + params.height);
     }
     cell(params) {
-        let paramsToDraw = params;
+        const width = calculateWidth({
+            width: params.width,
+            left: params.left,
+            pdf: this
+        });
+        let paramsToDraw = { ...params, width };
         while (paramsToDraw) {
             const prepared = this.prepareCell(paramsToDraw);
             this.drawCell(prepared.currentPage);

package/package.json

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