boxwood 0.61.2 → 0.61.4

package/index.js

@@ -57,7 +57,7 @@ const ENTITIES = {
 
 const REGEXP = /[&<>'"]/g
 
-const escape = (string) => {
+const escapeHTML = (string) => {
   return String.prototype.replace.call(string, REGEXP, function (character) {
     return ENTITIES[character]
   })
@@ -110,11 +110,14 @@ const ALIASES = {
 const attributes = (options) => {
   const result = []
   for (const key in options) {
-    if (BOOLEAN_ATTRIBUTES.includes(key)) {
-      result.push(key)
-    } else {
-      const name = ALIASES[key] || key
-      result.push(name + '=' + '"' + options[key] + '"')
+    const value = options[key]
+    if (value) {
+      if (BOOLEAN_ATTRIBUTES.includes(key)) {
+        result.push(key)
+      } else {
+        const name = ALIASES[key] || key
+        result.push(name + '=' + '"' + options[key] + '"')
+      }
     }
   }
   return result.join(' ')
@@ -140,7 +143,11 @@ const SELF_CLOSING_TAGS = [
   '!DOCTYPE html',
 ]
 
-const render = (input) => {
+const isUnescapedTag = (name) => {
+  return !['script', 'style', 'template'].includes(name)
+}
+
+const render = (input, escape = true) => {
   if (input.ignore) {
     return ''
   }
@@ -151,7 +158,7 @@ const render = (input) => {
     return input.toString()
   }
   if (typeof input === 'string') {
-    return escape(input)
+    return escape ? escapeHTML(input) : input
   }
   if (input.name === 'fragment') {
     return render(input.children)
@@ -167,7 +174,7 @@ const render = (input) => {
       `<${input.name} ` +
       attributes(input.attributes) +
       '>' +
-      render(input.children) +
+      render(input.children, isUnescapedTag(input.name)) +
       `</${input.name}>`
     )
   }
@@ -177,7 +184,7 @@ const render = (input) => {
     )
   }
   if (input.children) {
-    return `<${input.name}>` + render(input.children) + `</${input.name}>`
+    return `<${input.name}>` + render(input.children, isUnescapedTag(input.name)) + `</${input.name}>`
   }
   return `<${input.name}></${input.name}>`
 }
@@ -400,7 +407,7 @@ module.exports = {
   compile,
   classes,
   doctype,
-  escape,
+  escape: escapeHTML,
   fragment,
   css,
   js,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "boxwood",
-  "version": "0.61.2",
+  "version": "0.61.4",
   "description": "Compile HTML templates into JS",
   "main": "index.js",
   "scripts": {