From 33da726638b0090ab3480ae1a8b924cdb69f52e3 Mon Sep 17 00:00:00 2001 From: Stanislav Sysoev Date: Wed, 31 Aug 2016 21:41:49 +0300 Subject: [PATCH] Not null check in babel-helper-builder-binary-assignment-operator-visitor (#3647) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix: T7537 — https://phabricator.babeljs.io/T7537 When transforming super call in class constructor, part of ast is replaced using method "replaceWithMultiple" here: https://github.com/babel/babel/blob/master/packages/babel-plugin-transform-es2015-classes/src/vanilla.js#L379 It leads to removing the node (replacing it with null) here: https://github.com/babel/babel/blob/master/packages/babel-traverse/src/path/replacement.js#L51 But parent ExpressionsStatement is still untouched and when it reaches visitor generated in here https://github.com/babel/babel/blob/master/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js#L18 It blows up because expression is null from previous visitors. --- .../src/index.js | 2 +- .../test/fixtures/regression/T7537/actual.js | 7 +++++ .../fixtures/regression/T7537/expected.js | 31 +++++++++++++++++++ .../fixtures/regression/T7537/options.json | 4 +++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/actual.js create mode 100644 packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js create mode 100644 packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/options.json diff --git a/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js b/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js index 5f4a2aec4d..0c07eecf9f 100644 --- a/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js +++ b/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js @@ -8,7 +8,7 @@ export default function (opts: { let visitor = {}; function isAssignment(node) { - return node.operator === opts.operator + "="; + return node && node.operator === opts.operator + "="; } function buildAssignment(left, right) { diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/actual.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/actual.js new file mode 100644 index 0000000000..67a5b4ee9a --- /dev/null +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/actual.js @@ -0,0 +1,7 @@ +class B{} +class A extends B{ + constructor(track){ + if (track !== undefined) super(track); + else super(); + } +} diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js new file mode 100644 index 0000000000..95e8f8c8b5 --- /dev/null +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/expected.js @@ -0,0 +1,31 @@ +"use strict"; + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +var B = function B() { + _classCallCheck(this, B); +}; + +var A = function (_B) { + _inherits(A, _B); + + function A(track) { + _classCallCheck(this, A); + + if (track !== undefined) { + ; + + var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(A).call(this, track)); + } else { + ; + + var _this = _possibleConstructorReturn(this, Object.getPrototypeOf(A).call(this)); + }return _possibleConstructorReturn(_this); + } + + return A; +}(B); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/options.json b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/options.json new file mode 100644 index 0000000000..f531bf1fa9 --- /dev/null +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T7537/options.json @@ -0,0 +1,4 @@ +{ + "plugins": ["transform-exponentiation-operator"], + "presets": ["es2015"] +}