boxwood 0.61.3 → 0.61.5

package/index.js

@@ -13,12 +13,21 @@ async function compile(path) {
         if (node.name === 'head') {
           nodes.head = node
         }
+        if (node.name === 'body') {
+          nodes.body = node
+        }
         if (node.name === 'style') {
-          styles.push(node.children)
+          const css = node.children
+          if (!styles.includes(css)) {
+            styles.push(css)
+          }
           node.ignore = true
         }
         if (node.name === 'script') {
-          scripts.push(node.children)
+          const js = node.children
+          if (!scripts.includes(js)) {
+            scripts.push(js)
+          }
           node.ignore = true
         }
         if (Array.isArray(node)) {
@@ -35,8 +44,10 @@ async function compile(path) {
             children: styles.join(''),
           })
         }
+      }
+      if (nodes.body) {
         if (scripts.length > 0) {
-          nodes.head.children.push({
+          nodes.body.children.push({
             name: 'script',
             children: scripts.join(''),
           })
@@ -57,7 +68,7 @@ const ENTITIES = {
 
 const REGEXP = /[&<>'"]/g
 
-const escape = (string) => {
+const escapeHTML = (string) => {
   return String.prototype.replace.call(string, REGEXP, function (character) {
     return ENTITIES[character]
   })
@@ -143,7 +154,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 ''
   }
@@ -154,7 +169,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)
@@ -170,7 +185,7 @@ const render = (input) => {
       `<${input.name} ` +
       attributes(input.attributes) +
       '>' +
-      render(input.children) +
+      render(input.children, isUnescapedTag(input.name)) +
       `</${input.name}>`
     )
   }
@@ -180,7 +195,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}>`
 }
@@ -403,7 +418,7 @@ module.exports = {
   compile,
   classes,
   doctype,
-  escape,
+  escape: escapeHTML,
   fragment,
   css,
   js,

package/package.json

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