p3x-html-pdf 2025.4.153 → 2025.4.154

package/README.md

@@ -6,7 +6,7 @@
 
 
 
-# 📃 Generates PDF from HTML with custom headers and footers with wkhtmltopdf v2025.4.153
+# 📃 Generates PDF from HTML with custom headers and footers with wkhtmltopdf v2025.4.154
 
 
   
@@ -37,7 +37,7 @@ v22.13.0
 
 **p3x-html-pdf** is a Node.js package that generates PDFs from HTML with custom headers and footers using `wkhtmltopdf`. It is a robust tool for creating professional-grade PDFs with features like:
 
-- 📜 **Dynamic Headers and Footers**: Add placeholders for page numbers.
+- 📜 **Dynamic Headers and Footers**: Add placeholders for page numbers, dates, and more.
 - 🛠️ **Customizable Layouts**: Configure margins, orientation, and paper size.
 - ⚡ **Async/Await Support**: Modern JavaScript compatibility for efficient workflows.
 - 🔄 **Dynamic Content**: Render data-driven tables and content dynamically.
@@ -160,17 +160,28 @@ You can use placeholders in your HTML for dynamic data (only these, but it is en
 
 - `${page}`: Current page.
 - `${pages}`: Total pages.
-
-Example:
+- `${frompage}`: The starting page of the current section.
+- `${topage}`: The ending page of the current section.
+- `${webpage}`: The URL of the web page (if applicable).
+- `${section}`: The name of the current section.
+- `${subsection}`: The name of the current subsection.
+- `${date}`: The current date in a localized format.
+- `${isodate}`: The current date in ISO 8601 format.
+- `${time}`: The current time.
+- `${title}`: The document title.
+- `${doctitle}`: The title of the document as defined in metadata.
+- `${sitepage}`: Current site page number (specific context).
+- `${sitepages}`: Total number of site pages (specific context).
+
+### Example
 
 ```html
-<div id="p3x-footer" data-height="15mm">
+<div id="p3x-footer" data-height="10mm">
   <p>Page ${page} of ${pages}</p>
 </div>
 ```
 
 The `p3x-footer` and `p3x-header` should not have any styles other than `id` and `data-height`.
-
 ---
 
 ## 📊 Advanced Features
@@ -354,7 +365,7 @@ All my domains, including [patrikx3.com](https://patrikx3.com), [corifeus.eu](ht
 ---
 
 
-[**P3X-HTML-PDF**](https://corifeus.com/html-pdf) Build v2025.4.153
+[**P3X-HTML-PDF**](https://corifeus.com/html-pdf) Build v2025.4.154
 
  [![NPM](https://img.shields.io/npm/v/p3x-html-pdf.svg)](https://www.npmjs.com/package/p3x-html-pdf)  [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software)
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "p3x-html-pdf",
-    "version": "2025.4.153",
+    "version": "2025.4.154",
     "corifeus": {
         "prefix": "p3x-",
         "publish": true,

package/src/index.js

@@ -111,6 +111,18 @@ const generate = async (options) => {
             const lodashTemplateHack = `
         item = item.replace(/\\$\{page}/g, vars.page);
         item = item.replace(/\\$\{pages}/g, vars.pages);
+        item = item.replace(/\\$\{frompage}/g, vars.frompage);
+        item = item.replace(/\\$\{topage}/g, vars.topage);
+        item = item.replace(/\\$\{webpage}/g, vars.webpage);
+        item = item.replace(/\\$\{section}/g, vars.section);
+        item = item.replace(/\\$\{subsection}/g, vars.subsection);
+        item = item.replace(/\\$\{date}/g, vars.date);
+        item = item.replace(/\\$\{isodate}/g, vars.isodate);
+        item = item.replace(/\\$\{time}/g, vars.time);
+        item = item.replace(/\\$\{title}/g, vars.title);
+        item = item.replace(/\\$\{doctitle}/g, vars.doctitle);
+        item = item.replace(/\\$\{sitepage}/g, vars.sitepage);
+        item = item.replace(/\\$\{sitepages}/g, vars.sitepages);
         item = item.replace(/\\$\{qr}/g, qr);
 
 `;
@@ -145,10 +157,18 @@ var qr = ${JSON.stringify(mainsSettings.settings.qr)};
 //        console.debug('html', html)
 //        console.debug('header', header)
 
-        tmpHtmlPath = await utils.fs.ensureTempFile(html, 'html')
+        if (save) {
+            tmpPdfPath = saveFile;
+            tmpHtmlPath = `${saveFile}.html`;
+            await utils.fs.ensureFile(tmpHtmlPath, html);
+        } else {
+            tmpHtmlPath = await utils.fs.ensureTempFile(html, 'html')
+            tmpPdfPath = await utils.fs.tempFileName('pdf');
+        }
+
         tmpHtmlPathHeader = await utils.fs.ensureTempFile(header, 'html')
         tmpHtmlPathFooter = await utils.fs.ensureTempFile(footer, 'html')
-        tmpPdfPath = await utils.fs.tempFileName('pdf');
+
         //console.debug('header', footer)
         //console.debug('footer', footer)
         //console.debug('html', footer)
@@ -189,10 +209,8 @@ var qr = ${JSON.stringify(mainsSettings.settings.qr)};
 
         await utils.childProcess.exec(generatePdfCommand, debug);
 
-        if (save) {
-            await fsExtra.move(tmpPdfPath, saveFile)
-        } else {
-            return fs.readFile(tmpPdfPath);
+        if (!save) {
+            return await fs.readFile(tmpPdfPath);
         }
     } finally {
         if (tmpHtmlPath !== undefined) {

package/test/test.js

@@ -46,7 +46,9 @@ const fs = require('fs');
                     </div>
                 </div>
                 <div id="p3x-footer" data-height="10mm" >
-                    <div style="text-align: right; font-size: 12px; color: #777;">Page \${page} of \${pages}</div>
+                    <div style="text-align: right; font-size: 12px; color: #777;">
+                        Page \${page} of \${pages}                       
+                    </div>
                 </div>
                 <div>
                     <h2 style="color: #222;">Invoice Content</h2>
@@ -102,7 +104,7 @@ const fs = require('fs');
             `,
             },
             title: 'P3X-HTML-PDF Detailed Invoice',
-            debug: false,
+            debug: true,
             saveFile: outputPath,
         };