Add element node

3 files changed, 19 insertions, 2 deletions

diff --git a/lib/html/ast.js b/lib/html/ast.js
index f5f38da..25f4874 100644
--- a/lib/html/ast.js
+++ b/lib/html/ast.js
@@ -3,7 +3,16 @@ var _ = require("underscore");
 function fragment(children) {
     return {
         type: "fragment",
-        children: collapseFragments(children || [])
+        children: collapseFragments(children)
+    };
+}
+
+function element(tagName, attributes, children) {
+    return {
+        type: "element",
+        tagName: tagName,
+        attributes: attributes,
+        children: collapseFragments(children)
     };
 }
 
@@ -15,10 +24,11 @@ function text(value) {
 }
 
 function collapseFragments(elements) {
-    return _.flatten(elements.map(function(element) {
+    return _.flatten((elements || []).map(function(element) {
         return element.type === "fragment" ? element.children : [element];
     }), true)
 }
 
 exports.fragment = fragment;
+exports.element = element;
 exports.text = text;
diff --git a/lib/html/index.js b/lib/html/index.js
index 5e28f7b..f9e957a 100644
--- a/lib/html/index.js
+++ b/lib/html/index.js
@@ -1,4 +1,5 @@
 var ast = require("./ast.js");
 
 exports.fragment = ast.fragment;
+exports.element = ast.element;
 exports.text = ast.text;
diff --git a/tests/html/ast.tests.js b/tests/html/ast.tests.js
index 1920e63..c851377 100644
--- a/tests/html/ast.tests.js
+++ b/tests/html/ast.tests.js
@@ -10,5 +10,11 @@ describe("HTML ast", function() {
             html.fragment([html.fragment([html.text("Hello")])]),
             html.fragment([html.text("Hello")]));
     });
+    
+    test("children of elements are collapsed", function() {
+        assert.deepEqual(
+            html.element("p", {}, [html.fragment([html.text("Hello")])]),
+            html.element("p", {}, [html.text("Hello")]));
+    });
 });