fFix module formatter parsing bug where literals were being converted to identifiers

This commit is contained in:
Sebastian McKenzie
2014-12-16 08:06:25 +11:00
parent d8e4a4a776
commit 1f990f4030
3 changed files with 5 additions and 12 deletions

View File

@@ -104,7 +104,7 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
} else {
// export { foo } from "test";
nodes.push(util.template("exports-assign-key", {
VARIABLE_NAME: variableName.name,
VARIABLE_NAME: variableName,
OBJECT: getRef(),
KEY: specifier.id
}, true));

View File

@@ -25,7 +25,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
nodes.push(t.variableDeclaration("var", [
t.variableDeclarator(variableName,
t.callExpression(this.file.addDeclaration("interop-require"), [util.template("require", {
MODULE_NAME: node.source.raw
MODULE_NAME: node.source
})])
)
]));
@@ -42,7 +42,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
nodes.push(util.template(templateName, {
VARIABLE_NAME: variableName,
MODULE_NAME: node.source.raw,
MODULE_NAME: node.source,
KEY: specifier.id
}));
}
@@ -51,9 +51,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
// import "foo";
nodes.push(util.template("require", {
//inherits: node,
MODULE_NAME: node.source.raw
MODULE_NAME: node.source
}, true));
};

View File

@@ -152,12 +152,7 @@ exports.template = function (name, nodes, keepExpression) {
if (!_.isEmpty(nodes)) {
traverse(template, function (node) {
if (t.isIdentifier(node) && _.has(nodes, node.name)) {
var newNode = nodes[node.name];
if (_.isString(newNode)) {
node.name = newNode;
} else {
return newNode;
}
return nodes[node.name];
}
});
}