Skip to content

Annotating transformed classes with #__PURE__ comment #6209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hzoo merged 1 commit into from
Sep 11, 2017
Merged

Annotating transformed classes with #__PURE__ comment #6209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/babel-core/test/fixtures/transformation/misc/regression-1155/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {

@kzc kzc Sep 9, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not important... but is there a reason why this is on 3 lines instead of 1?

@Andarist Andarist Sep 9, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its just how babel-generator spits out code from the AST, looks weird to me too, but 🙄

@hzoo hzoo Sep 9, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably just because we removed some logic with newlines using tokens/comments so it's like that now

babelHelpers.inherits(Foo, _Bar);

function Foo(options) {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-core/test/fixtures/transformation/misc/regression-2892/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ function _asyncToGenerator(fn) { return function () { var _this = this, _argumen

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }

var Foo = function () {
var Foo =
/*#__PURE__*/
function () {
function Foo() {
_classCallCheck(this, Foo);
}
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-core/test/fixtures/transformation/source-maps/class/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function () {
var Test =
/*#__PURE__*/
function () {
function Test() {
babelHelpers.classCallCheck(this, Test);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-core/test/fixtures/transformation/source-maps/class/source-mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"column": 10
},
"generated": {
"line": 9,
"line": 11,
"column": 15
}
}]
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/general/derived/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo(...args) {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/general/foobar/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"use strict";

var Child = function (_Parent) {
var Child =
/*#__PURE__*/
function (_Parent) {
babelHelpers.inherits(Child, _Parent);

function Child() {
Expand Down
4 changes: 3 additions & 1 deletion ...-plugin-transform-class-properties/test/fixtures/general/non-block-arrow-func/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export default (param => {
var _class, _temp;

return _temp = _class = function () {
return _temp = _class =
/*#__PURE__*/
function () {
function App() {
babelHelpers.classCallCheck(this, App);
}
Expand Down
4 changes: 3 additions & 1 deletion ...abel-plugin-transform-class-properties/test/fixtures/general/regression-T6719/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
function withContext(ComposedComponent) {
var _class, _temp;

return _temp = _class = function (_Component) {
return _temp = _class =
/*#__PURE__*/
function (_Component) {
babelHelpers.inherits(WithContext, _Component);

function WithContext() {
Expand Down
8 changes: 6 additions & 2 deletions ...ages/babel-plugin-transform-class-properties/test/fixtures/general/super-call/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var A = function () {
var A =
/*#__PURE__*/
function () {
function A() {
babelHelpers.classCallCheck(this, A);
}
Expand All @@ -12,7 +14,9 @@ var A = function () {
return A;
}();

var B = function (_A) {
var B =
/*#__PURE__*/
function (_A) {
babelHelpers.inherits(B, _A);

function B(...args) {
Expand Down
4 changes: 3 additions & 1 deletion ...abel-plugin-transform-class-properties/test/fixtures/general/super-expression/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo() {
Expand Down
4 changes: 3 additions & 1 deletion ...babel-plugin-transform-class-properties/test/fixtures/general/super-statement/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/loose/derived/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo(...args) {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/loose/foobar/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
"use strict";

var Child = function (_Parent) {
var Child =
/*#__PURE__*/
function (_Parent) {
babelHelpers.inherits(Child, _Parent);

function Child() {
Expand Down
4 changes: 3 additions & 1 deletion ...el-plugin-transform-class-properties/test/fixtures/loose/non-block-arrow-func/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export default (param => {
var _class, _temp;

return _temp = _class = function () {
return _temp = _class =
/*#__PURE__*/
function () {
function App() {
babelHelpers.classCallCheck(this, App);
}
Expand Down
4 changes: 3 additions & 1 deletion .../babel-plugin-transform-class-properties/test/fixtures/loose/super-expression/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo() {
Expand Down
4 changes: 3 additions & 1 deletion ...s/babel-plugin-transform-class-properties/test/fixtures/loose/super-statement/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Foo = function (_Bar) {
var Foo =
/*#__PURE__*/
function (_Bar) {
babelHelpers.inherits(Foo, _Bar);

function Foo() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/regression/6154/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ var Test = function Test() {

_classCallCheck(this, Test);

var Other = function (_Test) {
var Other =
/*#__PURE__*/
function (_Test) {
_inherits(Other, _Test);

function Other() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-class-properties/test/fixtures/regression/T6719/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
function withContext(ComposedComponent) {
var _class, _temp;

return _temp = _class = function (_Component) {
return _temp = _class =
/*#__PURE__*/
function (_Component) {
babelHelpers.inherits(WithContext, _Component);

function WithContext() {
Expand Down
12 changes: 7 additions & 5 deletions packages/babel-plugin-transform-es2015-classes/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import LooseTransformer from "./loose";
import VanillaTransformer from "./vanilla";
import nameFunction from "babel-helper-function-name";

const PURE_ANNOTATION = "#__PURE__";

@xtuc xtuc Sep 9, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use this across multiple plugins? We might want to add it in a helper.

@Andarist Andarist Sep 9, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@xtuc sure thing, whats the best place to add such?

@xtuc xtuc Sep 11, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too late but I had something like babel-help-emit-pure-annotation in mind but I'm not sure it will be used apart from here.

@hzoo hzoo Sep 11, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would just make it when we need/get to it. It's not a breaking change to swap it out either


export default function({ types: t }) {
// todo: investigate traversal requeueing
const VISITED = Symbol();
Expand Down Expand Up @@ -51,11 +53,11 @@ export default function({ types: t }) {

path.replaceWith(new Constructor(path, state.file).run());

if (
path.isCallExpression() &&
path.get("callee").isArrowFunctionExpression()
) {
path.get("callee").arrowFunctionToExpression();
if (path.isCallExpression()) {
path.addComment("leading", PURE_ANNOTATION);
if (path.get("callee").isArrowFunctionExpression()) {
path.get("callee").arrowFunctionToExpression();
}
}
},
},
Expand Down
4 changes: 3 additions & 1 deletion ...-transform-es2015-classes/test/fixtures/loose-classCallCheck/with-constructor/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ let A = function A() {
console.log('a');
};

let B = function () {
let B =
/*#__PURE__*/
function () {
function B() {}

var _proto = B.prototype;
Expand Down
4 changes: 3 additions & 1 deletion ...n-transform-es2015-classes/test/fixtures/loose-classCallCheck/with-superClass/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea

let B = function B() {};

let A = function (_B) {
let A =
/*#__PURE__*/
function (_B) {
_inheritsLoose(A, _B);

function A(track) {
Expand Down
4 changes: 3 additions & 1 deletion ...bel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-class/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function (_Foo) {
var Test =
/*#__PURE__*/
function (_Foo) {
babelHelpers.inheritsLoose(Test, _Foo);

function Test() {
Expand Down
4 changes: 3 additions & 1 deletion ...lugin-transform-es2015-classes/test/fixtures/loose/accessing-super-properties/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function (_Foo) {
var Test =
/*#__PURE__*/
function (_Foo) {
babelHelpers.inheritsLoose(Test, _Foo);

function Test() {
Expand Down
4 changes: 3 additions & 1 deletion ...-plugin-transform-es2015-classes/test/fixtures/loose/calling-super-properties/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function (_Foo) {
var Test =
/*#__PURE__*/
function (_Foo) {
babelHelpers.inheritsLoose(Test, _Foo);

function Test() {
Expand Down
4 changes: 3 additions & 1 deletion ...s/babel-plugin-transform-es2015-classes/test/fixtures/loose/constructor-order/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var x = function () {
var x =
/*#__PURE__*/
function () {
var _proto = x.prototype;

_proto.f = function f() {
Expand Down
4 changes: 3 additions & 1 deletion ...es2015-classes/test/fixtures/loose/derived-constructor-no-super-return-falsey/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Child = function (_Base) {
var Child =
/*#__PURE__*/
function (_Base) {
babelHelpers.inheritsLoose(Child, _Base);

function Child() {
Expand Down
4 changes: 3 additions & 1 deletion ...es2015-classes/test/fixtures/loose/derived-constructor-no-super-return-object/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Child = function (_Base) {
var Child =
/*#__PURE__*/
function (_Base) {
babelHelpers.inheritsLoose(Child, _Base);

function Child() {
Expand Down
6 changes: 4 additions & 2 deletions packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/literal-key/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
var Foo = function () {
var Foo =
/*#__PURE__*/
function () {
function Foo() {}

var _proto = Foo.prototype;

_proto["bar"] = function bar() {};

return Foo;
}();
}();
6 changes: 4 additions & 2 deletions ...in-transform-es2015-classes/test/fixtures/loose/method-return-type-annotation/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// @flow
var C = function () {
var C =
/*#__PURE__*/
function () {
function C() {}

var _proto = C.prototype;
Expand All @@ -9,4 +11,4 @@ var C = function () {
};

return C;
}();
}();
6 changes: 4 additions & 2 deletions ...el-plugin-transform-es2015-classes/test/fixtures/loose/method-reuse-prototype/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function () {
var Test =
/*#__PURE__*/
function () {
function Test() {}

var _proto = Test.prototype;
Expand All @@ -10,4 +12,4 @@ var Test = function () {
_proto.c = function c() {};

return Test;
}();
}();
8 changes: 6 additions & 2 deletions ...transform-es2015-classes/test/fixtures/loose/super-class-id-member-expression/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var BaseController = function (_Chaplin$Controller) {
var BaseController =
/*#__PURE__*/
function (_Chaplin$Controller) {
babelHelpers.inheritsLoose(BaseController, _Chaplin$Controller);

function BaseController() {
Expand All @@ -8,7 +10,9 @@ var BaseController = function (_Chaplin$Controller) {
return BaseController;
}(Chaplin.Controller);

var BaseController2 = function (_Chaplin$Controller$A) {
var BaseController2 =
/*#__PURE__*/
function (_Chaplin$Controller$A) {
babelHelpers.inheritsLoose(BaseController2, _Chaplin$Controller$A);

function BaseController2() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var Test = function (_Foo) {
var Test =
/*#__PURE__*/
function (_Foo) {
babelHelpers.inheritsLoose(Test, _Foo);

function Test() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ var _binarySerializer = require("./helpers/binary-serializer");
var _binarySerializer2 = babelHelpers.interopRequireDefault(_binarySerializer);

// import ...
var Connection = function (_EventEmitter) {
var Connection =
/*#__PURE__*/
function (_EventEmitter) {
babelHelpers.inherits(Connection, _EventEmitter);

function Connection(endpoint, joinKey, joinData, roomId) {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ var _BaseFoo2 = require("./BaseFoo");

var _BaseFoo3 = babelHelpers.interopRequireDefault(_BaseFoo2);

var SubFoo = function (_BaseFoo) {
var SubFoo =
/*#__PURE__*/
function (_BaseFoo) {
babelHelpers.inherits(SubFoo, _BaseFoo);

function SubFoo() {
Expand Down
4 changes: 3 additions & 1 deletion packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ var _react = require("react");

var _react2 = babelHelpers.interopRequireDefault(_react);

var RandomComponent = function (_Component) {
var RandomComponent =
/*#__PURE__*/
function (_Component) {
babelHelpers.inherits(RandomComponent, _Component);

function RandomComponent() {
Expand Down
Loading