Support empty (void) tags (#3)

* Support empty tags

* Improve test for empty (void) tags

* Rename test for empty (void) tags

* Inline empty-tags module in the project

* Add forgotten empty-tags file

* Simplify sanitization mapping

Author: NekR

src/empty-tags.js

@@ -0,0 +1,18 @@
+export default [
+	'area',
+	'base',
+	'br',
+	'col',
+	'command',
+	'embed',
+	'hr',
+	'img',
+	'input',
+	'keygen',
+	'link',
+	'meta',
+	'param',
+	'source',
+	'track',
+	'wbr'
+];

src/vhtml.js

@@ -1,3 +1,5 @@
+import emptyTags from './empty-tags';
+
 // escape an attribute
 let esc = str => String(str).replace(/[&<>"']/g, s=>`&${map[s]};`);
 let map = {'&':'amp','<':'lt','>':'gt','"':'quot',"'":'apos'};
@@ -24,20 +26,27 @@ export default function h(name, attrs) {
 			s += ` ${esc(i)}="${esc(attrs[i])}"`;
 		}
 	}
-	s += '>';
 
-	while (stack.length) {
-		let child = stack.pop();
-		if (child) {
-			if (child.pop) {
-				for (let i=child.length; i--; ) stack.push(child[i]);
-			}
-			else {
-				s += sanitized[child]===true ? child : esc(child);
+	if (emptyTags.indexOf(name) === -1) {
+		s += '>';
+
+		while (stack.length) {
+			let child = stack.pop();
+			if (child) {
+				if (child.pop) {
+					for (let i=child.length; i--; ) stack.push(child[i]);
+				}
+				else {
+					s += sanitized[child]===true ? child : esc(child);
+				}
 			}
 		}
+
+		s += `</${name}>`;
+	} else {
+		s += '>';
 	}
 
-	sanitized[s += `</${name}>`] = true;
+	sanitized[s] = true;
 	return s;
 }

test/vhtml.js

@@ -77,4 +77,33 @@ describe('vhtml', () => {
 			`<div class="foo"><h1>Hi!</h1><ul><li id="0"><h4>one</h4>This is item one!</li><li id="1"><h4>two</h4>This is item two!</li></ul></div>`
 		);
 	});
+
+	it('should support empty (void) tags', () => {
+		expect(
+			<div>
+				<area />
+				<base />
+				<br />
+				<col />
+				<command />
+				<embed />
+				<hr />
+				<img />
+				<input />
+				<keygen />
+				<link />
+				<meta />
+				<param />
+				<source />
+				<track />
+				<wbr />
+				{/* Not void elements */}
+				<div />
+				<span />
+				<p />
+			</div>
+		).to.equal(
+			`<div><area><base><br><col><command><embed><hr><img><input><keygen><link><meta><param><source><track><wbr><div></div><span></span><p></p></div>`
+		);
+	});
 });