Simplify fix for scan+take dispose. Simplify take

lib/combinators/filter.js

@@ -74,23 +74,27 @@ function stepTakeWhile (p, stepper, s) {
  * @returns {Stream} stream containing at most the first n items from this stream
  */
 function take(n, stream) {
-	var stepper = stream.step;
-	return stream.beget(function(s) {
-		return stepTake(stepper, s);
-	}, new Yield(stream.scheduler.now(), void 0, new Pair(n|0, stream.state)));
+	// Note: abusing Yield, using it as a Tuple :/
+	return stream.beget(stepTake, new Yield(stream.scheduler.now(), n|0, stream), disposeTake);
+}
+
+function disposeTake(t, x, s) {
+	// Unwrap original stream's state
+	var stream = s.state;
+	return stream.dispose(t, x, stream.state);
 }
 
-function stepTake(stepper, s) {
-	var ss = s.state;
+function stepTake(s) {
+	var stream = s.state;
 
-	if(ss.value === 0) {
-		return new End(s.time, s.value, ss.state);
+	if(s.value === 0) {
+		return new End(s.time, s.value, stream.state);
 	}
 
 	return when(function (i) {
 		return i.done ? i
-			: i.withState(new Yield(i.time, i.value, new Pair(ss.value-1, i.state)));
-	}, when(stepper, ss.state));
+			: i.withState(new Yield(i.time, s.value-1, stream.beget(stream.step, i.state)));
+	}, when(stream.step, stream.state));
 }
 
 /**

lib/combinators/transform.js

@@ -115,17 +115,19 @@ function scan(f, initial, stream) {
 function stepScan (f, s) {
 	var stream = s.state;
 	return when(function (i) {
+		var next = stream.beget(stream.step, i.state);
+
 		if (i.done) {
-			return i.withState(stream);
+			return i.withState(new Pair(i.value, next));
 		}
 
 		var x = f(s.value, i.value);
-		return new Yield(i.time, x, new Pair(x, stream.beget(stream.step, i.state)));
+		return new Yield(i.time, x, new Pair(x, next));
 	}, when(stream.step, stream.state));
 }
 
-function disposeScan(t, x, stream) {
-	// Unwrap original stream's state from scan state
-	var state = stream.state.state;
-	return stream.dispose(t, x, state);
-}
+function disposeScan(t, x, s) {
+	// Unwrap original stream's state
+	var stream = s.state;
+	return stream.dispose(t, x, stream.state);
+}

test/extend-test.js

@@ -40,7 +40,7 @@ describe('cycle', function() {
 		var s = new Stream(identity, items, void 0, dispose);
 
 		return drain(take(1, extend.cycle(s))).then(function() {
-			expect(dispose).toHaveBeenCalledWith(0, 1, sentinel);
+			expect(dispose).toHaveBeenCalledWith(0, 0, sentinel);
 		});
 	});
 });