Refactor to ignore iterator return values

kgryte · kgryte · commit b0b21ae82f1c · 2021-12-15T18:12:15.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/filter-map/lib/main.js b/lib/node_modules/@stdlib/iter/filter-map/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' );
 
 
@@ -94,7 +93,6 @@ function iterFilterMap( iterator, fcn, thisArg ) {
 	* @returns {Object} iterator protocol-compliant object
 	*/
 	function next() {
-		var out;
 		var v;
 		if ( FLG ) {
 			return {
@@ -106,15 +104,7 @@ function iterFilterMap( iterator, fcn, thisArg ) {
 			i += 1;
 			if ( v.done ) {
 				FLG = true;
-				out = {};
-				if ( hasOwnProp( v, 'value' ) ) {
-					v = fcn.call( thisArg, v.value, i );
-					if ( v !== void 0 ) {
-						out.value = v;
-					}
-				}
-				out.done = true;
-				return out;
+				return v;
 			}
 			v = fcn.call( thisArg, v.value, i );
 			if ( v !== void 0 ) {
diff --git a/lib/node_modules/@stdlib/iter/filter-map/test/test.js b/lib/node_modules/@stdlib/iter/filter-map/test/test.js
@@ -29,37 +29,6 @@ var noop = require( '@stdlib/utils/noop' );
 var iterFilterMap = 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 ) {
@@ -147,81 +116,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, 3, 2, 4 ];
-	expected = [
-		{
-			'value': 30,
-			'done': false
-		},
-		{
-			'value': 40,
-			'done': true
-		}
-	];
-
-	it = iterFilterMap( createIterator( values ), fcn );
-	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 fcn( v ) {
-		if ( v > 2 ) {
-			return v * 10;
-		}
-	}
-});
-
-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, 3, 4, 2 ];
-	expected = [
-		{
-			'value': 30,
-			'done': false
-		},
-		{
-			'value': 40,
-			'done': false
-		},
-		{
-			'done': true
-		}
-	];
-
-	it = iterFilterMap( createIterator( values ), fcn );
-	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 fcn( v ) {
-		if ( v > 2 ) {
-			return v * 10;
-		}
-	}
-});
-
 tape( 'the function returns an iterator protocol-compliant object which filters and maps iterated values according to a callback function', function test( t ) {
 	var expected;
 	var actual;
