Accept non-strings in htmlEscapeTag and htmlUnescapeTag (#13)

sindresorhus · May 30, 2019 · 633c0dc · 633c0dc
1 parent 235683e
commit 633c0dc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -17,7 +17,7 @@ exports.htmlUnescape = htmlString => htmlString
 exports.htmlEscapeTag = (strings, ...values) => {
 	let output = strings[0];
 	for (let i = 0; i < values.length; i++) {
-		output = output + exports.htmlEscape(values[i]) + strings[i + 1];
+		output = output + exports.htmlEscape(String(values[i])) + strings[i + 1];
 	}
 
 	return output;
@@ -26,7 +26,7 @@ exports.htmlEscapeTag = (strings, ...values) => {
 exports.htmlUnescapeTag = (strings, ...values) => {
 	let output = strings[0];
 	for (let i = 0; i < values.length; i++) {
-		output = output + exports.htmlUnescape(values[i]) + strings[i + 1];
+		output = output + exports.htmlUnescape(String(values[i])) + strings[i + 1];
 	}
 
 	return output;

diff --git a/test.js b/test.js
@@ -24,12 +24,24 @@ test('htmlEscapeTag', t => {
 	t.is(htmlEscapeTag`Hello <em><>${'<>'}</em>`, 'Hello <em><>&lt;&gt;</em>');
 });
 
+test('htmlEscapeTag non-strings', t => {
+	t.is(htmlEscapeTag`foobarz${undefined}`, 'foobarzundefined');
+	t.is(htmlEscapeTag`🦄 ${true}`, '🦄 true');
+	t.is(htmlEscapeTag`Hello <em><>${1}</em>`, 'Hello <em><>1</em>');
+});
+
 test('htmlUnescapeTag', t => {
 	t.is(htmlUnescapeTag`foobarz${'&amp;&lt;&gt;&quot;&#39;'}`, 'foobarz&<>"\'');
 	t.is(htmlUnescapeTag`🦄 ${'&amp;'} 🐐`, '🦄 & 🐐');
 	t.is(htmlUnescapeTag`Hello <em><>${'&lt;&gt;'}</em>`, 'Hello <em><><></em>');
 });
 
+test('htmlUnescapeTag non-strings', t => {
+	t.is(htmlUnescapeTag`foobarz${undefined}`, 'foobarzundefined');
+	t.is(htmlUnescapeTag`🦄 ${true}`, '🦄 true');
+	t.is(htmlUnescapeTag`Hello <em><>${1}</em>`, 'Hello <em><>1</em>');
+});
+
 test('htmlEscapeTag & htmlUnescapeTag', t => {
 	const input = '&<>"\'';
 	const actual = htmlUnescapeTag`${htmlEscapeTag`${input}`}`;