From 0d8e5a9e869e83694ec394207b1dc9b43d9b8231 Mon Sep 17 00:00:00 2001 From: Amjad Masad Date: Thu, 24 Dec 2015 14:55:51 -0800 Subject: [PATCH] Fix over-parenthesizing of function expressions --- .../--whitelist/stdout.txt | 4 +-- .../misc/regression-1155/expected.js | 4 +-- .../source-maps/class/expected.js | 4 +-- packages/babel-generator/src/node/index.js | 8 ++--- .../babel-generator/src/node/parentheses.js | 28 +++++++++++++++-- packages/babel-generator/src/printer.js | 6 +++- .../edgecase/variable-declaration/expected.js | 4 +-- .../fixtures/parentheses/expression/actual.js | 2 +- .../parentheses/expression/expected.js | 2 +- .../async-to-generator/expression/expected.js | 4 +-- .../named-expression/expected.js | 4 +-- .../async-to-generator/parameters/expected.js | 4 +-- .../async-to-generator/statement/expected.js | 4 +-- .../expression/expected.js | 4 +-- .../named-expression/expected.js | 4 +-- .../bluebird-coroutines/statement/expected.js | 4 +-- .../expression/expected.js | 4 +-- .../test/fixtures/general/derived/expected.js | 4 +-- .../test/fixtures/general/foobar/expected.js | 4 +-- .../general/super-expression/expected.js | 4 +-- .../general/super-statement/expected.js | 4 +-- .../fixtures/regression/T2983/expected.js | 5 ++-- .../fixtures/regression/T6719/expected.js | 4 +-- .../fixtures/arrow-functions/spec/expected.js | 12 ++++---- .../fixtures/exec/duplicate-function-scope.js | 4 +-- .../fixtures/general/issue-1051/expected.js | 4 +-- .../loose/accessing-super-class/expected.js | 4 +-- .../accessing-super-properties/expected.js | 4 +-- .../calling-super-properties/expected.js | 4 +-- .../loose/constructor-order/expected.js | 4 +-- .../fixtures/loose/literal-key/expected.js | 4 +-- .../expected.js | 8 ++--- .../fixtures/loose/super-class/expected.js | 4 +-- .../test/fixtures/regression/2663/expected.js | 4 +-- .../test/fixtures/regression/2694/expected.js | 4 +-- .../test/fixtures/regression/2775/expected.js | 4 +-- .../test/fixtures/regression/3028/expected.js | 8 ++--- .../fixtures/regression/T2494/expected.js | 4 +-- .../fixtures/regression/T2997/expected.js | 5 ++-- .../fixtures/regression/T6750/expected.js | 4 +-- .../fixtures/regression/T6755/expected.js | 4 +-- .../spec/accessing-super-class/expected.js | 4 +-- .../accessing-super-properties/expected.js | 4 +-- .../spec/calling-super-properties/expected.js | 4 +-- .../spec/computed-methods/expected.js | 4 +-- .../fixtures/spec/constructor/expected.js | 4 +-- .../expected.js | 4 +-- .../spec/export-super-class/expected.js | 4 +-- .../instance-getter-and-setter/expected.js | 4 +-- .../fixtures/spec/instance-getter/expected.js | 4 +-- .../fixtures/spec/instance-method/expected.js | 4 +-- .../fixtures/spec/instance-setter/expected.js | 4 +-- .../spec/name-method-collision/expected.js | 4 +-- .../spec/relaxed-method-coercion/expected.js | 4 +-- .../test/fixtures/spec/statement/expected.js | 4 +-- .../test/fixtures/spec/static/expected.js | 4 +-- .../spec/super-class-anonymous/expected.js | 30 +++++++++---------- .../expected.js | 8 ++--- .../fixtures/spec/super-class/expected.js | 4 +-- .../function-name/class-method/expected.js | 4 +-- .../fixtures/function-name/global/expected.js | 4 +-- .../function-name/modules-2/expected.js | 6 ++-- .../function-name/modules-3/expected.js | 4 +-- .../function-name/modules/expected.js | 6 ++-- .../fixtures/function-name/object/expected.js | 4 +-- .../fixtures/amd/exports-default/expected.js | 6 ++-- .../amd/hoist-function-exports/expected.js | 6 ++-- .../interop/exports-default/expected.js | 4 +-- .../hoist-function-exports/expected.js | 4 +-- .../systemjs/exports-default/expected.js | 6 ++-- .../hoist-function-exports/expected.js | 4 +-- .../fixtures/umd/exports-default/expected.js | 6 ++-- .../umd/hoist-function-exports/expected.js | 6 ++-- .../parameters/default-eval/expected.js | 4 +-- .../parameters/rest-nested-iife/expected.js | 4 +-- .../fixtures/jscript/simple-class/expected.js | 4 +-- .../var-named-function-expression/expected.js | 4 +-- .../inline-elements/expected.js | 4 +-- 78 files changed, 213 insertions(+), 187 deletions(-) diff --git a/packages/babel-cli/test/fixtures/babel-external-helpers/--whitelist/stdout.txt b/packages/babel-cli/test/fixtures/babel-external-helpers/--whitelist/stdout.txt index 88c4bd2b2f..7f1e7f327f 100644 --- a/packages/babel-cli/test/fixtures/babel-external-helpers/--whitelist/stdout.txt +++ b/packages/babel-cli/test/fixtures/babel-external-helpers/--whitelist/stdout.txt @@ -1,7 +1,7 @@ (function (global) { var babelHelpers = global.babelHelpers = {}; - babelHelpers.createClass = (function () { + babelHelpers.createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; @@ -17,5 +17,5 @@ if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; - })(); + }(); })(typeof global === "undefined" ? self : global); diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/expected.js b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/expected.js index 52cba9f323..a424838128 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/expected.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/expected.js @@ -1,4 +1,4 @@ -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo(options) { @@ -12,4 +12,4 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/class/expected.js b/packages/babel-core/test/fixtures/transformation/source-maps/class/expected.js index 2a5d6b6276..33ff47166c 100644 --- a/packages/babel-core/test/fixtures/transformation/source-maps/class/expected.js +++ b/packages/babel-core/test/fixtures/transformation/source-maps/class/expected.js @@ -1,4 +1,4 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } @@ -10,7 +10,7 @@ var Test = (function () { } }]); return Test; -})(); +}(); var test = new Test(); test.bar; diff --git a/packages/babel-generator/src/node/index.js b/packages/babel-generator/src/node/index.js index 74ee6fce6a..516e7980ff 100644 --- a/packages/babel-generator/src/node/index.js +++ b/packages/babel-generator/src/node/index.js @@ -5,7 +5,7 @@ import * as parens from "./parentheses"; import each from "lodash/collection/each"; import * as t from "babel-types"; -function find(obj, node, parent) { +function find(obj, node, parent, printStack) { if (!obj) return; let result; @@ -15,7 +15,7 @@ function find(obj, node, parent) { if (t.is(type, node)) { let fn = obj[type]; - result = fn(node, parent); + result = fn(node, parent, printStack); if (result != null) break; } } @@ -79,14 +79,14 @@ export default class Node { return Node.needsWhitespace(node, parent, "after"); } - static needsParens(node, parent) { + static needsParens(node, parent, printStack) { if (!parent) return false; if (t.isNewExpression(parent) && parent.callee === node) { if (isOrHasCallExpression(node)) return true; } - return find(parens, node, parent); + return find(parens, node, parent, printStack); } } diff --git a/packages/babel-generator/src/node/parentheses.js b/packages/babel-generator/src/node/parentheses.js index 14bc66028c..52f79b0a99 100644 --- a/packages/babel-generator/src/node/parentheses.js +++ b/packages/babel-generator/src/node/parentheses.js @@ -176,7 +176,7 @@ export function UnaryLike(node: Object, parent: Object): boolean { return false; } -export function FunctionExpression(node: Object, parent: Object): boolean { +export function FunctionExpression(node: Object, parent: Object, printStack: Array): boolean { // (function () {}); if (t.isExpressionStatement(parent)) { return true; @@ -187,7 +187,31 @@ export function FunctionExpression(node: Object, parent: Object): boolean { return true; } - return UnaryLike(node, parent); + // Walk up the tree and determine if the function will be printed first in a statement. + let i = printStack.length - 1; + node = printStack[i]; + i--; + parent = printStack[i]; + while (i > 0) { + if (t.isExpressionStatement(parent, { expression: node })) { + return true; + } + + if ((t.isCallExpression(parent, { callee: node })) || + (t.isSequenceExpression(parent) && parent.expressions[0] === node) || + (t.isMemberExpression(parent, { object: node })) || + (t.isConditional(parent, { test: node })) || + (t.isBinary(parent, { left: node })) || + (t.isAssignmentExpression(parent, { left: node }))) { + node = parent; + i--; + parent = printStack[i]; + } else { + return false; + } + } + + return false; } export function ArrowFunctionExpression(node: Object, parent: Object): boolean { diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js index 79102ade5c..7e0749d46b 100644 --- a/packages/babel-generator/src/printer.js +++ b/packages/babel-generator/src/printer.js @@ -8,6 +8,7 @@ export default class Printer extends Buffer { super(...args); this.insideAux = false; this.printAuxAfterOnNextUserNode = false; + this._printStack = []; } print(node, parent, opts = {}) { @@ -32,10 +33,12 @@ export default class Printer extends Buffer { throw new ReferenceError(`unknown node of type ${JSON.stringify(node.type)} with constructor ${JSON.stringify(node && node.constructor.name)}`); } + this._printStack.push(node); + if (node.loc) this.printAuxAfterComment(); this.printAuxBeforeComment(oldInAux); - let needsParens = n.needsParens(node, parent); + let needsParens = n.needsParens(node, parent, this._printStack); if (needsParens) this.push("("); this.printLeadingComments(node, parent); @@ -58,6 +61,7 @@ export default class Printer extends Buffer { if (needsParens) this.push(")"); // end + this._printStack.pop(); this.map.mark(node, "end"); if (opts.after) opts.after(); diff --git a/packages/babel-generator/test/fixtures/edgecase/variable-declaration/expected.js b/packages/babel-generator/test/fixtures/edgecase/variable-declaration/expected.js index 0af0dd6ac0..12407627ec 100644 --- a/packages/babel-generator/test/fixtures/edgecase/variable-declaration/expected.js +++ b/packages/babel-generator/test/fixtures/edgecase/variable-declaration/expected.js @@ -1,4 +1,4 @@ -var fact5 = (function fact(n) { +var fact5 = function fact(n) { if (n <= 1) return 1; return n * fact(n - 1); -})(5); +}(5); diff --git a/packages/babel-generator/test/fixtures/parentheses/expression/actual.js b/packages/babel-generator/test/fixtures/parentheses/expression/actual.js index 8a2b727e0e..c48b7f4592 100644 --- a/packages/babel-generator/test/fixtures/parentheses/expression/actual.js +++ b/packages/babel-generator/test/fixtures/parentheses/expression/actual.js @@ -1 +1 @@ -a && (a.b && a.b.c()); +a && (a.b && a.b.c()) && function() {}(); diff --git a/packages/babel-generator/test/fixtures/parentheses/expression/expected.js b/packages/babel-generator/test/fixtures/parentheses/expression/expected.js index 56580c5211..19b53f1146 100644 --- a/packages/babel-generator/test/fixtures/parentheses/expression/expected.js +++ b/packages/babel-generator/test/fixtures/parentheses/expression/expected.js @@ -1 +1 @@ -a && a.b && a.b.c(); +a && a.b && a.b.c() && function () {}(); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/expression/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/expression/expected.js index a8a7685d12..e3c7d2218f 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/expression/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/expression/expected.js @@ -1,8 +1,8 @@ -var foo = (function () { +var foo = function () { var ref = babelHelpers.asyncToGenerator(function* () { var wat = yield bar(); }); return function foo() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/expected.js index d1ce465a7a..4a7daccce3 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/named-expression/expected.js @@ -1,8 +1,8 @@ -var foo = (function () { +var foo = function () { var ref = babelHelpers.asyncToGenerator(function* () { console.log(bar); }); return function bar() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/parameters/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/parameters/expected.js index 22fc56a52c..2cbaf5139e 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/parameters/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/parameters/expected.js @@ -1,6 +1,6 @@ -let foo = (function () { +let foo = function () { var ref = babelHelpers.asyncToGenerator(function* (bar) {}); return function foo(_x) { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/statement/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/statement/expected.js index 1a7a07612e..6f6a08626b 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/statement/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/statement/expected.js @@ -1,10 +1,10 @@ function normalFunction() {} -let foo = (function () { +let foo = function () { var ref = babelHelpers.asyncToGenerator(function* () { var wat = yield bar(); }); return function foo() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/expression/expected.js b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/expression/expected.js index 1733da4a46..1d7bf3bba5 100644 --- a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/expression/expected.js +++ b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/expression/expected.js @@ -1,5 +1,5 @@ import { coroutine as _coroutine } from "bluebird"; -var foo = (function () { +var foo = function () { var ref = _coroutine(function* () { var wat = yield bar(); }); @@ -7,4 +7,4 @@ var foo = (function () { return function foo() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/named-expression/expected.js b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/named-expression/expected.js index 32b58b8fd7..5cdceead47 100644 --- a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/named-expression/expected.js +++ b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/named-expression/expected.js @@ -1,5 +1,5 @@ import { coroutine as _coroutine } from "bluebird"; -var foo = (function () { +var foo = function () { var ref = _coroutine(function* () { console.log(bar); }); @@ -7,4 +7,4 @@ var foo = (function () { return function bar() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/statement/expected.js b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/statement/expected.js index 3433c86c89..ef7b97d56b 100644 --- a/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/statement/expected.js +++ b/packages/babel-plugin-transform-async-to-module-method/test/fixtures/bluebird-coroutines/statement/expected.js @@ -1,6 +1,6 @@ import { coroutine as _coroutine } from "bluebird"; -let foo = (function () { +let foo = function () { var ref = _coroutine(function* () { var wat = yield bar(); }); @@ -8,4 +8,4 @@ let foo = (function () { return function foo() { return ref.apply(this, arguments); }; -})(); +}(); diff --git a/packages/babel-plugin-transform-class-constructor-call/test/fixtures/class-constructor-call/expression/expected.js b/packages/babel-plugin-transform-class-constructor-call/test/fixtures/class-constructor-call/expression/expected.js index 07daf3dee2..47ccf7e759 100644 --- a/packages/babel-plugin-transform-class-constructor-call/test/fixtures/class-constructor-call/expression/expected.js +++ b/packages/babel-plugin-transform-class-constructor-call/test/fixtures/class-constructor-call/expression/expected.js @@ -1,4 +1,4 @@ -let Foo = (function () { +let Foo = function () { let _class2 = class {}; var _classCall = function () { @@ -15,4 +15,4 @@ let Foo = (function () { _class.__proto__ = _class2; return _class; -})(); +}(); diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/general/derived/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/general/derived/expected.js index 7bf3a94664..5fa7c1476e 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/general/derived/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/general/derived/expected.js @@ -1,4 +1,4 @@ -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo(...args) { @@ -9,4 +9,4 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/general/foobar/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/general/foobar/expected.js index 5a4201e1f1..fdc9b47fbf 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/general/foobar/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/general/foobar/expected.js @@ -1,6 +1,6 @@ "use strict"; -var Child = (function (_Parent) { +var Child = function (_Parent) { babelHelpers.inherits(Child, _Parent); function Child() { @@ -16,4 +16,4 @@ var Child = (function (_Parent) { } return Child; -})(Parent); +}(Parent); diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-expression/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-expression/expected.js index 7eab2b7172..f26716cd91 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-expression/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-expression/expected.js @@ -1,4 +1,4 @@ -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo() { @@ -11,4 +11,4 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-statement/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-statement/expected.js index fa87f118f1..206f437f1a 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-statement/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/general/super-statement/expected.js @@ -1,4 +1,4 @@ -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo() { @@ -11,4 +11,4 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T2983/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T2983/expected.js index 2b7ee5536f..12e34907ed 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T2983/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T2983/expected.js @@ -1,12 +1,12 @@ var _class, _temp; -call((_temp = _class = (function () { +call((_temp = _class = function () { function _class2() { babelHelpers.classCallCheck(this, _class2); } return _class2; -})(), _class.test = true, _temp)); +}(), _class.test = true, _temp)); var _class3 = function _class3() { babelHelpers.classCallCheck(this, _class3); @@ -15,4 +15,3 @@ var _class3 = function _class3() { _class3.test = true; export default _class3; ; - diff --git a/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T6719/expected.js b/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T6719/expected.js index fc48e43cdd..15ce34f7de 100644 --- a/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T6719/expected.js +++ b/packages/babel-plugin-transform-class-properties/test/fixtures/regression/T6719/expected.js @@ -1,7 +1,7 @@ function withContext(ComposedComponent) { var _class, _temp; - return _temp = _class = (function (_Component) { + return _temp = _class = function (_Component) { babelHelpers.inherits(WithContext, _Component); function WithContext() { @@ -10,7 +10,7 @@ function withContext(ComposedComponent) { } return WithContext; - })(Component), _class.propTypes = { + }(Component), _class.propTypes = { context: PropTypes.shape({ addCss: PropTypes.func, setTitle: PropTypes.func, diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/spec/expected.js b/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/spec/expected.js index 52dd949dce..51a320d177 100644 --- a/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/spec/expected.js +++ b/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/spec/expected.js @@ -1,20 +1,20 @@ function foo() { var _this = this; - arr.map((function (x) { + arr.map(function (x) { babelHelpers.newArrowCheck(this, _this); return x * x; - }).bind(this)); - var f = (function (x, y) { + }.bind(this)); + var f = function (x, y) { babelHelpers.newArrowCheck(this, _this); return x * y; - }).bind(this); + }.bind(this); (function () { var _this2 = this; - return (function () { + return function () { babelHelpers.newArrowCheck(this, _this2); return this; - }).bind(this); + }.bind(this); })(); } diff --git a/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/exec/duplicate-function-scope.js b/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/exec/duplicate-function-scope.js index 68cb396aeb..3fd573afb4 100644 --- a/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/exec/duplicate-function-scope.js +++ b/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/exec/duplicate-function-scope.js @@ -1,10 +1,10 @@ function test () { let value = "outer"; - return (function () { + return function () { let value = "inner"; return value; - })(); + }(); } assert(test(), "inner"); diff --git a/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/issue-1051/expected.js b/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/issue-1051/expected.js index e9e5798e9b..7e9d566ac8 100644 --- a/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/issue-1051/expected.js +++ b/packages/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/issue-1051/expected.js @@ -2,14 +2,14 @@ foo.func1 = function () { if (cond1) { for (;;) { if (cond2) { - var _ret = (function () { + var _ret = function () { function func2() {} function func3() {} func4(function () { func2(); }); return "break"; - })(); + }(); if (_ret === "break") break; } diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-class/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-class/expected.js index dc81b57bd6..f837c9c172 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-class/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-class/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -22,4 +22,4 @@ var Test = (function (_Foo) { } return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-properties/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-properties/expected.js index 1c9524d16d..b1da9bd99f 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-properties/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/accessing-super-properties/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -12,4 +12,4 @@ var Test = (function (_Foo) { } return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/calling-super-properties/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/calling-super-properties/expected.js index 322e2d1a0c..25bdf6a1c3 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/calling-super-properties/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/calling-super-properties/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -16,4 +16,4 @@ var Test = (function (_Foo) { }; return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/constructor-order/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/constructor-order/expected.js index 7732e9c42a..4ebd527994 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/constructor-order/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/constructor-order/expected.js @@ -1,4 +1,4 @@ -var x = (function () { +var x = function () { x.prototype.f = function f() { 1; 2; @@ -14,4 +14,4 @@ var x = (function () { } return x; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/literal-key/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/literal-key/expected.js index bb11e8c355..9d78574423 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/literal-key/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/literal-key/expected.js @@ -1,4 +1,4 @@ -var Foo = (function () { +var Foo = function () { function Foo() { babelHelpers.classCallCheck(this, Foo); } @@ -6,4 +6,4 @@ var Foo = (function () { Foo.prototype["bar"] = function bar() {}; return Foo; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class-id-member-expression/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class-id-member-expression/expected.js index ffe79cc6c4..e03b4f885c 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class-id-member-expression/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class-id-member-expression/expected.js @@ -1,4 +1,4 @@ -var BaseController = (function (_Chaplin$Controller) { +var BaseController = function (_Chaplin$Controller) { babelHelpers.inherits(BaseController, _Chaplin$Controller); function BaseController() { @@ -7,9 +7,9 @@ var BaseController = (function (_Chaplin$Controller) { } return BaseController; -})(Chaplin.Controller); +}(Chaplin.Controller); -var BaseController2 = (function (_Chaplin$Controller$A) { +var BaseController2 = function (_Chaplin$Controller$A) { babelHelpers.inherits(BaseController2, _Chaplin$Controller$A); function BaseController2() { @@ -18,4 +18,4 @@ var BaseController2 = (function (_Chaplin$Controller$A) { } return BaseController2; -})(Chaplin.Controller.Another); +}(Chaplin.Controller.Another); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class/expected.js index 9a50791c8b..dd6df765b8 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/loose/super-class/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -7,4 +7,4 @@ var Test = (function (_Foo) { } return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js index 7296efa18e..84ceeede83 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js @@ -16,7 +16,7 @@ var _binarySerializer2 = babelHelpers.interopRequireDefault(_binarySerializer); // import ... -var Connection = (function (_EventEmitter) { +var Connection = function (_EventEmitter) { babelHelpers.inherits(Connection, _EventEmitter); function Connection(endpoint, joinKey, joinData, roomId) { @@ -43,6 +43,6 @@ var Connection = (function (_EventEmitter) { } }]); return Connection; -})(_events.EventEmitter); +}(_events.EventEmitter); exports.default = Connection; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js index 4bcd62d51c..21a29ff6d9 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js @@ -8,7 +8,7 @@ var _BaseFoo2 = require('./BaseFoo'); var _BaseFoo3 = babelHelpers.interopRequireDefault(_BaseFoo2); -var SubFoo = (function (_BaseFoo) { +var SubFoo = function (_BaseFoo) { babelHelpers.inherits(SubFoo, _BaseFoo); function SubFoo() { @@ -24,6 +24,6 @@ var SubFoo = (function (_BaseFoo) { } }]); return SubFoo; -})(_BaseFoo3.default); +}(_BaseFoo3.default); exports.default = SubFoo; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js index 117ad3f785..484001fb56 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js @@ -8,7 +8,7 @@ var _react = require('react'); var _react2 = babelHelpers.interopRequireDefault(_react); -var RandomComponent = (function (_Component) { +var RandomComponent = function (_Component) { babelHelpers.inherits(RandomComponent, _Component); function RandomComponent() { @@ -31,6 +31,6 @@ var RandomComponent = (function (_Component) { } }]); return RandomComponent; -})(_react.Component); +}(_react.Component); exports.default = RandomComponent; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js index 8828aee19c..b663065caa 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js @@ -8,7 +8,7 @@ var b = function b() { babelHelpers.classCallCheck(this, b); }; -var a1 = (function (_b) { +var a1 = function (_b) { babelHelpers.inherits(a1, _b); function a1() { @@ -23,9 +23,9 @@ var a1 = (function (_b) { } return a1; -})(b); +}(b); -var a2 = (function (_b2) { +var a2 = function (_b2) { babelHelpers.inherits(a2, _b2); function a2() { @@ -40,6 +40,6 @@ var a2 = (function (_b2) { } return a2; -})(b); +}(b); exports.default = a2; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2494/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2494/expected.js index 80c100c717..5f61e18c8e 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2494/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2494/expected.js @@ -1,7 +1,7 @@ "use strict"; var x = { - Foo: (function (_Foo) { + Foo: function (_Foo) { babelHelpers.inherits(_class, _Foo); function _class() { @@ -10,5 +10,5 @@ var x = { } return _class; - })(Foo) + }(Foo) }; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2997/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2997/expected.js index 92e540a4a2..5bc287668a 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2997/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T2997/expected.js @@ -4,7 +4,7 @@ var A = function A() { babelHelpers.classCallCheck(this, A); }; -var B = (function (_A) { +var B = function (_A) { babelHelpers.inherits(B, _A); function B() { @@ -16,5 +16,4 @@ var B = (function (_A) { } return B; -})(A); - +}(A); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js index 233d75891b..9ac751c380 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); function _default() { - return (function () { + return function () { function Select() { babelHelpers.classCallCheck(this, Select); } @@ -14,6 +14,6 @@ function _default() { value: function query(_query) {} }]); return Select; - })(); + }(); } exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6755/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6755/expected.js index fac597d962..3a32ac177a 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6755/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6755/expected.js @@ -2,7 +2,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } -var Example = (function () { +var Example = function () { function Example() { _classCallCheck(this, Example); } @@ -27,4 +27,4 @@ var Example = (function () { }, test2, this); }); return Example; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-class/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-class/expected.js index 413d246ab5..72d7738a0d 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-class/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-class/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -41,4 +41,4 @@ var Test = (function (_Foo) { } }]); return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-properties/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-properties/expected.js index c30864e083..6083507ff2 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-properties/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/accessing-super-properties/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -12,4 +12,4 @@ var Test = (function (_Foo) { } return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/calling-super-properties/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/calling-super-properties/expected.js index cce857b8e6..27180ca048 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/calling-super-properties/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/calling-super-properties/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -18,4 +18,4 @@ var Test = (function (_Foo) { } }]); return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/computed-methods/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/computed-methods/expected.js index ecc9ae3f21..8dad510155 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/computed-methods/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/computed-methods/expected.js @@ -1,4 +1,4 @@ -var Foo = (function () { +var Foo = function () { function Foo() { babelHelpers.classCallCheck(this, Foo); } @@ -17,4 +17,4 @@ var Foo = (function () { value: function value() {} }]); return Foo; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/constructor/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/constructor/expected.js index 8f1b418649..48021ec700 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/constructor/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/constructor/expected.js @@ -4,7 +4,7 @@ var Test = function Test() { this.state = "test"; }; -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo() { @@ -17,7 +17,7 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); var ConstructorScoping = function ConstructorScoping() { babelHelpers.classCallCheck(this, ConstructorScoping); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/delay-arrow-function-for-bare-super-derived/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/delay-arrow-function-for-bare-super-derived/expected.js index e65c69e209..406077385e 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/delay-arrow-function-for-bare-super-derived/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/delay-arrow-function-for-bare-super-derived/expected.js @@ -1,4 +1,4 @@ -var Foo = (function (_Bar) { +var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo() { @@ -11,4 +11,4 @@ var Foo = (function (_Bar) { } return Foo; -})(Bar); +}(Bar); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/export-super-class/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/export-super-class/expected.js index 62032a4013..1770aa7484 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/export-super-class/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/export-super-class/expected.js @@ -1,4 +1,4 @@ -var _class = (function (_A) { +var _class = function (_A) { babelHelpers.inherits(_class, _A); function _class() { @@ -7,6 +7,6 @@ var _class = (function (_A) { } return _class; -})(A); +}(A); export default _class; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter-and-setter/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter-and-setter/expected.js index 56420bf1f4..1a6add5619 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter-and-setter/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter-and-setter/expected.js @@ -1,4 +1,4 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } @@ -13,4 +13,4 @@ var Test = (function () { } }]); return Test; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter/expected.js index 419321e583..cc3dd6e960 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-getter/expected.js @@ -1,4 +1,4 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } @@ -10,4 +10,4 @@ var Test = (function () { } }]); return Test; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-method/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-method/expected.js index 92ee97fde2..c3f4fc8d0e 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-method/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-method/expected.js @@ -1,4 +1,4 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } @@ -10,4 +10,4 @@ var Test = (function () { } }]); return Test; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-setter/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-setter/expected.js index da0ac43573..9d1a465b4f 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-setter/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/instance-setter/expected.js @@ -1,4 +1,4 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } @@ -10,4 +10,4 @@ var Test = (function () { } }]); return Test; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/name-method-collision/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/name-method-collision/expected.js index e071a841c6..f1bb059220 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/name-method-collision/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/name-method-collision/expected.js @@ -2,7 +2,7 @@ var _a2 = require("./a"); -var Foo = (function () { +var Foo = function () { function Foo() { babelHelpers.classCallCheck(this, Foo); } @@ -14,4 +14,4 @@ var Foo = (function () { } }]); return Foo; -})(); \ No newline at end of file +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/relaxed-method-coercion/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/relaxed-method-coercion/expected.js index 9ecfb9d445..c2000517a5 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/relaxed-method-coercion/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/relaxed-method-coercion/expected.js @@ -1,6 +1,6 @@ // #1649 -var Foo = (function () { +var Foo = function () { function Foo() { babelHelpers.classCallCheck(this, Foo); } @@ -13,4 +13,4 @@ var Foo = (function () { value: function value() {} }]); return Foo; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/statement/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/statement/expected.js index a320977e84..5d462968dd 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/statement/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/statement/expected.js @@ -10,7 +10,7 @@ var BaseView = function BaseView() { this.autoRender = true; }; -var BaseView = (function () { +var BaseView = function () { function BaseView() { babelHelpers.classCallCheck(this, BaseView); } @@ -22,4 +22,4 @@ var BaseView = (function () { } }]); return BaseView; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/static/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/static/expected.js index 76e5b2195c..bec96562bf 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/static/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/static/expected.js @@ -1,4 +1,4 @@ -var A = (function () { +var A = function () { function A() { babelHelpers.classCallCheck(this, A); } @@ -12,4 +12,4 @@ var A = (function () { set: function set(b) {} }]); return A; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-anonymous/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-anonymous/expected.js index 541efbdde1..e9bd89270d 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-anonymous/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-anonymous/expected.js @@ -1,4 +1,4 @@ -var TestEmpty = (function (_ref) { +var TestEmpty = function (_ref) { babelHelpers.inherits(TestEmpty, _ref); function TestEmpty() { @@ -7,15 +7,15 @@ var TestEmpty = (function (_ref) { } return TestEmpty; -})((function () { +}(function () { function _class() { babelHelpers.classCallCheck(this, _class); } return _class; -})()); +}()); -var TestConstructorOnly = (function (_ref2) { +var TestConstructorOnly = function (_ref2) { babelHelpers.inherits(TestConstructorOnly, _ref2); function TestConstructorOnly() { @@ -24,15 +24,15 @@ var TestConstructorOnly = (function (_ref2) { } return TestConstructorOnly; -})((function () { +}(function () { function _class2() { babelHelpers.classCallCheck(this, _class2); } return _class2; -})()); +}()); -var TestMethodOnly = (function (_ref3) { +var TestMethodOnly = function (_ref3) { babelHelpers.inherits(TestMethodOnly, _ref3); function TestMethodOnly() { @@ -41,7 +41,7 @@ var TestMethodOnly = (function (_ref3) { } return TestMethodOnly; -})((function () { +}(function () { function _class3() { babelHelpers.classCallCheck(this, _class3); } @@ -51,9 +51,9 @@ var TestMethodOnly = (function (_ref3) { value: function method() {} }]); return _class3; -})()); +}()); -var TestConstructorAndMethod = (function (_ref4) { +var TestConstructorAndMethod = function (_ref4) { babelHelpers.inherits(TestConstructorAndMethod, _ref4); function TestConstructorAndMethod() { @@ -62,7 +62,7 @@ var TestConstructorAndMethod = (function (_ref4) { } return TestConstructorAndMethod; -})((function () { +}(function () { function _class4() { babelHelpers.classCallCheck(this, _class4); } @@ -72,9 +72,9 @@ var TestConstructorAndMethod = (function (_ref4) { value: function method() {} }]); return _class4; -})()); +}()); -var TestMultipleMethods = (function (_ref5) { +var TestMultipleMethods = function (_ref5) { babelHelpers.inherits(TestMultipleMethods, _ref5); function TestMultipleMethods() { @@ -83,7 +83,7 @@ var TestMultipleMethods = (function (_ref5) { } return TestMultipleMethods; -})((function () { +}(function () { function _class5() { babelHelpers.classCallCheck(this, _class5); } @@ -96,4 +96,4 @@ var TestMultipleMethods = (function (_ref5) { value: function m2() {} }]); return _class5; -})()); +}()); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-id-member-expression/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-id-member-expression/expected.js index abeca347e0..00044b30a9 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-id-member-expression/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class-id-member-expression/expected.js @@ -1,4 +1,4 @@ -var BaseController = (function (_Chaplin$Controller) { +var BaseController = function (_Chaplin$Controller) { babelHelpers.inherits(BaseController, _Chaplin$Controller); function BaseController() { @@ -7,9 +7,9 @@ var BaseController = (function (_Chaplin$Controller) { } return BaseController; -})(Chaplin.Controller); +}(Chaplin.Controller); -var BaseController2 = (function (_Chaplin$Controller$A) { +var BaseController2 = function (_Chaplin$Controller$A) { babelHelpers.inherits(BaseController2, _Chaplin$Controller$A); function BaseController2() { @@ -18,4 +18,4 @@ var BaseController2 = (function (_Chaplin$Controller$A) { } return BaseController2; -})(Chaplin.Controller.Another); +}(Chaplin.Controller.Another); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class/expected.js index 10cc6dd095..b178825328 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-class/expected.js @@ -1,4 +1,4 @@ -var Test = (function (_Foo) { +var Test = function (_Foo) { babelHelpers.inherits(Test, _Foo); function Test() { @@ -7,4 +7,4 @@ var Test = (function (_Foo) { } return Test; -})(Foo); +}(Foo); diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/class-method/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/class-method/expected.js index b437bcd715..af24a07109 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/class-method/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/class-method/expected.js @@ -1,4 +1,4 @@ -let Foo = (function () { +let Foo = function () { function Foo() { babelHelpers.classCallCheck(this, Foo); } @@ -10,4 +10,4 @@ let Foo = (function () { } }]); return Foo; -})(); +}(); diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/global/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/global/expected.js index 79cdf12923..b10580e9cb 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/global/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/global/expected.js @@ -1,5 +1,5 @@ var test = { - setInterval: (function (_setInterval) { + setInterval: function (_setInterval) { function setInterval(_x, _x2) { return _setInterval.apply(this, arguments); } @@ -9,7 +9,7 @@ var test = { }; return setInterval; - })(function (fn, ms) { + }(function (fn, ms) { setInterval(fn, ms); }) }; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js index c5c6421850..dc2a8f943d 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js @@ -8,7 +8,7 @@ var _last2 = require("lodash/array/last"); var _last3 = babelHelpers.interopRequireDefault(_last2); -let Container = (function () { +let Container = function () { function Container() { babelHelpers.classCallCheck(this, Container); } @@ -24,6 +24,6 @@ let Container = (function () { } }]); return Container; -})(); +}(); -exports.default = Container; \ No newline at end of file +exports.default = Container; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-3/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-3/expected.js index 7ed65d798b..f2a53010a5 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-3/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-3/expected.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { var _store = require("./store"); -let Login = (function (_React$Component) { +let Login = function (_React$Component) { babelHelpers.inherits(Login, _React$Component); function Login() { @@ -21,6 +21,6 @@ let Login = (function (_React$Component) { } }]); return Login; -})(React.Component); +}(React.Component); exports.default = Login; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js index e1b4e4f84d..722636775e 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js @@ -4,7 +4,7 @@ var _events2 = require("events"); var _events3 = babelHelpers.interopRequireDefault(_events2); -let Template = (function () { +let Template = function () { function Template() { babelHelpers.classCallCheck(this, Template); } @@ -16,6 +16,6 @@ let Template = (function () { } }]); return Template; -})(); +}(); -console.log(new Template().events()); \ No newline at end of file +console.log(new Template().events()); diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/object/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/object/expected.js index d154a50f8e..85e48babaf 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/object/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/object/expected.js @@ -5,7 +5,7 @@ var obj = { })(); }, - h: (function (_h) { + h: function (_h) { function h() { return _h.apply(this, arguments); } @@ -15,7 +15,7 @@ var obj = { }; return h; - })(function () { + }(function () { console.log(h); }), diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js index c31ad75f0d..3327a6678f 100644 --- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/exports-default/expected.js @@ -21,7 +21,7 @@ define(["exports"], function (exports) { exports.default = Foo; exports.default = foo; - exports.default = (function () { + exports.default = function () { return "foo"; - })(); -}); \ No newline at end of file + }(); +}); diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js index f634fbe3bf..7472d84ba8 100644 --- a/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-amd/test/fixtures/amd/hoist-function-exports/expected.js @@ -11,9 +11,9 @@ define(["exports", "./evens"], function (exports, _evens) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; } - var isOdd = exports.isOdd = (function (isEven) { + var isOdd = exports.isOdd = function (isEven) { return function (n) { return !isEven(n); }; - })(_evens.isEven); -}); \ No newline at end of file + }(_evens.isEven); +}); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-default/expected.js index 2a5005d771..970f546e3f 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-default/expected.js @@ -17,6 +17,6 @@ class Foo {} exports.default = Foo; exports.default = foo; -exports.default = (function () { +exports.default = function () { return "foo"; -})(); \ No newline at end of file +}(); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js index 466493acf5..6eaf1e7bbd 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js @@ -12,8 +12,8 @@ function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; } -var isOdd = exports.isOdd = (function (isEven) { +var isOdd = exports.isOdd = function (isEven) { return function (n) { return !isEven(n); }; -})(_evens.isEven); \ No newline at end of file +}(_evens.isEven); diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/exports-default/expected.js index 134fe7a778..cce3c60971 100644 --- a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/exports-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/exports-default/expected.js @@ -24,9 +24,9 @@ System.register([], function (_export) { _export("default", Foo); - _export("default", (function () { + _export("default", function () { return "foo"; - })()); + }()); } }; -}); \ No newline at end of file +}); diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/expected.js index e619811b41..a3dce2d6f3 100644 --- a/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-systemjs/test/fixtures/systemjs/hoist-function-exports/expected.js @@ -21,11 +21,11 @@ System.register(["./evens"], function (_export) { for (i = 0, j = 0;;); - _export("isOdd", isOdd = (function (isEven) { + _export("isOdd", isOdd = function (isEven) { return function (n) { return !isEven(n); }; - })(isEven)); + }(isEven)); _export("isOdd", isOdd); } diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js index 5b61dcc5d7..615e0afdba 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/exports-default/expected.js @@ -33,7 +33,7 @@ exports.default = Foo; exports.default = foo; - exports.default = (function () { + exports.default = function () { return "foo"; - })(); -}); \ No newline at end of file + }(); +}); diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js index 61c7c1b6c5..55001913e4 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/fixtures/umd/hoist-function-exports/expected.js @@ -23,9 +23,9 @@ return (0, _evens.isEven)(n) ? n + 1 : n + 2; } - var isOdd = exports.isOdd = (function (isEven) { + var isOdd = exports.isOdd = function (isEven) { return function (n) { return !isEven(n); }; - })(_evens.isEven); -}); \ No newline at end of file + }(_evens.isEven); +}); diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-eval/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-eval/expected.js index 7f93a0e21f..e86f29f40f 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-eval/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-eval/expected.js @@ -3,9 +3,9 @@ function outer() { var a = arguments.length <= 0 || arguments[0] === undefined ? function () { return eval("x"); } : arguments[0]; - return (function () { + return function () { var x = "inside"; return a(); - })(); + }(); } outer(); diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/rest-nested-iife/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/rest-nested-iife/expected.js index a687304cae..6d0cfa21ca 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/rest-nested-iife/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/rest-nested-iife/expected.js @@ -1,6 +1,6 @@ function broken(x) { if (true) { - var Foo = (function (_Bar) { + var Foo = function (_Bar) { babelHelpers.inherits(Foo, _Bar); function Foo() { @@ -9,7 +9,7 @@ function broken(x) { } return Foo; - })(Bar); + }(Bar); for (var _len = arguments.length, foo = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { foo[_key - 1] = arguments[_key]; diff --git a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/simple-class/expected.js b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/simple-class/expected.js index 9a9dc38685..7d28d4011e 100644 --- a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/simple-class/expected.js +++ b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/simple-class/expected.js @@ -1,7 +1,7 @@ -var Test = (function () { +var Test = function () { function Test() { babelHelpers.classCallCheck(this, Test); } return Test; -})(); +}(); diff --git a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/var-named-function-expression/expected.js b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/var-named-function-expression/expected.js index cc2a8c592d..d35d02edc3 100644 --- a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/var-named-function-expression/expected.js +++ b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/var-named-function-expression/expected.js @@ -1,10 +1,10 @@ -var IdenticalName = (function () { +var IdenticalName = function () { function IdenticalName(x) { return x; } return IdenticalName; -})(); +}(); (function () { function foo() {} diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/expected.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/expected.js index 172a587281..433bd99101 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/expected.js +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/expected.js @@ -1,4 +1,4 @@ -var _jsx = (function () { var REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol.for && Symbol.for("react.element") || 0xeac7; return function createRawReactElement(type, props, key, children) { var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = {}; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }; })(); +var _jsx = function () { var REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol.for && Symbol.for("react.element") || 0xeac7; return function createRawReactElement(type, props, key, children) { var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = {}; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; }; }(); var _ref = _jsx("foo", {}); @@ -14,4 +14,4 @@ function render() { return function () { return _ref2; }; -} \ No newline at end of file +}