@typed/fx 0.0.9 → 0.0.10

package/cjs/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/cjs/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/cjs/{never.js → mapEffect.js}

@@ -23,8 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.never = void 0;
+exports.mapEffect = void 0;
 const Effect = __importStar(require("@effect/core/io/Effect"));
-const fromEffect_js_1 = require("./fromEffect.js");
-exports.never = (0, fromEffect_js_1.fromEffect)(Effect.never);
-//# sourceMappingURL=never.js.map
+const Function_1 = require("@fp-ts/data/Function");
+const Fx_js_1 = require("./Fx.js");
+const mapEffect = (f) => (fx) => (0, Fx_js_1.Fx)((emitter) => fx.run((0, Fx_js_1.Emitter)((0, Function_1.flow)(f, Effect.foldCauseEffect(emitter.failCause, emitter.emit)), emitter.failCause, emitter.end)));
+exports.mapEffect = mapEffect;
+//# sourceMappingURL=mapEffect.js.map

package/cjs/mapEffect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapEffect.js","sourceRoot":"","sources":["../src/mapEffect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAChD,mDAA2C;AAE3C,mCAAqC;AAE9B,MAAM,SAAS,GACpB,CAAe,CAAqC,EAAE,EAAE,CACxD,CAAO,EAAe,EAAyB,EAAE,CAC/C,IAAA,UAAE,EAAC,CAAC,OAAO,EAAE,EAAE,CACb,EAAE,CAAC,GAAG,CACJ,IAAA,eAAO,EACL,IAAA,eAAI,EAAC,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;AAXQ,QAAA,SAAS,aAWjB"}

package/cjs/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/cjs/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/cjs/merge.js

@@ -25,21 +25,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeAll = exports.merge = void 0;
 const Effect = __importStar(require("@effect/core/io/Effect"));
-const Function_1 = require("@fp-ts/data/Function");
 const Fx_js_1 = require("./Fx.js");
-const Sink_js_1 = require("./Sink.js");
 const _internal_js_1 = require("./_internal.js");
-function merge(other) {
-    return (self) => mergeAll([self, other]);
+function merge(second) {
+    return (first) => mergeAll([first, second]);
 }
 exports.merge = merge;
-function mergeAll(fx) {
-    return (0, Fx_js_1.Fx)((sink) => Effect.gen(function* ($) {
-        const array = Array.from(fx);
-        const deferred = yield* $((0, _internal_js_1.refCountDeferred)(true, array.length));
-        yield* $(Effect.forEachDiscard(array, (fx) => Effect.fork(fx.run((0, Sink_js_1.Sink)(sink.event, (0, Function_1.flow)(sink.error, deferred.error), (0, Function_1.pipe)(deferred.decrement, Effect.flatMap(() => deferred.endIfComplete(sink.end))))))));
-        return yield* $(deferred.await);
-    }));
+function mergeAll(iterable) {
+    return (0, Fx_js_1.Fx)((emitter) => {
+        const array = Array.from(iterable);
+        return (0, _internal_js_1.withDynamicCountdownLatch)(array.length, ({ latch }) => Effect.forEachDiscard(array, (fx) => Effect.forkScoped(fx.run((0, Fx_js_1.Emitter)(emitter.emit, emitter.failCause, latch.countDown)))), emitter.end);
+    });
 }
 exports.mergeAll = mergeAll;
 //# sourceMappingURL=merge.js.map

package/cjs/merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge.js","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAChD,mDAAiD;AAEjD,mCAA4B;AAC5B,uCAAgC;AAChC,iDAAiD;AAEjD,SAAgB,KAAK,CAAgB,KAAwB;IAC3D,OAAO,CAAc,IAAqB,EAAsC,EAAE,CAChF,QAAQ,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;AAC3B,CAAC;AAHD,sBAGC;AAaD,SAAgB,QAAQ,CAAgB,EAA+B;IACrE,OAAO,IAAA,UAAE,EAAC,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,IAAA,+BAAgB,EAAa,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,IAAA,cAAI,EACF,IAAI,CAAC,KAAK,EACV,IAAA,eAAI,EAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAChC,IAAA,eAAI,EACF,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;AA1BD,4BA0BC"}
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../src/merge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAEhD,mCAAqC;AACrC,iDAA0D;AAE1D,SAAgB,KAAK,CAAY,MAAqB;IACpD,OAAO,CAAU,KAAkB,EAA6B,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9F,CAAC;AAFD,sBAEC;AAQD,SAAgB,QAAQ,CAAU,QAA+B;IAC/D,OAAO,IAAA,UAAE,EAAC,CAAC,OAAO,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAElC,OAAO,IAAA,wCAAyB,EAC9B,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,IAAA,eAAO,EAAC,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;AAbD,4BAaC"}

package/cjs/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/cjs/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/cjs/multicast.js

@@ -24,60 +24,56 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Multicast = exports.multicast = void 0;
-const Cause = __importStar(require("@effect/core/io/Cause"));
 const Deferred = __importStar(require("@effect/core/io/Deferred"));
 const Effect = __importStar(require("@effect/core/io/Effect"));
+const Fiber = __importStar(require("@effect/core/io/Fiber"));
 const Function_1 = require("@fp-ts/data/Function");
-const _internal_js_1 = require("./_internal.js");
-function multicast(self) {
-    return new Multicast(self);
+const Duration = __importStar(require("@tsplus/stdlib/data/Duration"));
+function multicast(fx) {
+    return new Multicast(fx);
 }
 exports.multicast = multicast;
 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);
+        this.emit = this.emit.bind(this);
+        this.failCause = this.failCause.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(_internal_js_1.asap)(that.fx.run(that))));
-            }
-            return yield* $(deferred.await);
-        });
+    run(emitter) {
+        return (0, Function_1.pipe)(Effect.environment(), Effect.zip(Deferred.make()), Effect.tap(([env, deferred]) => {
+            this.observers.push({ emitter, env, deferred });
+            return this.fiber
+                ? Effect.unit
+                : (0, Function_1.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));
     }
-    event(a) {
-        return Effect.forEachDiscard(this.sinks.slice(), (o) => this.runEvent(a, o));
+    emit(a) {
+        return Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runEvent(a, observer)));
     }
-    error(e) {
-        return (0, Function_1.pipe)(Effect.forEachDiscard(this.sinks.slice(), (o) => this.runError(e, o)), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))));
+    failCause(e) {
+        return (0, Function_1.pipe)(Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runFailCause(e, observer))), Effect.flatMap(() => this.cleanup()));
     }
     get end() {
-        return (0, Function_1.pipe)(Effect.forEachDiscard(this.sinks.slice(), (o) => this.runEnd(o)), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))));
+        return (0, Function_1.pipe)(Effect.suspendSucceed(() => Effect.forEachDiscard(this.observers.slice(), (observer) => this.runEnd(observer))), Effect.flatMap(() => this.cleanup()));
     }
     runEvent(a, observer) {
-        return (0, Function_1.pipe)(observer[0].event(a), Effect.provideEnvironment(observer[1]), Effect.onError((c) => (Cause.isEmpty(c) ? Effect.unit : this.runError(c, observer))));
+        return (0, Function_1.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 (0, Function_1.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 (0, Function_1.pipe)(observer.emitter.failCause(e), Effect.intoDeferred(observer.deferred), Effect.provideEnvironment(observer.env));
     }
     runEnd(observer) {
-        this.sinks.splice(this.sinks.indexOf(observer), 1);
-        return (0, Function_1.pipe)(observer[0].end, Effect.intoDeferred(observer[2]), Effect.provideEnvironment(observer[1]));
+        this.observers.splice(this.observers.indexOf(observer), 1);
+        return (0, Function_1.pipe)(observer.emitter.end, Effect.intoDeferred(observer.deferred), Effect.provideEnvironment(observer.env));
+    }
+    cleanup() {
+        return this.fiber
+            ? (0, Function_1.pipe)(Fiber.interrupt(this.fiber), Effect.tap(() => Effect.sync(() => (this.fiber = undefined))))
+            : Effect.unit;
     }
 }
 exports.Multicast = Multicast;

package/cjs/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/cjs/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/cjs/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/cjs/orElse.js

@@ -23,27 +23,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.orElseEffect = exports.orElseCauseEffect = exports.orElse = exports.orElseCause = void 0;
+exports.orElse = exports.orElseCause = void 0;
 const Cause = __importStar(require("@effect/core/io/Cause"));
+const Effect = __importStar(require("@effect/core/io/Effect"));
 const Function_1 = require("@fp-ts/data/Function");
 const Either = __importStar(require("@tsplus/stdlib/data/Either"));
 const Fx_js_1 = require("./Fx.js");
-const Sink_js_1 = require("./Sink.js");
 const fromEffect_js_1 = require("./fromEffect.js");
+const runObserve_js_1 = require("./runObserve.js");
 function orElseCause(f) {
-    return (fx) => (0, Fx_js_1.Fx)((sink) => fx.run((0, Sink_js_1.Sink)(sink.event, (e) => f(e).run(sink), sink.end)));
+    return (fx) => orElseCause_(fx, f);
 }
 exports.orElseCause = orElseCause;
 function orElse(f) {
-    return (fx) => (0, Fx_js_1.Fx)((sink) => fx.run((0, Sink_js_1.Sink)(sink.event, (e) => (0, Function_1.pipe)(Cause.failureOrCause(e), Either.fold((e) => f(e).run(sink), sink.error)), sink.end)));
+    return (fx) => orElseCause_(fx, (0, Function_1.flow)(Cause.failureOrCause, Either.fold(f, fromEffect_js_1.failCause)));
 }
 exports.orElse = orElse;
-function orElseCauseEffect(f) {
-    return (fx) => (0, Function_1.pipe)(fx, orElseCause((e) => (0, fromEffect_js_1.fromEffect)(f(e))));
+function orElseCause_(fx, f) {
+    return (0, Fx_js_1.Fx)((emitter) => {
+        return (0, Function_1.pipe)(fx, (0, runObserve_js_1.runObserve)(emitter.emit), Effect.foldCauseEffect((c) => f(c).run(emitter), () => emitter.end));
+    });
 }
-exports.orElseCauseEffect = orElseCauseEffect;
-function orElseEffect(f) {
-    return (fx) => (0, Function_1.pipe)(fx, orElse((e) => (0, fromEffect_js_1.fromEffect)(f(e))));
-}
-exports.orElseEffect = orElseEffect;
 //# sourceMappingURL=orElse.js.map

package/cjs/orElse.js.map

@@ -1 +1 @@
-{"version":3,"file":"orElse.js","sourceRoot":"","sources":["../src/orElse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAE9C,mDAA2C;AAC3C,mEAAoD;AAEpD,mCAA4B;AAC5B,uCAAgC;AAChC,mDAA4C;AAE5C,SAAgB,WAAW,CAAmB,CAA2C;IACvF,OAAO,CAAW,EAAmB,EAAsC,EAAE,CAC3E,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,IAAA,cAAI,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;AAC3E,CAAC;AAHD,kCAGC;AAED,SAAgB,MAAM,CAAmB,CAA8B;IACrE,OAAO,CAAW,EAAmB,EAAsC,EAAE,CAC3E,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CACV,EAAE,CAAC,GAAG,CACJ,IAAA,cAAI,EACF,IAAI,CAAC,KAAK,EACV,CAAC,CAAC,EAAE,EAAE,CACJ,IAAA,eAAI,EACF,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,EACvB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAC/C,EACH,IAAI,CAAC,GAAG,CACT,CACF,CACF,CAAA;AACL,CAAC;AAfD,wBAeC;AAED,SAAgB,iBAAiB,CAAe,CAA2C;IACzF,OAAO,CAAW,EAAmB,EAAiC,EAAE,CACtE,IAAA,eAAI,EACF,EAAE,EACF,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAU,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrC,CAAA;AACL,CAAC;AAND,8CAMC;AAED,SAAgB,YAAY,CAAe,CAA8B;IACvE,OAAO,CAAW,EAAmB,EAAiC,EAAE,CACtE,IAAA,eAAI,EACF,EAAE,EACF,MAAM,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,IAAA,0BAAU,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnC,CAAA;AACL,CAAC;AAND,oCAMC"}
+{"version":3,"file":"orElse.js","sourceRoot":"","sources":["../src/orElse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA8C;AAC9C,+DAAgD;AAChD,mDAAiD;AACjD,mEAAoD;AAEpD,mCAA4B;AAC5B,mDAA2C;AAC3C,mDAA4C;AAE5C,SAAgB,WAAW,CAAe,CAA2C;IACnF,OAAO,CAAO,EAAe,EAAyB,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAC9E,CAAC;AAFD,kCAEC;AAED,SAAgB,MAAM,CAAe,CAA8B;IACjE,OAAO,CAAO,EAAe,EAAyB,EAAE,CACtD,YAAY,CAAC,EAAE,EAAE,IAAA,eAAI,EAAC,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,yBAAS,CAAC,CAAC,CAAC,CAAA;AAC3E,CAAC;AAHD,wBAGC;AAED,SAAS,YAAY,CACnB,EAAe,EACf,CAA2C;IAE3C,OAAO,IAAA,UAAE,EAAC,CAAC,OAAO,EAAE,EAAE;QACpB,OAAO,IAAA,eAAI,EACT,EAAE,EACF,IAAA,0BAAU,EAAC,OAAO,CAAC,IAAI,CAAC,EACxB,MAAM,CAAC,eAAe,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EACxB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAClB,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/cjs/provide.d.ts

@@ -1,12 +1,12 @@
 import * as Effect from '@effect/core/io/Effect';
-import { Layer } from '@effect/core/io/Layer';
-import * as Env from '@tsplus/stdlib/service/Env';
+import * as Layer from '@effect/core/io/Layer';
+import { Env } from '@tsplus/stdlib/service/Env';
 import { Tag } from '@tsplus/stdlib/service/Tag';
 import { Fx } from './Fx.js';
-export declare const provideEnvironment: <R>(env: Env.Env<R>) => <E, A, E1>(fx: Fx<R, E, A, E1>) => Fx<never, E, A, E1>;
-export declare const provideSomeEnvironment: <R3>(env: Env.Env<R3>) => <R, E, A, E1>(fx: Fx<R3 | R, E, A, E1>) => Fx<R, E, A, E1>;
-export declare const provideLayer: <RI, E3, RO>(layer: Layer<RI, E3, RO>) => <E, A, E1>(fx: Fx<RO, E, A, E1>) => Fx<RI, E, A, E3 | E1>;
-export declare const provideSomeLayer: <RI, E3, RO>(layer: Layer<RI, E3, RO>) => <R, E, A, E1>(fx: Fx<RO | R, E, A, E1>) => Fx<RI | R, E, A, E3 | E1>;
-export declare const provideService: <T>(tag: Tag<T>, resource: T) => <R, E, A, E1>(fx: Fx<T | R, E, A, E1>) => Fx<R, E, A, E1>;
-export declare const provideServiceEffect: <T, R3, E3>(tag: Tag<T>, effect: Effect.Effect<R3, E3, T>) => <R, E, A, E1>(fx: Fx<T | R, E, A, E1>) => Fx<R3 | R, E, A, E3 | E1>;
+export declare function provideSomeEnvironment<R2>(env: Env<R2>): <R, E, A>(fx: Fx<R2 | R, E, A>) => Fx<Exclude<R, R2>, E, A>;
+export declare function provideEnvironment<R>(env: Env<R>): <E, A>(fx: Fx<R, E, A>) => Fx<never, E, A>;
+export declare function provideSomeLayer<RI, E2, RO>(layer: Layer.Layer<RI, E2, RO>): <R, E, A>(fx: Fx<RO | R, E, A>) => Fx<RI | Exclude<R, RO>, E2 | E, A>;
+export declare function provideLayer<RI, E2, RO>(layer: Layer.Layer<RI, E2, RO>): <E, A>(fx: Fx<RO, E, A>) => Fx<RI, E2 | E, A>;
+export declare function provideService<S>(tag: Tag<S>, service: S): <R, E, A>(fx: Fx<S | R, E, A>) => Fx<Exclude<R, S>, E, A>;
+export declare function provideServiceEffect<S, R2, E2>(tag: Tag<S>, service: Effect.Effect<R2, E2, S>): <R, E, A>(fx: Fx<R, E, A>) => Fx<R2 | R, E2 | E, A>;
 //# sourceMappingURL=provide.d.ts.map

package/cjs/provide.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAA;AAE7C,OAAO,KAAK,GAAG,MAAM,4BAA4B,CAAA;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAG5B,eAAO,MAAM,kBAAkB,gFAS1B,CAAA;AAEL,eAAO,MAAM,sBAAsB,sFAS9B,CAAA;AAEL,eAAO,MAAM,YAAY,qGAG2C,CAAA;AAEpE,eAAO,MAAM,gBAAgB,gHAGuC,CAAA;AAEpE,eAAO,MAAM,cAAc,4FAG+C,CAAA;AAE1E,eAAO,MAAM,oBAAoB,mIAG6C,CAAA"}
+{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,uBAAuB,CAAA;AAG9C,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,EAAW,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,+DAWtD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,8CAEhD;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,yEAY1E;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,iDAEtE;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC9B,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EACX,OAAO,EAAE,CAAC,GACT,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAE3D;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,uDAS7F"}

package/cjs/provide.js

@@ -23,20 +23,34 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideServiceEffect = exports.provideService = exports.provideSomeLayer = exports.provideLayer = exports.provideSomeEnvironment = exports.provideEnvironment = void 0;
+exports.provideServiceEffect = exports.provideService = exports.provideLayer = exports.provideSomeLayer = exports.provideEnvironment = exports.provideSomeEnvironment = void 0;
 const Effect = __importStar(require("@effect/core/io/Effect"));
+const Layer = __importStar(require("@effect/core/io/Layer"));
 const Function_1 = require("@fp-ts/data/Function");
+const Env_1 = require("@tsplus/stdlib/service/Env");
 const Fx_js_1 = require("./Fx.js");
-const provideEnvironment = (env) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideSomeEnvironment((e) => e.merge(env))));
-exports.provideEnvironment = provideEnvironment;
-const provideSomeEnvironment = (env) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideSomeEnvironment((e) => e.merge(env))));
+function provideSomeEnvironment(env) {
+    return (fx) => (0, Fx_js_1.Fx)((emitter) => (0, Function_1.pipe)(fx.run(emitter), Effect.provideSomeEnvironment((e) => e.merge(env))));
+}
 exports.provideSomeEnvironment = provideSomeEnvironment;
-const provideLayer = (layer) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideSomeLayer(layer)));
-exports.provideLayer = provideLayer;
-const provideSomeLayer = (layer) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideSomeLayer(layer)));
+function provideEnvironment(env) {
+    return provideSomeEnvironment(env);
+}
+exports.provideEnvironment = provideEnvironment;
+function provideSomeLayer(layer) {
+    return (fx) => (0, Fx_js_1.Fx)((emitter) => Effect.scopeWith((scope) => (0, Function_1.pipe)(layer, Layer.buildWithScope(scope), Effect.flatMap((ro) => (0, Function_1.pipe)(fx, provideSomeEnvironment(ro)).run(emitter)), Effect.foldCauseEffect((c) => emitter.failCause(c), Effect.succeed))));
+}
 exports.provideSomeLayer = provideSomeLayer;
-const provideService = (tag, resource) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideService(tag, resource)));
+function provideLayer(layer) {
+    return provideSomeLayer(layer);
+}
+exports.provideLayer = provideLayer;
+function provideService(tag, service) {
+    return provideSomeEnvironment((0, Env_1.Env)(tag, service));
+}
 exports.provideService = provideService;
-const provideServiceEffect = (tag, effect) => (fx) => (0, Fx_js_1.Fx)((sink) => (0, Function_1.pipe)(fx.run(sink), Effect.provideServiceEffect(tag, effect)));
+function provideServiceEffect(tag, service) {
+    return (fx) => (0, Fx_js_1.Fx)((emitter) => (0, Function_1.pipe)(fx.run(emitter), Effect.provideServiceEffect(tag, service), Effect.foldCauseEffect(emitter.failCause, Effect.succeed)));
+}
 exports.provideServiceEffect = provideServiceEffect;
 //# sourceMappingURL=provide.js.map

package/cjs/provide.js.map

@@ -1 +1 @@
-{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAEhD,mDAA2C;AAI3C,mCAA4B;AAGrB,MAAM,kBAAkB,GAC7B,CAAI,GAAe,EAAE,EAAE,CACvB,CAAW,EAAmB,EAAuB,EAAE,CACrD,IAAA,UAAE,EACA,CAAY,IAA2B,EAAiC,EAAE,CACxE,IAAA,eAAI,EACF,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EACZ,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAc,EAAmB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAQ,GAAG,CAAC,CAAC,CACxF,CACJ,CAAA;AATQ,QAAA,kBAAkB,sBAS1B;AAEE,MAAM,sBAAsB,GACjC,CAAK,GAAgB,EAAE,EAAE,CACzB,CAAc,EAAwB,EAAmB,EAAE,CACzD,IAAA,UAAE,EACA,CAAY,IAA2B,EAAqC,EAAE,CAC5E,IAAA,eAAI,EACF,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EACZ,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CACnD,CACJ,CAAA;AATQ,QAAA,sBAAsB,0BAS9B;AAEE,MAAM,YAAY,GACvB,CAAa,KAAwB,EAAE,EAAE,CACzC,CAAW,EAAoB,EAAyB,EAAE,CACxD,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAHvD,QAAA,YAAY,gBAG2C;AAE7D,MAAM,gBAAgB,GAC3B,CAAa,KAAwB,EAAE,EAAE,CACzC,CAAc,EAAwB,EAA6B,EAAE,CACnE,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAHvD,QAAA,gBAAgB,oBAGuC;AAE7D,MAAM,cAAc,GACzB,CAAI,GAAW,EAAE,QAAW,EAAE,EAAE,CAChC,CAAc,EAAuB,EAAmB,EAAE,CACxD,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;AAH7D,QAAA,cAAc,kBAG+C;AAEnE,MAAM,oBAAoB,GAC/B,CAAY,GAAW,EAAE,MAAgC,EAAE,EAAE,CAC7D,CAAc,EAAuB,EAA6B,EAAE,CAClE,IAAA,UAAE,EAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;AAHjE,QAAA,oBAAoB,wBAG6C"}
+{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAChD,6DAA8C;AAE9C,mDAA2C;AAC3C,oDAAgD;AAGhD,mCAAqC;AAErC,SAAgB,sBAAsB,CAAK,GAAY;IACrD,OAAO,CAAU,EAAoB,EAA4B,EAAE,CACjE,IAAA,UAAE,EAAC,CAAC,OAAO,EAAE,EAAE,CACb,IAAA,eAAI,EACF,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EACf,MAAM,CAAC,sBAAsB,CAC3B,CAAC,CAA0E,EAAE,EAAE,CAC5E,CAAgE,CAAC,KAAK,CAAC,GAAG,CAAC,CAC/E,CACF,CACF,CAAA;AACL,CAAC;AAXD,wDAWC;AAED,SAAgB,kBAAkB,CAAI,GAAW;IAC/C,OAAO,sBAAsB,CAAC,GAAG,CAA+C,CAAA;AAClF,CAAC;AAFD,gDAEC;AAED,SAAgB,gBAAgB,CAAa,KAA8B;IACzE,OAAO,CAAU,EAAoB,EAAsC,EAAE,CAC3E,IAAA,UAAE,EAAC,CAAK,OAA+B,EAAE,EAAE,CACzC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CACzB,IAAA,eAAI,EACF,KAAK,EACL,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,EAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,EAAE,EAAE,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EACzE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CACpE,CACF,CACF,CAAA;AACL,CAAC;AAZD,4CAYC;AAED,SAAgB,YAAY,CAAa,KAA8B;IACrE,OAAO,gBAAgB,CAAC,KAAK,CAAkD,CAAA;AACjF,CAAC;AAFD,oCAEC;AAED,SAAgB,cAAc,CAC5B,GAAW,EACX,OAAU;IAEV,OAAO,sBAAsB,CAAC,IAAA,SAAG,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;AAClD,CAAC;AALD,wCAKC;AAED,SAAgB,oBAAoB,CAAY,GAAW,EAAE,OAAiC;IAC5F,OAAO,CAAU,EAAe,EAAyB,EAAE,CACzD,IAAA,UAAE,EAAC,CAAC,OAAO,EAAE,EAAE,CACb,IAAA,eAAI,EACF,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EACf,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,EACzC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAC1D,CACF,CAAA;AACL,CAAC;AATD,oDASC"}

package/cjs/runCollect.d.ts

@@ -0,0 +1,4 @@
+import * as Effect from '@effect/core/io/Effect';
+import { Fx } from './Fx.js';
+export declare function runCollect<R, E, A>(fx: Fx<R, E, A>): Effect.Effect<R, E, ReadonlyArray<A>>;
+//# sourceMappingURL=runCollect.d.ts.map

package/cjs/runCollect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runCollect.d.ts","sourceRoot":"","sources":["../src/runCollect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAGhD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAG5B,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAY1F"}

package/cjs/{from.js → runCollect.js}

@@ -23,21 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FromCollectionFx = exports.from = void 0;
+exports.runCollect = void 0;
 const Effect = __importStar(require("@effect/core/io/Effect"));
 const Function_1 = require("@fp-ts/data/Function");
-function from(collection) {
-    return new FromCollectionFx(collection);
+const runObserve_js_1 = require("./runObserve.js");
+function runCollect(fx) {
+    return (0, Function_1.pipe)(Effect.sync(() => []), Effect.flatMap((values) => (0, Function_1.pipe)(fx, (0, runObserve_js_1.runObserve)((a) => Effect.sync(() => values.push(a))), Effect.map(() => values))), Effect.scoped);
 }
-exports.from = from;
-class FromCollectionFx {
-    collection;
-    constructor(collection) {
-        this.collection = collection;
-    }
-    run(sink) {
-        return (0, Function_1.pipe)(Effect.forEachDiscard(this.collection, sink.event), Effect.zipRight(sink.end));
-    }
-}
-exports.FromCollectionFx = FromCollectionFx;
-//# sourceMappingURL=from.js.map
+exports.runCollect = runCollect;
+//# sourceMappingURL=runCollect.js.map

package/cjs/runCollect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runCollect.js","sourceRoot":"","sources":["../src/runCollect.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAgD;AAChD,mDAA2C;AAG3C,mDAA4C;AAE5C,SAAgB,UAAU,CAAU,EAAe;IACjD,OAAO,IAAA,eAAI,EACT,MAAM,CAAC,IAAI,CAAM,GAAG,EAAE,CAAC,EAAE,CAAC,EAC1B,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxB,IAAA,eAAI,EACF,EAAE,EACF,IAAA,0BAAU,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EACpD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CACzB,CACF,EACD,MAAM,CAAC,MAAM,CACd,CAAA;AACH,CAAC;AAZD,gCAYC"}

package/cjs/runDrain.d.ts

@@ -0,0 +1,4 @@
+import * as Effect from '@effect/core/io/Effect';
+import { Fx } from './Fx.js';
+export declare function runDrain<R, E, A>(fx: Fx<R, E, A>): Effect.Effect<R, E, void>;
+//# sourceMappingURL=runDrain.d.ts.map

package/cjs/runDrain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runDrain.d.ts","sourceRoot":"","sources":["../src/runDrain.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAGhD,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAgB5E"}

package/cjs/runDrain.js

@@ -0,0 +1,38 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runDrain = void 0;
+const Deferred = __importStar(require("@effect/core/io/Deferred"));
+const Effect = __importStar(require("@effect/core/io/Effect"));
+const Function_1 = require("@fp-ts/data/Function");
+function runDrain(fx) {
+    return (0, Function_1.pipe)(Deferred.make(), Effect.flatMap((deferred) => (0, Function_1.pipe)(fx.run({
+        emit: () => Effect.unit,
+        failCause: (c) => deferred.failCauseSync(c),
+        end: deferred.succeed(undefined),
+    }), Effect.forkScoped, Effect.zipRight(deferred.await))), Effect.scoped);
+}
+exports.runDrain = runDrain;
+//# sourceMappingURL=runDrain.js.map

package/cjs/runDrain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runDrain.js","sourceRoot":"","sources":["../src/runDrain.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAoD;AACpD,+DAAgD;AAChD,mDAA2C;AAI3C,SAAgB,QAAQ,CAAU,EAAe;IAC/C,OAAO,IAAA,eAAI,EACT,QAAQ,CAAC,IAAI,EAAW,EACxB,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1B,IAAA,eAAI,EACF,EAAE,CAAC,GAAG,CAAC;QACL,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;QACvB,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3C,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;KACjC,CAAC,EACF,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAChC,CACF,EACD,MAAM,CAAC,MAAM,CACd,CAAA;AACH,CAAC;AAhBD,4BAgBC"}

package/cjs/runObserve.d.ts

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

package/cjs/runObserve.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runObserve.d.ts","sourceRoot":"","sources":["../src/runObserve.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAA;AAGhD,OAAO,EAAW,EAAE,EAAE,MAAM,SAAS,CAAA;AAErC,wBAAgB,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,kEAwB7E"}

package/cjs/{takeUntil.js → runObserve.js}

@@ -23,24 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.takeUntil = void 0;
+exports.runObserve = void 0;
+const Deferred = __importStar(require("@effect/core/io/Deferred"));
 const Effect = __importStar(require("@effect/core/io/Effect"));
-const Exit = __importStar(require("@effect/core/io/Exit"));
 const Function_1 = require("@fp-ts/data/Function");
 const Fx_js_1 = require("./Fx.js");
-const _internal_js_1 = require("./_internal.js");
-function takeUntil(predicate) {
-    return (fx) => (0, Fx_js_1.Fx)((sink) => (0, _internal_js_1.deferredCallback)((cb) => {
-        return fx.run({
-            ...sink,
-            event: (a) => {
-                if (!predicate(a)) {
-                    return sink.event(a);
-                }
-                return (0, Function_1.pipe)(sink.end, Effect.tap((b) => cb(Exit.succeed(b))));
-            },
-        });
-    }));
+function runObserve(f) {
+    return (fx) => (0, Function_1.pipe)(Deferred.make(), Effect.tap((deferred) => Effect.forkScoped(fx.run((0, Fx_js_1.Emitter)((0, Function_1.flow)(f, Effect.foldCauseEffect((c) => deferred.failCauseSync(c), () => Effect.unit)), (c) => deferred.failCauseSync(c), deferred.succeed(undefined))))), Effect.flatMap((deferred) => deferred.await), Effect.scoped);
 }
-exports.takeUntil = takeUntil;
-//# sourceMappingURL=takeUntil.js.map
+exports.runObserve = runObserve;
+//# sourceMappingURL=runObserve.js.map

package/cjs/runObserve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runObserve.js","sourceRoot":"","sources":["../src/runObserve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAoD;AACpD,+DAAgD;AAChD,mDAAiD;AAEjD,mCAAqC;AAErC,SAAgB,UAAU,CAAe,CAAqC;IAC5E,OAAO,CAAO,EAAe,EAAuC,EAAE,CACpE,IAAA,eAAI,EACF,QAAQ,CAAC,IAAI,EAAgB,EAC7B,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CACtB,MAAM,CAAC,UAAU,CACf,EAAE,CAAC,GAAG,CACJ,IAAA,eAAO,EACL,IAAA,eAAI,EACF,CAAC,EACD,MAAM,CAAC,eAAe,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAChC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAClB,CACF,EACD,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,EAChC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAC5B,CACF,CACF,CACF,EACD,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC5C,MAAM,CAAC,MAAM,CACd,CAAA;AACL,CAAC;AAxBD,gCAwBC"}