From 7f57d3d6a2013be0afca23fe39e94389b0f90185 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Sun, 23 Nov 2014 21:50:49 +1100 Subject: [PATCH] fix experimental object spread/rest helper --- CHANGELOG.md | 4 ++++ lib/6to5/templates/object-spread.js | 8 ++++---- .../es6-destructuring/es7-object-rest/expected.js | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6aff16a9e6..ca959a23af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.13.6 + + * Fix experimental object spread/rest helper. + # 1.13.5 * Upgrade `acorn-6to5`. diff --git a/lib/6to5/templates/object-spread.js b/lib/6to5/templates/object-spread.js index 901fb418c6..a5ad00f639 100644 --- a/lib/6to5/templates/object-spread.js +++ b/lib/6to5/templates/object-spread.js @@ -1,9 +1,9 @@ -(function (target, keys) { +(function (obj, keys) { var target = {}; - for (var i in target) { + for (var i in obj) { if (keys.indexOf(i) >= 0) continue; - if (!Object.prototype.hasOwn.call(target)) continue; - target[i] = target[i]; + if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; + target[i] = obj[i]; } return target; }) diff --git a/test/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js b/test/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js index f1333fb51e..50857a50a3 100644 --- a/test/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js +++ b/test/fixtures/transformation/es6-destructuring/es7-object-rest/expected.js @@ -1,11 +1,11 @@ "use strict"; -var _objectSpread = function (target, keys) { +var _objectSpread = function (obj, keys) { var target = {}; - for (var i in target) { + for (var i in obj) { if (keys.indexOf(i) >= 0) continue; - if (!Object.prototype.hasOwn.call(target)) continue; - target[i] = target[i]; + if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; + target[i] = obj[i]; } return target;