From 94a0eb5b0645ea41b3f4e1bf8b3abb1980deb5af Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Tue, 10 Feb 2015 13:06:26 +1100 Subject: [PATCH] copy over descriptors and handle non-enumerable properties in defaults helper - fixes #738 --- lib/6to5/transformation/templates/defaults.js | 5 +++-- .../transformation/es6-modules-amd/exports-from/expected.js | 2 +- .../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, 9 insertions(+), 8 deletions(-) diff --git a/lib/6to5/transformation/templates/defaults.js b/lib/6to5/transformation/templates/defaults.js index 3fda0b6fb6..cfda13c33d 100644 --- a/lib/6to5/transformation/templates/defaults.js +++ b/lib/6to5/transformation/templates/defaults.js @@ -1,7 +1,8 @@ (function (obj, defaults) { - for (var key in defaults) { + var keys = Object.getOwnPropertyNames(defaults); + for (var key in keys) { if (obj[key] === undefined) { - obj[key] = defaults[key]; + Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } return obj; 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 f1973e1317..58d62c5ec3 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; + var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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 8db5af8c82..947f129063 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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 84f959d5df..1e36f84905 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; + var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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 bbab18ef80..44c356acb1 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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 26d5cc5673..744529ac4c 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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 4b47fef537..c53392882f 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) { for (var key in defaults) { if (obj[key] === undefined) { obj[key] = defaults[key]; } } return obj; }; +var _defaults = function (obj, defaults) { var keys = Object.getOwnPropertyNames(defaults); for (var key in keys) { if (obj[key] === undefined) { Object.defineProperty(obj, key, Object.getOwnPropertyDescriptor(defaults, key)); } } 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); };