diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1168/expected.js b/packages/babel-core/test/fixtures/transformation/misc/regression-1168/expected.js index b16d3772ed..84d9ab0e5c 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-1168/expected.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-1168/expected.js @@ -1,5 +1,5 @@ function test() { - var x = arguments.length <= 0 || arguments[0] === undefined ? "hi" : arguments[0]; + var x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "hi"; return x; -} +} \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/default-parameters/expected.js b/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/default-parameters/expected.js index 1312b6d72f..d310016546 100644 --- a/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/default-parameters/expected.js +++ b/packages/babel-plugin-transform-es2015-arrow-functions/test/fixtures/arrow-functions/default-parameters/expected.js @@ -1,12 +1,12 @@ var some = function () { - let count = arguments.length <= 0 || arguments[0] === undefined ? "30" : arguments[0]; + let count = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "30"; console.log("count", count); }; var collect = function () { - let since = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0]; + let since = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0; let userid = arguments[1]; console.log(userid); -}; +}; \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/default-precedence/expected.js b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/default-precedence/expected.js index 676f9c51d5..c64513fb24 100644 --- a/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/default-precedence/expected.js +++ b/packages/babel-plugin-transform-es2015-destructuring/test/fixtures/destructuring/default-precedence/expected.js @@ -1,6 +1,6 @@ var f0 = function (a) { - var b = arguments.length <= 1 || arguments[1] === undefined ? a : arguments[1]; - var c = arguments.length <= 2 || arguments[2] === undefined ? b : arguments[2]; + var b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : a; + var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : b; return [a, b, c]; }; @@ -9,8 +9,8 @@ assert.deepEqual(f0(1), [1, 1, 1]); var f1 = function (_ref) { var a = _ref.a; - var b = arguments.length <= 1 || arguments[1] === undefined ? a : arguments[1]; - var c = arguments.length <= 2 || arguments[2] === undefined ? b : arguments[2]; + var b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : a; + var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : b; return [a, b, c]; }; @@ -19,10 +19,10 @@ assert.deepEqual(f1({ a: 1 }), [1, 1, 1]); var f2 = function (_ref2) { var a = _ref2.a; - var b = arguments.length <= 1 || arguments[1] === undefined ? a : arguments[1]; - var c = arguments.length <= 2 || arguments[2] === undefined ? a : arguments[2]; + var b = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : a; + var c = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : a; return [a, b, c]; }; -assert.deepEqual(f2({ a: 1 }), [1, 1, 1]); +assert.deepEqual(f2({ a: 1 }), [1, 1, 1]); \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js index 62122a7b78..d1e6156a95 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js @@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); var foo = exports.foo = function foo(gen) { - var ctx = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1]; + var ctx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; }; var bar = exports.bar = function bar(gen) { - var ctx = arguments.length <= 1 || arguments[1] === undefined ? null : arguments[1]; -}; + var ctx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; +}; \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-parameters/src/default.js b/packages/babel-plugin-transform-es2015-parameters/src/default.js index fefa7461d8..afcdba29b5 100644 --- a/packages/babel-plugin-transform-es2015-parameters/src/default.js +++ b/packages/babel-plugin-transform-es2015-parameters/src/default.js @@ -7,10 +7,10 @@ import * as t from "babel-types"; let buildDefaultParam = template(` let VARIABLE_NAME = - ARGUMENTS.length <= ARGUMENT_KEY || ARGUMENTS[ARGUMENT_KEY] === undefined ? - DEFAULT_VALUE + ARGUMENTS.length > ARGUMENT_KEY && ARGUMENTS[ARGUMENT_KEY] !== undefined ? + ARGUMENTS[ARGUMENT_KEY] : - ARGUMENTS[ARGUMENT_KEY]; + DEFAULT_VALUE; `); let buildCutOff = template(` diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-before-last/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-before-last/expected.js index fd30010bce..5567975b2d 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-before-last/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-before-last/expected.js @@ -1,4 +1,4 @@ function foo() { - var a = arguments.length <= 0 || arguments[0] === undefined ? "foo" : arguments[0]; + var a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "foo"; var b = arguments[1]; -} +} \ No newline at end of file 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 e86f29f40f..4de49be383 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 @@ -1,11 +1,11 @@ var x = "outside"; function outer() { - var a = arguments.length <= 0 || arguments[0] === undefined ? function () { + var a = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () { return eval("x"); - } : arguments[0]; + }; return function () { var x = "inside"; return a(); }(); } -outer(); +outer(); \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-multiple/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-multiple/expected.js index 5d7a1b41e0..e1139c5791 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-multiple/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-multiple/expected.js @@ -1,12 +1,12 @@ var t = function () { - var e = arguments.length <= 0 || arguments[0] === undefined ? "foo" : arguments[0]; - var f = arguments.length <= 1 || arguments[1] === undefined ? 5 : arguments[1]; + var e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "foo"; + var f = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5; return e + " bar " + f; }; var a = function (e) { - var f = arguments.length <= 1 || arguments[1] === undefined ? 5 : arguments[1]; + var f = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 5; return e + " bar " + f; -}; +}; \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-single/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-single/expected.js index 61ee0102e3..8f5cb5ade4 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-single/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/default-single/expected.js @@ -1,5 +1,5 @@ var t = function () { - var f = arguments.length <= 0 || arguments[0] === undefined ? "foo" : arguments[0]; + var f = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "foo"; return f + " bar"; -}; +}; \ No newline at end of file diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js index bb85d2a92b..5350b8fade 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/parameters/destructuring-rest/expected.js @@ -1,6 +1,6 @@ // #3861 function t() { - var x = arguments.length <= 0 || arguments[0] === undefined ? "default" : arguments[0]; + var x = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "default"; var _ref = arguments[1]; var a = _ref.a; var b = _ref.b; @@ -10,4 +10,4 @@ function t() { } console.log(x, a, b, args); -} +} \ No newline at end of file