@typed/fx 0.0.9 → 0.0.10

package/esm/hold.js

@@ -1,8 +1,8 @@
 import * as Effect from '@effect/core/io/Effect';
 import * as FiberId from '@effect/core/io/FiberId';
 import { pipe } from '@fp-ts/data/Function';
+import * as Duration from '@tsplus/stdlib/data/Duration';
 import * as Maybe from '@tsplus/stdlib/data/Maybe';
-import { asap } from './_internal.js';
 import { Multicast } from './multicast.js';
 export function hold(fx) {
     return new Hold(fx);
@@ -10,51 +10,53 @@ export function hold(fx) {
 export class Hold extends Multicast {
     fx;
     _value = Maybe.none;
-    _pendingSinks = [];
+    _pendingEmitters = [];
     _scheduledFiber;
     constructor(fx) {
         super(fx);
         this.fx = fx;
     }
-    run(sink) {
+    run(emitter) {
         if (this.shouldScheduleFlush()) {
-            return pipe(this.scheduleFush(sink), Effect.flatMap(() => super.run(sink)));
+            return pipe(this.scheduleFlush(emitter), Effect.flatMap(() => super.run(emitter)));
         }
-        return super.run(sink);
+        return super.run(emitter);
     }
-    event(value) {
-        this.addValue(value);
-        return pipe(this.flushPending(), Effect.flatMap(() => super.event(value)));
+    emit(value) {
+        return Effect.suspendSucceed(() => {
+            this.addValue(value);
+            return pipe(this.flushPending(), Effect.flatMap(() => super.emit(value)));
+        });
     }
-    error(cause) {
-        return pipe(this.flushPending(), Effect.flatMap(() => super.error(cause)));
+    failCause(cause) {
+        return Effect.suspendSucceed(() => pipe(this.flushPending(), Effect.flatMap(() => super.failCause(cause))));
     }
     get end() {
-        return pipe(this.flushPending(), Effect.flatMap(() => super.end));
+        return Effect.suspendSucceed(() => pipe(this.flushPending(), Effect.flatMap(() => super.end)));
     }
     shouldScheduleFlush() {
-        return Maybe.isSome(this._value) && this.sinks.length > 0;
+        return Maybe.isSome(this._value) && this.observers.length > 0;
     }
-    scheduleFush(sink) {
-        this._pendingSinks.push([
-            sink,
+    scheduleFlush(observer) {
+        this._pendingEmitters.push([
+            observer,
             pipe(this._value, Maybe.fold(() => [], (a) => [a])),
         ]);
         const interrupt = this._scheduledFiber
             ? this._scheduledFiber.interruptAsFork(new FiberId.None())
             : Effect.unit;
         this._scheduledFiber = undefined;
-        return pipe(interrupt, Effect.flatMap(() => this.flushPending()), Effect.schedule(asap), Effect.fork, Effect.tap((fiber) => Effect.sync(() => (this._scheduledFiber = fiber))));
+        return pipe(interrupt, Effect.flatMap(() => this.flushPending()), Effect.delay(Duration.millis(0)), Effect.forkScoped, Effect.tap((fiber) => Effect.sync(() => (this._scheduledFiber = fiber))));
     }
     flushPending() {
-        if (this._pendingSinks.length === 0) {
+        if (this._pendingEmitters.length === 0) {
             return Effect.unit;
         }
-        const pendingSinks = this._pendingSinks;
-        this._pendingSinks = [];
-        return Effect.forEachDiscard(pendingSinks, (pending) => Effect.suspendSucceed(() => {
-            const [sink, values] = pending;
-            const observer = this.findSink(sink);
+        const pendingEmitters = this._pendingEmitters;
+        this._pendingEmitters = [];
+        return Effect.forEachDiscard(pendingEmitters, (pending) => Effect.suspendSucceed(() => {
+            const [emitter, values] = pending;
+            const observer = this.findObserver(emitter);
             if (!observer) {
                 return Effect.unit;
             }
@@ -63,12 +65,12 @@ export class Hold extends Multicast {
     }
     addValue(value) {
         this._value = Maybe.some(value);
-        this._pendingSinks.forEach(([, values]) => {
+        this._pendingEmitters.forEach(([, values]) => {
             values.push(value);
         });
     }
-    findSink(sink) {
-        return this.sinks.find(([s]) => s === sink);
+    findObserver(emitter) {
+        return this.observers.find((o) => o.emitter === emitter);
     }
 }
 //# sourceMappingURL=hold.js.map

package/esm/hold.js.map

@@ -1 +1 @@
-{"version":3,"file":"hold.js","sourceRoot":"","sources":["../src/hold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hold.js","sourceRoot":"","sources":["../src/hold.ts"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -2,37 +2,40 @@ export * from './combine.js';
 export * from './continueWith.js';
 export * from './debounce.js';
 export * from './delay.js';
-export * from './drain.js';
 export * from './during.js';
-export * from './empty.js';
+export * from './filterLoop.js';
+export * from './filterMap.js';
 export * from './flatMap.js';
 export * from './flatMapConcurrently.js';
-export * from './from.js';
-export * from './fromCallback.js';
 export * from './fromEffect.js';
+export * from './fromIterable.js';
+export * from './Fx.js';
 export * from './hold.js';
-export * from './loop.js';
-export * from './map.js';
+export * from './mapCause.js';
+export * from './mapEffect.js';
 export * from './merge.js';
-export * from './never.js';
-export * from './observe.js';
+export * from './multicast.js';
 export * from './orElse.js';
 export * from './periodic.js';
 export * from './provide.js';
-export * from './reduce.js';
+export * from './runCollect.js';
+export * from './runDrain.js';
+export * from './runObserve.js';
+export * from './runReduce.js';
 export * from './scheduled.js';
 export * from './since.js';
-export * as Sink from './Sink.js';
 export * from './skipRepeats.js';
+export * from './skipWhile.js';
 export * from './slice.js';
 export * from './snapshot.js';
-export * from './Fx.js';
 export * from './suspendSucceed.js';
 export * from './switchMap.js';
-export * from './tap.js';
+export * from './takeWhile.js';
+export * from './tapEffect.js';
 export * from './throttle.js';
-export * from './TSemaphore.js';
-export * from './until.js';
 export * from './transform.js';
-export * from './zipItems.js';
+export * from './until.js';
+export * from './withEmitter.js';
+export * from './zip.js';
+export * from './zipIterable.js';
 //# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA"}

package/esm/index.js

@@ -2,38 +2,40 @@ export * from './combine.js';
 export * from './continueWith.js';
 export * from './debounce.js';
 export * from './delay.js';
-export * from './drain.js';
 export * from './during.js';
-export * from './empty.js';
+export * from './filterLoop.js';
+export * from './filterMap.js';
 export * from './flatMap.js';
 export * from './flatMapConcurrently.js';
-export * from './from.js';
-export * from './fromCallback.js';
 export * from './fromEffect.js';
+export * from './fromIterable.js';
+export * from './Fx.js';
 export * from './hold.js';
-export * from './loop.js';
-export * from './map.js';
+export * from './mapCause.js';
+export * from './mapEffect.js';
 export * from './merge.js';
-export * from './never.js';
-export * from './observe.js';
+export * from './multicast.js';
 export * from './orElse.js';
 export * from './periodic.js';
 export * from './provide.js';
-export * from './reduce.js';
+export * from './runCollect.js';
+export * from './runDrain.js';
+export * from './runObserve.js';
+export * from './runReduce.js';
 export * from './scheduled.js';
 export * from './since.js';
-import * as Sink_1 from './Sink.js';
-export { Sink_1 as Sink };
 export * from './skipRepeats.js';
+export * from './skipWhile.js';
 export * from './slice.js';
 export * from './snapshot.js';
-export * from './Fx.js';
 export * from './suspendSucceed.js';
 export * from './switchMap.js';
-export * from './tap.js';
+export * from './takeWhile.js';
+export * from './tapEffect.js';
 export * from './throttle.js';
-export * from './TSemaphore.js';
-export * from './until.js';
 export * from './transform.js';
-export * from './zipItems.js';
+export * from './until.js';
+export * from './withEmitter.js';
+export * from './zip.js';
+export * from './zipIterable.js';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,WAAW,CAAA;AACzB,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;wBACJ,WAAW;mBAArB,IAAI;AAChB,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,eAAe,CAAA;AAC7B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,mBAAmB,CAAA;AACjC,cAAc,SAAS,CAAA;AACvB,cAAc,WAAW,CAAA;AACzB,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,kBAAkB,CAAA;AAChC,cAAc,UAAU,CAAA;AACxB,cAAc,kBAAkB,CAAA"}

package/esm/mapCause.d.ts

@@ -0,0 +1,5 @@
+import * as Cause from '@effect/core/io/Cause';
+import { Fx } from './Fx.js';
+export declare function mapCause<E, E2>(f: (cause: Cause.Cause<E>) => Cause.Cause<E2>): <R, A>(fx: Fx<R, E, A>) => Fx<R, E2, A>;
+export declare function mapError<E, E2>(f: (error: E) => E2): <R, A>(fx: Fx<R, E, A>) => Fx<R, E2, A>;
+//# sourceMappingURL=mapCause.d.ts.map

package/esm/mapCause.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapCause.d.ts","sourceRoot":"","sources":["../src/mapCause.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAG9C,OAAO,EAAW,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,2CAE5E;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,2CAElD"}

package/esm/mapCause.js

@@ -0,0 +1,13 @@
+import * as Cause from '@effect/core/io/Cause';
+import { flow } from '@fp-ts/data/Function';
+import { Emitter, Fx } from './Fx.js';
+export function mapCause(f) {
+    return (fx) => mapCause_(fx, f);
+}
+export function mapError(f) {
+    return (fx) => mapCause_(fx, Cause.map(f));
+}
+function mapCause_(fx, f) {
+    return Fx((emitter) => fx.run(Emitter(emitter.emit, flow(f, emitter.failCause), emitter.end)));
+}
+//# sourceMappingURL=mapCause.js.map

package/esm/mapCause.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapCause.js","sourceRoot":"","sources":["../src/mapCause.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,MAAM,UAAU,QAAQ,CAAQ,CAA6C;IAC3E,OAAO,CAAO,EAAe,EAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAClE,CAAC;AAED,MAAM,UAAU,QAAQ,CAAQ,CAAmB;IACjD,OAAO,CAAO,EAAe,EAAgB,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7E,CAAC;AAED,SAAS,SAAS,CAAc,EAAe,EAAE,CAA6C;IAC5F,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAChG,CAAC"}

package/esm/mapEffect.d.ts

@@ -0,0 +1,4 @@
+import * as Effect from '@effect/core/io/Effect';
+import { Fx } from './Fx.js';
+export declare const mapEffect: <A, R2, E2, B>(f: (a: A) => Effect.Effect<R2, E2, B>) => <R, E>(fx: Fx<R, E, A>) => Fx<R2 | R, E2 | E, B>;
+//# sourceMappingURL=mapEffect.d.ts.map

package/esm/mapEffect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapEffect.d.ts","sourceRoot":"","sources":["../src/mapEffect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAGhD,OAAO,EAAW,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,eAAO,MAAM,SAAS,2GAWjB,CAAA"}

package/esm/mapEffect.js

@@ -0,0 +1,5 @@
+import * as Effect from '@effect/core/io/Effect';
+import { flow } from '@fp-ts/data/Function';
+import { Emitter, Fx } from './Fx.js';
+export const mapEffect = (f) => (fx) => Fx((emitter) => fx.run(Emitter(flow(f, Effect.foldCauseEffect(emitter.failCause, emitter.emit)), emitter.failCause, emitter.end)));
+//# sourceMappingURL=mapEffect.js.map

package/esm/mapEffect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapEffect.js","sourceRoot":"","sources":["../src/mapEffect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,MAAM,CAAC,MAAM,SAAS,GACpB,CAAe,CAAqC,EAAE,EAAE,CACxD,CAAO,EAAe,EAAyB,EAAE,CAC/C,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CACb,EAAE,CAAC,GAAG,CACJ,OAAO,CACL,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAChE,OAAO,CAAC,SAAS,EACjB,OAAO,CAAC,GAAG,CACZ,CACF,CACF,CAAA"}

package/esm/merge.d.ts

@@ -1,5 +1,5 @@
 import { Fx } from './Fx.js';
-export declare function merge<R2, E2, B, E3>(other: Fx<R2, E2, B, E3>): <R, E, A, E1>(self: Fx<R, E, A, E1>) => Fx<R2 | R, E2 | E, B | A, E3 | E1>;
-export declare function mergeAll<FX extends ReadonlyArray<Fx<any, any, any, any>>>(fx: readonly [...FX]): Fx<Fx.ResourcesOf<FX[number]>, Fx.ErrorsOf<FX[number]>, Fx.OutputOf<FX[number]>, Fx.ReturnErrorsOf<FX[number]>>;
-export declare function mergeAll<R2, E2, B, E3>(fx: Iterable<Fx<R2, E2, B, E3>>): Fx<R2, E2, B, E3>;
+export declare function merge<R2, E2, B>(second: Fx<R2, E2, B>): <R, E, A>(first: Fx<R, E, A>) => Fx<R2 | R, E2 | E, B | A>;
+export declare function mergeAll<FX extends ReadonlyArray<Fx<any, any, any>>>(fx: readonly [...FX]): Fx<Fx.ResourcesOf<FX[number]>, Fx.ErrorsOf<FX[number]>, Fx.OutputOf<FX[number]>>;
+export declare function mergeAll<R, E, A>(iterable: Iterable<Fx<R, E, A>>): Fx<R, E, A>;
 //# sourceMappingURL=merge.d.ts.map

package/esm/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAI5B,wBAAgB,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,8EAG5D;AAED,wBAAgB,QAAQ,CAAC,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EACvE,EAAE,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,GACnB,EAAE,CACH,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAC1B,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACvB,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACvB,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAC9B,CAAA;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,EAAE,EAAE,MAAM,SAAS,CAAA;AAGrC,wBAAgB,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,8DAErD;AAED,wBAAgB,QAAQ,CAAC,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAClE,EAAE,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,GACnB,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAEnF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}

package/esm/merge.js

@@ -1,17 +1,13 @@
 import * as Effect from '@effect/core/io/Effect';
-import { flow, pipe } from '@fp-ts/data/Function';
-import { Fx } from './Fx.js';
-import { Sink } from './Sink.js';
-import { refCountDeferred } from './_internal.js';
-export function merge(other) {
-    return (self) => mergeAll([self, other]);
+import { Emitter, Fx } from './Fx.js';
+import { withDynamicCountdownLatch } from './_internal.js';
+export function merge(second) {
+    return (first) => mergeAll([first, second]);
 }
-export function mergeAll(fx) {
-    return Fx((sink) => Effect.gen(function* ($) {
-        const array = Array.from(fx);
-        const deferred = yield* $(refCountDeferred(true, array.length));
-        yield* $(Effect.forEachDiscard(array, (fx) => Effect.fork(fx.run(Sink(sink.event, flow(sink.error, deferred.error), pipe(deferred.decrement, Effect.flatMap(() => deferred.endIfComplete(sink.end))))))));
-        return yield* $(deferred.await);
-    }));
+export function mergeAll(iterable) {
+    return Fx((emitter) => {
+        const array = Array.from(iterable);
+        return withDynamicCountdownLatch(array.length, ({ latch }) => Effect.forEachDiscard(array, (fx) => Effect.forkScoped(fx.run(Emitter(emitter.emit, emitter.failCause, latch.countDown)))), emitter.end);
+    });
 }
 //# sourceMappingURL=merge.js.map

package/esm/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,MAAM,UAAU,KAAK,CAAgB,KAAwB;IAC3D,OAAO,CAAc,IAAqB,EAAsC,EAAE,CAChF,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;AAC3B,CAAC;AAaD,MAAM,UAAU,QAAQ,CAAgB,EAA+B;IACrE,OAAO,EAAE,CAAC,CAAY,IAA4B,EAAE,EAAE,CACpD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAa,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;QAE3E,KAAK,CAAC,CAAC,CAAC,CACN,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAClC,MAAM,CAAC,IAAI,CACT,EAAE,CAAC,GAAG,CACJ,IAAI,CACF,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAChC,IAAI,CACF,QAAQ,CAAC,SAAS,EAClB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CACvD,CACF,CACF,CACF,CACF,CACF,CAAA;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC,CAAC,CACH,CAAA;AACH,CAAC"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAEhD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,UAAU,KAAK,CAAY,MAAqB;IACpD,OAAO,CAAU,KAAkB,EAA6B,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9F,CAAC;AAQD,MAAM,UAAU,QAAQ,CAAU,QAA+B;IAC/D,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAElC,OAAO,yBAAyB,CAC9B,KAAK,CAAC,MAAM,EACZ,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACZ,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAClC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CACrF,EACH,OAAO,CAAC,GAAG,CACZ,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/esm/multicast.d.ts

@@ -2,26 +2,27 @@ import * as Cause from '@effect/core/io/Cause';
 import * as Deferred from '@effect/core/io/Deferred';
 import * as Effect from '@effect/core/io/Effect';
 import * as Fiber from '@effect/core/io/Fiber';
+import { Scope } from '@effect/core/io/Scope';
 import { Env } from '@tsplus/stdlib/service/Env';
-import { Fx } from './Fx.js';
-import { Sink } from './Sink.js';
-export declare function multicast<R, E, A, E1 = never>(self: Fx<R, E, A, E1>): Fx<R, E, A, E1>;
-export declare type MulticastObserver<E, A> = readonly [
-    Sink<E, A, any, any, any>,
-    Env<any>,
-    Deferred.Deferred<any, any>
-];
-export declare class Multicast<R, E, A, E1> implements Fx<R, E, A, E1>, Sink<E, A, any, any, any> {
-    readonly fx: Fx<R, E, A, E1>;
-    protected sinks: Array<MulticastObserver<E, A>>;
-    protected fiber: Fiber.Fiber<any, any> | undefined;
-    constructor(fx: Fx<R, E, A, E1>);
-    run<R2, E2, B>(sink: Sink<E, A, R2, E2, B>): Effect.Effect<R | R2, E1 | E2, B>;
-    event(a: A): Effect.Effect<never, any, void>;
-    error(e: Cause.Cause<E>): Effect.Effect<never, any, void>;
-    get end(): Sink<E, A, any, any, any>['end'];
-    protected runEvent(a: A, observer: MulticastObserver<E, A>): Effect.Effect<never, any, unknown>;
-    protected runError(e: Cause.Cause<E>, observer: MulticastObserver<E, A>): Effect.Effect<never, never, boolean>;
+import { Emitter, Fx } from './Fx.js';
+export declare function multicast<R, E, A>(fx: Fx<R, E, A>): Fx<R, E, A>;
+export interface MulticastObserver<E, A> {
+    readonly emitter: Emitter<any, E, A>;
+    readonly env: Env<any>;
+    readonly deferred: Deferred.Deferred<never, void>;
+}
+export declare class Multicast<R, E, A> implements Fx<R, E, A>, Emitter<never, E, A> {
+    readonly fx: Fx<R, E, A>;
+    protected observers: MulticastObserver<E, A>[];
+    protected fiber: Fiber.Fiber<never, unknown> | undefined;
+    constructor(fx: Fx<R, E, A>);
+    run<RO>(emitter: Emitter<RO, E, A>): Effect.Effect<R | RO | Scope, never, unknown>;
+    emit(a: A): Effect.Effect<never, never, void>;
+    failCause(e: Cause.Cause<E>): Effect.Effect<never, never, void>;
+    get end(): Effect.Effect<never, never, void>;
+    protected runEvent(a: A, observer: MulticastObserver<E, A>): Effect.Effect<never, never, unknown>;
+    protected runFailCause(e: Cause.Cause<E>, observer: MulticastObserver<E, A>): Effect.Effect<never, never, boolean>;
     protected runEnd(observer: MulticastObserver<E, A>): Effect.Effect<never, never, boolean>;
+    protected cleanup(): Effect.Effect<never, never, void>;
 }
 //# sourceMappingURL=multicast.d.ts.map

package/esm/multicast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multicast.d.ts","sourceRoot":"","sources":["../src/multicast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAC9C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAE9C,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAGhC,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAErF;AAED,oBAAY,iBAAiB,CAAC,CAAC,EAAE,CAAC,IAAI,SAAS;IAC7C,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IACzB,GAAG,CAAC,GAAG,CAAC;IACR,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CAC5B,CAAA;AAED,qBAAa,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAE,YAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;IAI3E,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IAHxC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAK;IACpD,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;gBAE7B,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;IASxC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAkB9E,KAAK,CAAC,CAAC,EAAE,CAAC;IAIV,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC;IAOzD,IAAW,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAKjD;IAED,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ1D,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAUvE,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;CASnD"}
+{"version":3,"file":"multicast.d.ts","sourceRoot":"","sources":["../src/multicast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAC9C,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAG7C,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAE/D;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;IACtB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;CAClD;AAED,qBAAa,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAE,YAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IAI9D,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAHpC,SAAS,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAK;IACnD,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;gBAEnC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAKpC,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC;IAqBlF,IAAI,CAAC,CAAC,EAAE,CAAC;IAMT,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAS3B,IAAI,GAAG,sCAON;IAED,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ1D,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAU3E,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC;IAUlD,SAAS,CAAC,OAAO;CAQlB"}

package/esm/multicast.js

@@ -1,56 +1,52 @@
-import * as Cause from '@effect/core/io/Cause';
 import * as Deferred from '@effect/core/io/Deferred';
 import * as Effect from '@effect/core/io/Effect';
+import * as Fiber from '@effect/core/io/Fiber';
 import { pipe } from '@fp-ts/data/Function';
-import { asap } from './_internal.js';
-export function multicast(self) {
-    return new Multicast(self);
+import * as Duration from '@tsplus/stdlib/data/Duration';
+export function multicast(fx) {
+    return new Multicast(fx);
 }
 export class Multicast {
     fx;
-    sinks = [];
+    observers = [];
     fiber;
     constructor(fx) {
         this.fx = fx;
-        this.run = this.run.bind(this);
-        this.event = this.event.bind(this);
-        this.error = this.error.bind(this);
-        this.runEvent = this.runEvent.bind(this);
-        this.runError = this.runError.bind(this);
-        this.runEnd = this.runEnd.bind(this);
-    }
-    run(sink) {
-        // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const that = this;
-        return Effect.gen(function* ($) {
-            const env = yield* $(Effect.environment());
-            const deferred = yield* $(Deferred.make());
-            that.sinks.push([sink, env, deferred]);
-            if (!that.fiber) {
-                that.fiber = yield* $(Effect.fork(Effect.schedule(asap)(that.fx.run(that))));
-            }
-            return yield* $(deferred.await);
-        });
-    }
-    event(a) {
-        return Effect.forEachDiscard(this.sinks.slice(), (o) => this.runEvent(a, o));
-    }
-    error(e) {
-        return pipe(Effect.forEachDiscard(this.sinks.slice(), (o) => this.runError(e, o)), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))));
+        this.emit = this.emit.bind(this);
+        this.failCause = this.failCause.bind(this);
+    }
+    run(emitter) {
+        return pipe(Effect.environment(), Effect.zip(Deferred.make()), Effect.tap(([env, deferred]) => {
+            this.observers.push({ emitter, env, deferred });
+            return this.fiber
+                ? Effect.unit
+                : pipe(this.fx.run(this), Effect.delay(Duration.millis(0)), Effect.forkScoped, Effect.tap((fiber) => Effect.sync(() => (this.fiber = fiber))));
+        }), Effect.flatMap(([, deferred]) => deferred.await));
+    }
+    emit(a) {
+        return Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runEvent(a, observer)));
+    }
+    failCause(e) {
+        return pipe(Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runFailCause(e, observer))), Effect.flatMap(() => this.cleanup()));
     }
     get end() {
-        return pipe(Effect.forEachDiscard(this.sinks.slice(), (o) => this.runEnd(o)), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))));
+        return pipe(Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runEnd(observer))), Effect.flatMap(() => this.cleanup()));
     }
     runEvent(a, observer) {
-        return pipe(observer[0].event(a), Effect.provideEnvironment(observer[1]), Effect.onError((c) => (Cause.isEmpty(c) ? Effect.unit : this.runError(c, observer))));
+        return pipe(observer.emitter.emit(a), Effect.onError((c) => this.runFailCause(c, observer)), Effect.provideEnvironment(observer.env));
     }
-    runError(e, observer) {
-        this.sinks.splice(this.sinks.indexOf(observer), 1);
-        return pipe(observer[0].error(e), Effect.intoDeferred(observer[2]), Effect.provideEnvironment(observer[1]));
+    runFailCause(e, observer) {
+        this.observers.splice(this.observers.indexOf(observer), 1);
+        return pipe(observer.emitter.failCause(e), Effect.intoDeferred(observer.deferred), Effect.provideEnvironment(observer.env));
     }
     runEnd(observer) {
-        this.sinks.splice(this.sinks.indexOf(observer), 1);
-        return pipe(observer[0].end, Effect.intoDeferred(observer[2]), Effect.provideEnvironment(observer[1]));
+        this.observers.splice(this.observers.indexOf(observer), 1);
+        return pipe(observer.emitter.end, Effect.intoDeferred(observer.deferred), Effect.provideEnvironment(observer.env));
+    }
+    cleanup() {
+        return this.fiber
+            ? pipe(Fiber.interrupt(this.fiber), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))))
+            : Effect.unit;
     }
 }
 //# sourceMappingURL=multicast.js.map

package/esm/multicast.js.map

@@ -1 +1 @@
-{"version":3,"file":"multicast.js","sourceRoot":"","sources":["../src/multicast.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multicast.js","sourceRoot":"","sources":["../src/multicast.ts"],"names":[],"mappings":"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"}

package/esm/orElse.d.ts

@@ -1,8 +1,5 @@
 import * as Cause from '@effect/core/io/Cause';
-import { Effect } from '@effect/core/io/Effect';
 import { Fx } from './Fx.js';
-export declare function orElseCause<E, R2, E2, B, E3>(f: (e: Cause.Cause<E>) => Fx<R2, E2, B, E3>): <R, A, E1>(fx: Fx<R, E, A, E1>) => Fx<R2 | R, E | E2, B | A, E3 | E1>;
-export declare function orElse<E, R2, E2, B, E3>(f: (e: E) => Fx<R2, E2, B, E3>): <R, A, E1>(fx: Fx<R, E, A, E1>) => Fx<R2 | R, E | E2, B | A, E3 | E1>;
-export declare function orElseCauseEffect<E, R2, E2, B>(f: (e: Cause.Cause<E>) => Effect<R2, E2, B>): <R, A, E1>(fx: Fx<R, E, A, E1>) => Fx<R2 | R, E | E2, B | A, E1>;
-export declare function orElseEffect<E, R2, E2, B>(f: (e: E) => Effect<R2, E2, B>): <R, A, E1>(fx: Fx<R, E, A, E1>) => Fx<R2 | R, E | E2, B | A, E1>;
+export declare function orElseCause<E, R2, E2, B>(f: (cause: Cause.Cause<E>) => Fx<R2, E2, B>): <R, A>(fx: Fx<R, E, A>) => Fx<R2 | R, E2, B | A>;
+export declare function orElse<E, R2, E2, B>(f: (error: E) => Fx<R2, E2, B>): <R, A>(fx: Fx<R, E, A>) => Fx<R2 | R, E2, B | A>;
 //# sourceMappingURL=orElse.d.ts.map

package/esm/orElse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orElse.d.ts","sourceRoot":"","sources":["../src/orElse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAI/C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAI5B,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,yEAGxF;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,yEAetE;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,oEAM1F;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,oEAMxE"}
+{"version":3,"file":"orElse.d.ts","sourceRoot":"","sources":["../src/orElse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAK9C,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAI5B,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,oDAEpF;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,oDAGlE"}

package/esm/orElse.js

@@ -1,19 +1,19 @@
 import * as Cause from '@effect/core/io/Cause';
-import { pipe } from '@fp-ts/data/Function';
+import * as Effect from '@effect/core/io/Effect';
+import { flow, pipe } from '@fp-ts/data/Function';
 import * as Either from '@tsplus/stdlib/data/Either';
 import { Fx } from './Fx.js';
-import { Sink } from './Sink.js';
-import { fromEffect } from './fromEffect.js';
+import { failCause } from './fromEffect.js';
+import { runObserve } from './runObserve.js';
 export function orElseCause(f) {
-    return (fx) => Fx((sink) => fx.run(Sink(sink.event, (e) => f(e).run(sink), sink.end)));
+    return (fx) => orElseCause_(fx, f);
 }
 export function orElse(f) {
-    return (fx) => Fx((sink) => fx.run(Sink(sink.event, (e) => pipe(Cause.failureOrCause(e), Either.fold((e) => f(e).run(sink), sink.error)), sink.end)));
+    return (fx) => orElseCause_(fx, flow(Cause.failureOrCause, Either.fold(f, failCause)));
 }
-export function orElseCauseEffect(f) {
-    return (fx) => pipe(fx, orElseCause((e) => fromEffect(f(e))));
-}
-export function orElseEffect(f) {
-    return (fx) => pipe(fx, orElse((e) => fromEffect(f(e))));
+function orElseCause_(fx, f) {
+    return Fx((emitter) => {
+        return pipe(fx, runObserve(emitter.emit), Effect.foldCauseEffect((c) => f(c).run(emitter), () => emitter.end));
+    });
 }
 //# sourceMappingURL=orElse.js.map