orbit-oss/chalk
5
4
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix undefined and null interpolated expressions (fixes #194)

Browse source
This commit is contained in:
Josh Junon 2017-08-01 18:55:54 -07:00 • committed by Josh Junon
parent 106f086aaf
commit 69ac663f29
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.js
View file

@ -207,8 +207,8 @@ function chalkTag(chalk, strings) {
const parts = [strings.raw[0]];
for (let i = 1; i < strings.length; i++) {
parts.push(args[i - 1].toString().replace(/[{}\\]/g, '\\$&'));
parts.push(strings.raw[i]);
parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&'));
parts.push(String(strings.raw[i]));
}
return template(chalk, parts.join(''));

6
test/template-literal.js
View file

@ -161,3 +161,9 @@ test('should not parse upper-case escapes', t => {
const ctx = m.constructor({level: 0});
t.is(ctx`\N\n\T\t\X07\x07\U000A\u000A\U000a\u000a`, 'N\nT\tX07\x07U000A\u000AU000a\u000A');
});
test('should properly handle undefined template interpolated values', t => {
const ctx = m.constructor({level: 0});
t.is(ctx`hello ${undefined}`, 'hello undefined');
t.is(ctx`hello ${null}`, 'hello null');
});