btrz-liquid-templates 1.7.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "btrz-liquid-templates",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Extension and helpers for liquid templates to deal with our data and other things we need to encapsulate",
   "main": "src/index.js",
   "scripts": {

package/src/html.js

@@ -90,8 +90,27 @@ function Html(engine) {
 });
 }
 
+function Unescape(engine) {
+  this.registerTag("unescape", {
+    parse: function(tagToken) {
+      this.item = tagToken.args;
+    },
+    render: async function(ctx) {
+      const str = await this.liquid.evalValue(this.item, ctx);
+
+      return(str || "")
+        .replace(/&/g, '&')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/&#39;/g, "'");
+    }
+});
+}
+
 module.exports = {
-  Html
+  Html,
+  Unescape
 };
 
 

package/src/httpimg.js

@@ -1,13 +1,5 @@
 const axios = require("axios");
 
-function getPrefix(url) {
-  const extention = url.split(".").pop();
-  if (extention.toLowerCase() === "png") {
-    return "data:image/png;base64,";
-  }
-  return "data:image/jpeg;base64,";
-}
-
 function HttpImg(engine) {
   this.registerTag("httpImg", {
     parse: function(tagToken, remainTokens) {
@@ -19,7 +11,16 @@ function HttpImg(engine) {
         const response = await axios.get(url, {
           responseType: "arraybuffer"
         });
-        return `${getPrefix(url)}${Buffer.from(response.data, "binary").toString("base64")}`;
+        if (response && response.headers && response.headers["content-type"]) {
+          const contentType = response.headers["content-type"];
+          if (contentType.startsWith("image/png")) {
+            return `data:image/png;base64,${Buffer.from(response.data, "binary").toString("base64")}`;
+          } else if (contentType.startsWith("image/jpeg")) {
+            return `data:image/jpeg;base64,${Buffer.from(response.data, "binary").toString("base64")}`;
+          }
+        }
+        //default to a placeholder image if the content type is not recognized
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mP8P4PhPwMVAeOogaMGjho4auCogSPVQACqOzPNQ/wwqAAAAABJRU5ErkJggg==';
       } catch (e) {
         console.log(e);
         return "";

package/src/index.js

@@ -2,7 +2,10 @@ const {Liquid} = require("liquidjs");
 const {Localizer} = require("./localizer.js");
 const {HorizontalLine} = require("./lines.js");
 const {Barcode} = require("./barcode.js");
-const {Html} = require("./html.js");
+const {
+  Html, 
+  Unescape
+} = require("./html.js");
 const {Money, CurcySymbol, CurcyIso, CurcyName, MoneyReduce} = require("./money.js");
 const {DateF, TimeF, DateTime, HumanDate, HumanDateTime, ExpDate, HumanArrivalDateTime, HumanDepartureDateTime,
   DepartureDateTime, ArrivalDateTime, DepartureDate, ArrivalDate, DepartureTime, ArrivalTime, HumanArrivalDate,
@@ -52,6 +55,7 @@ function getEngine() {
   });
   engine.plugin(Localizer);
   engine.plugin(Html);
+  engine.plugin(Unescape);
   engine.plugin(HorizontalLine);
   engine.plugin(Barcode);
   engine.plugin(Money);

package/test/index-test.js

@@ -198,6 +198,26 @@ and some more here`,
     });
   });
 
+
+  it("should not load non image urls", async () => {
+    const tpl = require("../src/index");
+    const template = `{
+      "content": [
+        {
+          "image" : "{% httpImg 'https://www.google.com' %}"
+        }
+      ]
+    }`;
+    const documentDefinition = await tpl.processToObj(template, data);
+    expect(documentDefinition).to.be.eql({
+      "content": [
+        {
+          "image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAH0lEQVR42mP8P4PhPwMVAeOogaMGjho4auCogSPVQACqOzPNQ/wwqAAAAABJRU5ErkJggg=="
+        }
+      ]
+    });
+  });
+
   it("should apply tag after translations", async () => {
     const tpl = require("../src/index");
     const template = `{
@@ -728,4 +748,20 @@ and some more here`,
     const documentDefinition = await tpl.processToEscp(template, data);
     expect(documentDefinition).to.be.eql(`\u001bia\u0000\u001b@\u001b3$\u001bM\u001bEShift location closure #: 5c9f8f8f8f8f8f8f8f8f8f8\n\u001bF\u001b\u000f\f`);
   });
+
+  it("should return a text with unescaped characters", async () => {
+    const tpl = require("../src/index");
+    data.escapedCharacters = "< > & $";
+    const template = `{
+      "content": [
+        "{%- unescape escapedCharacters %}"
+      ]
+    }`;
+    const documentDefinition = await tpl.processToObj(template, data);
+    expect(documentDefinition).to.be.eql({
+      "content": [
+        "< > & $"
+      ]
+    });
+  });
 });