From 7f61c8b65e906d71b45f7ee0d07b0a368f318abb Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Tue, 10 Feb 2015 18:33:29 +1100 Subject: [PATCH] add descriptor falsy check to defaults helper - #739 --- lib/6to5/transformation/templates/defaults.js | 2 +- .../transformation/es6-modules-amd/exports-from/expected.js | 2 +- .../transformation/es6-modules-common/exports-from/expected.js | 2 +- .../transformation/es6-modules-umd/exports-from/expected.js | 2 +- .../spec-proto-to-assign/assignment-expression/expected.js | 2 +- .../spec-proto-to-assign/assignment-statement/expected.js | 2 +- .../transformation/spec-proto-to-assign/class/expected.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/6to5/transformation/templates/defaults.js b/lib/6to5/transformation/templates/defaults.js index 47d177049f..1553b89089 100644 --- a/lib/6to5/transformation/templates/defaults.js +++ b/lib/6to5/transformation/templates/defaults.js @@ -3,7 +3,7 @@ for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); - if (value.configurable && obj[key] === undefined) { + if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } diff --git a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js index e02b62c5a1..113dd40be3 100644 --- a/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js +++ b/test/fixtures/transformation/es6-modules-amd/exports-from/expected.js @@ -3,7 +3,7 @@ define(["exports", "foo"], function (exports, _foo) { var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; }; - var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; + var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; _defaults(exports, _interopRequireWildcard(_foo)); diff --git a/test/fixtures/transformation/es6-modules-common/exports-from/expected.js b/test/fixtures/transformation/es6-modules-common/exports-from/expected.js index 35fef0159f..b3d182d456 100644 --- a/test/fixtures/transformation/es6-modules-common/exports-from/expected.js +++ b/test/fixtures/transformation/es6-modules-common/exports-from/expected.js @@ -2,7 +2,7 @@ var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; }; -var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; var _foo = require("foo"); diff --git a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js index 745f5596e2..35cdb100e3 100644 --- a/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js +++ b/test/fixtures/transformation/es6-modules-umd/exports-from/expected.js @@ -9,7 +9,7 @@ var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { "default": obj }; }; - var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; + var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; _defaults(exports, _interopRequireWildcard(_foo)); diff --git a/test/fixtures/transformation/spec-proto-to-assign/assignment-expression/expected.js b/test/fixtures/transformation/spec-proto-to-assign/assignment-expression/expected.js index 14c2f367e4..08369913d8 100644 --- a/test/fixtures/transformation/spec-proto-to-assign/assignment-expression/expected.js +++ b/test/fixtures/transformation/spec-proto-to-assign/assignment-expression/expected.js @@ -1,7 +1,7 @@ "use strict"; var _foo, _foo$bar, _foo$bar2; -var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; console.log((_foo = foo, _defaults(_foo, bar), _foo)); diff --git a/test/fixtures/transformation/spec-proto-to-assign/assignment-statement/expected.js b/test/fixtures/transformation/spec-proto-to-assign/assignment-statement/expected.js index 0ffb46eb2a..b4529baf22 100644 --- a/test/fixtures/transformation/spec-proto-to-assign/assignment-statement/expected.js +++ b/test/fixtures/transformation/spec-proto-to-assign/assignment-statement/expected.js @@ -1,5 +1,5 @@ "use strict"; -var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; _defaults(obj, bar); \ No newline at end of file diff --git a/test/fixtures/transformation/spec-proto-to-assign/class/expected.js b/test/fixtures/transformation/spec-proto-to-assign/class/expected.js index e389845303..8043b14352 100644 --- a/test/fixtures/transformation/spec-proto-to-assign/class/expected.js +++ b/test/fixtures/transformation/spec-proto-to-assign/class/expected.js @@ -1,6 +1,6 @@ "use strict"; -var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var i = 0; i < keys.length; i++) { var key = keys[i]; var value = Object.getOwnPropertyDescriptor(defaults, key); if (value && value.configurable && obj[key] === undefined) { Object.defineProperty(obj, key, value); } } return obj; }; var _inherits = function (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) _defaults(subClass, superClass); };