Skip to content

Commit

Permalink
Add for-of fallback for arrays in browsers without symbol supp… (#11263)
Browse files Browse the repository at this point in the history
* Add for-of fallback for arrays in browsers without symbol support

* Update after rebase

* Re-throw error when iterating array

* Update fixture
  • Loading branch information
nicolo-ribaudo committed Mar 19, 2020
1 parent d60802b commit 6f93297
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
19 changes: 18 additions & 1 deletion packages/babel-helpers/src/helpers.js
Expand Up @@ -1078,8 +1078,24 @@ helpers.createForOfIteratorHelper = helper("7.9.0")`
// f: finish (always called at the end)
export default function _createForOfIteratorHelper(o) {
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null)
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
// Fallback for engines without symbol support
if (Array.isArray(o)) {
var i = 0;
var F = function(){};
return {
s: F,
n: function() {
if (i >= o.length) return { done: true };
return { done: false, value: o[i++] };
},
e: function(e) { throw e; },
f: F,
};
}
throw new TypeError("Invalid attempt to iterate non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
}
var it, normalCompletion = true, didErr = false, err;
Expand Down Expand Up @@ -1112,6 +1128,7 @@ helpers.createForOfIteratorHelperLoose = helper("7.9.0")`
var i = 0;
if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {
// Fallback for engines without symbol support
if (Array.isArray(o))
return function() {
if (i >= o.length) return { done: true };
Expand Down
@@ -0,0 +1,23 @@
var a = (() => [1, 2, 3])();

// Simulate old environment
let _Symbol = Symbol;
Symbol = void 0;
try {
let didErr = false, err;
let obj = {};

try {
for (let i of a) {
if (i === 2) throw obj;
}
} catch (e) {
didErr = true;
err = e;
}

expect(didErr).toBe(true);
expect(obj).toBe(err);
} finally {
Symbol = _Symbol;
}
Expand Up @@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(

function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }

function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e) { didErr = true; err = _e; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o)) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }

// https://github.com/babel/babel/issues/7557
var _iterator = _createForOfIteratorHelper(c),
Expand Down

0 comments on commit 6f93297

Please sign in to comment.