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

add comments and change single quotes in amd formatter getModuleName

Browse Source
This commit is contained in:
Sebastian McKenzie
2014-11-16 19:18:56 +11:00
parent 105e6ac379
commit 50333c879c
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/6to5/transformation/modules/amd.js
View File

@@ -29,7 +29,7 @@ AMDFormatter.prototype.transform = function (ast) {
var params = _.values(this.ids);
params.unshift(t.identifier("exports"));
var moduleName = this.getModuleName(this.file);
var moduleName = this.getModuleName();
var container = t.functionExpression(null, params, t.blockStatement(body));
var call = t.callExpression(t.identifier("define"), [t.literal(moduleName), names, container]);
@@ -37,26 +37,28 @@ AMDFormatter.prototype.transform = function (ast) {
program.body = [t.expressionStatement(call)];
};
AMDFormatter.prototype.getModuleName = function (file) {
var opts = file.opts,
filenameRelative = opts.filenameRelative,
sourceRootRegEx,
moduleName;
AMDFormatter.prototype.getModuleName = function () {
var opts = this.file.opts;
var filenameRelative = opts.filenameRelative;
var moduleName = "";
if (opts.moduleRoot) {
moduleName = opts.moduleRoot + '/';
moduleName = opts.moduleRoot + "/";
}
if (!opts.filenameRelative) {
return moduleName + opts.filename.replace(/^\//, '');
return moduleName + opts.filename.replace(/^\//, "");
}
if (opts.sourceRoot) {
sourceRootRegEx = new RegExp('^' + opts.sourceRoot + '\/?');
filenameRelative = filenameRelative.replace(sourceRootRegEx, '');
// remove sourceRoot from filename
var sourceRootRegEx = new RegExp("^" + opts.sourceRoot + "\/?");
filenameRelative = filenameRelative.replace(sourceRootRegEx, "");
}
filenameRelative = filenameRelative.replace(/\.js$/, '');
// remove extension
filenameRelative = filenameRelative.replace(/\.(.*?)$/, "");
moduleName += filenameRelative;
return moduleName;

2
lib/6to5/transformation/modules/umd.js
View File

@@ -32,7 +32,7 @@ UMDFormatter.prototype.transform = function (ast) {
// runner
var moduleName = this.getModuleName(this.file);
var moduleName = this.getModuleName();
var runner = util.template("umd-runner-body", {
AMD_ARGUMENTS: [t.literal(moduleName), t.arrayExpression([t.literal("exports")].concat(names))],