cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1733 from hzoo/i-1732

Browse Source 
remove empty strings from beginning of template - fixes #1732
This commit is contained in:
Sebastian McKenzie
2015-06-15 10:46:28 +01:00
parent 7e080aa9d2 98424f80af
commit e08d400b36
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/babel/transformation/transformers/es6/template-literals.js
View File

@@ -45,6 +45,10 @@ export function TaggedTemplateExpression(node, parent, scope, file) {
return t.callExpression(node.tag, args);
}
function isString(node) {
return t.isLiteral(node) && typeof node.value === "string";
}
export function TemplateLiteral(node, parent, scope, file) {
var nodes = [];
@@ -56,9 +60,18 @@ export function TemplateLiteral(node, parent, scope, file) {
}
if (nodes.length > 1) {
// remove redundant '' at the end of the expression
var last = nodes[nodes.length - 1];
if (t.isLiteral(last, { value: "" })) nodes.pop();
// filter out empty string literals
nodes = nodes.filter(n => !t.isLiteral(n, { value: "" }));
if (nodes.length === 1 && isString(nodes[0])) {
return nodes[0];
}
// since `+` is left-to-right associative
// ensure the first node is a string if first/second isn't
if (!isString(nodes[0]) && !isString(nodes[1])) {
nodes.unshift(t.literal(""));
}
var root = buildBinaryExpression(nodes.shift(), nodes.shift());