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

Copy getters and setters correctly in interopWildcard (#6850)

Browse Source
This commit is contained in:
Daniel Tschinder 2017-11-30 22:50:10 +01:00 committed by Brian Ng
parent 18b91a8388
commit 9d9710c765
10 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/babel-helpers/src/helpers.js
View File

@ -449,7 +449,16 @@ helpers.interopRequireWildcard = defineHelper(`
var newObj = {};
if (obj != null) {
for (var key in obj) {
if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
if (Object.prototype.hasOwnProperty.call(obj, key)) {
var desc = Object.defineProperty && Object.getOwnPropertyDescriptor
? Object.getOwnPropertyDescriptor(obj, key)
: {};
if (desc.get || desc.set) {
Object.defineProperty(newObj, key, desc);
} else {
newObj[key] = obj[key];
}
}
}
}
newObj.default = obj;

3
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/actual.js vendored Normal file
View File

@ -0,0 +1,3 @@
import * as foo from "./moduleWithGetter";
export { foo };

5
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/exec.js vendored Normal file
View File

@ -0,0 +1,5 @@
import * as foo from "./moduleWithGetter";
assert.throws(() => foo.boo);
// No exception should be thrown

12
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/expected.js vendored Normal file
View File

@ -0,0 +1,12 @@
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.foo = void 0;
var foo = _interopRequireWildcard(require("./moduleWithGetter"));
exports.foo = foo;
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }

6
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/moduleWithGetter.js vendored Normal file
View File

@ -0,0 +1,6 @@
var Obj = {
baz: 123,
get boo() { throw new Error('Should never be triggered'); }
}
module.exports = Obj;

3
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/actual.js vendored Normal file
View File

@ -0,0 +1,3 @@
import Foo, { baz } from "./moduleWithGetter";
export { Foo, baz };

3
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/exec.js vendored Normal file
View File

@ -0,0 +1,3 @@
import Foo, { baz } from "./moduleWithGetter";
// No exception should be thrown

21
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/expected.js vendored Normal file
View File

@ -0,0 +1,21 @@
"use strict";
Object.defineProperty(exports, "__esModule", {
value: true
});
Object.defineProperty(exports, "Foo", {
enumerable: true,
get: function () {
return _moduleWithGetter.default;
}
});
Object.defineProperty(exports, "baz", {
enumerable: true,
get: function () {
return _moduleWithGetter.baz;
}
});
var _moduleWithGetter = _interopRequireWildcard(require("./moduleWithGetter"));
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }

6
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/moduleWithGetter.js vendored Normal file
View File

@ -0,0 +1,6 @@
var Obj = {
baz: 123,
get boo() { throw new Error('Should never be triggered'); }
}
module.exports = Obj;

2
packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/expected.js vendored
View File

@ -6,7 +6,7 @@ var Bar = _interopRequireWildcard(require("bar"));
var _baz = require("baz");
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }