Refactor to ignore iterator return values except for the return value of the last iterator

kgryte · kgryte · commit 3562396632b1 · 2021-12-15T16:49:26.000-08:00
diff --git a/lib/node_modules/@stdlib/iter/concat/lib/main.js b/lib/node_modules/@stdlib/iter/concat/lib/main.js
@@ -133,9 +133,8 @@ function iterConcat() {
 					};
 				}
 				iterator = iterators[ i ];
-				if ( hasOwnProp( v, 'value' ) ) {
-					break;
-				}
+
+				// Note: we ignore iterator return values except for the final iterator...
 			} else {
 				break;
 			}
diff --git a/lib/node_modules/@stdlib/iter/concat/test/test.js b/lib/node_modules/@stdlib/iter/concat/test/test.js
@@ -349,6 +349,7 @@ tape( 'the function returns an iterator protocol-compliant object (value+done)',
 	var values2;
 	var actual;
 	var it;
+	var N;
 	var i;
 
 	values1 = [ 1, 2 ];
@@ -368,17 +369,23 @@ tape( 'the function returns an iterator protocol-compliant object (value+done)',
 		},
 		{
 			'value': 4,
+			'done': false
+		},
+		{
+			'value': 'beep',
 			'done': true
 		}
 	];
 
 	it = iterConcat( createIterator( values1 ), createIterator( values2 ) );
 	t.equal( it.next.length, 0, 'has zero arity' );
 
+	N = values1.length + values2.length;
 	actual = [];
-	for ( i = 0; i < values1.length+values2.length; i++ ) {
+	for ( i = 0; i < N; i++ ) {
 		actual.push( it.next() );
 	}
+	actual.push( it.next() );
 	t.deepEqual( actual, expected, 'returns expected values' );
 	t.end();
 
@@ -396,15 +403,15 @@ tape( 'the function returns an iterator protocol-compliant object (value+done)',
 		return it;
 
 		function next() {
-			var out;
 			i += 1;
 			if ( i < len ) {
-				out = {};
-				out.value = arr[ i ];
-				out.done = ( i === len-1 );
-				return out;
+				return {
+					'value': arr[ i ],
+					'done': false
+				};
 			}
 			return {
+				'value': 'beep',
 				'done': true
 			};
 		}

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,8 @@ function iterConcat() {`
`133`	`133`	`};`
`134`	`134`	`}`
`135`	`135`	`iterator = iterators[ i ];`
`136`		`- if ( hasOwnProp( v, 'value' ) ) {`
`137`		`- break;`
`138`		`- }`
	`136`	`+`
	`137`	`+ // Note: we ignore iterator return values except for the final iterator...`
`139`	`138`	`} else {`
`140`	`139`	`break;`
`141`	`140`	`}`