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

Fix class properties after nested class' bare super (#7671)

Browse Source 
* Fix class properties after nested class' bare super

Fixes #7371.

* Fix node 4 test

* This damn node 4 test

* All of the ClassBody, but not the methods or field inits

* tmp

* tmp

* Use common class environment visitor

* Tests

* Use skipKey to avoid recursive traversal

* Remove old state

* Use jest expect
This commit is contained in:
Justin Ridgewell
2018-04-14 13:48:38 -04:00
committed by GitHub
parent 39b05598a0
commit 668358c4d0
12 changed files with 436 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/babel-plugin-transform-classes/src/transformClass.js
View File

@@ -1,22 +1,14 @@
import type { NodePath } from "@babel/traverse";
import nameFunction from "@babel/helper-function-name";
import ReplaceSupers from "@babel/helper-replace-supers";
import ReplaceSupers, {
environmentVisitor,
} from "@babel/helper-replace-supers";
import optimiseCall from "@babel/helper-optimise-call-expression";
import * as defineMap from "@babel/helper-define-map";
import { traverse, template, types as t } from "@babel/core";
type ReadonlySet<T> = Set<T> | { has(val: T): boolean };
const noMethodVisitor = {
"FunctionExpression|FunctionDeclaration"(path) {
path.skip();
},
Method(path) {
path.skip();
},
};
function buildConstructor(classRef, constructorBody, node) {
const func = t.functionDeclaration(
t.cloneNode(classRef),
@@ -78,7 +70,7 @@ export default function transformClass(
};
const verifyConstructorVisitor = traverse.visitors.merge([
noMethodVisitor,
environmentVisitor,
{
CallExpression: {
exit(path) {
@@ -115,7 +107,7 @@ export default function transformClass(
]);
const findThisesVisitor = traverse.visitors.merge([
noMethodVisitor,
environmentVisitor,
{
ThisExpression(path) {
classState.superThises.push(path);

4
packages/babel-plugin-transform-classes/test/fixtures/spec/nested-class-super-property-in-key/output.js vendored
View File

@@ -22,8 +22,6 @@ function (_Hello) {
babelHelpers.inherits(Outer, _Hello);
function Outer() {
var _this2 = this;
var _this;
babelHelpers.classCallCheck(this, Outer);
@@ -37,7 +35,7 @@ function (_Hello) {
}
babelHelpers.createClass(Inner, [{
key: babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this2)).call(_this2),
key: babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this)).call(_this),
value: function value() {
return 'hello';
}

2
packages/babel-plugin-transform-classes/test/fixtures/spec/nested-object-super-property-in-key/output.js vendored
View File

@@ -27,7 +27,7 @@ function (_Hello) {
babelHelpers.classCallCheck(this, Outer);
_this = babelHelpers.possibleConstructorReturn(this, babelHelpers.getPrototypeOf(Outer).call(this));
var Inner = {
[babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(this)).call(this)]() {
[babelHelpers.get(babelHelpers.getPrototypeOf(Outer.prototype), "toString", babelHelpers.assertThisInitialized(_this)).call(_this)]() {
return 'hello';
}