Add support for dashes in keys (sindresorhus#24)

SolinkCorp · Aug 25, 2022 · 1ba448a · 1ba448a
1 parent 9e000b6
commit 1ba448a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -39,13 +39,13 @@ module.exports = (template, data, {ignoreMissing = false, transform = ({value})
 	const composeHtmlEscape = replacer => (...args) => htmlEscape(replacer(...args));
 
 	// The regex tries to match either a number inside `{{ }}` or a valid JS identifier or key path.
-	const doubleBraceRegex = /{{(\d+|[a-z$_][a-z\d$_]*?(?:\.[a-z\d$_]*?)*?)}}/gi;
+	const doubleBraceRegex = /{{(\d+|[a-z$_][\w\-$]*?(?:\.[\w\-$]*?)*?)}}/gi;
 
 	if (doubleBraceRegex.test(template)) {
 		template = template.replace(doubleBraceRegex, composeHtmlEscape(replace));
 	}
 
-	const braceRegex = /{(\d+|[a-z$_][a-z\d$_]*?(?:\.[a-z\d$_]*?)*?)}/gi;
+	const braceRegex = /{(\d+|[a-z$_][\w\-$]*?(?:\.[\w\-$]*?)*?)}/gi;
 
 	return template.replace(braceRegex, replace);
 };

diff --git a/test.js b/test.js
@@ -6,6 +6,7 @@ test('main', t => {
 	t.is(pupa('{foo}', {foo: '!'}), '!');
 	t.is(pupa('{foo}', {foo: 10}), '10');
 	t.is(pupa('{foo}', {foo: 0}), '0');
+	t.is(pupa('{fo-o}', {'fo-o': 0}), '0');
 	t.is(pupa('{foo}{foo}', {foo: '!'}), '!!');
 	t.is(pupa('{foo}{bar}{foo}', {foo: '!', bar: '#'}), '!#!');
 	t.is(pupa('yo {foo} lol {bar} sup', {foo: '🦄', bar: '🌈'}), 'yo 🦄 lol 🌈 sup');