@typed/fx 0.0.3 → 0.0.4

package/esm/Scope/ReleaseMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReleaseMap.d.ts","sourceRoot":"","sources":["../../src/Scope/ReleaseMap.ts"],"names":[],"mappings":"AAGA,OAAO,EAAQ,KAAK,EAAW,MAAM,cAAc,CAAA;AAGnD,OAAO,EAAE,IAAI,EAAE,wBAAsB;AACrC,OAAO,EACL,oBAAoB,EACpB,SAAS,EACT,YAAY,EAEb,kCAAgC;AACjC,OAAO,EAAM,EAAE,EAA8C,oBAAkB;AAI/E;;;GAGG;AACH,qBAAa,UAAU;IAGT,QAAQ,CAAC,QAAQ,EAAE,oBAAoB;IAFnD,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAY;gBAEzC,QAAQ,EAAE,oBAAoB;IAEnD,QAAQ,CAAC,OAAO,gBAAmC;IAEnD,QAAQ,CAAC,GAAG,cAAe,SAAS,KAAG,YAAY,CAMlD;IAED,QAAQ,CAAC,MAAM,QAAS,YAAY,KAAG,MAAM,SAAS,CAAC,CAUtD;IAED,QAAQ,CAAC,OAAO,QAAS,YAAY,QAAQ,KAAK,GAAG,EAAE,GAAG,CAAC,KAAG,GAAG,IAAI,CAAC,CAWnE;IAEH,QAAQ,CAAC,UAAU,SAAU,KAAK,GAAG,EAAE,GAAG,CAAC,KAAG,GAAG,IAAI,CAAC,CAgCrD;CACF"}
+{"version":3,"file":"ReleaseMap.d.ts","sourceRoot":"","sources":["../../src/Scope/ReleaseMap.ts"],"names":[],"mappings":"AAIA,OAAO,EAAQ,KAAK,EAAW,MAAM,cAAc,CAAA;AAInD,OAAO,KAAK,IAAI,wBAAsB;AACtC,OAAO,EACL,oBAAoB,EACpB,SAAS,EACT,YAAY,EAEb,kCAAgC;AACjC,OAAO,EAAM,EAAE,EAAgD,oBAAkB;AAOjF;;;GAGG;AACH,qBAAa,UAAU;IAGT,QAAQ,CAAC,QAAQ,EAAE,oBAAoB;IAFnD,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAY;gBAEzC,QAAQ,EAAE,oBAAoB;IAEnD,QAAQ,CAAC,OAAO,gBAAmC;IAEnD,QAAQ,CAAC,GAAG,cAAe,SAAS,KAAG,YAAY,CAMlD;IAED,QAAQ,CAAC,MAAM,QAAS,YAAY,KAAG,MAAM,SAAS,CAAC,CAUtD;IAED,QAAQ,CAAC,OAAO,QAAS,YAAY,QAAQ,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAAG,GAAG,IAAI,CAAC,CAWxE;IAEH,QAAQ,CAAC,UAAU,SAAU,KAAK,OAAO,KAAG,GAAG,KAAK,OAAO,CAAC,CA6C3D;CACF"}

package/esm/Scope/ReleaseMap.js

@@ -1,10 +1,15 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import * as A from 'hkt-ts/Array';
 import { Just, Nothing } from 'hkt-ts/Maybe';
+import { First } from 'hkt-ts/Typeclass/Associative';
 import { pipe } from 'hkt-ts/function';
+import * as Exit from "../Exit/Exit.js";
 import { FinalizerKey, finalizationStrategyToConcurrency, } from "../Finalizer/Finalizer.js";
-import { Fx, lazy, mapTo, unit, withConcurrency, zipAll } from "../Fx/Fx.js";
+import { Fx, attempt, lazy, unit, withConcurrency, zipAll } from "../Fx/Fx.js";
 let nextId = 0;
+const concatExitSeq = Exit.makeSequentialAssociative(First).concat;
+const concatExitPar = Exit.makeParallelAssociative(First).concat;
 /**
  * ReleaseMap is an underlying class utilizing in the implementation of Managed. It allows
  * tracking multiple Finalizers and closing them.
@@ -35,28 +40,37 @@ export class ReleaseMap {
             this.remove(key);
             return finalize;
         })
-        : unit, "lazy" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:50:9");
+        : unit, "lazy" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:55:9");
     releaseAll = (exit) => {
         const toBeReleased = () => Array.from(this.finalizers.keys())
             .reverse()
-            .map((key) => this.release(key, exit));
+            .map((key) => attempt(this.release(key, exit)));
         const isEmpty = () => this.isEmpty();
         if (this.strategy.strategy === 'Sequential') {
             return Fx(function* () {
+                const exits = [];
                 while (!isEmpty()) {
                     for (const fx of toBeReleased()) {
-                        yield* fx;
+                        exits.push(yield* fx);
                     }
                 }
-            }, "Fx" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:71:16");
+                if (A.isNonEmpty(exits)) {
+                    return exits.reduce(concatExitSeq, exit);
+                }
+                return exit;
+            }, "Fx" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:76:16");
         }
-        const releaseAll_ = () => pipe(zipAll(toBeReleased()), withConcurrency(finalizationStrategyToConcurrency(this.strategy)), mapTo(undefined));
+        const releaseAll_ = () => pipe(zipAll(toBeReleased()), withConcurrency(finalizationStrategyToConcurrency(this.strategy)));
         return Fx(function* () {
-            yield* releaseAll_();
+            const exits = [];
             while (!isEmpty()) {
-                yield* releaseAll_();
+                exits.push((yield* releaseAll_()).reduce(concatExitPar));
+            }
+            if (A.isNonEmpty(exits)) {
+                return exits.reduce(concatExitSeq, exit);
             }
-        }, "Fx" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:87:14");
+            return exit;
+        }, "Fx" + " node_modules/@typed/fx/src/Scope/ReleaseMap.ts:99:14");
     };
 }
 //# sourceMappingURL=ReleaseMap.js.map

package/esm/Scope/ReleaseMap.js.map

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

package/esm/Semaphore/Semaphore.d.ts

@@ -1,10 +1,11 @@
 import { NonNegativeInteger } from 'hkt-ts/number';
+import { AtomicCounter } from "../Atomic/AtomicCounter.js";
 import { MutableFutureQueue } from "../Future/MutableFutureQueue.js";
 import { Fx, Of } from "../Fx/Fx.js";
 export declare class Semaphore {
     readonly maxPermits: NonNegativeInteger;
     protected waiting: MutableFutureQueue<never, never, void>;
-    protected running: number;
+    protected running: AtomicCounter;
     constructor(maxPermits: NonNegativeInteger);
     get available(): NonNegativeInteger;
     get acquired(): NonNegativeInteger;

package/esm/Semaphore/Semaphore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Semaphore.d.ts","sourceRoot":"","sources":["../../src/Semaphore/Semaphore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAE,kBAAkB,EAAE,wCAAsC;AAEnE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAkB,oBAAkB;AAGnD,qBAAa,SAAS;IAIR,QAAQ,CAAC,UAAU,EAAE,kBAAkB;IAHnD,SAAS,CAAC,OAAO,yCAA2C;IAC5D,SAAS,CAAC,OAAO,SAAI;gBAEA,UAAU,EAAE,kBAAkB;IAGnD,IAAI,SAAS,IAAI,kBAAkB,CAElC;IAED,IAAI,QAAQ,IAAI,kBAAkB,CAEjC;IAED,QAAQ,CAAC,OAAO,kBAwBd;IAEF,SAAS,CAAC,OAAO,WAMf;CACH;AAED,qBAAa,WAAW;IACV,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;gBAA7C,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,EAAW,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;CACnE;AAED;;GAEG;AACH,qBAAa,IAAK,SAAQ,SAAS;;CAIlC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,sDAMjD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,SAAS,yFAS3C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,yFAShD"}
+{"version":3,"file":"Semaphore.d.ts","sourceRoot":"","sources":["../../src/Semaphore/Semaphore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,OAAO,EAAE,aAAa,EAAwB,mCAAiC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,wCAAsC;AAEnE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAgC,oBAAkB;AAGjE,qBAAa,SAAS;IAIR,QAAQ,CAAC,UAAU,EAAE,kBAAkB;IAHnD,SAAS,CAAC,OAAO,yCAA2C;IAC5D,SAAS,CAAC,OAAO,gBAAkB;gBAEd,UAAU,EAAE,kBAAkB;IAGnD,IAAI,SAAS,IAAI,kBAAkB,CAElC;IAED,IAAI,QAAQ,IAAI,kBAAkB,CAEjC;IAED,QAAQ,CAAC,OAAO,kBA2Bd;IAEF,SAAS,CAAC,OAAO,WAMf;CACH;AAED,qBAAa,WAAW;IACV,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;gBAA7C,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,EAAW,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;CACnE;AAED;;GAEG;AACH,qBAAa,IAAK,SAAQ,SAAS;;CAIlC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,sDAKjD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,SAAS,yFAO3C;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,yFAOhD"}

package/esm/Semaphore/Semaphore.js

@@ -1,44 +1,44 @@
-import { constant } from 'hkt-ts/function';
+import { constant, pipe } from 'hkt-ts/function';
 import { NonNegativeInteger } from 'hkt-ts/number';
+import { AtomicCounter, decrement, increment } from "../Atomic/AtomicCounter.js";
 import { MutableFutureQueue } from "../Future/MutableFutureQueue.js";
 import { wait } from "../Future/wait.js";
-import { Fx, fromLazy, unit } from "../Fx/Fx.js";
+import { flatMap, fromLazy, tap, unit } from "../Fx/Fx.js";
 import { fiberScoped, managed, scoped } from "../Fx/scoped.js";
 export class Semaphore {
     maxPermits;
     waiting = MutableFutureQueue();
-    running = 0;
+    running = AtomicCounter();
     constructor(maxPermits) {
         this.maxPermits = maxPermits;
     }
     // Retrieve the number of permits still available
     get available() {
-        return NonNegativeInteger(Math.max(0, this.maxPermits - this.running));
+        return NonNegativeInteger(Math.max(0, this.maxPermits - this.running.get()));
     }
     get acquired() {
-        return NonNegativeInteger(this.running);
+        return this.running.get();
     }
     prepare = fromLazy(() => {
         if (this.available > 0) {
             return new Acquisition(fromLazy(() => {
-                this.running++;
+                increment(this.running);
             }), this.release);
         }
         const [future] = this.waiting.waitFor(1);
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const that = this;
-        const acquisition = new Acquisition(Fx(function* () {
-            yield* wait(future);
-            that.running++;
-        }), this.release);
+        const acquisition = new Acquisition(pipe(wait(future), tap(() => fromLazy(() => {
+            increment(that.running);
+        }))), this.release);
         return acquisition;
-    }, "fromLazy" + " node_modules/@typed/fx/src/Semaphore/Semaphore.ts:24:30");
+    }, "fromLazy" + " node_modules/@typed/fx/src/Semaphore/Semaphore.ts:25:30");
     release = fromLazy(() => {
-        this.running = Math.max(0, this.running - 1);
+        decrement(this.running);
         if (this.waiting.size() > 0) {
             this.waiting.next(unit);
         }
-    }, "fromLazy" + " node_modules/@typed/fx/src/Semaphore/Semaphore.ts:50:31");
+    }, "fromLazy" + " node_modules/@typed/fx/src/Semaphore/Semaphore.ts:54:31");
 }
 export class Acquisition {
     acquire;
@@ -61,27 +61,18 @@ export class Lock extends Semaphore {
  * Must be used with Fx.scoped() to release the permit at the desired time.
  */
 export function acquirePermit(semaphore) {
-    return Fx(function* () {
-        const { acquire, release } = yield* semaphore.prepare;
-        return yield* managed(acquire, constant(release));
-    }, "Fx" + " node_modules/@typed/fx/src/Semaphore/Semaphore.ts:77:12");
+    return pipe(semaphore.prepare, flatMap(({ acquire, release }) => managed(acquire, constant(release))));
 }
 /**
  * Acquire a permit from a given semaphore, run an Fx, and then release the permit.
  */
 export function acquire(semaphore) {
-    return (fx) => scoped(Fx(function* () {
-        yield* acquirePermit(semaphore);
-        return yield* fx;
-    }));
+    return (fx) => pipe(acquirePermit(semaphore), flatMap(() => fx), scoped);
 }
 /**
  * Acquire a permit from a given semaphore, run an Fx, and then release the permit.
  */
 export function acquireFiber(semaphore) {
-    return (fx) => fiberScoped(Fx(function* () {
-        yield* acquirePermit(semaphore);
-        return yield* fx;
-    }));
+    return (fx) => pipe(acquirePermit(semaphore), flatMap(() => fx), fiberScoped);
 }
 //# sourceMappingURL=Semaphore.js.map

package/esm/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/esm/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/esm/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/esm/Service/Id.js

@@ -1,5 +1,6 @@
+import { pipe } from 'hkt-ts/function';
 import { Service } from './Service.js';
-import { ask } from "../Fx/Fx.js";
+import { ask, flatMap, fromLazy } from "../Fx/Fx.js";
 import * as Layer from "../Layer/Layer.js";
 const idCache = new WeakMap();
 /**
@@ -22,7 +23,13 @@ export class Id {
      * Retrieve this service at Runtime, requiring it from the given Environment.
      */
     static ask() {
-        return ask(this.id(), "ask" + " node_modules/@typed/fx/src/Service/Id.ts:39:15");
+        return 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 pipe(ask(this.id()), flatMap(f));
     }
     /**
      * Construct a Layer that provides this service.
@@ -30,6 +37,9 @@ export class Id {
     static layer(provider) {
         return Layer.fromFx(this.id(), provider);
     }
+    static layerOf(...args) {
+        return Layer.fromFx(this.id(), fromLazy(() => new this(...args)));
+    }
 }
 /**
  * Helper for constructing IDs that are tied to a particular object, which much have

package/esm/Service/Id.js.map

@@ -1 +1 @@
-{"version":3,"file":"Id.js","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAW,GAAG,EAAE,oBAAkB;AACzC,OAAO,KAAK,KAAK,0BAAwB;AAGzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAwB,CAAA;AAInD;;GAEG;AACH,MAAM,OAAO,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,GAAG,CAAC,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;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,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,OAAO,CAAgB,GAAG,CAAC,IAAI,CAAC,CAAA;IAE1C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,CAAA;AACV,CAAC"}
+{"version":3,"file":"Id.js","sourceRoot":"","sources":["../../src/Service/Id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAW,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,oBAAkB;AAC5D,OAAO,KAAK,KAAK,0BAAwB;AAGzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAwB,CAAA;AAInD;;GAEG;AACH,MAAM,OAAO,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,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,4DAAC,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,CAQA,CAAsC;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,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,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,CAAC,GAAI,IAAY,CAAC,CAAC,CAC3C,CAAA;IACH,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,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,OAAO,CAAgB,GAAG,CAAC,IAAI,CAAC,CAAA;IAE1C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAEnB,OAAO,CAAC,CAAA;AACV,CAAC"}

package/esm/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/esm/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/esm/Service/fn.js

@@ -0,0 +1,15 @@
+import { tagged } from './tagged.js';
+export const fn = () => (name) => class Fn extends 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);
+    }
+};
+//# sourceMappingURL=fn.js.map

package/esm/Service/fn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fn.js","sourceRoot":"","sources":["../../src/Service/fn.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAIpC,MAAM,CAAC,MAAM,EAAE,GACb,GAAsC,EAAE,CACxC,CAA6B,IAAiB,EAAE,EAAE,CAChD,MAAM,EAAG,SAAQ,MAAM,CAAC,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"}

package/esm/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/esm/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/esm/Service/index.js

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

package/esm/Service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Service/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,SAAS,CAAA;AACvB,cAAc,aAAa,CAAA"}
+{"version":3,"file":"index.js","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/esm/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/esm/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/esm/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,5 @@ 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>>;
 //# sourceMappingURL=Sink.d.ts.map

package/esm/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,EAA4C,oBAAkB;AAC7E,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"}

package/esm/Sink/Sink.js

@@ -1,6 +1,6 @@
 import { flow, pipe } from 'hkt-ts';
 import { Left, Right } from 'hkt-ts/Either';
-import { Fx, getEnv, provide, unit } from "../Fx/Fx.js";
+import { access, flatMap, fromLazy, provide, unit } from "../Fx/Fx.js";
 export class Drain {
     scope;
     constructor(scope) {
@@ -11,16 +11,20 @@ export class Drain {
     end = this.scope.close(Right(undefined));
 }
 export function makeDrain(scope, fx) {
-    return Fx(function* () {
-        const env = yield* getEnv();
+    return access((env) => fromLazy(() => {
         const drain = new Drain(scope);
-        // TODO: Should drain always be called for error + end?
         const sink = {
-            event: (fx.event ? flow(fx.event, provide(env)) : drain.event),
-            error: (fx.error ? flow(fx.error, provide(env)) : drain.error),
-            end: (fx.end ? pipe(fx.end, provide(env)) : drain.end),
+            event: fx.event ? flow(fx.event, provide(env)) : drain.event,
+            error: fx.error
+                ? (a) => pipe(
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                fx.error(a), provide(env), flatMap(() => drain.error(a)))
+                : drain.error,
+            end: fx.end
+                ? pipe(fx.end, provide(env), 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");
 }
 //# sourceMappingURL=Sink.js.map

package/esm/Sink/Sink.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sink.js","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAG3C,OAAO,EAAE,EAAE,EAAM,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAkB;AAS1D,MAAM,OAAO,KAAK;IACK;IAArB,YAAqB,KAAgB;QAAhB,UAAK,GAAL,KAAK,CAAW;IAAG,CAAC;IAEhC,KAAK,GAAwB,GAAG,EAAE,CAAC,IAAkB,CAAA;IACrD,KAAK,GAAwB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAe,CAAA;IACnF,GAAG,GAAsB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAe,CAAA;CACnF;AAiBD,MAAM,UAAU,SAAS,CAUvB,KAAgB,EAChB,EAAwC;IAExC,OAAO,EAAE,CAAC,QAAQ,CAAC;QACjB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,EAAgB,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,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAe;YAC5E,KAAK,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAe;YAC5E,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAa;SACnE,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC,0DAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"Sink.js","sourceRoot":"","sources":["../../src/Sink/Sink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAG3C,OAAO,EAAU,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,oBAAkB;AAS7E,MAAM,OAAO,KAAK;IACK;IAArB,YAAqB,KAAgB;QAAhB,UAAK,GAAL,KAAK,CAAW;IAAG,CAAC;IAEhC,KAAK,GAAwB,GAAG,EAAE,CAAC,IAAI,CAAA;IACvC,KAAK,GAAwB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IACrE,GAAG,GAAsB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAA;CACrE;AAiBD,MAAM,UAAU,SAAS,CAUvB,KAAgB,EAChB,EAAwC;IAExC,OAAO,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CACpB,QAAQ,CAAC,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,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;YAC5D,KAAK,EAAE,EAAE,CAAC,KAAK;gBACb,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI;gBACF,oEAAoE;gBACpE,EAAE,CAAC,KAAM,CAAC,CAAQ,CAAC,EACnB,OAAO,CAAC,GAAG,CAAC,EACZ,OAAO,CAAC,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,IAAI,CACF,EAAE,CAAC,GAAG,EACN,OAAO,CAAC,GAAG,CAAC,EACZ,OAAO,CAAC,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"}

package/esm/Stream/Stream.d.ts

@@ -1,10 +1,45 @@
-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:
+ * - Scan
+ * - Loop
+ * - zipItems
+ * - withItems
+ * - switchLatest
+ * - concatMap
+ * - mergeConcurrently
+ * - merge/mergeArray
+ * - combine/combineArray
+ * - zip/zipArray
+ * - sample
+ * - snapshot
+ * - skipRepeats
+ * - slice/take/skip
+ * - takeWhile/skipWhile
+ * - takeUntil/skipUntil
+ * - takeAfter/skipAfter
+ * - since
+ * - during
+ * - until
+ * - delay
+ * - throttle
+ * - debounce
+ * - orElse
+ * - multicast
+ * - hold
+ * - reduce
+ * - run
+ * - Fusion/Commutation
+ * - Unique Identification for streams to add to tracing
+ *    - How to build a dynamic stream graph?
+ */
+export interface Stream<R = never, E = never, A = unknown> {
+    readonly fork: <E2 = never>(sink: Sink<E, A, E2>, scheduler: Scheduler, context: FiberContext<FiberId.Live>) => Fx.RIO<R, Fiber<E2, any>>;
 }
 export interface RIO<R, A> extends Stream<R, never, A> {
 }
@@ -12,7 +47,5 @@ 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/esm/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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,MAAM,WAAW,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,OAAO;IACvD,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,KAAK,EACxB,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAChC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAA;CAC/B;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,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAE9E"}

package/esm/Stream/Stream.js.map

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

package/esm/Stream/bimap.d.ts

@@ -0,0 +1,15 @@
+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): <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;
+    constructor(stream: Stream<R, A, C>, f: (a: A) => B, g: (c: C) => D);
+    fork: <E2>(sink: Sink<B, D, E2>, scheduler: Scheduler, context: FiberContext<Live>) => import("../index.js").RIO<R, import("../Fiber/Fiber.js").Fiber<E2, any>>;
+    static make<R, A, B, C, D>(stream: Stream<R, A, C>, f: (a: A) => B, g: (c: C) => D): Stream<R, B, D>;
+}
+//# sourceMappingURL=bimap.d.ts.map

package/esm/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,GACb,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;IACpD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;IAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;gBAAzE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;IAE9F,IAAI,wCAAyC,SAAS,WAAW,aAAa,IAAI,CAAC,8EAMlF;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,GACb,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;CAWnB"}