@ejfdelgado/ejflab-back 1.26.1 → 1.26.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.26.1",
+  "version": "1.26.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/MyPdf.mjs

@@ -2,21 +2,35 @@ import fs from "fs";
 import puppeteer from 'puppeteer';
 import { General } from "./common/General.mjs";
 import { MyTemplate } from "@ejfdelgado/ejflab-common/src/MyTemplate.js";
+import { CsvFormatterFilters } from "@ejfdelgado/ejflab-common/src/CsvFormatterFilters.js";
+import { MyUtilities } from '@ejfdelgado/ejflab-common/src/MyUtilities';
 
 export class MyPdf {
     static async localRender(template, model = {}, format = "pdf", extra = []) {
         const source = fs.readFileSync(`./src/assets/templates/pdf/${template}`, { encoding: "utf8" });
-
         for (let i = 0; i < extra.length; i++) {
             const extraFile = extra[i];
-            const text = fs.readFileSync(`./src/assets/templates/pdf/${extraFile.path}`, { encoding: "utf8" });
             if (!model.extra) {
                 model.extra = {};
-                model.extra[extraFile.alias];
+            }
+            const path = MyUtilities.removeRepeatedSlash(`./src/assets/templates/pdf/${extraFile.path}`);
+            const exists = fs.existsSync(path);
+            if (exists) {
+                if (extraFile.base64) {
+                    const data = fs.readFileSync(path);
+                    const base64String = data.toString('base64');
+                    model.extra[extraFile.alias] = base64String;
+                } else {
+                    const text = fs.readFileSync(path, { encoding: "utf8" });
+                    model.extra[extraFile.alias] = text;
+                }
+            } else {
+                model.extra[extraFile.alias] = "";
             }
         }
 
         const renderer = new MyTemplate();
+        renderer.registerFunction("json", CsvFormatterFilters.json);
         const rendered = renderer.render(source, model);
         if (format == "html") {
             return rendered;

package/srv/common/General.mjs

@@ -30,6 +30,8 @@ export class General {
             return req.query[nameLower];
         } else if (req.params && name in req.params) {
             return req.params[name];
+        } else if (req.params && nameLower in req.params) {
+            return req.params[nameLower];
         } else if (req.locals?.extra) {
             if (name in req.locals.extra) {
                 return req.locals.extra[name];