Call freshElement to create self-closing elements

2 files changed, 16 insertions, 5 deletions

diff --git a/lib/html/ast.js b/lib/html/ast.js
index 0dd8120..c949550 100644
--- a/lib/html/ast.js
+++ b/lib/html/ast.js
@@ -8,9 +8,22 @@ function nonFreshElement(tagName, attributes, children) {
 }
 
 function freshElement(tagName, attributes, children) {
-    return elementWithTag(
-        htmlPaths.element(tagName, attributes, {fresh: true}),
-        children);
+    if (isVoidElement(tagName, children)) {
+        return selfClosingElement(tagName, attributes);
+    } else {
+        var tag = htmlPaths.element(tagName, attributes, {fresh: true});
+        return elementWithTag(tag, children);
+    }
+}
+
+var voidTagNames = {
+    "br": true,
+    "hr": true,
+    "img": true
+};
+
+function isVoidElement(tagName, children) {
+    return (!children || children.length === 0) && voidTagNames[tagName];
 }
 
 function elementWithTag(tag, children) {
@@ -43,6 +56,5 @@ var forceWrite = {
 exports.freshElement = freshElement;
 exports.nonFreshElement = nonFreshElement;
 exports.elementWithTag = elementWithTag;
-exports.selfClosingElement = selfClosingElement;
 exports.text = text;
 exports.forceWrite = forceWrite;
diff --git a/lib/html/index.js b/lib/html/index.js
index 600d783..3b6a190 100644
--- a/lib/html/index.js
+++ b/lib/html/index.js
@@ -3,7 +3,6 @@ var ast = require("./ast");
 exports.freshElement = ast.freshElement;
 exports.nonFreshElement = ast.nonFreshElement;
 exports.elementWithTag = ast.elementWithTag;
-exports.selfClosingElement = ast.selfClosingElement;
 exports.text = ast.text;
 exports.forceWrite = ast.forceWrite;