Refactor to ignore iterator return values

kgryte · kgryte · commit 74e55d4802a6 · 2021-12-16T00:01:39.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/push/lib/main.js b/lib/node_modules/@stdlib/iter/push/lib/main.js
@@ -23,7 +23,6 @@
 var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-property' );
 var isFunction = require( '@stdlib/assert/is-function' );
 var isIteratorLike = require( '@stdlib/assert/is-iterator-like' );
-var hasOwnProp = require( '@stdlib/assert/has-own-property' );
 var iteratorSymbol = require( '@stdlib/symbol/iterator' );
 
 
@@ -60,6 +59,7 @@ var iteratorSymbol = require( '@stdlib/symbol/iterator' );
 function iterPush( iterator ) {
 	var items;
 	var iter;
+	var ret;
 	var FLG;
 	var i;
 	if ( !isIteratorLike( iterator ) ) {
@@ -100,9 +100,7 @@ function iterPush( iterator ) {
 			i += 1;
 			if ( i >= items.length ) {
 				FLG = 2;
-				return {
-					'done': true
-				};
+				return ret;
 			}
 			return {
 				'value': items[ i ],
@@ -112,19 +110,12 @@ function iterPush( iterator ) {
 		v = iterator.next();
 		if ( v.done ) {
 			FLG = 1;
-			if ( hasOwnProp( v, 'value' ) ) {
-				return {
-					'value': v.value,
-					'done': false
-				};
-			}
 			i += 1;
 			if ( i >= items.length ) {
 				FLG = 2;
-				return {
-					'done': true
-				};
+				return v;
 			}
+			ret = v;
 			return {
 				'value': items[ i ],
 				'done': false
diff --git a/lib/node_modules/@stdlib/iter/push/test/test.js b/lib/node_modules/@stdlib/iter/push/test/test.js
@@ -29,37 +29,6 @@ var iteratorSymbol = require( '@stdlib/symbol/iterator' );
 var iterPush = require( './../lib' );
 
 
-// FUNCTIONS //
-
-function createIterator( arr ) {
-	var len;
-	var it;
-	var i;
-
-	len = arr.length;
-	i = -1;
-
-	it = {};
-	it.next = next;
-
-	return it;
-
-	function next() {
-		var out;
-		i += 1;
-		if ( i < len ) {
-			out = {};
-			out.value = arr[ i ];
-			out.done = ( i === len-1 );
-			return out;
-		}
-		return {
-			'done': true
-		};
-	}
-}
-
-
 // TESTS //
 
 tape( 'main export is a function', function test( t ) {
@@ -340,96 +309,6 @@ tape( 'the function returns an iterator protocol-compliant object (no additional
 	t.end();
 });
 
-tape( 'the function returns an iterator protocol-compliant object (value+done)', function test( t ) {
-	var expected;
-	var values;
-	var actual;
-	var it;
-	var i;
-
-	values = [ 1, 2, 3, 4 ];
-	expected = [
-		{
-			'value': 1,
-			'done': false
-		},
-		{
-			'value': 2,
-			'done': false
-		},
-		{
-			'value': 3,
-			'done': false
-		},
-		{
-			'value': 4,
-			'done': false
-		},
-		{
-			'value': 5,
-			'done': false
-		},
-		{
-			'value': 6,
-			'done': false
-		},
-		{
-			'done': true
-		}
-	];
-
-	it = iterPush( createIterator( values ), 5, 6 );
-	t.equal( it.next.length, 0, 'has zero arity' );
-
-	actual = [];
-	for ( i = 0; i < expected.length; i++ ) {
-		actual.push( it.next() );
-	}
-	t.deepEqual( actual, expected, 'returns expected values' );
-	t.end();
-});
-
-tape( 'the function returns an iterator protocol-compliant object (value+done; no additional arguments)', function test( t ) {
-	var expected;
-	var values;
-	var actual;
-	var it;
-	var i;
-
-	values = [ 1, 2, 3, 4 ];
-	expected = [
-		{
-			'value': 1,
-			'done': false
-		},
-		{
-			'value': 2,
-			'done': false
-		},
-		{
-			'value': 3,
-			'done': false
-		},
-		{
-			'value': 4,
-			'done': false
-		},
-		{
-			'done': true
-		}
-	];
-
-	it = iterPush( createIterator( values ) );
-	t.equal( it.next.length, 0, 'has zero arity' );
-
-	actual = [];
-	for ( i = 0; i < expected.length; i++ ) {
-		actual.push( it.next() );
-	}
-	t.deepEqual( actual, expected, 'returns expected values' );
-	t.end();
-});
-
 tape( 'the returned iterator has a `return` method for closing an iterator (no argument)', function test( t ) {
 	var it;
 	var r;
