@effectionx/stream-helpers 0.2.0 → 0.4.0

package/README.md

@@ -144,6 +144,54 @@ function* example() {
 }
 ```
 
+### ForEach
+
+The `forEach` helper invokes a function for each item passing through a stream.
+This is useful when you need to perform side effects or operations on each item
+without transforming the stream itself. Unlike other stream helpers that return
+transformed streams, `forEach` consumes the entire stream and returns the
+stream's close value.
+
+```typescript
+import { forEach } from "@effectionx/stream-helpers";
+import { createSignal, spawn } from "effection";
+
+function* example() {
+  const stream = createSignal<number, void>();
+
+  // Process each item in the stream
+  yield* spawn(() =>
+    forEach(function* (item) {
+      console.log(`Processing: ${item}`);
+      // Perform any side effects here
+    }, stream)
+  );
+
+  stream.send(1);
+  stream.send(2);
+  stream.send(3);
+  stream.close();
+}
+
+// Example: Handling stream close value
+function* exampleWithCloseValue() {
+  const stream = createSignal<string, number>();
+
+  const result = yield* spawn(() =>
+    forEach(function* (item) {
+      console.log(`Item: ${item}`);
+    }, stream)
+  );
+
+  stream.send("hello");
+  stream.send("world");
+  stream.close(42); // Close with value 42
+
+  const closeValue = yield* result;
+  console.log(`Stream closed with: ${closeValue}`); // 42
+}
+```
+
 ### Passthrough Tracker
 
 Passthrough Tracker stream helper provides a way to know if all items that
@@ -183,8 +231,7 @@ You can use a simple `pipe()` to compose a series of stream helpers together. In
 this example, we use one from [remeda](https://remedajs.com/docs/#pipe),
 
 ```typescript
-import { batch, filter, map, valve } from "@effectionx/stream-helpers";
-import { each } from "effection";
+import { batch, filter, forEach, map, valve } from "@effectionx/stream-helpers";
 // any standard pipe function should work
 import { pipe } from "remeda";
 
@@ -202,10 +249,10 @@ function* example(source: Stream<number, unknown>) {
     batch({ maxSize: 50 }),
   );
 
-  for (const value of yield* each(stream)) {
+  // Use forEach to process each value in the composed stream
+  yield* forEach(function* (value) {
     console.log(value);
-    yield* each.next();
-  }
+  }, stream);
 }
 ```
 

package/esm/batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../src/batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGlE,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IACpD,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,GAC/B;KACC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CACzE,CAAC,IAAI,CAAC,CAAC;AAEV,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,GACvC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CA4C/D"}
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../src/batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAa,MAAM,WAAW,CAAC;AAG1D,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IACpD,IAAI,CACJ,CAAC,EACD,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CACvB,GACC;KACC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CACzE,CAAC,IAAI,CAAC,CAAC;AAEV,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,GACvC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CA8E/D"}

package/esm/batch.js

@@ -1,5 +1,5 @@
-import { each, race, sleep, spawn } from "effection";
-import { createArraySignal, is } from "@effectionx/signals";
+import { spawn } from "effection";
+import { timebox } from "@effectionx/timebox";
 /**
  * Creates batches of items from the source stream. The batches can be created either by
  * specifying a maximum time or a maximum size. If both are specified, the batch will be
@@ -14,38 +14,73 @@ export function batch(options) {
     return function (stream) {
         return {
             *[Symbol.iterator]() {
-                let batch = yield* createArraySignal([]);
-                yield* spawn(function* () {
-                    for (let item of yield* each(stream)) {
-                        batch.push(item);
-                        if (options.maxSize && batch.length >= options.maxSize) {
-                            // wait until it's drained
-                            yield* is(batch, (batch) => batch.length === 0);
-                        }
-                        yield* each.next();
-                    }
-                });
-                function drain() {
-                    let value = batch.valueOf();
-                    batch.set([]);
-                    return value;
-                }
+                const subscription = yield* stream;
+                let lastPull;
                 return {
                     *next() {
-                        yield* is(batch, (batch) => batch.length >= 1);
-                        if (options.maxTime && options.maxSize) {
-                            yield* race([
-                                is(batch, (batch) => batch.length === options.maxSize),
-                                sleep(options.maxTime),
-                            ]);
+                        let start = performance.now();
+                        const batch = [];
+                        let next = {
+                            done: true,
+                            value: undefined,
+                        };
+                        if (lastPull && options.maxTime) {
+                            const timeout = yield* timebox(options.maxTime, () => lastPull);
+                            if (timeout.timeout) {
+                                yield* lastPull.halt();
+                                lastPull = undefined;
+                            }
+                            else {
+                                next = timeout.value;
+                                lastPull = undefined;
+                            }
+                        }
+                        else {
+                            next = yield* subscription.next();
                         }
-                        else if (options.maxTime) {
-                            yield* sleep(options.maxTime);
+                        // push the next value into the batch
+                        while (!next.done) {
+                            batch.push(next.value);
+                            const now = performance.now();
+                            if (options.maxSize && batch.length >= options.maxSize) {
+                                return {
+                                    done: false,
+                                    value: batch,
+                                };
+                            }
+                            else if (options.maxTime && start + options.maxTime <= now) {
+                                return {
+                                    done: false,
+                                    value: batch,
+                                };
+                            }
+                            else if (options.maxTime) {
+                                const task = yield* spawn(() => subscription.next());
+                                const timeout = yield* timebox(start + options.maxTime - performance.now(), () => task);
+                                if (timeout.timeout) {
+                                    // produce the batch that we have, save task for next batch
+                                    lastPull = task;
+                                    return {
+                                        done: false,
+                                        value: batch,
+                                    };
+                                }
+                                else {
+                                    next = timeout.value;
+                                }
+                            }
+                            else {
+                                next = yield* subscription.next();
+                            }
                         }
-                        else if (options.maxSize) {
-                            yield* is(batch, (batch) => batch.length === options.maxSize);
+                        // Stream is done, return any remaining batch
+                        if (batch.length > 0) {
+                            return {
+                                done: false,
+                                value: batch,
+                            };
                         }
-                        return { done: false, value: drain() };
+                        return next;
                     },
                 };
             },

package/esm/for-each.d.ts

@@ -0,0 +1,27 @@
+import type { Operation, Stream } from "effection";
+/**
+ * Invoke a function for each item passing through the stream.
+ *
+ * @template T - The type of items in the stream
+ * @template TClose - The type of the close value returned when the stream ends
+ * @param fn - A function that processes each item from the stream.
+ * @param stream: A stream to process
+ *
+ * @example
+ * ```typescript
+ * import { forEach } from "./for-each.ts";
+ * import { createSignal } from "effection";
+ *
+ * // Process items from a stream
+ * const stream = createSignal<number, void>();
+ *
+ * yield* spawn(() => forEach(function*(item) {
+ *   console.log(`Processing: ${item}`);
+ * }, stream));
+ *
+ * yield* stream.send(1);
+ * yield* stream.send(2);
+ * ```
+ */
+export declare function forEach<T, TClose>(fn: (item: T) => Operation<void>, stream: Stream<T, TClose>): Operation<TClose>;
+//# sourceMappingURL=for-each.d.ts.map

package/esm/for-each.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"for-each.d.ts","sourceRoot":"","sources":["../src/for-each.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAiB,OAAO,CAAC,CAAC,EAAE,MAAM,EAChC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,EAChC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,GACxB,SAAS,CAAC,MAAM,CAAC,CAQnB"}

package/esm/for-each.js

@@ -0,0 +1,33 @@
+/**
+ * Invoke a function for each item passing through the stream.
+ *
+ * @template T - The type of items in the stream
+ * @template TClose - The type of the close value returned when the stream ends
+ * @param fn - A function that processes each item from the stream.
+ * @param stream: A stream to process
+ *
+ * @example
+ * ```typescript
+ * import { forEach } from "./for-each.ts";
+ * import { createSignal } from "effection";
+ *
+ * // Process items from a stream
+ * const stream = createSignal<number, void>();
+ *
+ * yield* spawn(() => forEach(function*(item) {
+ *   console.log(`Processing: ${item}`);
+ * }, stream));
+ *
+ * yield* stream.send(1);
+ * yield* stream.send(2);
+ * ```
+ */
+export function* forEach(fn, stream) {
+    let subscription = yield* stream;
+    let next = yield* subscription.next();
+    while (!next.done) {
+        yield* fn(next.value);
+        next = yield* subscription.next();
+    }
+    return next.value;
+}

package/esm/map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EACtB,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAC7B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAsB1D"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EACtB,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAC7B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAwB1D"}

package/esm/map.js

@@ -15,9 +15,10 @@ export function map(fn) {
                         if (next.done) {
                             return next;
                         }
+                        const value = yield* fn(next.value);
                         return {
                             done: false,
-                            value: yield* fn(next.value),
+                            value,
                         };
                     },
                 };

package/esm/mod.d.ts

@@ -3,4 +3,5 @@ export * from "./valve.js";
 export * from "./map.js";
 export * from "./filter.js";
 export * from "./tracker.js";
+export * from "./for-each.js";
 //# sourceMappingURL=mod.d.ts.map

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}

package/esm/mod.js

@@ -3,3 +3,4 @@ export * from "./valve.js";
 export * from "./map.js";
 export * from "./filter.js";
 export * from "./tracker.js";
+export * from "./for-each.js";

package/esm/test-helpers/faucet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/test-helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGtE;;GAEG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC;;;OAGG;IACH,IAAI,CACF,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,GAC1D,SAAS,CAAC,IAAI,CAAC,CAAC;IACnB;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAiB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CA0B1E"}
+{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/test-helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGvE;;GAEG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC;;;OAGG;IACH,IAAI,CACF,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,GAC1D,SAAS,CAAC,IAAI,CAAC,CAAC;IACnB;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAiB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CA0B1E"}

package/esm/test-helpers/faucet.js

@@ -1,4 +1,4 @@
-import { createSignal } from "effection";
+import { createChannel } from "effection";
 import { createBooleanSignal, is } from "@effectionx/signals";
 /**
  * Creates a stream that can be used to test the behavior of streams that use backpressure.
@@ -44,7 +44,7 @@ import { createBooleanSignal, is } from "@effectionx/signals";
  * @returns stream of items coming from the faucet
  */
 export function* useFaucet(options) {
-    let signal = createSignal();
+    let signal = createChannel();
     let open = yield* createBooleanSignal(options.open);
     return {
         [Symbol.iterator]: signal[Symbol.iterator],
@@ -52,13 +52,13 @@ export function* useFaucet(options) {
             if (Array.isArray(items)) {
                 for (let i of items) {
                     yield* is(open, (open) => open);
-                    signal.send(i);
+                    yield* signal.send(i);
                 }
             }
             else {
                 yield* items(function* (item) {
                     yield* is(open, (open) => open);
-                    signal.send(item);
+                    yield* signal.send(item);
                 });
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effectionx/stream-helpers",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "author": "engineering@frontside.com",
   "repository": {
     "type": "git",
@@ -28,8 +28,9 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@effectionx/signals": "^0.1.0",
-    "effection": "^3"
+    "@effectionx/signals": "0.3.0",
+    "@effectionx/timebox": "0.2.0",
+    "effection": "^3 || ^4.0.0-0"
   },
   "_generatedBy": "dnt@dev"
 }

package/script/batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../src/batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGlE,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IACpD,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,GAC/B;KACC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CACzE,CAAC,IAAI,CAAC,CAAC;AAEV,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,GACvC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CA4C/D"}
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../src/batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAa,MAAM,WAAW,CAAC;AAG1D,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,IACpD,IAAI,CACJ,CAAC,EACD,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CACvB,GACC;KACC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;CACzE,CAAC,IAAI,CAAC,CAAC;AAEV,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,wBAAgB,KAAK,CACnB,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,GACvC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CA8E/D"}

package/script/batch.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.batch = batch;
 const effection_1 = require("effection");
-const signals_1 = require("@effectionx/signals");
+const timebox_1 = require("@effectionx/timebox");
 /**
  * Creates batches of items from the source stream. The batches can be created either by
  * specifying a maximum time or a maximum size. If both are specified, the batch will be
@@ -17,38 +17,73 @@ function batch(options) {
     return function (stream) {
         return {
             *[Symbol.iterator]() {
-                let batch = yield* (0, signals_1.createArraySignal)([]);
-                yield* (0, effection_1.spawn)(function* () {
-                    for (let item of yield* (0, effection_1.each)(stream)) {
-                        batch.push(item);
-                        if (options.maxSize && batch.length >= options.maxSize) {
-                            // wait until it's drained
-                            yield* (0, signals_1.is)(batch, (batch) => batch.length === 0);
-                        }
-                        yield* effection_1.each.next();
-                    }
-                });
-                function drain() {
-                    let value = batch.valueOf();
-                    batch.set([]);
-                    return value;
-                }
+                const subscription = yield* stream;
+                let lastPull;
                 return {
                     *next() {
-                        yield* (0, signals_1.is)(batch, (batch) => batch.length >= 1);
-                        if (options.maxTime && options.maxSize) {
-                            yield* (0, effection_1.race)([
-                                (0, signals_1.is)(batch, (batch) => batch.length === options.maxSize),
-                                (0, effection_1.sleep)(options.maxTime),
-                            ]);
+                        let start = performance.now();
+                        const batch = [];
+                        let next = {
+                            done: true,
+                            value: undefined,
+                        };
+                        if (lastPull && options.maxTime) {
+                            const timeout = yield* (0, timebox_1.timebox)(options.maxTime, () => lastPull);
+                            if (timeout.timeout) {
+                                yield* lastPull.halt();
+                                lastPull = undefined;
+                            }
+                            else {
+                                next = timeout.value;
+                                lastPull = undefined;
+                            }
+                        }
+                        else {
+                            next = yield* subscription.next();
                         }
-                        else if (options.maxTime) {
-                            yield* (0, effection_1.sleep)(options.maxTime);
+                        // push the next value into the batch
+                        while (!next.done) {
+                            batch.push(next.value);
+                            const now = performance.now();
+                            if (options.maxSize && batch.length >= options.maxSize) {
+                                return {
+                                    done: false,
+                                    value: batch,
+                                };
+                            }
+                            else if (options.maxTime && start + options.maxTime <= now) {
+                                return {
+                                    done: false,
+                                    value: batch,
+                                };
+                            }
+                            else if (options.maxTime) {
+                                const task = yield* (0, effection_1.spawn)(() => subscription.next());
+                                const timeout = yield* (0, timebox_1.timebox)(start + options.maxTime - performance.now(), () => task);
+                                if (timeout.timeout) {
+                                    // produce the batch that we have, save task for next batch
+                                    lastPull = task;
+                                    return {
+                                        done: false,
+                                        value: batch,
+                                    };
+                                }
+                                else {
+                                    next = timeout.value;
+                                }
+                            }
+                            else {
+                                next = yield* subscription.next();
+                            }
                         }
-                        else if (options.maxSize) {
-                            yield* (0, signals_1.is)(batch, (batch) => batch.length === options.maxSize);
+                        // Stream is done, return any remaining batch
+                        if (batch.length > 0) {
+                            return {
+                                done: false,
+                                value: batch,
+                            };
                         }
-                        return { done: false, value: drain() };
+                        return next;
                     },
                 };
             },

package/script/for-each.d.ts

@@ -0,0 +1,27 @@
+import type { Operation, Stream } from "effection";
+/**
+ * Invoke a function for each item passing through the stream.
+ *
+ * @template T - The type of items in the stream
+ * @template TClose - The type of the close value returned when the stream ends
+ * @param fn - A function that processes each item from the stream.
+ * @param stream: A stream to process
+ *
+ * @example
+ * ```typescript
+ * import { forEach } from "./for-each.ts";
+ * import { createSignal } from "effection";
+ *
+ * // Process items from a stream
+ * const stream = createSignal<number, void>();
+ *
+ * yield* spawn(() => forEach(function*(item) {
+ *   console.log(`Processing: ${item}`);
+ * }, stream));
+ *
+ * yield* stream.send(1);
+ * yield* stream.send(2);
+ * ```
+ */
+export declare function forEach<T, TClose>(fn: (item: T) => Operation<void>, stream: Stream<T, TClose>): Operation<TClose>;
+//# sourceMappingURL=for-each.d.ts.map

package/script/for-each.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"for-each.d.ts","sourceRoot":"","sources":["../src/for-each.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAiB,OAAO,CAAC,CAAC,EAAE,MAAM,EAChC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,EAChC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,GACxB,SAAS,CAAC,MAAM,CAAC,CAQnB"}

package/script/for-each.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.forEach = forEach;
+/**
+ * Invoke a function for each item passing through the stream.
+ *
+ * @template T - The type of items in the stream
+ * @template TClose - The type of the close value returned when the stream ends
+ * @param fn - A function that processes each item from the stream.
+ * @param stream: A stream to process
+ *
+ * @example
+ * ```typescript
+ * import { forEach } from "./for-each.ts";
+ * import { createSignal } from "effection";
+ *
+ * // Process items from a stream
+ * const stream = createSignal<number, void>();
+ *
+ * yield* spawn(() => forEach(function*(item) {
+ *   console.log(`Processing: ${item}`);
+ * }, stream));
+ *
+ * yield* stream.send(1);
+ * yield* stream.send(2);
+ * ```
+ */
+function* forEach(fn, stream) {
+    let subscription = yield* stream;
+    let next = yield* subscription.next();
+    while (!next.done) {
+        yield* fn(next.value);
+        next = yield* subscription.next();
+    }
+    return next.value;
+}

package/script/map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EACtB,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAC7B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAsB1D"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,EACtB,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,GAC7B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAwB1D"}

package/script/map.js

@@ -18,9 +18,10 @@ function map(fn) {
                         if (next.done) {
                             return next;
                         }
+                        const value = yield* fn(next.value);
                         return {
                             done: false,
-                            value: yield* fn(next.value),
+                            value,
                         };
                     },
                 };

package/script/mod.d.ts

@@ -3,4 +3,5 @@ export * from "./valve.js";
 export * from "./map.js";
 export * from "./filter.js";
 export * from "./tracker.js";
+export * from "./for-each.js";
 //# sourceMappingURL=mod.d.ts.map

package/script/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}

package/script/mod.js

@@ -19,3 +19,4 @@ __exportStar(require("./valve.js"), exports);
 __exportStar(require("./map.js"), exports);
 __exportStar(require("./filter.js"), exports);
 __exportStar(require("./tracker.js"), exports);
+__exportStar(require("./for-each.js"), exports);

package/script/test-helpers/faucet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/test-helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGtE;;GAEG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC;;;OAGG;IACH,IAAI,CACF,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,GAC1D,SAAS,CAAC,IAAI,CAAC,CAAC;IACnB;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAiB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CA0B1E"}
+{"version":3,"file":"faucet.d.ts","sourceRoot":"","sources":["../../src/test-helpers/faucet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,SAAS,EAAE,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAGvE;;GAEG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAClC;;;OAGG;IACH,IAAI,CACF,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,GAC1D,SAAS,CAAC,IAAI,CAAC,CAAC;IACnB;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IACb;;OAEG;IACH,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAiB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CA0B1E"}

package/script/test-helpers/faucet.js

@@ -47,7 +47,7 @@ const signals_1 = require("@effectionx/signals");
  * @returns stream of items coming from the faucet
  */
 function* useFaucet(options) {
-    let signal = (0, effection_1.createSignal)();
+    let signal = (0, effection_1.createChannel)();
     let open = yield* (0, signals_1.createBooleanSignal)(options.open);
     return {
         [Symbol.iterator]: signal[Symbol.iterator],
@@ -55,13 +55,13 @@ function* useFaucet(options) {
             if (Array.isArray(items)) {
                 for (let i of items) {
                     yield* (0, signals_1.is)(open, (open) => open);
-                    signal.send(i);
+                    yield* signal.send(i);
                 }
             }
             else {
                 yield* items(function* (item) {
                     yield* (0, signals_1.is)(open, (open) => open);
-                    signal.send(item);
+                    yield* signal.send(item);
                 });
             }
         },