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

fix static member expression calls, make classes more spec-compliant

Browse Source
This commit is contained in:
Sebastian McKenzie
2014-10-12 13:39:10 +11:00
parent 141ea98b89
commit bb697c6436
34 changed files with 158 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js vendored
View File

@@ -1,5 +1,5 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL2Jhci9iYXIuanMiLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJJQUFNLENBQUMsQ0FBQyxDQUFDO1dBQUgsQ0FBQyxDQUFDLENBQUM7U0FBSCxDQUFDLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59Il19
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL2Jhci9iYXIuanMiLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJJQUFNLENBQUMsQ0FBQyxDQUFDO01BQUgsQ0FBQyxDQUFDLENBQUMsYUFBSCxDQUFDLENBQUMsQ0FBQztTQUFILENBQUMsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgVGVzdCB7XG5cbn0iXX0=

2
test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js vendored
View File

@@ -1,4 +1,4 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();

2
test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map vendored
View File

@@ -1 +1 @@
{"version":3,"file":"lib/bar/bar.js","sources":["src/bar/bar.js"],"names":[],"mappings":"IAAM,CAAC,CAAC,CAAC;WAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC","sourcesContent":["class Test {\n\n}"]}
{"version":3,"file":"lib/bar/bar.js","sources":["src/bar/bar.js"],"names":[],"mappings":"IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC","sourcesContent":["class Test {\n\n}"]}

2
test/fixtures/bin/6to5/dir --out-dir/out-files/lib/bar/bar.js vendored
View File

@@ -1,4 +1,4 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();

4
test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js vendored
View File

@@ -1,9 +1,9 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();
arr.map(function(x) {
return x * MULTIPLIER;
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IklBQU0sQ0FBQyxDQUFDLENBQUM7V0FBSCxDQUFDLENBQUMsQ0FBQztTQUFILENBQUMsQ0FBQyxDQUFDOzs7QUNBVCxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQUM7U0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Q0FBQyxDQUFDIiwiZmlsZSI6InNjcmlwdDMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBUZXN0IHtcblxufSIsImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IklBQU0sQ0FBQyxDQUFDLENBQUM7TUFBSCxDQUFDLENBQUMsQ0FBQyxhQUFILENBQUMsQ0FBQyxDQUFDO1NBQUgsQ0FBQyxDQUFDLENBQUM7OztBQ0FULENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBQztTQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=

2
test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js vendored
View File

@@ -1,5 +1,5 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();
arr.map(function(x) {

2
test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map vendored
View File

@@ -1 +1 @@
{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":"IAAM,CAAC,CAAC,CAAC;WAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}
{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":"IAAM,CAAC,CAAC,CAAC;MAAH,CAAC,CAAC,CAAC,aAAH,CAAC,CAAC,CAAC;SAAH,CAAC,CAAC,CAAC;;;ACAT,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAC;SAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}

2
test/fixtures/bin/6to5/filenames --out-file/out-files/script3.js vendored
View File

@@ -1,5 +1,5 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
return Test;
}();
arr.map(function(x) {

4
test/fixtures/syntax/api/blacklist/expected.js vendored
View File

@@ -1,6 +1,6 @@
var Test = function () {
function Test() {
var Test = function Test() {
arr.map(x => x * x);
}
};
return Test;
}();

94
test/fixtures/syntax/classes/accessing-super-class/expected.js vendored
View File

@@ -1,57 +1,57 @@
var Test = function(Foo) {
function Test() {
woops.super.test();
Foo.call(this);
var Test = function Test() {
woops.super.test();
Foo.call(this);
Foo.prototype.test.call(this);
foob(Foo);
Foo.call.apply(Foo, [this].concat(Array.prototype.slice.call(arguments)));
Foo.call.apply(Foo, [this, "test"].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(Foo.prototype, [this].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(
Foo.prototype,
[this, "test"].concat(Array.prototype.slice.call(arguments))
);
};
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
});
Test.__proto__ = Foo;
Object.defineProperties(Test.prototype, {
test: {
writeable: true,
value: function() {
Foo.prototype.test.call(this);
foob(Foo);
Foo.call.apply(Foo, [this].concat(Array.prototype.slice.call(arguments)));
Foo.call.apply(Foo, [this, "test"].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(Foo.prototype, [this].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(Foo.prototype.test, [this].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(
Foo.prototype,
[this, "test"].concat(Array.prototype.slice.call(arguments))
Foo.prototype.test,
[this, "test"].concat(Array.prototype.slice.call(arguments))
);
}
}
});
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
});
Object.defineProperties(Test, {
foo: {
writeable: true,
Test.__proto__ = Foo;
value: function() {
Foo.foo.call(this);
Foo.foo.call.apply(Foo.foo, [this].concat(Array.prototype.slice.call(arguments)));
Foo.foo.call.apply(Foo.foo, [this, "test"].concat(Array.prototype.slice.call(arguments)));
}
}
});
Object.defineProperties(Test.prototype, {
test: {
writeable: true,
value: function() {
Foo.prototype.test.call(this);
Foo.prototype.test.call.apply(Foo.prototype.test, [this].concat(Array.prototype.slice.call(arguments)));
Foo.prototype.test.call.apply(
Foo.prototype.test,
[this, "test"].concat(Array.prototype.slice.call(arguments))
);
}
}
});
Object.defineProperties(Test, {
foo: {
writeable: true,
value: function() {
Foo.foo.call(this);
Foo.foo.call.apply(Foo.foo, [this].concat(Array.prototype.slice.call(arguments)));
Foo.foo.call.apply(Foo.foo, [this, "test"].concat(Array.prototype.slice.call(arguments)));
}
}
});
return Test;
return Test;
}(Foo);

28
test/fixtures/syntax/classes/accessing-super-properties/expected.js vendored
View File

@@ -1,18 +1,18 @@
var Test = function(Foo) {
function Test() {
Foo.prototype.test;
Foo.prototype.test.whatever;
var Test = function Test() {
Foo.prototype.test;
Foo.prototype.test.whatever;
};
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
});
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
});
Test.__proto__ = Foo;
return Test;
Test.__proto__ = Foo;
return Test;
}(Foo);

4
test/fixtures/syntax/classes/calling-super-properties/actual.js vendored
View File

@@ -3,4 +3,8 @@ class Test extends Foo {
super.test.whatever();
super.test();
}
static test() {
return super.wow();
}
}

35
test/fixtures/syntax/classes/calling-super-properties/expected.js vendored
View File

@@ -1,16 +1,25 @@
var Test = function(Foo) {
function Test() {
Foo.prototype.test.whatever();
Foo.prototype.test.call(this);
var Test = function Test() {
Foo.prototype.test.whatever();
Foo.prototype.test.call(this);
};
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,
enumerable: false,
writable: true,
configurable: true
}
});
Test.__proto__ = Foo;
return Test;
});
Test.__proto__ = Foo;
Object.defineProperties(Test, {
test: {
writeable: true,
value: function() {
return Foo.wow.call(this);
}
}
});
return Test;
}(Foo);

8
test/fixtures/syntax/classes/constructor/expected.js vendored
View File

@@ -1,14 +1,14 @@
var Test = function () {
function Test() {
var Test = function Test() {
this.state = "test";
}
};
return Test;
}();
var Foo = function(Bar) {
function Foo() {
var Foo = function Foo() {
this.state = "test";
}
};
Foo.prototype = Object.create(Bar.prototype, {
constructor: {

3
test/fixtures/syntax/classes/instance-getter-and-setter/expected.js vendored
View File

@@ -1,6 +1,5 @@
var Test = function () {
function Test() {
}
var Test = function Test() { };
Object.defineProperties(Test.prototype, {
test: {
get: function () {

3
test/fixtures/syntax/classes/instance-getter/expected.js vendored
View File

@@ -1,6 +1,5 @@
var Test = function () {
function Test() {
}
var Test = function Test() { };
Object.defineProperties(Test.prototype, {
test: {
get: function () {

3
test/fixtures/syntax/classes/instance-method/expected.js vendored
View File

@@ -1,6 +1,5 @@
var Test = function () {
function Test() {
}
var Test = function Test() { };
Object.defineProperties(Test.prototype, {
test: {
writeable: true,

3
test/fixtures/syntax/classes/instance-setter/expected.js vendored
View File

@@ -1,6 +1,5 @@
var Test = function () {
function Test() {
}
var Test = function Test() { };
Object.defineProperties(Test.prototype, {
test: {
set: function (val) {

3
test/fixtures/syntax/classes/plain-class/expected.js vendored
View File

@@ -1,5 +1,4 @@
var Test = function () {
function Test() {
}
var Test = function Test() { };
return Test;
}();

6
test/fixtures/syntax/classes/statement/actual.js vendored
View File

@@ -4,4 +4,8 @@ var BaseView = class BaseView {
}
}
module.exports = BaseView;
var BaseView = class {
constructor() {
this.autoRender = true;
}
}

11
test/fixtures/syntax/classes/statement/expected.js vendored
View File

@@ -1,9 +1,14 @@
var BaseView = function () {
function BaseView() {
var BaseView = function BaseView() {
this.autoRender = true;
}
};
return BaseView;
}();
module.exports = BaseView;
var BaseView = function () {
var _class = function () {
this.autoRender = true;
};
return _class;
}();

2
test/fixtures/syntax/classes/static/expected.js vendored
View File

@@ -1,5 +1,5 @@
var A = function() {
function A() {}
var A = function A() {};
Object.defineProperties(A, {
a: {

0
test/fixtures/syntax/classes/super-class-member-expression/actual.js → test/fixtures/syntax/classes/super-class-id-member-expression/actual.js vendored
View File

8
test/fixtures/syntax/classes/super-class-member-expression/expected.js → test/fixtures/syntax/classes/super-class-id-member-expression/expected.js vendored
View File

@@ -1,7 +1,7 @@
var BaseController = function (Chaplin) {
function BaseController() {
var BaseController = function BaseController() {
Chaplin.Controller.apply(this, arguments);
}
};
BaseController.prototype = Object.create(Chaplin.Controller.prototype, {
constructor: {
value: BaseController,
@@ -15,9 +15,9 @@ var BaseController = function (Chaplin) {
}(Chaplin);
var BaseController2 = function (Chaplin) {
function BaseController2() {
var BaseController2 = function BaseController2() {
Chaplin.Controller.Another.apply(this, arguments);
}
};
BaseController2.prototype = Object.create(Chaplin.Controller.Another.prototype, {
constructor: {
value: BaseController2,

0
test/fixtures/syntax/classes/super-class-non-identifiers/actual.js → test/fixtures/syntax/classes/super-class-id-non-identifiers/actual.js vendored
View File

4
test/fixtures/syntax/classes/super-class-non-identifiers/expected.js → test/fixtures/syntax/classes/super-class-id-non-identifiers/expected.js vendored
View File

@@ -1,7 +1,7 @@
var Q = function(_ref) {
function Q() {
var Q = function Q() {
_ref.apply(this, arguments);
}
};
Q.prototype = Object.create(_ref.prototype, {
constructor: {

4
test/fixtures/syntax/classes/super-class/expected.js vendored
View File

@@ -1,7 +1,7 @@
var Test = function (Foo) {
function Test() {
var Test = function Test() {
Foo.apply(this, arguments);
}
};
Test.prototype = Object.create(Foo.prototype, {
constructor: {
value: Test,

0
test/fixtures/syntax/classes/super-fallback/actual.js → test/fixtures/syntax/classes/super-function-fallback/actual.js vendored
View File

4
test/fixtures/syntax/classes/super-fallback/expected.js → test/fixtures/syntax/classes/super-function-fallback/expected.js vendored
View File

@@ -1,6 +1,6 @@
var Test = function () {
function Test() {
var Test = function Test() {
Function.prototype.hasOwnProperty.call(this, "test");
}
};
return Test;
}();

8
test/fixtures/syntax/modules/exports-default/expected.js vendored
View File

@@ -8,15 +8,13 @@ exports.default = foo;
exports.default = function () {}
exports.default = function () {
function Anonymous() {
}
return Anonymous;
var _class = function() {};
return _class;
}();
exports.default = function foo () {}
exports.default = function () {
function foo() {
}
var foo = function foo() {};
return foo;
}();

3
test/fixtures/syntax/modules/exports-variable/expected.js vendored
View File

@@ -25,8 +25,7 @@ var foo8;
function foo7 () {}
foo8 = function () {
function foo8() {
}
var foo8 = function foo8() {};
return foo8;
}();
exports.foo8 = foo8;

2
test/fixtures/syntax/source-maps/class/expected.js vendored
View File

@@ -1,5 +1,5 @@
var Test = function() {
function Test() {}
var Test = function Test() {};
Object.defineProperties(Test.prototype, {
bar: {