Spec compatibility for iteratorClose condition. (babel#6094)

* for-of: IteratorClose spec compatibility. See #3: https://tc39.github.io/ecma262/#sec-iteratorclose * Update spec fixtures for for-of. * Fix IteratorClose case for remap-async-to-generator. * Fix IteratorClose case for async-generator-function test output. * Modify few tests according to iteratorClose fix. * Fix iteratorClose for helpers.slicedToArray also. * Update iteratorClose fixture for commonjs.
Daniel15 · Aug 28, 2017 · b2b3d79 · b2b3d79
1 parent 827d845
commit b2b3d79
Show file tree

Hide file tree

Showing 23 changed files with 25 additions and 25 deletions.
diff --git a/packages/babel-helper-remap-async-to-generator/src/for-await.js b/packages/babel-helper-remap-async-to-generator/src/for-await.js
@@ -22,7 +22,7 @@ const awaitTemplate = `
       ITERATOR_ERROR_KEY = err;
     } finally {
       try {
-        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return) {
+        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return != null) {
           yield AWAIT(ITERATOR_KEY.return());
         }
       } finally {

diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js
@@ -542,7 +542,7 @@ helpers.slicedToArray = template(`
         _e = err;
       } finally {
         try {
-          if (!_n && _i["return"]) _i["return"]();
+          if (!_n && _i["return"] != null) _i["return"]();
         } finally {
           if (_d) throw _e;
         }

diff --git a/...lugin-transform-async-generator-functions/test/fixtures/for-await/async-arrow/expected.js b/...lugin-transform-async-generator-functions/test/fixtures/for-await/async-arrow/expected.js
@@ -13,7 +13,7 @@ babelHelpers.asyncToGenerator(function* () {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
         yield _iterator.return();
       }
     } finally {

diff --git a/...in-transform-async-generator-functions/test/fixtures/for-await/async-function/expected.js b/...in-transform-async-generator-functions/test/fixtures/for-await/async-function/expected.js
@@ -14,7 +14,7 @@ let f = (() => {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
           yield _iterator.return();
         }
       } finally {

diff --git a/...n-transform-async-generator-functions/test/fixtures/for-await/async-generator/expected.js b/...n-transform-async-generator-functions/test/fixtures/for-await/async-generator/expected.js
@@ -14,7 +14,7 @@ let g = (() => {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
           yield babelHelpers.asyncGenerator.await(_iterator.return());
         }
       } finally {

diff --git a/...gin-transform-async-generator-functions/test/fixtures/for-await/destructuring/expected.js b/...gin-transform-async-generator-functions/test/fixtures/for-await/destructuring/expected.js
@@ -17,7 +17,7 @@ let f = (() => {
       _iteratorError = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
           yield _iterator.return();
         }
       } finally {

diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/5880/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/5880/expected.js
@@ -14,7 +14,7 @@ babelHelpers.asyncToGenerator(function* () {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
         yield _iterator.return();
       }
     } finally {

diff --git a/...es/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/hoisting/expected.js b/...es/babel-plugin-transform-es2015-block-scoping/test/fixtures/general/hoisting/expected.js
@@ -27,7 +27,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/README.md b/packages/babel-plugin-transform-es2015-for-of/README.md
@@ -26,7 +26,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/src/index.js b/packages/babel-plugin-transform-es2015-for-of/src/index.js
@@ -33,7 +33,7 @@ export default function({ messages, template, types: t }) {
       ITERATOR_ERROR_KEY = err;
     } finally {
       try {
-        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return) {
+        if (!ITERATOR_COMPLETION && ITERATOR_KEY.return != null) {
           ITERATOR_KEY.return();
         }
       } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/opt/typeannotation/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/opt/typeannotation/expected.js
@@ -18,7 +18,7 @@ function a(b) {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
         _iterator.return();
       }
     } finally {

diff --git a/...ansform-es2015-for-of/test/fixtures/regression/label-object-with-comment-4995/expected.js b/...ansform-es2015-for-of/test/fixtures/regression/label-object-with-comment-4995/expected.js
@@ -13,7 +13,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/identifier/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/identifier/expected.js
@@ -11,7 +11,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/ignore-cases/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/ignore-cases/expected.js
@@ -16,7 +16,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/let/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/let/expected.js
@@ -11,7 +11,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/...ges/babel-plugin-transform-es2015-for-of/test/fixtures/spec/member-expression/expected.js b/...ges/babel-plugin-transform-es2015-for-of/test/fixtures/spec/member-expression/expected.js
@@ -11,7 +11,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/multiple/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/multiple/expected.js
@@ -11,7 +11,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {
@@ -34,7 +34,7 @@ try {
   _iteratorError2 = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion2 && _iterator2.return) {
+    if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
       _iterator2.return();
     }
   } finally {

diff --git a/...s/babel-plugin-transform-es2015-for-of/test/fixtures/spec/nested-label-for-of/expected.js b/...s/babel-plugin-transform-es2015-for-of/test/fixtures/spec/nested-label-for-of/expected.js
@@ -19,7 +19,7 @@ try {
       _iteratorError2 = err;
     } finally {
       try {
-        if (!_iteratorNormalCompletion2 && _iterator2.return) {
+        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
           _iterator2.return();
         }
       } finally {
@@ -34,7 +34,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/var/expected.js b/packages/babel-plugin-transform-es2015-for-of/test/fixtures/spec/var/expected.js
@@ -11,7 +11,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/...babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js b/...babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
 
 var _foo = require("foo");
 

diff --git a/...015-parameters/test/fixtures/parameters/rest-member-expression-deoptimisation/expected.js b/...015-parameters/test/fixtures/parameters/rest-member-expression-deoptimisation/expected.js
@@ -164,7 +164,7 @@ function forOf() {
     _iteratorError = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion && _iterator.return) {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
         _iterator.return();
       }
     } finally {

diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
@@ -12,7 +12,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {

diff --git a/packages/babel-preset-es2015/test/fixtures/preset-options/6025/expected.js b/packages/babel-preset-es2015/test/fixtures/preset-options/6025/expected.js
@@ -21,7 +21,7 @@ try {
   _iteratorError = err;
 } finally {
   try {
-    if (!_iteratorNormalCompletion && _iterator.return) {
+    if (!_iteratorNormalCompletion && _iterator.return != null) {
       _iterator.return();
     }
   } finally {