emilsoftware-utilities 1.3.67 → 1.3.69

package/dist/ContractGenerator.d.ts

@@ -1,6 +1,3 @@
-/**
- * Interface representing the contract parties.
- */
 export interface IPartiContratto {
     fornitore: {
         denominazione: string;
@@ -13,9 +10,6 @@ export interface IPartiContratto {
         indirizzoCompleto: string;
     };
 }
-/**
- * Parameters passed by the user when generating a document.
- */
 export interface DocumentParams {
     parti: IPartiContratto;
     tipOutput?: 'f' | 'd' | 'u';
@@ -26,20 +20,15 @@ export interface DocumentParams {
         [placeholder: string]: DynamicElement;
     };
 }
-/**
- * DynamicElement supports different types, currently "table".
- */
 export type DynamicElement = {
     type: 'table';
     config: {
         head: string[];
         body: string[][];
         options?: any;
+        styles?: any;
     };
 };
-/**
- * A simplified type for the configuration file.
- */
 interface DocumentConfig {
     fontTitolo: {
         nome: string;
@@ -89,12 +78,15 @@ interface DocumentConfig {
         backgrund: string;
         raggio: number;
     };
+    tableStyle?: {
+        lineColor?: string;
+        lineWidth?: number;
+        font?: string;
+        fontSize?: number;
+        cellPadding?: number;
+        fillColor?: string;
+    };
 }
-/**
- * DocumentGenerator encapsulates the PDF generation logic.
- * It handles text wrapping, dynamic placeholders, image insertion, custom font installation,
- * and rendering text inside a rounded rectangle box or as bold text.
- */
 export declare class DocumentGenerator {
     private configPath?;
     private config;
@@ -102,127 +94,28 @@ export declare class DocumentGenerator {
     private curX;
     private curY;
     private configLoaded;
-    /**
-     * Constructor for DocumentGenerator.
-     * @param configPath - Optional path to the JSON configuration file.
-     */
     constructor(configPath?: string);
-    /**
-     * Sets the configuration directly.
-     * @param config - The DocumentConfig object.
-     */
     setConfig(config: DocumentConfig): void;
-    /**
-     * Applies dynamic text templating by replacing markers like $KEY$ with their values.
-     * @param template - The template string containing markers.
-     * @param dynamicFields - An object mapping marker keys to replacement values.
-     * @returns The processed string with replacements.
-     */
     private applyTemplate;
-    /**
-     * Replaces party-specific placeholders (e.g., $cliente:denominazione$) with corresponding values.
-     * @param text - The text containing party placeholders.
-     * @param parti - The contract parties.
-     * @returns The processed string with party-specific values.
-     */
     private applyPartiPlaceholders;
-    /**
-     * Loads the configuration JSON from the local filesystem.
-     * @throws Error if the configuration file cannot be read.
-     */
     private loadConfig;
-    /**
-     * Initializes the jsPDF document and sets the cursor to the top-left margin.
-     */
     private initDoc;
-    /**
-     * Extracts a dynamic element placeholder from text if it is in the form "$PLACEHOLDER$".
-     * @param text - The text to check.
-     * @returns The placeholder key or null if not found.
-     */
     private extractPlaceholder;
-    /**
-     * Installs a custom font into jsPDF by reading the font file and adding it to the Virtual File System.
-     * @param fontPath - Path to the TTF font file.
-     * @param fontName - Name of the font to be used in jsPDF.
-     */
     private installFont;
-    /**
-     * Core method to write wrapped text with a specified font.
-     * Handles text splitting and page-breaks.
-     * @param fontName - The name of the font to use.
-     * @param fontSize - The font size in points.
-     * @param color - The text color.
-     * @param text - The text to write.
-     * @param x - The X coordinate.
-     * @param y - The starting Y coordinate.
-     * @param maxWidth - Maximum width for text wrapping.
-     * @param lineSpacingFactor - Factor for line spacing.
-     * @returns The updated Y position after writing the text.
-     */
     private writeWrappedTextCore;
-    /**
-     * Writes wrapped text using a custom font.
-     * Ensures the font is installed before writing.
-     * @param fontConf - Font configuration object.
-     * @param text - The text to write.
-     * @param x - The X coordinate.
-     * @param y - The starting Y coordinate.
-     * @param maxWidth - Maximum width for text wrapping.
-     * @param lineSpacingFactor - Factor for line spacing.
-     */
+    private writeLineWithInlineBold;
     private writeWrappedTextWithFont;
-    /**
-     * Renders text inside a rounded rectangle box.
-     * This method is invoked when text is wrapped in '^' markers.
-     * @param text - The text to render (without '^' markers).
-     * @param fontConf - Font configuration for the text.
-     * @param padding - Padding inside the box.
-     * @param borderRadius - Corner radius of the box.
-     * @param borderWidth - Border thickness.
-     * @param boxColor - Optional background color.
-     */
-    scriveTestoBox(text: string, fontConf: {
+    writeBoxedText(text: string, fontConf: {
         nome: string;
         dimensione: number;
         colore: string;
         installPath?: string;
     }, padding?: number, borderRadius?: number, borderWidth?: number, boxColor?: string): Promise<void>;
-    /**
-     * Checks if a given text is wrapped in '^' markers, indicating it should be rendered in a box.
-     * @param text - The text to check.
-     * @returns True if text is boxed.
-     */
     private isBoxedText;
-    /**
-     * Removes the '^' markers from the text.
-     * @param text - The boxed text.
-     * @returns The text without '^' markers.
-     */
     private stripBoxMarkers;
-    /**
-     * Checks if a given text is wrapped in '**' markers, indicating bold formatting.
-     * @param text - The text to check.
-     * @returns True if text is marked as bold.
-     */
     private isBoldText;
-    /**
-     * Removes the '**' markers from bold text.
-     * @param text - The bold text.
-     * @returns The text without '**' markers.
-     */
     private stripBoldMarkers;
-    /**
-     * Inserts images as defined in the configuration.
-     * Uses the current cursor position for placement.
-     */
-    private inserisciImmagini;
-    /**
-     * Generates the PDF document based on provided parameters.
-     * Processes dynamic fields, images, tables, and text (with optional boxed or bold formatting).
-     * Returns the file name if saved or an ArrayBuffer.
-     * @param params - The DocumentParams object.
-     */
+    private insertLogo;
     generateDocument(params: DocumentParams): Promise<string | ArrayBuffer>;
 }
 export {};

package/dist/ContractGenerator.js

@@ -17,11 +17,6 @@ const jspdf_1 = require("jspdf");
 const jspdf_autotable_1 = __importDefault(require("jspdf-autotable"));
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-/**
- * Reads an image file from the filesystem and returns a Base64-encoded data URL.
- * @param imagePath - Path to the image file.
- * @returns The Base64-encoded data URL of the image.
- */
 function loadImageAsBase64(imagePath) {
     return __awaiter(this, void 0, void 0, function* () {
         const absolutePath = path_1.default.resolve(imagePath);
@@ -31,62 +26,31 @@ function loadImageAsBase64(imagePath) {
         return `data:image/${ext};base64,${base64}`;
     });
 }
-/**
- * DocumentGenerator encapsulates the PDF generation logic.
- * It handles text wrapping, dynamic placeholders, image insertion, custom font installation,
- * and rendering text inside a rounded rectangle box or as bold text.
- */
 class DocumentGenerator {
-    /**
-     * Constructor for DocumentGenerator.
-     * @param configPath - Optional path to the JSON configuration file.
-     */
     constructor(configPath) {
         this.configPath = configPath;
         this.curX = 0;
         this.curY = 0;
         this.configLoaded = false;
     }
-    /**
-     * Sets the configuration directly.
-     * @param config - The DocumentConfig object.
-     */
     setConfig(config) {
         this.config = config;
         this.configLoaded = true;
     }
-    /**
-     * Applies dynamic text templating by replacing markers like $KEY$ with their values.
-     * @param template - The template string containing markers.
-     * @param dynamicFields - An object mapping marker keys to replacement values.
-     * @returns The processed string with replacements.
-     */
     applyTemplate(template, dynamicFields) {
         if (!dynamicFields)
             return template;
         return template.replace(/\$(\w+)\$/g, (match, key) => dynamicFields[key] !== undefined ? dynamicFields[key] : match);
     }
-    /**
-     * Replaces party-specific placeholders (e.g., $cliente:denominazione$) with corresponding values.
-     * @param text - The text containing party placeholders.
-     * @param parti - The contract parties.
-     * @returns The processed string with party-specific values.
-     */
     applyPartiPlaceholders(text, parti) {
-        return text.replace(/\$(fornitore|cliente):(\w+)\$/g, (match, party, field) => {
-            return (parti[party] && parti[party][field]) ? parti[party][field] : match;
-        });
+        return text.replace(/\$(fornitore|cliente):(\w+)\$/g, (match, party, field) => (parti[party] && parti[party][field]) ? parti[party][field] : match);
     }
-    /**
-     * Loads the configuration JSON from the local filesystem.
-     * @throws Error if the configuration file cannot be read.
-     */
     loadConfig() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.configLoaded)
                 return;
             if (!this.configPath)
-                throw new Error("No configuration provided. Set a configPath or use setConfig().");
+                throw new Error("No configuration provided.");
             try {
                 const data = yield fs_1.promises.readFile(this.configPath, 'utf8');
                 this.config = JSON.parse(data);
@@ -97,29 +61,16 @@ class DocumentGenerator {
             }
         });
     }
-    /**
-     * Initializes the jsPDF document and sets the cursor to the top-left margin.
-     */
     initDoc() {
         this.doc = new jspdf_1.jsPDF();
         const margins = this.config.margini;
         this.curX = margins.sx;
         this.curY = margins.alto;
     }
-    /**
-     * Extracts a dynamic element placeholder from text if it is in the form "$PLACEHOLDER$".
-     * @param text - The text to check.
-     * @returns The placeholder key or null if not found.
-     */
     extractPlaceholder(text) {
         const match = text.match(/^\$(\w+)\$$/);
         return match ? match[1] : null;
     }
-    /**
-     * Installs a custom font into jsPDF by reading the font file and adding it to the Virtual File System.
-     * @param fontPath - Path to the TTF font file.
-     * @param fontName - Name of the font to be used in jsPDF.
-     */
     installFont(fontPath, fontName) {
         return __awaiter(this, void 0, void 0, function* () {
             const absolutePath = path_1.default.resolve(fontPath);
@@ -131,19 +82,7 @@ class DocumentGenerator {
             this.doc.setFont(fontName);
         });
     }
-    /**
-     * Core method to write wrapped text with a specified font.
-     * Handles text splitting and page-breaks.
-     * @param fontName - The name of the font to use.
-     * @param fontSize - The font size in points.
-     * @param color - The text color.
-     * @param text - The text to write.
-     * @param x - The X coordinate.
-     * @param y - The starting Y coordinate.
-     * @param maxWidth - Maximum width for text wrapping.
-     * @param lineSpacingFactor - Factor for line spacing.
-     * @returns The updated Y position after writing the text.
-     */
+    // Writes wrapped text, handling inline bold segments.
     writeWrappedTextCore(fontName_1, fontSize_1, color_1, text_1, x_1, y_1, maxWidth_1) {
         return __awaiter(this, arguments, void 0, function* (fontName, fontSize, color, text, x, y, maxWidth, lineSpacingFactor = 1.15) {
             this.doc.setFont(fontName);
@@ -156,22 +95,48 @@ class DocumentGenerator {
                     this.doc.addPage();
                     y = this.config.margini.alto;
                 }
-                this.doc.text(line, x, y);
-                y += lineHeight;
+                // If the line contains inline bold markers, process them.
+                if (line.includes("**")) {
+                    y = yield this.writeLineWithInlineBold(line, x, y, fontName, fontSize, color, maxWidth, lineSpacingFactor);
+                }
+                else {
+                    this.doc.text(line, x, y);
+                    y += lineHeight;
+                }
             }
             return y;
         });
     }
-    /**
-     * Writes wrapped text using a custom font.
-     * Ensures the font is installed before writing.
-     * @param fontConf - Font configuration object.
-     * @param text - The text to write.
-     * @param x - The X coordinate.
-     * @param y - The starting Y coordinate.
-     * @param maxWidth - Maximum width for text wrapping.
-     * @param lineSpacingFactor - Factor for line spacing.
-     */
+    // Writes a single line with inline bold processing.
+    writeLineWithInlineBold(line_1, x_1, y_1, normalFont_1, fontSize_1, color_1, maxWidth_1) {
+        return __awaiter(this, arguments, void 0, function* (line, x, y, normalFont, fontSize, color, maxWidth, lineSpacingFactor = 1.15) {
+            let currentX = x;
+            // Split the line by bold segments. The regex keeps the markers.
+            const segments = line.split(/(\*\*.*?\*\*)/);
+            const lineHeight = (fontSize * lineSpacingFactor / 72) * 25.4;
+            for (const seg of segments) {
+                let segText = seg;
+                let useBold = false;
+                if (seg.startsWith("**") && seg.endsWith("**")) {
+                    useBold = true;
+                    segText = seg.substring(2, seg.length - 2);
+                }
+                if (useBold) {
+                    this.doc.setFont("Montserrat-Bold");
+                }
+                else {
+                    this.doc.setFont(normalFont);
+                }
+                this.doc.setFontSize(fontSize);
+                this.doc.setTextColor(color);
+                const segWidth = this.doc.getTextWidth(segText);
+                // Write segment
+                this.doc.text(segText, currentX, y);
+                currentX += segWidth;
+            }
+            return y + lineHeight;
+        });
+    }
     writeWrappedTextWithFont(fontConf_1, text_1, x_1, y_1, maxWidth_1) {
         return __awaiter(this, arguments, void 0, function* (fontConf, text, x, y, maxWidth, lineSpacingFactor = 1.15) {
             const fontList = this.doc.getFontList();
@@ -187,17 +152,7 @@ class DocumentGenerator {
             this.curY = yield this.writeWrappedTextCore(fontConf.nome, fontConf.dimensione, fontConf.colore, text, x, y, maxWidth, lineSpacingFactor);
         });
     }
-    /**
-     * Renders text inside a rounded rectangle box.
-     * This method is invoked when text is wrapped in '^' markers.
-     * @param text - The text to render (without '^' markers).
-     * @param fontConf - Font configuration for the text.
-     * @param padding - Padding inside the box.
-     * @param borderRadius - Corner radius of the box.
-     * @param borderWidth - Border thickness.
-     * @param boxColor - Optional background color.
-     */
-    scriveTestoBox(text_1, fontConf_1) {
+    writeBoxedText(text_1, fontConf_1) {
         return __awaiter(this, arguments, void 0, function* (text, fontConf, padding = 5, borderRadius = 5, borderWidth = 1, boxColor) {
             const fontList = this.doc.getFontList();
             if (!fontList[fontConf.nome]) {
@@ -222,56 +177,43 @@ class DocumentGenerator {
             const boxHeight = textHeight + 2 * padding;
             if (boxColor) {
                 this.doc.setFillColor(boxColor);
-                this.doc.roundedRect(boxX, boxY, boxWidth, boxHeight, borderRadius, borderRadius, 'F');
+                this.doc.roundedRect(boxX, boxY, boxWidth, boxHeight, borderRadius, borderRadius, "F");
             }
             this.doc.setLineWidth(borderWidth);
             this.doc.roundedRect(boxX, boxY, boxWidth, boxHeight, borderRadius, borderRadius);
             const textX = boxX + padding;
             let textY = boxY + padding + lineHeight;
             for (const line of lines) {
-                this.doc.text(line, textX, textY);
-                textY += lineHeight;
+                if (line.includes("**")) {
+                    textY = yield this.writeLineWithInlineBold(line, textX, textY, fontConf.nome, fontConf.dimensione, fontConf.colore, maxTextWidth, 1.15);
+                }
+                else {
+                    this.doc.text(line, textX, textY);
+                    textY += lineHeight;
+                }
             }
             this.curY = boxY + boxHeight + this.config.staccoriga;
         });
     }
-    /**
-     * Checks if a given text is wrapped in '^' markers, indicating it should be rendered in a box.
-     * @param text - The text to check.
-     * @returns True if text is boxed.
-     */
+    // Checks if text is wrapped in '^' markers for boxed text.
     isBoxedText(text) {
         return text.startsWith('^') && text.endsWith('^');
     }
-    /**
-     * Removes the '^' markers from the text.
-     * @param text - The boxed text.
-     * @returns The text without '^' markers.
-     */
+    // Removes '^' markers.
     stripBoxMarkers(text) {
         return text.substring(1, text.length - 1);
     }
-    /**
-     * Checks if a given text is wrapped in '**' markers, indicating bold formatting.
-     * @param text - The text to check.
-     * @returns True if text is marked as bold.
-     */
+    // Checks if text is entirely wrapped in '**' markers (not inline).
+    // (This function is kept for backward compatibility.)
     isBoldText(text) {
         return text.startsWith('**') && text.endsWith('**');
     }
-    /**
-     * Removes the '**' markers from bold text.
-     * @param text - The bold text.
-     * @returns The text without '**' markers.
-     */
+    // Removes '**' markers.
     stripBoldMarkers(text) {
         return text.substring(2, text.length - 2);
     }
-    /**
-     * Inserts images as defined in the configuration.
-     * Uses the current cursor position for placement.
-     */
-    inserisciImmagini() {
+    // Inserts images using the current cursor position.
+    insertLogo() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             if (this.config.immagini && this.config.immagini.length > 0) {
@@ -291,17 +233,13 @@ class DocumentGenerator {
             }
         });
     }
-    /**
-     * Generates the PDF document based on provided parameters.
-     * Processes dynamic fields, images, tables, and text (with optional boxed or bold formatting).
-     * Returns the file name if saved or an ArrayBuffer.
-     * @param params - The DocumentParams object.
-     */
+    // Generates the PDF document by processing images, dynamic fields, tables, and text.
+    // Supports inline bold formatting and boxed text.
     generateDocument(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.loadConfig();
             this.initDoc();
-            yield this.inserisciImmagini();
+            yield this.insertLogo();
             const dynamicFields = params.dynamicFields || {};
             const dynamicElements = params.dynamicElements || {};
             const pageWidth = this.doc.internal.pageSize.getWidth();
@@ -321,9 +259,10 @@ class DocumentGenerator {
                 this.curY += this.config.staccoriga;
                 for (const sub of punto.Sottopunti) {
                     const placeholder = this.extractPlaceholder(sub.titolo);
-                    if (placeholder && dynamicElements[placeholder] && dynamicElements[placeholder].type === 'table') {
+                    if (placeholder && dynamicElements[placeholder] && dynamicElements[placeholder].type === 'table' && dynamicElements[placeholder].config) {
                         const tableConfig = dynamicElements[placeholder].config;
-                        (0, jspdf_autotable_1.default)(this.doc, Object.assign({ startY: this.curY, head: [tableConfig.head], body: tableConfig.body }, tableConfig.options));
+                        const defaultTableOptions = this.config.tableStyle || {};
+                        (0, jspdf_autotable_1.default)(this.doc, Object.assign(Object.assign(Object.assign({ startY: this.curY, head: [tableConfig.head], body: tableConfig.body }, defaultTableOptions), tableConfig.options), tableConfig.styles));
                         this.curY = this.doc.lastAutoTable.finalY + this.config.staccoriga;
                     }
                     else {
@@ -332,7 +271,7 @@ class DocumentGenerator {
                             titleText = this.applyPartiPlaceholders(titleText, params.parti);
                             if (this.isBoxedText(titleText)) {
                                 const boxText = this.stripBoxMarkers(titleText);
-                                yield this.scriveTestoBox(boxText, this.config.fontSottotitolo);
+                                yield this.writeBoxedText(boxText, this.config.fontSottotitolo);
                             }
                             else if (this.isBoldText(titleText)) {
                                 const boldText = this.stripBoldMarkers(titleText);
@@ -345,9 +284,10 @@ class DocumentGenerator {
                         }
                     }
                     const contentPlaceholder = this.extractPlaceholder(sub.contenuto);
-                    if (contentPlaceholder && dynamicElements[contentPlaceholder] && dynamicElements[contentPlaceholder].type === 'table') {
+                    if (contentPlaceholder && dynamicElements[contentPlaceholder] && dynamicElements[contentPlaceholder].type === 'table' && dynamicElements[contentPlaceholder].config) {
                         const tableConfig = dynamicElements[contentPlaceholder].config;
-                        (0, jspdf_autotable_1.default)(this.doc, Object.assign({ startY: this.curY, head: [tableConfig.head], body: tableConfig.body }, tableConfig.options));
+                        const defaultTableOptions = this.config.tableStyle || {};
+                        (0, jspdf_autotable_1.default)(this.doc, Object.assign(Object.assign(Object.assign({ startY: this.curY, head: [tableConfig.head], body: tableConfig.body }, defaultTableOptions), tableConfig.options), tableConfig.styles));
                         this.curY = this.doc.lastAutoTable.finalY + this.config.staccoriga;
                     }
                     else if (sub.contenuto) {
@@ -355,7 +295,7 @@ class DocumentGenerator {
                         contenuto = this.applyPartiPlaceholders(contenuto, params.parti);
                         if (this.isBoxedText(contenuto)) {
                             const boxText = this.stripBoxMarkers(contenuto);
-                            yield this.scriveTestoBox(boxText, this.config.fontTesto);
+                            yield this.writeBoxedText(boxText, this.config.fontTesto);
                         }
                         else if (this.isBoldText(contenuto)) {
                             const boldText = this.stripBoldMarkers(contenuto);

package/dist/tests/contract/test.js

@@ -41,6 +41,16 @@ function testDocumentGenerator() {
                         ],
                         options: {
                             theme: 'striped'
+                        },
+                        styles: {
+                            headStyles: {
+                                fillColor: "#03fc0b"
+                            },
+                            columnStyles: {
+                                0: {
+                                    fontStyle: 'bold'
+                                }
+                            }
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.3.67",
+  "version": "1.3.69",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,8 +27,8 @@
     "es-node-firebird": "^1.2.6",
     "inversify": "^6.2.2",
     "jsonwebtoken": "^9.0.2",
-    "jspdf": "^2.5.1",
-    "jspdf-autotable": "^3.8.4",
+    "jspdf": "^3.0.0",
+    "jspdf-autotable": "^5.0.2",
     "node-fetch": "^3.3.2",
     "nodemailer": "^6.10.0",
     "reflect-metadata": "^0.2.2",