Refactor to ignore iterator return values

kgryte · kgryte · commit c4c28360ba83 · 2021-12-16T00:54:51.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/strided-by/lib/main.js b/lib/node_modules/@stdlib/iter/strided-by/lib/main.js
@@ -26,7 +26,6 @@ var isPositiveInteger = require( '@stdlib/assert/is-positive-integer' ).isPrimit
 var isBoolean = require( '@stdlib/assert/is-boolean' ).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' );
 
 
@@ -81,6 +80,7 @@ function iterStridedBy( iterator, fcn, offset, eager, thisArg ) {
 	var FLG;
 	var idx;
 	var ctx;
+	var ret;
 	var o;
 	var v;
 	var i;
@@ -129,6 +129,7 @@ function iterStridedBy( iterator, fcn, offset, eager, thisArg ) {
 			v = iterator.next();
 			if ( v.done ) {
 				FLG = true;
+				ret = v;
 				break;
 			}
 		}
@@ -160,9 +161,13 @@ function iterStridedBy( iterator, fcn, offset, eager, thisArg ) {
 	* @returns {Object} iterator protocol-compliant object
 	*/
 	function next() {
-		var out;
 		var v;
 		if ( FLG ) {
+			if ( ret ) {
+				v = ret;
+				ret = null;
+				return v;
+			}
 			return {
 				'done': true
 			};
@@ -181,23 +186,15 @@ function iterStridedBy( iterator, fcn, offset, eager, thisArg ) {
 		v = iterator.next();
 		if ( v.done ) {
 			FLG = true;
-			out = {};
-			if ( hasOwnProp( v, 'value' ) ) {
-				out.value = v.value;
-			}
-			out.done = true;
-			return out;
+			return v;
 		}
 		s += 1;
 		stride = fcn.call( ctx, v.value, i, s, stride );
 		if ( !isPositiveInteger( stride ) ) {
 			throw new TypeError( 'invalid return value. Callback function must return a positive integer. Value: `' + stride + '`.' );
 		}
 		idx += stride;
-		return {
-			'value': v.value,
-			'done': false
-		};
+		return v;
 	}
 
 	/**
diff --git a/lib/node_modules/@stdlib/iter/strided-by/test/test.js b/lib/node_modules/@stdlib/iter/strided-by/test/test.js
@@ -29,37 +29,6 @@ var noop = require( '@stdlib/utils/noop' );
 var iterStridedBy = 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 ) {
@@ -417,40 +386,6 @@ tape( 'the function returns an iterator protocol-compliant object having a `next
 	}
 });
 
-tape( 'the function returns an iterator protocol-compliant object having a `next` method which throws an error if a provided callback function does not return a positive integer value (value+done)', function test( t ) {
-	var values;
-	var i;
-
-	values = [
-		'5',
-		-5,
-		0,
-		3.14,
-		NaN,
-		true,
-		false,
-		null,
-		void 0,
-		[],
-		{},
-		function noop() {}
-	];
-	for ( i = 0; i < values.length; i++ ) {
-		t.throws( badValue( values[i] ), TypeError, 'throws an error when a callback returns '+values[i] );
-	}
-	t.end();
-
-	function badValue( value ) {
-		function clbk() {
-			return value;
-		}
-		return function badValue() {
-			var it = iterStridedBy( createIterator( [ 1, 2 ] ), clbk );
-			it.next();
-		};
-	}
-});
-
 tape( 'the function returns an iterator protocol-compliant object', function test( t ) {
 	var it;
 	var r;
@@ -471,48 +406,6 @@ tape( 'the function returns an iterator protocol-compliant object', function tes
 	}
 });
 
-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': true
-		}
-	];
-
-	it = iterStridedBy( createIterator( values ), stride );
-	t.equal( it.next.length, 0, 'has zero arity' );
-
-	actual = [];
-	for ( i = 0; i < values.length; i++ ) {
-		actual.push( it.next() );
-	}
-	t.deepEqual( actual, expected, 'returns expected values' );
-	t.end();
-
-	function stride() {
-		return 1;
-	}
-});
-
 tape( 'the function returns an iterator protocol-compliant object which steps according to a callback function', function test( t ) {
 	var expected;
 	var values;
@@ -838,54 +731,6 @@ tape( 'the function supports specifying the callback execution context (offset+e
 	}
 });
 
-tape( 'the function supports specifying the callback execution context (value+done)', function test( t ) {
-	var expected;
-	var values;
-	var actual;
-	var ctx;
-	var it;
-	var i;
-
-	ctx = {
-		'count': 0
-	};
-	values = [ 1, 2, 3, 4 ];
-	expected = [
-		{
-			'value': 1,
-			'done': false
-		},
-		{
-			'value': 2,
-			'done': false
-		},
-		{
-			'value': 3,
-			'done': false
-		},
-		{
-			'value': 4,
-			'done': true
-		}
-	];
-
-	it = iterStridedBy( createIterator( values ), stride, ctx );
-	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.equal( ctx.count, 3, 'returns expected value' );
-	t.end();
-
-	function stride() {
-		this.count += 1; // eslint-disable-line no-invalid-this
-		return 1;
-	}
-});
-
 tape( 'the returned iterator has a `return` method for closing an iterator (no argument)', function test( t ) {
 	var it;
 	var r;
