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

Merge pull request #296 from caseywebdev/fix-295

Browse Source 
Fix incorrect object reference in #295
This commit is contained in:
Sebastian McKenzie 2014-12-15 13:58:34 +11:00
commit e7cbbefc11
7 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,25 +65,16 @@ AMDFormatter.prototype.import = function (node) {
AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) { AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
var key = t.getSpecifierName(specifier); var key = t.getSpecifierName(specifier);
var id = specifier.id; var ref = this._push(node);
// import foo from "foo";
if (specifier.default) {
id = t.identifier("default");
}
var ref;
if (t.isImportBatchSpecifier(specifier)) { if (t.isImportBatchSpecifier(specifier)) {
// import * as bar from "foo"; // import * as bar from "foo";
ref = this._push(node); } else if (specifier.default) {
} else {
// import foo from "foo"; // import foo from "foo";
ref = t.memberExpression(this._push(node), id, false); ref = t.callExpression(this.file.addDeclaration("interop-require"), [ref]);
} else {
if (specifier.default) { // import {foo} from "foo";
ref = t.callExpression(this.file.addDeclaration("interop-require"), [ref]); ref = t.memberExpression(ref, specifier.id, false);
}
} }
nodes.push(t.variableDeclaration("var", [ nodes.push(t.variableDeclaration("var", [

2
test/fixtures/transformation/es6-modules-amd/imports-default/expected.js vendored
View File

@ -5,7 +5,7 @@ define(["exports", "foo"], function (exports, _foo) {
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var foo = _foo["default"]; var foo = _foo["default"];
}); });

2
test/fixtures/transformation/es6-modules-amd/imports-mixing/expected.js vendored
View File

@ -5,7 +5,7 @@ define(["exports", "foo"], function (exports, _foo) {
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var xyz = _foo.baz; var xyz = _foo.baz;
}); });

2
test/fixtures/transformation/es6-modules-amd/overview/expected.js vendored
View File

@ -5,7 +5,7 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports,
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var foo = _foo; var foo = _foo;
var bar = _foo.bar; var bar = _foo.bar;

2
test/fixtures/transformation/es6-modules-umd/imports-default/expected.js vendored
View File

@ -11,7 +11,7 @@
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var foo = _foo["default"]; var foo = _foo["default"];
}); });

2
test/fixtures/transformation/es6-modules-umd/imports-mixing/expected.js vendored
View File

@ -11,7 +11,7 @@
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var xyz = _foo.baz; var xyz = _foo.baz;
}); });

2
test/fixtures/transformation/es6-modules-umd/overview/expected.js vendored
View File

@ -11,7 +11,7 @@
return obj && (obj["default"] || obj); return obj && (obj["default"] || obj);
}; };
var foo = _interopRequire(_foo["default"]); var foo = _interopRequire(_foo);
var foo = _foo; var foo = _foo;
var bar = _foo.bar; var bar = _foo.bar;