@typed/fx 0.0.3 → 0.0.6

package/cjs/Semaphore/Semaphore.js.map

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

package/cjs/Service/Id.d.ts

@@ -25,13 +25,24 @@ export declare class Id {
         readonly id: () => Service<any>;
         new (...args: any): any;
     }>(this: S): RIO<InstanceOf<S>, InstanceOf<S>>;
+    /**
+     * Retrieve this service at Runtime, requiring it from the given Environment.
+     */
+    static with<S extends {
+        readonly id: () => Service<any>;
+        new (...args: any): any;
+    }, R2, E2, B>(this: S, f: (s: InstanceOf<S>) => Fx<R2, E2, B>): Fx<R2 | InstanceOf<S>, E2, B>;
     /**
      * Construct a Layer that provides this service.
      */
     static layer<S extends {
         readonly id: () => Service<any>;
         new (...args: any): any;
-    }, R, E>(this: S, provider: Fx<R | Scope, E, InstanceOf<S>>): Layer.Layer<R, E, InstanceOf<S>>;
+    }, R, E>(this: S, provider: Fx<R, E, InstanceOf<S>> | Fx<R | Scope, E, InstanceOf<S>>): Layer.Layer<R, E, InstanceOf<S>>;
+    static layerOf<S extends {
+        readonly id: () => Service<any>;
+        new (...args: any): any;
+    }>(this: S, ...args: ConstructorParameters<S>): Layer.Layer<never, never, InstanceOf<S>>;
 }
 /**
  * Helper for constructing IDs that are tied to a particular object, which much have

package/cjs/Service/Id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Id.d.ts","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAO,oBAAkB;AACzC,OAAO,KAAK,KAAK,0BAAwB;AACzC,OAAO,EAAE,KAAK,EAAE,0BAAwB;AAIxC,oBAAY,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAE3E;;GAEG;AACH,qBAAa,EAAE;IACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAwB;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAK/E,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiC;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG,CACR,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAI7C;;OAEG;IACH,MAAM,CAAC,KAAK,CACV,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,CAAC,EACD,CAAC,EACD,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAGxF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAU/F"}
+{"version":3,"file":"Id.d.ts","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,EAAE,EAAE,GAAG,EAA0B,oBAAkB;AAC5D,OAAO,KAAK,KAAK,0BAAwB;AACzC,OAAO,EAAE,KAAK,EAAE,0BAAwB;AAIxC,oBAAY,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;AAE3E;;GAEG;AACH,qBAAa,EAAE;IACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAwB;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAK/E,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiC;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG,CACR,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAI7C;;OAEG;IACH,MAAM,CAAC,IAAI,CACT,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,EAAE,EACF,EAAE,EACF,CAAC,EACD,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAIjF;;OAEG;IACH,MAAM,CAAC,KAAK,CACV,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,CAAC,EACD,CAAC,EAED,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,GAClE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAInC,MAAM,CAAC,OAAO,CACZ,CAAC,SAAS;QACR,QAAQ,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,KAAK,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,CAAA;KACxB,EACD,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAMxF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAU/F"}

package/cjs/Service/Id.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCachedId = exports.Id = void 0;
+const function_1 = require("hkt-ts/function");
 const Service_js_1 = require("./Service.js");
 const Fx_js_1 = require("../Fx/Fx.js");
 const Layer = __importStar(require("../Layer/Layer.js"));
@@ -48,7 +49,13 @@ class Id {
      * Retrieve this service at Runtime, requiring it from the given Environment.
      */
     static ask() {
-        return (0, Fx_js_1.ask)(this.id(), "ask" + " node_modules/@typed/fx/src/Service/Id.ts:39:15");
+        return (0, Fx_js_1.ask)(this.id(), "ask" + " node_modules/@typed/fx/src/Service/Id.ts:41:15");
+    }
+    /**
+     * Retrieve this service at Runtime, requiring it from the given Environment.
+     */
+    static with(f) {
+        return (0, function_1.pipe)((0, Fx_js_1.ask)(this.id()), (0, Fx_js_1.flatMap)(f));
     }
     /**
      * Construct a Layer that provides this service.
@@ -56,6 +63,9 @@ class Id {
     static layer(provider) {
         return Layer.fromFx(this.id(), provider);
     }
+    static layerOf(...args) {
+        return Layer.fromFx(this.id(), (0, Fx_js_1.fromLazy)(() => new this(...args)));
+    }
 }
 exports.Id = Id;
 /**

package/cjs/Service/Id.js.map

@@ -1 +1 @@
-{"version":3,"file":"Id.js","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsC;AAEtC,uCAAyC;AACzC,yDAAyC;AAGzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAwB,CAAA;AAInD;;GAEG;AACH,MAAa,EAAE;IACJ,IAAI,GAAW,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QACP,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,yCAAyC;IAChC,EAAE,GAAmB,IAAI,CAAC,WAAmB,CAAC,EAAE,EAAE,CAAA;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG;QAMR,OAAO,IAAA,WAAG,EAAC,IAAI,CAAC,EAAE,EAAE,4DAAC,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAOD,QAAyC;QAClD,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;CACF;AAzCD,gBAyCC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,WAAW,CAAsC,GAAM;IACrE,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAA2B,CAAA;KAClD;IAED,MAAM,CAAC,GAAG,IAAA,oBAAO,EAAgB,GAAG,CAAC,IAAI,CAAC,CAAA;IAE1C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,CAAA;AACV,CAAC;AAVD,kCAUC"}
+{"version":3,"file":"Id.js","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsC;AAEtC,6CAAsC;AAEtC,uCAA4D;AAC5D,yDAAyC;AAGzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAwB,CAAA;AAInD;;GAEG;AACH,MAAa,EAAE;IACJ,IAAI,GAAW,IAAI,CAAC,WAAW,CAAC,IAAI,CAAA;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QACP,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,yCAAyC;IAChC,EAAE,GAAmB,IAAI,CAAC,WAAmB,CAAC,EAAE,EAAE,CAAA;IAE3D;;OAEG;IACH,MAAM,CAAC,GAAG;QAMR,OAAO,IAAA,WAAG,EAAC,IAAI,CAAC,EAAE,EAAE,4DAAC,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAQA,CAAsC;QAC/C,OAAO,IAAA,eAAI,EAAC,IAAA,WAAG,EAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,IAAA,eAAO,EAAC,CAAC,CAAC,CAAC,CAAA;IACzC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CASV,QAAmE;QAEnE,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM,CAAC,OAAO,CAKH,GAAG,IAA8B;QAC1C,OAAO,KAAK,CAAC,MAAM,CACjB,IAAI,CAAC,EAAE,EAAE,EACT,IAAA,gBAAQ,EAAC,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,GAAI,IAAY,CAAC,CAAC,CAC3C,CAAA;IACH,CAAC;CACF;AAvED,gBAuEC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,WAAW,CAAsC,GAAM;IACrE,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAA2B,CAAA;KAClD;IAED,MAAM,CAAC,GAAG,IAAA,oBAAO,EAAgB,GAAG,CAAC,IAAI,CAAC,CAAA;IAE1C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,CAAA;AACV,CAAC;AAVD,kCAUC"}

package/cjs/Service/fn.d.ts

@@ -0,0 +1,47 @@
+import { ArgsOf } from 'hkt-ts';
+import { Id, InstanceOf } from './Id.js';
+import { Service } from './Service.js';
+import type { AnyFx, ErrorsOf, Fx, OutputOf, ResourcesOf } from "../Fx/Fx.js";
+export declare const fn: <F extends (...args: any) => AnyFx>() => <ServiceName extends string>(name: ServiceName) => {
+    new (f: F): {
+        readonly f: F;
+        readonly tag: ServiceName;
+        readonly name: string;
+        readonly id: Service<any>;
+    };
+    apply<T extends {
+        new (...args: any): {
+            readonly f: F;
+        };
+        readonly id: () => Service<any>;
+    } & {
+        readonly with: (typeof Id)['with'];
+    }>(this: T, ...args: ArgsOf<F>): Fx<InstanceOf<T> | ResourcesOf<ReturnType<F>>, ErrorsOf<ReturnType<F>>, OutputOf<ReturnType<F>>>;
+    make<T_1 extends {
+        new (...args: any): {
+            readonly f: F;
+        };
+        readonly id: () => Service<any>;
+    }>(this: T_1, fn: F): InstanceOf<T_1>;
+    tag: ServiceName;
+    id<S extends {
+        readonly name: string;
+    }>(this: S): Service<InstanceOf<S>>;
+    ask<S_1 extends {
+        new (...args: any): any;
+        readonly id: () => Service<any>;
+    }>(this: S_1): import("../Fx/Fx.js").RIO<InstanceOf<S_1>, InstanceOf<S_1>>;
+    with<S_2 extends {
+        new (...args: any): any;
+        readonly id: () => Service<any>;
+    }, R2, E2, B>(this: S_2, f: (s: InstanceOf<S_2>) => Fx<R2, E2, B>): Fx<R2 | InstanceOf<S_2>, E2, B>;
+    layer<S_3 extends {
+        new (...args: any): any;
+        readonly id: () => Service<any>;
+    }, R, E>(this: S_3, provider: Fx<R, E, InstanceOf<S_3>> | Fx<import("../Scope/Scope.js").Scope | R, E, InstanceOf<S_3>>): import("../Layer/Layer.js").Layer<R, E, InstanceOf<S_3>>;
+    layerOf<S_4 extends {
+        new (...args: any): any;
+        readonly id: () => Service<any>;
+    }>(this: S_4, ...args: ConstructorParameters<S_4>): import("../Layer/Layer.js").Layer<never, never, InstanceOf<S_4>>;
+};
+//# sourceMappingURL=fn.d.ts.map

package/cjs/Service/fn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../src/Service/fn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,oBAAkB;AAE5E,eAAO,MAAM,EAAE,uBACQ,GAAG;;;;;;;;sBAUF,GAAG;;;qBADJ,MAAM,QAAQ,GAAG,CAAC;;uBAEZ,CAAA,SAAS,EAAC,MAAM,CAAC;;;sBAetB,GAAG;;;qBADJ,MAAM,QAAQ,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;CAMpC,CAAA"}

package/cjs/Service/fn.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fn = void 0;
+const tagged_js_1 = require("./tagged.js");
+const fn = () => (name) => class Fn extends (0, tagged_js_1.tagged)(name) {
+    f;
+    constructor(f) {
+        super();
+        this.f = f;
+    }
+    static apply(...args) {
+        return this.with((s) => s.f(...args));
+    }
+    static make(fn) {
+        return new this(fn);
+    }
+};
+exports.fn = fn;
+//# sourceMappingURL=fn.js.map

package/cjs/Service/fn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fn.js","sourceRoot":"","sources":["../../src/Service/fn.ts"],"names":[],"mappings":";;;AAIA,2CAAoC;AAI7B,MAAM,EAAE,GACb,GAAsC,EAAE,CACxC,CAA6B,IAAiB,EAAE,EAAE,CAChD,MAAM,EAAG,SAAQ,IAAA,kBAAM,EAAC,IAAI,CAAC;IACN;IAArB,YAAqB,CAAI;QACvB,KAAK,EAAE,CAAA;QADY,MAAC,GAAD,CAAC,CAAG;IAEzB,CAAC;IAED,MAAM,CAAC,KAAK,CAOV,GAAG,IAAe;QAMlB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAI,IAAY,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,IAAI,CAKA,EAAK;QACd,OAAO,IAAI,IAAI,CAAC,EAAE,CAAkB,CAAA;IACtC,CAAC;CACF,CAAA;AAhCQ,QAAA,EAAE,MAgCV"}

package/cjs/Service/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Service.js';
 export * from './Id.js';
 export * from './tagged.js';
+export * from './fn.js';
 //# sourceMappingURL=index.d.ts.map

package/cjs/Service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Service/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Service/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA"}

package/cjs/Service/index.js

@@ -17,4 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Service.js"), exports);
 __exportStar(require("./Id.js"), exports);
 __exportStar(require("./tagged.js"), exports);
+__exportStar(require("./fn.js"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/Service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,0CAAuB;AACvB,8CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,0CAAuB;AACvB,8CAA2B;AAC3B,0CAAuB"}

package/cjs/Service/tagged.d.ts

@@ -15,9 +15,17 @@ export declare const tagged: <Tag extends string>(tag: Tag) => {
         new (...args: any): any;
         readonly id: () => import("./Service.js").Service<any>;
     }>(this: S_1): import("../index.js").RIO<import("./Id.js").InstanceOf<S_1>, import("./Id.js").InstanceOf<S_1>>;
-    layer<S_2 extends {
+    with<S_2 extends {
         new (...args: any): any;
         readonly id: () => import("./Service.js").Service<any>;
-    }, R, E>(this: S_2, provider: import("../Fx/Fx.js").Fx<import("../Scope/Scope.js").Scope | R, E, import("./Id.js").InstanceOf<S_2>>): import("../Layer/Layer.js").Layer<R, E, import("./Id.js").InstanceOf<S_2>>;
+    }, R2, E2, B>(this: S_2, f: (s: import("./Id.js").InstanceOf<S_2>) => import("../Fx/Fx.js").Fx<R2, E2, B>): import("../Fx/Fx.js").Fx<R2 | import("./Id.js").InstanceOf<S_2>, E2, B>;
+    layer<S_3 extends {
+        new (...args: any): any;
+        readonly id: () => import("./Service.js").Service<any>;
+    }, R, E>(this: S_3, provider: import("../Fx/Fx.js").Fx<R, E, import("./Id.js").InstanceOf<S_3>> | import("../Fx/Fx.js").Fx<import("../Scope/Scope.js").Scope | R, E, import("./Id.js").InstanceOf<S_3>>): import("../Layer/Layer.js").Layer<R, E, import("./Id.js").InstanceOf<S_3>>;
+    layerOf<S_4 extends {
+        new (...args: any): any;
+        readonly id: () => import("./Service.js").Service<any>;
+    }>(this: S_4, ...args: ConstructorParameters<S_4>): import("../Layer/Layer.js").Layer<never, never, import("./Id.js").InstanceOf<S_4>>;
 };
 //# sourceMappingURL=tagged.d.ts.map

package/cjs/Service/tagged.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tagged.d.ts","sourceRoot":"","sources":["../../src/Service/tagged.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;CAIhB,CAAA"}
+{"version":3,"file":"tagged.d.ts","sourceRoot":"","sources":["../../src/Service/tagged.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CAIhB,CAAA"}

package/cjs/Sink/Sink.d.ts

@@ -1,10 +1,10 @@
 import { Cause } from "../Cause/Cause.js";
 import { Fx, IO } from "../Fx/Fx.js";
 import { Closeable } from "../Scope/Closeable.js";
-export interface Sink<E, A> {
-    readonly event: (a: A) => IO<E, any>;
-    readonly error: (cause: Cause<E>) => IO<E, any>;
-    readonly end: IO<E, any>;
+export interface Sink<in E, in A, out E2 = never> {
+    readonly event: (a: A) => IO<E2, any>;
+    readonly error: (cause: Cause<E>) => IO<E2, any>;
+    readonly end: IO<E2, any>;
 }
 export declare class Drain<E, A> implements Sink<E, A> {
     readonly scope: Closeable;
@@ -18,5 +18,6 @@ export interface SinkFx<E, A, R2 = never, E2 = never, R3 = never, E3 = never, R4
     readonly error?: (cause: Cause<E>) => Fx<R3, E3, any>;
     readonly end?: Fx<R4, E4, any>;
 }
-export declare function makeDrain<E, A, R2 = never, E2 = never, R3 = never, E3 = never, R4 = never, E4 = never>(scope: Closeable, fx: SinkFx<E, A, R2, E2, R3, E3, R4, E4>): Fx<R2 | R3 | R4, never, Sink<E | E2 | E3 | E4, A>>;
+export declare function makeDrain<E, A, R2 = never, E2 = never, R3 = never, E3 = never, R4 = never, E4 = never>(scope: Closeable, fx: SinkFx<E, A, R2, E2, R3, E3, R4, E4>): Fx<R2 | R3 | R4, never, Sink<E, A, E2 | E3 | E4>>;
+export declare function addTrace<E, A, E2>(sink: Sink<E, A, E2>, trace?: string): Sink<E, A, E2>;
 //# sourceMappingURL=Sink.d.ts.map

package/cjs/Sink/Sink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sink.d.ts","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,0BAAwB;AACxC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAyB,oBAAkB;AAC1D,OAAO,EAAE,SAAS,EAAE,8BAA4B;AAEhD,MAAM,WAAW,IAAI,CAAC,CAAC,EAAE,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACpC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IAC/C,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;CACzB;AAED,qBAAa,KAAK,CAAC,CAAC,EAAE,CAAC,CAAE,YAAW,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS;gBAAhB,KAAK,EAAE,SAAS;IAErC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAA2B;IAC9D,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAyD;IAC5F,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAmD;CACnF;AAED,MAAM,WAAW,MAAM,CACrB,CAAC,EACD,CAAC,EACD,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK;IAEV,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAC1C,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrD,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;CAC/B;AAED,wBAAgB,SAAS,CACvB,CAAC,EACD,CAAC,EACD,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EAEV,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GACvC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAgBpD"}
+{"version":3,"file":"Sink.d.ts","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,0BAAwB;AACxC,OAAO,EAAE,EAAE,EAAE,EAAE,EAA4D,oBAAkB;AAC7F,OAAO,EAAE,SAAS,EAAE,8BAA4B;AAEhD,MAAM,WAAW,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK;IAC9C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IACrC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAChD,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;CAC1B;AAED,qBAAa,KAAK,CAAC,CAAC,EAAE,CAAC,CAAE,YAAW,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS;gBAAhB,KAAK,EAAE,SAAS;IAErC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAa;IAChD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAA2C;IAC9E,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAqC;CACrE;AAED,MAAM,WAAW,MAAM,CACrB,CAAC,EACD,CAAC,EACD,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK;IAEV,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IAC1C,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;IACrD,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;CAC/B;AAED,wBAAgB,SAAS,CACvB,CAAC,EACD,CAAC,EACD,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EAEV,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GACvC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CA8BnD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAQvF"}

package/cjs/Sink/Sink.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDrain = exports.Drain = void 0;
+exports.addTrace = exports.makeDrain = exports.Drain = void 0;
 const hkt_ts_1 = require("hkt-ts");
 const Either_1 = require("hkt-ts/Either");
 const Fx_js_1 = require("../Fx/Fx.js");
@@ -15,17 +15,31 @@ class Drain {
 }
 exports.Drain = Drain;
 function makeDrain(scope, fx) {
-    return (0, Fx_js_1.Fx)(function* () {
-        const env = yield* (0, Fx_js_1.getEnv)();
+    return (0, Fx_js_1.access)((env) => (0, Fx_js_1.fromLazy)(() => {
         const drain = new Drain(scope);
-        // TODO: Should drain always be called for error + end?
         const sink = {
-            event: (fx.event ? (0, hkt_ts_1.flow)(fx.event, (0, Fx_js_1.provide)(env)) : drain.event),
-            error: (fx.error ? (0, hkt_ts_1.flow)(fx.error, (0, Fx_js_1.provide)(env)) : drain.error),
-            end: (fx.end ? (0, hkt_ts_1.pipe)(fx.end, (0, Fx_js_1.provide)(env)) : drain.end),
+            event: fx.event ? (0, hkt_ts_1.flow)(fx.event, (0, Fx_js_1.provide)(env)) : drain.event,
+            error: fx.error
+                ? (a) => (0, hkt_ts_1.pipe)(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                fx.error(a), (0, Fx_js_1.provide)(env), (0, Fx_js_1.flatMap)(() => drain.error(a)))
+                : drain.error,
+            end: fx.end
+                ? (0, hkt_ts_1.pipe)(fx.end, (0, Fx_js_1.provide)(env), (0, Fx_js_1.flatMap)(() => drain.end))
+                : drain.end,
         };
         return sink;
-    }, "Fx" + " node_modules/@typed/fx/src/Sink/Sink.ts:50:12");
+    }), "access" + " node_modules/@typed/fx/src/Sink/Sink.ts:50:16");
 }
 exports.makeDrain = makeDrain;
+function addTrace(sink, trace) {
+    if (trace === undefined)
+        return sink;
+    return {
+        event: (0, hkt_ts_1.flow)(sink.event, (0, Fx_js_1.addCustomTrace)(trace)),
+        error: (0, hkt_ts_1.flow)(sink.error, (0, Fx_js_1.addCustomTrace)(trace)),
+        end: (0, hkt_ts_1.pipe)(sink.end, (0, Fx_js_1.addCustomTrace)(trace)),
+    };
+}
+exports.addTrace = addTrace;
 //# sourceMappingURL=Sink.js.map

package/cjs/Sink/Sink.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sink.js","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,0CAA2C;AAG3C,uCAA0D;AAS1D,MAAa,KAAK;IACK;IAArB,YAAqB,KAAgB;QAAhB,UAAK,GAAL,KAAK,CAAW;IAAG,CAAC;IAEhC,KAAK,GAAwB,GAAG,EAAE,CAAC,YAAkB,CAAA;IACrD,KAAK,GAAwB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAA,aAAI,EAAC,KAAK,CAAC,CAAe,CAAA;IACnF,GAAG,GAAsB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAA,cAAK,EAAC,SAAS,CAAC,CAAe,CAAA;CACnF;AAND,sBAMC;AAiBD,SAAgB,SAAS,CAUvB,KAAgB,EAChB,EAAwC;IAExC,OAAO,IAAA,UAAE,EAAC,QAAQ,CAAC;QACjB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,IAAA,cAAM,GAAgB,CAAA;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAO,KAAK,CAAC,CAAA;QAIpC,uDAAuD;QACvD,MAAM,IAAI,GAAM;YACd,KAAK,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,aAAI,EAAC,EAAE,CAAC,KAAK,EAAE,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAe;YAC5E,KAAK,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,aAAI,EAAC,EAAE,CAAC,KAAK,EAAE,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAe;YAC5E,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,aAAI,EAAC,EAAE,CAAC,GAAG,EAAE,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAa;SACnE,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC,0DAAC,CAAA;AACJ,CAAC;AA5BD,8BA4BC"}
+{"version":3,"file":"Sink.js","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,0CAA2C;AAG3C,uCAA6F;AAS7F,MAAa,KAAK;IACK;IAArB,YAAqB,KAAgB;QAAhB,UAAK,GAAL,KAAK,CAAW;IAAG,CAAC;IAEhC,KAAK,GAAwB,GAAG,EAAE,CAAC,YAAI,CAAA;IACvC,KAAK,GAAwB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAA,aAAI,EAAC,KAAK,CAAC,CAAC,CAAA;IACrE,GAAG,GAAsB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC,CAAA;CACrE;AAND,sBAMC;AAiBD,SAAgB,SAAS,CAUvB,KAAgB,EAChB,EAAwC;IAExC,OAAO,IAAA,cAAM,EAAC,CAAC,GAAG,EAAE,EAAE,CACpB,IAAA,gBAAQ,EAAC,GAAG,EAAE;QACZ,MAAM,KAAK,GAAG,IAAI,KAAK,CAAO,KAAK,CAAC,CAAA;QAIpC,MAAM,IAAI,GAAM;YACd,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,aAAI,EAAC,EAAE,CAAC,KAAK,EAAE,IAAA,eAAO,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;YAC5D,KAAK,EAAE,EAAE,CAAC,KAAK;gBACb,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACJ,IAAA,aAAI;gBACF,oEAAoE;gBACpE,EAAE,CAAC,KAAM,CAAC,CAAQ,CAAC,EACnB,IAAA,eAAO,EAAC,GAAG,CAAC,EACZ,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAC9B;gBACL,CAAC,CAAC,KAAK,CAAC,KAAK;YACf,GAAG,EAAE,EAAE,CAAC,GAAG;gBACT,CAAC,CAAC,IAAA,aAAI,EACF,EAAE,CAAC,GAAG,EACN,IAAA,eAAO,EAAC,GAAG,CAAC,EACZ,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CACzB;gBACH,CAAC,CAAC,KAAK,CAAC,GAAG;SACd,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,8DACH,CAAA;AACH,CAAC;AA1CD,8BA0CC;AAED,SAAgB,QAAQ,CAAW,IAAoB,EAAE,KAAc;IACrE,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAA;IAEpC,OAAO;QACL,KAAK,EAAE,IAAA,aAAI,EAAC,IAAI,CAAC,KAAK,EAAE,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAC;QAC9C,KAAK,EAAE,IAAA,aAAI,EAAC,IAAI,CAAC,KAAK,EAAE,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAC;QAC9C,GAAG,EAAE,IAAA,aAAI,EAAC,IAAI,CAAC,GAAG,EAAE,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAC;KAC3C,CAAA;AACH,CAAC;AARD,4BAQC"}

package/cjs/Stream/Stream.d.ts

@@ -1,18 +1,46 @@
-import { Live } from "../Fiber/Fiber.js";
+import { Fiber } from "../Fiber/Fiber.js";
 import { FiberContext } from "../FiberContext/FiberContext.js";
+import { FiberId } from "../FiberId/FiberId.js";
 import * as Fx from "../Fx/Fx.js";
 import { Scheduler } from "../Scheduler/Scheduler.js";
 import { Sink } from "../Sink/Sink.js";
-export interface Stream<R, E, A> {
-    readonly fork: <E2>(sink: Sink<E | E2, A>, scheduler: Scheduler, context: FiberContext) => Fx.RIO<R, Live<E | E2, any>>;
+/**
+ * TODOS:
+ * - Loop
+ * - zipItems
+ * - withItems
+ * - concatMap
+ * - combine/combineArray
+ * - zip/zipArray
+ * - sample
+ * - snapshot
+ * - skipRepeats
+ * - slice/take/skip
+ * - takeWhile/skipWhile
+ * - takeUntil/skipUntil
+ * - takeAfter/skipAfter
+ * - since
+ * - during
+ * - until
+ * - delay
+ * - throttle
+ * - debounce
+ * - reduce
+ * - Fusion/Commutation
+ * - Unique Identification for streams to add to tracing
+ *    - How to build a dynamic stream graph?
+ */
+export interface Stream<out R = never, out E = never, out A = unknown> {
+    fork<E2 = never>(sink: Sink<E, A, E2>, scheduler: Scheduler, context: FiberContext<FiberId.Live>): Fx.RIO<R, Fiber<E2, any>>;
 }
+export declare type ResourcesOf<T> = T extends Stream<infer R, infer _, infer __> ? R : never;
+export declare type ErrorsOf<T> = T extends Stream<infer _, infer E, infer __> ? E : never;
+export declare type OutputOf<T> = T extends Stream<infer _, infer __, infer A> ? A : never;
 export interface RIO<R, A> extends Stream<R, never, A> {
 }
 export interface IO<E, A> extends Stream<never, E, A> {
 }
 export interface Of<A> extends Stream<never, never, A> {
 }
-export declare function Stream<R, E, A>(fork: Stream<R, E, A>['fork']): {
-    fork: <E2>(sink: Sink<E | E2, A>, scheduler: Scheduler, context: FiberContext) => Fx.RIO<R, Live<E | E2, any>>;
-};
+export declare function Stream<R, E, A>(fork: Stream<R, E, A>['fork']): Stream<R, E, A>;
 //# sourceMappingURL=Stream.d.ts.map

package/cjs/Stream/Stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stream.d.ts","sourceRoot":"","sources":["../../src/Stream/Stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,0BAAwB;AACvC,OAAO,EAAE,YAAY,EAAE,wCAAsC;AAC7D,OAAO,KAAK,EAAE,oBAAkB;AAChC,OAAO,EAAE,SAAS,EAAE,kCAAgC;AACpD,OAAO,EAAE,IAAI,EAAE,wBAAsB;AAErC,MAAM,WAAW,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAChB,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EACrB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,KAClB,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;CAClC;AAED,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;CAAG;AACzD,MAAM,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG;AACxD,MAAM,WAAW,EAAE,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;CAAG;AAEzD,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;;EAE5D"}
+{"version":3,"file":"Stream.d.ts","sourceRoot":"","sources":["../../src/Stream/Stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,0BAAwB;AACxC,OAAO,EAAE,YAAY,EAAE,wCAAsC;AAC7D,OAAO,EAAE,OAAO,EAAE,8BAA4B;AAC9C,OAAO,KAAK,EAAE,oBAAkB;AAChC,OAAO,EAAE,SAAS,EAAE,kCAAgC;AACpD,OAAO,EAAE,IAAI,EAAE,wBAAsB;AAErC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,MAAM,WAAW,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,GAAG,OAAO;IACnE,IAAI,CAAC,EAAE,GAAG,KAAK,EACb,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAClC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;CAC7B;AAGD,oBAAY,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AACrF,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAClF,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAGlF,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;CAAG;AACzD,MAAM,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;CAAG;AACxD,MAAM,WAAW,EAAE,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;CAAG;AAEzD,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAE9E"}

package/cjs/Stream/Stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"Stream.js","sourceRoot":"","sources":["../../src/Stream/Stream.ts"],"names":[],"mappings":";;;AAkBA,SAAgB,MAAM,CAAU,IAA6B;IAC3D,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"Stream.js","sourceRoot":"","sources":["../../src/Stream/Stream.ts"],"names":[],"mappings":";;;AAoDA,SAAgB,MAAM,CAAU,IAA6B;IAC3D,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC;AAFD,wBAEC"}

package/cjs/Stream/acquirePermit.d.ts

@@ -0,0 +1,15 @@
+import { Stream } from './Stream.js';
+import { FiberContext } from "../FiberContext/FiberContext.js";
+import { Live } from "../FiberId/FiberId.js";
+import * as Fx from "../Fx/Fx.js";
+import { Scheduler } from "../Scheduler/index.js";
+import * as Semaphore from "../Semaphore/index.js";
+import { Sink } from "../Sink/Sink.js";
+export declare function acquirePermit(semaphore: Semaphore.Semaphore): <R, E, A>(stream: Stream<R, E, A>) => Stream<R, E, A>;
+export declare class AcquirePermitStream<R, E, A> implements Stream<R, E, A> {
+    readonly stream: Stream<R, E, A>;
+    readonly semaphore: Semaphore.Semaphore;
+    constructor(stream: Stream<R, E, A>, semaphore: Semaphore.Semaphore);
+    fork: <E2>(sink: Sink<E, A, E2>, scheduler: Scheduler, context: FiberContext<Live>) => Fx.Fx<R, never, import("../Fiber/Fiber.js").Fiber<E2, any>>;
+}
+//# sourceMappingURL=acquirePermit.d.ts.map

package/cjs/Stream/acquirePermit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acquirePermit.d.ts","sourceRoot":"","sources":["../../src/Stream/acquirePermit.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,YAAY,EAAE,wCAAsC;AAC7D,OAAO,EAAE,IAAI,EAAE,8BAA4B;AAC3C,OAAO,KAAK,EAAE,oBAAkB;AAChC,OAAO,EAAE,SAAS,EAAE,8BAA4B;AAChD,OAAO,KAAK,SAAS,8BAA4B;AACjD,OAAO,EAAE,IAAI,EAAE,wBAAsB;AAErC,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,yDAG3D;AAED,qBAAa,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAAE,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS;gBAAhE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAW,SAAS,EAAE,SAAS,CAAC,SAAS;IAErF,IAAI,wCAAyC,SAAS,WAAW,aAAa,IAAI,CAAC,iEAWhF;CACJ"}

package/cjs/Stream/acquirePermit.js

@@ -0,0 +1,43 @@
+"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.AcquirePermitStream = exports.acquirePermit = void 0;
+const function_1 = require("hkt-ts/function");
+const Fx = __importStar(require("../Fx/Fx.js"));
+function acquirePermit(semaphore) {
+    return (stream) => new AcquirePermitStream(stream, semaphore);
+}
+exports.acquirePermit = acquirePermit;
+class AcquirePermitStream {
+    stream;
+    semaphore;
+    constructor(stream, semaphore) {
+        this.stream = stream;
+        this.semaphore = semaphore;
+    }
+    fork = (sink, scheduler, context) => (0, function_1.pipe)(this.semaphore.prepare, Fx.flatMap(({ acquire, release }) => (0, function_1.pipe)(acquire, Fx.uninterruptable, Fx.tapLazy(() => context.scope.ensuring(() => release)), Fx.flatMap(() => this.stream.fork(sink, scheduler, context)))));
+}
+exports.AcquirePermitStream = AcquirePermitStream;
+//# sourceMappingURL=acquirePermit.js.map

package/cjs/Stream/acquirePermit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acquirePermit.js","sourceRoot":"","sources":["../../src/Stream/acquirePermit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsC;AAMtC,gDAAgC;AAKhC,SAAgB,aAAa,CAAC,SAA8B;IAC1D,OAAO,CAAU,MAAuB,EAAmB,EAAE,CAC3D,IAAI,mBAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AAC9C,CAAC;AAHD,sCAGC;AAED,MAAa,mBAAmB;IACT;IAAkC;IAAvD,YAAqB,MAAuB,EAAW,SAA8B;QAAhE,WAAM,GAAN,MAAM,CAAiB;QAAW,cAAS,GAAT,SAAS,CAAqB;IAAG,CAAC;IAEzF,IAAI,GAAG,CAAK,IAAoB,EAAE,SAAoB,EAAE,OAA2B,EAAE,EAAE,CACrF,IAAA,eAAI,EACF,IAAI,CAAC,SAAS,CAAC,OAAO,EACtB,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAClC,IAAA,eAAI,EACF,OAAO,EACP,EAAE,CAAC,eAAe,EAClB,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,EACvD,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAC7D,CACF,CACF,CAAA;CACJ;AAfD,kDAeC"}

package/cjs/Stream/bimap.d.ts

@@ -0,0 +1,16 @@
+import { Stream } from './Stream.js';
+import { FiberContext } from "../FiberContext/FiberContext.js";
+import { Live } from "../FiberId/FiberId.js";
+import { Scheduler } from "../Scheduler/Scheduler.js";
+import { Sink } from "../Sink/Sink.js";
+export declare function bimap<A, B, C, D>(f: (a: A) => B, g: (c: C) => D, __trace?: string): <R>(stream: Stream<R, A, C>) => Stream<R, B, D>;
+export declare class BimapStream<R, A, B, C, D> implements Stream<R, B, D> {
+    readonly stream: Stream<R, A, C>;
+    readonly f: (a: A) => B;
+    readonly g: (c: C) => D;
+    readonly __trace?: string | undefined;
+    constructor(stream: Stream<R, A, C>, f: (a: A) => B, g: (c: C) => D, __trace?: string | undefined);
+    fork: <E>(sink: Sink<B, D, E>, scheduler: Scheduler, context: FiberContext<Live>) => import("../index.js").RIO<R, import("../Fiber/Fiber.js").Fiber<E, any>>;
+    static make<R, A, B, C, D>(stream: Stream<R, A, C>, f: (a: A) => B, g: (c: C) => D, __trace?: string): Stream<R, B, D>;
+}
+//# sourceMappingURL=bimap.d.ts.map

package/cjs/Stream/bimap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bimap.d.ts","sourceRoot":"","sources":["../../src/Stream/bimap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAIpC,OAAO,EAAE,YAAY,EAAE,wCAAsC;AAC7D,OAAO,EAAE,IAAI,EAAE,8BAA4B;AAC3C,OAAO,EAAE,SAAS,EAAE,kCAAgC;AACpD,OAAO,EAAE,IAAI,EAAE,wBAAsB;AAErC,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAC9B,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,OAAO,CAAC,EAAE,MAAM,GACf,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAEjD;AAED,qBAAa,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAE9D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;IACvB,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC;gBAHR,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACvB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,OAAO,CAAC,oBAAQ;IAG3B,IAAI,sCAAuC,SAAS,WAAW,aAAa,IAAI,CAAC,6EAMhF;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EACvB,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACvB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EACd,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAWnB"}

package/cjs/Stream/bimap.js

@@ -0,0 +1,76 @@
+"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.BimapStream = exports.bimap = void 0;
+const function_1 = require("hkt-ts/function");
+const map_js_1 = require("./map.js");
+const Cause = __importStar(require("../Cause/index.js"));
+function bimap(f, g, __trace) {
+    return (stream) => BimapStream.make(stream, f, g, __trace);
+}
+exports.bimap = bimap;
+class BimapStream {
+    stream;
+    f;
+    g;
+    __trace;
+    constructor(stream, f, g, __trace) {
+        this.stream = stream;
+        this.f = f;
+        this.g = g;
+        this.__trace = __trace;
+    }
+    fork = (sink, scheduler, context) => {
+        return this.stream.fork(new BimapSink(sink, scheduler, context, this.f, this.g), scheduler, context);
+    };
+    static make(stream, f, g, __trace) {
+        if (stream instanceof map_js_1.MapStream) {
+            return BimapStream.make(stream.stream, f, (0, function_1.flow)(stream.f, g), __trace);
+        }
+        if (stream instanceof BimapStream) {
+            return BimapStream.make(stream.stream, (0, function_1.flow)(stream.f, f), (0, function_1.flow)(stream.g, g), __trace);
+        }
+        return new BimapStream(stream, f, g, __trace);
+    }
+}
+exports.BimapStream = BimapStream;
+class BimapSink {
+    sink;
+    scheduler;
+    context;
+    f;
+    g;
+    constructor(sink, scheduler, context, f, g) {
+        this.sink = sink;
+        this.scheduler = scheduler;
+        this.context = context;
+        this.f = f;
+        this.g = g;
+    }
+    event = (0, function_1.flow)(this.g, this.sink.event);
+    error = (0, function_1.flow)(Cause.map(this.f), this.sink.error);
+    end = this.sink.end;
+}
+//# sourceMappingURL=bimap.js.map

package/cjs/Stream/bimap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bimap.js","sourceRoot":"","sources":["../../src/Stream/bimap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsC;AAGtC,qCAAoC;AAEpC,yDAAyC;AAMzC,SAAgB,KAAK,CACnB,CAAc,EACd,CAAc,EACd,OAAgB;IAEhB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAA;AAC5D,CAAC;AAND,sBAMC;AAED,MAAa,WAAW;IAEX;IACA;IACA;IACA;IAJX,YACW,MAAuB,EACvB,CAAc,EACd,CAAc,EACd,OAAgB;QAHhB,WAAM,GAAN,MAAM,CAAiB;QACvB,MAAC,GAAD,CAAC,CAAa;QACd,MAAC,GAAD,CAAC,CAAa;QACd,YAAO,GAAP,OAAO,CAAS;IACxB,CAAC;IAEJ,IAAI,GAAG,CAAI,IAAmB,EAAE,SAAoB,EAAE,OAA2B,EAAE,EAAE;QACnF,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,IAAI,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,EACvD,SAAS,EACT,OAAO,CACR,CAAA;IACH,CAAC,CAAA;IAED,MAAM,CAAC,IAAI,CACT,MAAuB,EACvB,CAAc,EACd,CAAc,EACd,OAAgB;QAEhB,IAAI,MAAM,YAAY,kBAAS,EAAE;YAC/B,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,IAAA,eAAI,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;SACtE;QAED,IAAI,MAAM,YAAY,WAAW,EAAE;YACjC,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAA,eAAI,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAA,eAAI,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;SACtF;QAED,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAA;IAC/C,CAAC;CACF;AAhCD,kCAgCC;AAED,MAAM,SAAS;IAEF;IACA;IACA;IACA;IACA;IALX,YACW,IAAmB,EACnB,SAAoB,EACpB,OAA2B,EAC3B,CAAc,EACd,CAAc;QAJd,SAAI,GAAJ,IAAI,CAAe;QACnB,cAAS,GAAT,SAAS,CAAW;QACpB,YAAO,GAAP,OAAO,CAAoB;QAC3B,MAAC,GAAD,CAAC,CAAa;QACd,MAAC,GAAD,CAAC,CAAa;IACtB,CAAC;IAEJ,KAAK,GAAG,IAAA,eAAI,EAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACrC,KAAK,GAAG,IAAA,eAAI,EAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAChD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;CACpB"}

package/cjs/Stream/continueWith.d.ts

@@ -0,0 +1,28 @@
+import { Stream } from './Stream.js';
+import { Env } from "../Env/Env.js";
+import { FiberContext } from "../FiberContext/FiberContext.js";
+import { FiberId } from "../FiberId/FiberId.js";
+import * as Fx from "../Fx/index.js";
+import { Scheduler } from "../Scheduler/Scheduler.js";
+import { Sink } from "../Sink/Sink.js";
+export declare function continueWith<R2, E2, B>(f: () => Stream<R2, E2, B>, __trace?: string): <R, E, A>(stream: Stream<R, E, A>) => Stream<R2 | R, E2 | E, B | A>;
+export declare const startWith: <B>(value: B, __trace?: string) => <R, E, A>(stream: Stream<R, E, A>) => Stream<R, E, B | A>;
+export declare class ContinueWith<R, E, A, R2, E2, B> implements Stream<R | R2, E | E2, A | B> {
+    readonly stream: Stream<R, E, A>;
+    readonly f: () => Stream<R2, E2, B>;
+    readonly __trace?: string | undefined;
+    constructor(stream: Stream<R, E, A>, f: () => Stream<R2, E2, B>, __trace?: string | undefined);
+    fork: <E3>(sink: Sink<E | E2, A | B, E3>, scheduler: Scheduler, context: FiberContext<FiberId.Live>) => Fx.Fx<R | R2, never, import("../Fiber/Fiber.js").Fiber<E3, any>>;
+}
+export declare class ContinueWithSink<R, E, A, R2, E2, B, E3> implements Sink<E | E2, A | B, E3> {
+    readonly sink: Sink<E | E2, A | B, E3>;
+    readonly scheduler: Scheduler;
+    readonly context: FiberContext<FiberId.Live>;
+    readonly env: Env<R | R2>;
+    readonly f: () => Stream<R2, E2, B>;
+    constructor(sink: Sink<E | E2, A | B, E3>, scheduler: Scheduler, context: FiberContext<FiberId.Live>, env: Env<R | R2>, f: () => Stream<R2, E2, B>);
+    event: (a: A | B) => Fx.IO<E3, any>;
+    error: (cause: import("../Cause/Cause.js").Cause<E | E2>) => Fx.IO<E3, any>;
+    end: Fx.IO<never, import("../Fiber/Fiber.js").Fiber<E3, any>>;
+}
+//# sourceMappingURL=continueWith.d.ts.map

package/cjs/Stream/continueWith.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"continueWith.d.ts","sourceRoot":"","sources":["../../src/Stream/continueWith.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGpC,OAAO,EAAE,GAAG,EAAE,sBAAoB;AAClC,OAAO,EAAE,YAAY,EAAE,wCAAsC;AAC7D,OAAO,EAAE,OAAO,EAAE,8BAA4B;AAC9C,OAAO,KAAK,EAAE,uBAAqB;AACnC,OAAO,EAAE,SAAS,EAAE,kCAAgC;AACpD,OAAO,EAAE,IAAI,EAAY,wBAAsB;AAE/C,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,uEAGnF;AAED,eAAO,MAAM,SAAS,0BACI,MAAM,8DAK3B,CAAA;AAEL,qBAAa,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;IAElF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAChC,QAAQ,CAAC,CAAC,EAAE,MAAM,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC;gBAFR,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACvB,CAAC,EAAE,MAAM,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAC1B,OAAO,CAAC,oBAAQ;IAG3B,IAAI,iDAES,SAAS,WACX,aAAa,QAAQ,IAAI,CAAC,sEASpC;CACF;AAED,qBAAa,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAE,YAAW,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;IAEpF,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS;IAC7B,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;IAC5C,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACzB,QAAQ,CAAC,CAAC,EAAE,MAAM,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAJ1B,IAAI,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAC7B,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EACnC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAChB,CAAC,EAAE,MAAM,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAGrC,KAAK,+BAAkB;IACvB,KAAK,uEAAkB;IACvB,GAAG,2DASF;CACF"}