Refactor to ignore iterator return values

kgryte · kgryte · commit a8da45697a04 · 2021-12-15T21:34:59.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/mapn/lib/main.js b/lib/node_modules/@stdlib/iter/mapn/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' );
 
 
@@ -109,8 +108,8 @@ function iterMapN() {
 			setReadOnly( iter, iteratorSymbol, factory );
 		}
 	}
+	FLG = false;
 	idx = -1;
-	FLG = 0;
 	i = 0;
 	return iter;
 
@@ -131,18 +130,11 @@ function iterMapN() {
 		}
 		args = [];
 		idx += 1;
-		FLG = 0;
 		for ( i = 0; i < niter; i++ ) {
 			v = iterators[ i ].next();
 			if ( v.done ) {
-				FLG += 1;
-				if ( hasOwnProp( v, 'value' ) ) {
-					args.push( v.value );
-					continue;
-				}
-				return {
-					'done': true
-				};
+				FLG = true;
+				return v;
 			}
 			args.push( v.value );
 		}
@@ -161,7 +153,7 @@ function iterMapN() {
 	* @returns {Object} iterator protocol-compliant object
 	*/
 	function end( value ) {
-		FLG = 1;
+		FLG = true;
 		if ( arguments.length ) {
 			return {
 				'value': value,
diff --git a/lib/node_modules/@stdlib/iter/mapn/test/test.js b/lib/node_modules/@stdlib/iter/mapn/test/test.js
@@ -29,37 +29,6 @@ var iterEmpty = require( '@stdlib/iter/empty' );
 var iterMapN = 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 ) {
@@ -749,45 +718,6 @@ tape( 'the function returns an iterator protocol-compliant object which applies
 	}
 });
 
-tape( 'the function returns an iterator protocol-compliant object which applies a function to iterated values (value+done)', function test( t ) {
-	var expected;
-	var values1;
-	var values2;
-	var actual;
-	var it;
-	var i;
-
-	values1 = [ 1.0, 2.0 ];
-	values2 = [ 3.0, 4.0 ];
-	expected = [
-		{
-			'value': 4.0,
-			'done': false
-		},
-		{
-			'value': 6.0,
-			'done': false
-		},
-		{
-			'done': true
-		}
-	];
-
-	it = iterMapN( createIterator( values1 ), createIterator( values2 ), transform ); // eslint-disable-line max-len
-	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();
-
-	function transform( x, y ) {
-		return x + y;
-	}
-});
-
 tape( 'the function invokes a provided callback with iterated values and the iteration index', function test( t ) {
 	var expected;
 	var values1;
@@ -872,51 +802,6 @@ tape( 'the function supports specifying the callback execution context', functio
 	}
 });
 
-tape( 'the function supports specifying the callback execution context (value+done)', function test( t ) {
-	var expected;
-	var values1;
-	var values2;
-	var actual;
-	var ctx;
-	var it;
-	var i;
-
-	ctx = {
-		'count': 0
-	};
-	values1 = [ 1.0, 2.0 ];
-	values2 = [ 3.0, 4.0 ];
-	expected = [
-		{
-			'value': 4.0,
-			'done': false
-		},
-		{
-			'value': 6.0,
-			'done': false
-		},
-		{
-			'done': true
-		}
-	];
-
-	it = iterMapN( createIterator( values1 ), createIterator( values2 ), transform, ctx ); // eslint-disable-line max-len
-	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, expected.length-1 );
-	t.end();
-
-	function transform( x, y ) {
-		this.count += 1; // eslint-disable-line no-invalid-this
-		return x + y;
-	}
-});
-
 tape( 'the returned iterator has a `return` method for closing an iterator (no argument)', function test( t ) {
 	var it;
 	var r;
