Refactor to ignore iterator return values

kgryte · kgryte · commit 36a16f7a2785 · 2021-12-16T00:35:25.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/slice/lib/main.js b/lib/node_modules/@stdlib/iter/slice/lib/main.js
@@ -24,7 +24,6 @@ var setReadOnly = require( '@stdlib/utils/define-nonenumerable-read-only-propert
 var isNonNegativeInteger = require( '@stdlib/assert/is-nonnegative-integer' ).isPrimitive;
 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' );
 
 
@@ -111,36 +110,35 @@ function iterSlice( iterator, begin, end ) {
 	* @returns {Object} iterator protocol-compliant object
 	*/
 	function next() {
-		var out;
 		var v;
-
+		if ( FLG ) {
+			return {
+				'done': true
+			};
+		}
 		i += 1;
 		if ( n > 0 && i < N ) {
 			// Lazily consume the first `N` values from the provided iterator...
 			for ( i = 0; i < N; i++ ) {
-				FLG = iterator.next().done;
+				v = iterator.next();
 			}
 		}
+		if ( v && v.done ) {
+			FLG = true;
+			return v;
+		}
 		n -= 1;
-		if ( FLG || n < 0 ) {
+		if ( n < 0 ) {
+			FLG = true;
 			return {
 				'done': true
 			};
 		}
 		v = iterator.next();
 		if ( v.done ) {
 			FLG = true;
-			out = {};
-			if ( hasOwnProp( v, 'value' ) ) {
-				out.value = v.value;
-			}
-			out.done = true;
-			return out;
 		}
-		return {
-			'value': v.value,
-			'done': false
-		};
+		return v;
 	}
 
 	/**
diff --git a/lib/node_modules/@stdlib/iter/slice/test/test.js b/lib/node_modules/@stdlib/iter/slice/test/test.js
@@ -29,37 +29,6 @@ var iteratorSymbol = require( '@stdlib/symbol/iterator' );
 var iterSlice = 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 ) {
@@ -505,44 +474,6 @@ tape( 'the function returns an "empty" iterator if the third argument is less th
 	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 = [ 0, 0, 0, 1, 2, 3, 4 ];
-	expected = [
-		{
-			'value': 1,
-			'done': false
-		},
-		{
-			'value': 2,
-			'done': false
-		},
-		{
-			'value': 3,
-			'done': false
-		},
-		{
-			'value': 4,
-			'done': true
-		}
-	];
-
-	it = iterSlice( createIterator( values ), 3, values.length );
-	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;
