@typed/fx 1.27.3 → 1.28.0

package/dist/esm/internal/DeferredRef.js

@@ -1,3 +1,4 @@
+import { MutableRef } from "effect";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
@@ -6,29 +7,31 @@ import { EffectBase } from "./protos.js";
 export class DeferredRef extends EffectBase {
     id;
     eq;
-    // Keep track of the latest value emitted by the stream
     current;
+    // Keep track of the latest value emitted by the stream
     version;
     deferred;
-    constructor(id, eq) {
+    constructor(id, eq, current) {
         super();
         this.id = id;
         this.eq = eq;
+        this.current = current;
         this.reset();
     }
     toEffect() {
         return Effect.suspend(() => {
-            if (Option.isNone(this.current)) {
+            const current = MutableRef.get(this.current);
+            if (Option.isNone(current)) {
                 return Deferred.await(this.deferred);
             }
             else {
-                return this.current.value;
+                return current.value;
             }
         });
     }
     done(exit) {
-        const current = this.current;
-        this.current = Option.some(exit);
+        const current = MutableRef.get(this.current);
+        MutableRef.set(this.current, Option.some(exit));
         if (Option.isSome(current) && this.eq(current.value, exit)) {
             return false;
         }
@@ -37,7 +40,7 @@ export class DeferredRef extends EffectBase {
         return true;
     }
     reset() {
-        this.current = Option.none();
+        MutableRef.set(this.current, Option.none());
         this.version = -1;
         if (this.deferred) {
             Deferred.unsafeDone(this.deferred, Exit.interrupt(this.id));
@@ -46,9 +49,9 @@ export class DeferredRef extends EffectBase {
     }
 }
 export function make(eq) {
-    return Effect.map(Effect.fiberId, (id) => new DeferredRef(id, eq));
+    return Effect.map(Effect.fiberId, (id) => new DeferredRef(id, eq, MutableRef.make(Option.none())));
 }
-export function unsafeMake(id, eq) {
-    return new DeferredRef(id, eq);
+export function unsafeMake(id, eq, current) {
+    return new DeferredRef(id, eq, current);
 }
 //# sourceMappingURL=DeferredRef.js.map

package/dist/esm/internal/DeferredRef.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeferredRef.js","sourceRoot":"","sources":["../../../src/internal/DeferredRef.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,OAAO,WAAkB,SAAQ,UAAuB;IAMxC;IAA6B;IALjD,uDAAuD;IAChD,OAAO,CAAiC;IACxC,OAAO,CAAS;IAChB,QAAQ,CAA0B;IAEzC,YAAoB,EAAmB,EAAU,EAA4C;QAC3F,KAAK,EAAE,CAAA;QADW,OAAE,GAAF,EAAE,CAAiB;QAAU,OAAE,GAAF,EAAE,CAA0C;QAE3F,IAAI,CAAC,KAAK,EAAE,CAAA;IACd,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YACzB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAChC,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtC,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAA;YAC3B,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,IAAqB;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAE5B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEhC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAA;QACd,CAAC;QAED,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAA;QAEjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QAEjB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC9C,CAAC;CACF;AAED,MAAM,UAAU,IAAI,CAAO,EAA4C;IACrE,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,UAAU,UAAU,CAAO,EAAmB,EAAE,EAA4C;IAChG,OAAO,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;AAChC,CAAC"}
+{"version":3,"file":"DeferredRef.js","sourceRoot":"","sources":["../../../src/internal/DeferredRef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AAEnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,OAAO,WAAkB,SAAQ,UAAuB;IAMlD;IACA;IACC;IAPX,uDAAuD;IAChD,OAAO,CAAS;IAChB,QAAQ,CAA0B;IAEzC,YACU,EAAmB,EACnB,EAA4C,EAC3C,OAA8D;QAEvE,KAAK,EAAE,CAAA;QAJC,OAAE,GAAF,EAAE,CAAiB;QACnB,OAAE,GAAF,EAAE,CAA0C;QAC3C,YAAO,GAAP,OAAO,CAAuD;QAGvE,IAAI,CAAC,KAAK,EAAE,CAAA;IACd,CAAC;IAED,QAAQ;QACN,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YACzB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC5C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtC,CAAC;iBAAM,CAAC;gBACN,OAAO,OAAO,CAAC,KAAK,CAAA;YACtB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,IAAqB;QACxB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE5C,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAA;QACd,CAAC;QAED,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAA;QAEjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK;QACH,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;QAEjB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC9C,CAAC;CACF;AAED,MAAM,UAAU,IAAI,CAAO,EAA4C;IACrE,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AACpG,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,EAAmB,EACnB,EAA4C,EAC5C,OAA8D;IAE9D,OAAO,IAAI,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC"}

package/dist/esm/internal/core.js

@@ -1,5 +1,5 @@
 import * as Context from "@typed/context";
-import { Unify } from "effect";
+import { Data, Record } from "effect";
 import * as Boolean from "effect/Boolean";
 import * as Cause from "effect/Cause";
 import * as Clock from "effect/Clock";
@@ -18,6 +18,7 @@ import * as Predicate from "effect/Predicate";
 import * as Ref from "effect/Ref";
 import * as Scope from "effect/Scope";
 import * as Tracer from "effect/Tracer";
+import * as Unify from "effect/Unify";
 import * as Sink from "../Sink.js";
 import { boundsFrom, isInfiniteBounds, isNilBounds, mergeBounds } from "./bounds.js";
 import * as EffectLoopOp from "./effect-loop-operator.js";
@@ -194,7 +195,7 @@ export const filterMapLoop = (fx, seed, f) => Transformer.make(fx, SyncLoopOp.Fi
 export const loopEffect = (fx, seed, f) => Transformer.make(fx, EffectLoopOp.LoopEffectOperator(seed, f));
 export const filterMapLoopEffect = (fx, seed, f) => Transformer.make(fx, EffectLoopOp.FilterMapLoopEffectOperator(seed, f));
 export const observe = (fx, f) => Observe.make(fx, f);
-const constUnit = () => Effect.unit;
+const constUnit = () => Effect.void;
 export const drain = (fx) => Observe.make(fx, constUnit);
 class Observe extends EffectBase {
     i0;
@@ -208,12 +209,12 @@ class Observe extends EffectBase {
         return Effect.asyncEffect((resume) => {
             const { i0: fx, i1: f } = this;
             const onFailure = (cause) => Effect.sync(() => resume(Effect.failCause(cause)));
-            return Effect.zipRight(fx.run(Sink.make(onFailure, (a) => Effect.catchAllCause(f(a), onFailure))), Effect.sync(() => resume(Effect.unit)));
+            return Effect.zipRight(fx.run(Sink.make(onFailure, (a) => Effect.catchAllCause(f(a), onFailure))), Effect.sync(() => resume(Effect.void)));
         });
     }
     static make(fx, f) {
         if (isEmpty(fx)) {
-            return Effect.unit;
+            return Effect.void;
         }
         else if (isNever(fx)) {
             return Effect.never;
@@ -225,13 +226,13 @@ class Observe extends EffectBase {
             return Op.matchOperator(fx.i1, {
                 SyncOperator: (op) => SyncOp.matchSyncOperator(op, {
                     Map: (op) => SyncProducer.effectOnce(() => SyncProducer.runEffect(fx.i0, (a) => f(op.f(a)))),
-                    Filter: (op) => SyncProducer.effectOnce(() => SyncProducer.runEffect(fx.i0, Unify.unify((a) => op.f(a) ? f(a) : Effect.unit))),
-                    FilterMap: (op) => SyncProducer.effectOnce(() => SyncProducer.runEffect(fx.i0, Unify.unify((a) => Option.match(op.f(a), { onNone: () => Effect.unit, onSome: f }))))
+                    Filter: (op) => SyncProducer.effectOnce(() => SyncProducer.runEffect(fx.i0, Unify.unify((a) => op.f(a) ? f(a) : Effect.void))),
+                    FilterMap: (op) => SyncProducer.effectOnce(() => SyncProducer.runEffect(fx.i0, Unify.unify((a) => Option.match(op.f(a), { onNone: () => Effect.void, onSome: f }))))
                 }),
                 EffectOperator: (op) => EffectOp.matchEffectOperator(op, {
                     MapEffect: (op) => SyncProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), f)),
-                    FilterMapEffect: (op) => SyncProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), Unify.unify(Option.match({ onNone: () => Effect.unit, onSome: f })))),
-                    FilterEffect: (op) => SyncProducer.runEffect(fx.i0, Unify.unify((a) => Effect.flatMap(op.f(a), Unify.unify((b) => b ? f(a) : Effect.unit)))),
+                    FilterMapEffect: (op) => SyncProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), Unify.unify(Option.match({ onNone: () => Effect.void, onSome: f })))),
+                    FilterEffect: (op) => SyncProducer.runEffect(fx.i0, Unify.unify((a) => Effect.flatMap(op.f(a), Unify.unify((b) => b ? f(a) : Effect.void)))),
                     TapEffect: (op) => SyncProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), () => f(a)))
                 }),
                 SyncLoopOperator: (op) => SyncLoopOp.matchSyncLoopOperator(op, {
@@ -260,13 +261,13 @@ class Observe extends EffectBase {
             return Op.matchOperator(fx.i1, {
                 SyncOperator: (op) => SyncOp.matchSyncOperator(op, {
                     Map: (op) => SyncProducer.effectOnce(() => EffectProducer.runEffect(fx.i0, (a) => f(op.f(a)))),
-                    Filter: (op) => SyncProducer.effectOnce(() => EffectProducer.runEffect(fx.i0, Unify.unify((a) => op.f(a) ? f(a) : Effect.unit))),
-                    FilterMap: (op) => SyncProducer.effectOnce(() => EffectProducer.runEffect(fx.i0, Unify.unify((a) => Option.match(op.f(a), { onNone: () => Effect.unit, onSome: f }))))
+                    Filter: (op) => SyncProducer.effectOnce(() => EffectProducer.runEffect(fx.i0, Unify.unify((a) => op.f(a) ? f(a) : Effect.void))),
+                    FilterMap: (op) => SyncProducer.effectOnce(() => EffectProducer.runEffect(fx.i0, Unify.unify((a) => Option.match(op.f(a), { onNone: () => Effect.void, onSome: f }))))
                 }),
                 EffectOperator: (op) => EffectOp.matchEffectOperator(op, {
                     MapEffect: (op) => EffectProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), f)),
-                    FilterMapEffect: (op) => EffectProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), Unify.unify(Option.match({ onNone: () => Effect.unit, onSome: f })))),
-                    FilterEffect: (op) => EffectProducer.runEffect(fx.i0, Unify.unify((a) => Effect.flatMap(op.f(a), Unify.unify((b) => b ? f(a) : Effect.unit)))),
+                    FilterMapEffect: (op) => EffectProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), Unify.unify(Option.match({ onNone: () => Effect.void, onSome: f })))),
+                    FilterEffect: (op) => EffectProducer.runEffect(fx.i0, Unify.unify((a) => Effect.flatMap(op.f(a), Unify.unify((b) => b ? f(a) : Effect.void)))),
                     TapEffect: (op) => EffectProducer.runEffect(fx.i0, (a) => Effect.flatMap(op.f(a), () => f(a)))
                 }),
                 SyncLoopOperator: (op) => SyncLoopOp.matchSyncLoopOperator(op, {
@@ -417,8 +418,43 @@ export function skipRepeatsWith(fx, eq) {
         }
     });
 }
+const toDeepEquals = (u) => {
+    switch (typeof u) {
+        case "object": {
+            if (Predicate.isNullable(u)) {
+                return u;
+            }
+            else if (Equal.symbol in u) {
+                return u;
+            }
+            else if (Array.isArray(u)) {
+                return Data.tuple(u.map(toDeepEquals));
+            }
+            else if (u instanceof Set) {
+                return Data.tuple(Array.from(u, toDeepEquals));
+            }
+            else if (u instanceof Map) {
+                return Data.tuple(Array.from(u, ([k, v]) => Data.tuple([toDeepEquals(k), toDeepEquals(v)])));
+            }
+            else {
+                return Data.struct(Record.map(u, toDeepEquals));
+            }
+        }
+        default:
+            return u;
+    }
+};
+/**
+ * @internal
+ */
+export const deepEquals = (a, b) => {
+    // Attempt reference equality first for performance
+    if (Object.is(a, b))
+        return true;
+    return Equal.equals(toDeepEquals(a), toDeepEquals(b));
+};
 export function skipRepeats(fx) {
-    return skipRepeatsWith(fx, Equal.equals);
+    return skipRepeatsWith(fx, deepEquals);
 }
 class ProducerEffectTransformer extends FxBase {
     i0;
@@ -440,7 +476,7 @@ export function isProducerEffectTransformer(fx) {
 }
 class Empty extends FxBase {
     run() {
-        return Effect.unit;
+        return Effect.void;
     }
 }
 /**
@@ -709,10 +745,10 @@ class OrElse extends FxBase {
         this.i1 = i1;
     }
     run(sink) {
-        return Effect.catchAll(Effect.asyncEffect((resume) => Effect.asUnit(Effect.zipRight(this.i0.run(Sink.make((cause) => Either.match(Cause.failureOrCause(cause), {
+        return Effect.catchAll(Effect.asyncEffect((resume) => Effect.asVoid(Effect.zipRight(this.i0.run(Sink.make((cause) => Either.match(Cause.failureOrCause(cause), {
             onLeft: (e) => Effect.succeed(resume(Effect.fail(e))),
             onRight: (cause) => sink.onFailure(cause)
-        }), sink.onSuccess)), Effect.sync(() => resume(Effect.unit))))), (error) => this.i1(error).run(sink));
+        }), sink.onSuccess)), Effect.sync(() => resume(Effect.void))))), (error) => this.i1(error).run(sink));
     }
     static make(fx, f) {
         if (isEmpty(fx))
@@ -804,9 +840,9 @@ function runUnordered(fx, sink, concurrency) {
     return Effect.forEach(fx, (fx) => fx.run(sink), { concurrency, discard: true });
 }
 function runOrdered(fx, sink, concurrency) {
-    return Effect.suspend(() => {
-        const buffers = withBuffers(fx.length, sink);
-        return Effect.forEach(fx, (fx, i) => Effect.flatMap(fx.run(Sink.make((cause) => Cause.isInterruptedOnly(cause) ? Effect.unit : sink.onFailure(cause), (a) => buffers.onSuccess(i, a))), () => buffers.onEnd(i)), {
+    return Effect.fiberIdWith((id) => {
+        const buffers = withBuffers(fx.length, sink, id);
+        return Effect.forEach(fx, (fx, i) => Effect.flatMap(fx.run(Sink.make((cause) => Cause.isInterruptedOnly(cause) ? buffers.onEnd(i) : sink.onFailure(cause), (a) => buffers.onSuccess(i, a))), () => buffers.onEnd(i)), {
             concurrency,
             discard: true
         });
@@ -985,7 +1021,7 @@ class During extends FxBase {
                 return take(nested, 1).run(Sink.make(onFailure, () => s.earlyExit));
             }))), () => Effect.zipRight(
             // Allow fibers to start
-            adjustTime(1), this.i0.run(Sink.make(onFailure, (a) => taking ? s.onSuccess(a) : Effect.unit))));
+            adjustTime(1), this.i0.run(Sink.make(onFailure, (a) => taking ? s.onSuccess(a) : Effect.void))));
         }), ExecutionStrategy.sequential);
     }
     static make(fx, window) {
@@ -1429,14 +1465,14 @@ class FromAsyncIterable extends FxBase {
         return Effect.asyncEffect((cb) => {
             const iterator = this.i0[Symbol.asyncIterator]();
             const loop = (result) => result.done
-                ? Effect.sync(() => cb(Effect.unit))
+                ? Effect.sync(() => cb(Effect.void))
                 : Effect.zipRight(sink.onSuccess(result.value), Effect.flatMap(Effect.promise(() => iterator.next()), loop));
-            return Effect.asUnit(Effect.flatMap(Effect.promise(() => iterator.next()), loop));
+            return Effect.asVoid(Effect.flatMap(Effect.promise(() => iterator.next()), loop));
         });
     }
 }
 export function findFirst(fx, predicate) {
-    return Effect.asyncEffect((cb) => observe(fx, (a) => predicate(a) ? Effect.sync(() => cb(Effect.succeed(a))) : Effect.unit));
+    return Effect.asyncEffect((cb) => observe(fx, (a) => predicate(a) ? Effect.sync(() => cb(Effect.succeed(a))) : Effect.void));
 }
 export function first(fx) {
     return findFirst(fx, constTrue);
@@ -1473,9 +1509,9 @@ class MergeRace extends FxBase {
     }
     run(sink) {
         return Effect.gen(this, function* (_) {
-            const fiber1 = yield* _(Effect.fork(this.i0.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(sink.onSuccess(a), () => Fiber.interrupt(fiber2))))));
-            const fiber2 = yield* _(Effect.fork(this.i1.run(sink)));
-            return yield* _(Fiber.joinAll([fiber1, fiber2]));
+            const fiber1 = yield* Effect.fork(this.i0.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(sink.onSuccess(a), () => Fiber.interrupt(fiber2)))));
+            const fiber2 = yield* Effect.fork(this.i1.run(sink));
+            return yield* Fiber.joinAll([fiber1, fiber2]);
         });
     }
 }
@@ -1493,15 +1529,15 @@ class RaceAll extends FxBase {
     }
     run(sink) {
         return Effect.gen(this, function* (_) {
-            const winner = yield* _(Deferred.make());
+            const winner = yield* Deferred.make();
             const fibers = [];
             for (const fx of this.i0) {
-                const fiber = yield* _(Effect.fork(fx.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(Deferred.succeed(winner, fiber), () => sink.onSuccess(a))))));
+                const fiber = yield* Effect.fork(fx.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(Deferred.succeed(winner, fiber), () => sink.onSuccess(a)))));
                 fibers.push(fiber);
             }
-            const winningFiber = yield* _(Deferred.await(winner));
-            yield* _(Fiber.interruptAll(fibers.filter((x) => x !== winningFiber)));
-            return yield* _(Fiber.join(winningFiber));
+            const winningFiber = yield* Deferred.await(winner);
+            yield* Fiber.interruptAll(fibers.filter((x) => x !== winningFiber));
+            return yield* Fiber.join(winningFiber);
         });
     }
 }
@@ -1525,7 +1561,7 @@ class Snapshot extends FxBase {
         return Effect.flatMap(Ref.make(Option.none()), (ref) => Effect.all([
             this.i1.run(Sink.make(sink.onFailure, (b) => Ref.set(ref, Option.some(b)))),
             this.i0.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(Ref.get(ref), Option.match({
-                onNone: () => Effect.unit,
+                onNone: () => Effect.void,
                 onSome: (b) => sink.onSuccess(this.i2(a, b))
             }))))
         ], UNBOUNDED));
@@ -1546,7 +1582,7 @@ class SnapshotEffect extends FxBase {
     }
     run(sink) {
         return Effect.flatMap(Ref.make(Option.none()), (ref) => Effect.flatMap(Effect.tap(Effect.fork(this.i1.run(Sink.make(sink.onFailure, (b) => Ref.set(ref, Option.some(b))))), () => this.i0.run(Sink.make(sink.onFailure, (a) => Effect.flatMap(Ref.get(ref), Option.match({
-            onNone: () => Effect.unit,
+            onNone: () => Effect.void,
             onSome: (b) => Effect.matchCauseEffect(this.i2(a, b), sink)
         }))))), Fiber.interrupt));
     }
@@ -1556,10 +1592,7 @@ function if_(bool, options) {
 }
 export { if_ as if };
 export function when(bool, options) {
-    return if_(bool, {
-        onTrue: succeed(options.onTrue),
-        onFalse: succeed(options.onFalse)
-    });
+    return map(skipRepeatsWith(bool, boolean), (b) => (b ? options.onTrue : options.onFalse));
 }
 export function mapBoth(fx, f, g) {
     return map(mapError(fx, f), g);