Iterator close on argument validation error

Author: slowcheetah

packages/core-js/modules/esnext.iterator.chunks.js

@@ -4,6 +4,7 @@ var anObject = require('../internals/an-object');
 var call = require('../internals/function-call');
 var createIteratorProxy = require('../internals/iterator-create-proxy');
 var getIteratorDirect = require('../internals/get-iterator-direct');
+var iteratorClose = require('../internals/iterator-close');
 var uncurryThis = require('../internals/function-uncurry-this');
 
 var $RangeError = RangeError;
@@ -34,7 +35,7 @@ $({ target: 'Iterator', proto: true, real: true, forced: true }, {
   chunks: function chunks(chunkSize) {
     var O = anObject(this);
     if (!chunkSize || chunkSize >>> 0 !== chunkSize) {
-      throw $RangeError('chunkSize must be integer in [1, 2^32-1]');
+      return iteratorClose(O, 'throw', new $RangeError('chunkSize must be integer in [1, 2^32-1]'));
     }
     return new IteratorProxy(getIteratorDirect(O), {
       chunkSize: chunkSize

packages/core-js/modules/esnext.iterator.windows.js

@@ -4,6 +4,7 @@ var anObject = require('../internals/an-object');
 var call = require('../internals/function-call');
 var createIteratorProxy = require('../internals/iterator-create-proxy');
 var getIteratorDirect = require('../internals/get-iterator-direct');
+var iteratorClose = require('../internals/iterator-close');
 var uncurryThis = require('../internals/function-uncurry-this');
 
 var $RangeError = RangeError;
@@ -35,7 +36,7 @@ $({ target: 'Iterator', proto: true, real: true, forced: true }, {
   windows: function windows(windowSize) {
     var O = anObject(this);
     if (!windowSize || windowSize >>> 0 !== windowSize) {
-      throw $RangeError('windowSize must be integer in [1, 2^32-1]');
+      return iteratorClose(O, 'throw', new $RangeError('windowSize must be integer in [1, 2^32-1]'));
     }
     return new IteratorProxy(getIteratorDirect(O), {
       windowSize: windowSize,

tests/unit-global/esnext.iterator.chunks.js

@@ -31,5 +31,14 @@ QUnit.test('Iterator#chunks', assert => {
 
   assert.throws(() => chunks.call(it), RangeError, 'throws on empty argument');
   assert.throws(() => chunks.call(it, -1), RangeError, 'throws on negative argument');
-  assert.throws(() => chunks.call(it, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+
+  const observableReturn = {
+    return() {
+      this.called = true;
+      return { done: true, value: undefined };
+    },
+  };
+  const itObservable = createIterator([1, 2, 3], observableReturn);
+  assert.throws(() => chunks.call(itObservable, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+  assert.true(itObservable.called, 'iterator closed on argument validation error');
 });

tests/unit-global/esnext.iterator.windows.js

@@ -31,5 +31,14 @@ QUnit.test('Iterator#windows', assert => {
 
   assert.throws(() => windows.call(it), RangeError, 'throws on empty argument');
   assert.throws(() => windows.call(it, -1), RangeError, 'throws on negative argument');
-  assert.throws(() => windows.call(it, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+
+  const observableReturn = {
+    return() {
+      this.called = true;
+      return { done: true, value: undefined };
+    },
+  };
+  const itObservable = createIterator([1, 2, 3], observableReturn);
+  assert.throws(() => windows.call(itObservable, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+  assert.true(itObservable.called, 'iterator closed on argument validation error');
 });

tests/unit-pure/esnext.iterator.chunks.js

@@ -30,5 +30,14 @@ QUnit.test('Iterator#chunks', assert => {
 
   assert.throws(() => chunks.call(it), RangeError, 'throws on empty argument');
   assert.throws(() => chunks.call(it, -1), RangeError, 'throws on negative argument');
-  assert.throws(() => chunks.call(it, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+
+  const observableReturn = {
+    return() {
+      this.called = true;
+      return { done: true, value: undefined };
+    },
+  };
+  const itObservable = createIterator([1, 2, 3], observableReturn);
+  assert.throws(() => chunks.call(itObservable, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+  assert.true(itObservable.called, 'iterator closed on argument validation error');
 });

tests/unit-pure/esnext.iterator.windows.js

@@ -30,5 +30,14 @@ QUnit.test('Iterator#windows', assert => {
 
   assert.throws(() => windows.call(it), RangeError, 'throws on empty argument');
   assert.throws(() => windows.call(it, -1), RangeError, 'throws on negative argument');
-  assert.throws(() => windows.call(it, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+
+  const observableReturn = {
+    return() {
+      this.called = true;
+      return { done: true, value: undefined };
+    },
+  };
+  const itObservable = createIterator([1, 2, 3], observableReturn);
+  assert.throws(() => windows.call(itObservable, 0x100000000), RangeError, 'throws on argument more then 2^32 - 1');
+  assert.true(itObservable.called, 'iterator closed on argument validation error');
 });