@fncts/io 0.0.45 → 0.0.46

package/_src/Logger.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Logger/*.ts }
-export * from "./Logger/definition.js";
-export * from "./Logger/constructors.js";
 export * from "./Logger/api.js";
+export * from "./Logger/constructors.js";
+export * from "./Logger/definition.js";
 // codegen:end

package/_src/MVar.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./MVar/*.ts }
-export * from "./MVar/definition.js";
 export * from "./MVar/api.js";
+export * from "./MVar/definition.js";
 // codegen:end

package/_src/Push/internal.ts

@@ -56,9 +56,8 @@ export function withExhaust<R, E, A>(f: (fork: <R>(io: URIO<R, void>) => URIO<R,
       const reset = ref.set(null);
 
       const exhaustFork = <R>(io: IO<R, never, void>) =>
-        io
-          .ensuring(reset)
-          .fork.flatMap((fiber) => ref.set(fiber))
+        fork(io.ensuring(reset))
+          .flatMap((fiber) => ref.set(fiber))
           .whenRef(ref, (fiber) => fiber === null).asUnit;
 
       Δ(f(exhaustFork));

package/_src/Push.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Push/*.ts }
-export * from "./Push/internal.js";
-export * from "./Push/definition.js";
 export * from "./Push/api.js";
+export * from "./Push/definition.js";
+export * from "./Push/internal.js";
 // codegen:end

package/_src/Queue/api.ts

@@ -1,11 +1,10 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: api/*.ts }
-export * from "./api/zipWithIO.js";
-export * from "./api/takeN.js";
-export * from "./api/takeBetween.js";
-export * from "./api/poll.js";
-export * from "./api/operations.js";
-export * from "./api/filterOutputIO.js";
-export * from "./api/filterInputIO.js";
 export * from "./api/dimapIO.js";
+export * from "./api/filterInputIO.js";
+export * from "./api/filterOutputIO.js";
+export * from "./api/operations.js";
+export * from "./api/poll.js";
+export * from "./api/takeBetween.js";
+export * from "./api/takeN.js";
+export * from "./api/zipWithIO.js";
 // codegen:end

package/_src/Queue.ts

@@ -1,8 +1,7 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Queue/*.ts }
-export * from "./Queue/strategy.js";
-export * from "./Queue/internal.js";
-export * from "./Queue/definition.js";
-export * from "./Queue/constructors.js";
 export * from "./Queue/api.js";
+export * from "./Queue/constructors.js";
+export * from "./Queue/definition.js";
+export * from "./Queue/internal.js";
+export * from "./Queue/strategy.js";
 // codegen:end

package/_src/Random.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Random/*.ts }
-export * from "./Random/live.js";
-export * from "./Random/definition.js";
 export * from "./Random/api.js";
+export * from "./Random/definition.js";
+export * from "./Random/live.js";
 // codegen:end

package/_src/Ref/Synchronized.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Synchronized/*.ts }
-export * from "./Synchronized/definition.js";
-export * from "./Synchronized/constructors.js";
 export * from "./Synchronized/api.js";
+export * from "./Synchronized/constructors.js";
+export * from "./Synchronized/definition.js";
 // codegen:end

package/_src/Ref/api.ts

@@ -2,16 +2,15 @@ import type { PRef } from "./definition.js";
 
 import { identity } from "@fncts/base/data/function";
 
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: api/*.ts }
-export * from "./api/set.js";
-export * from "./api/modify.js";
-export * from "./api/matchAll.js";
-export * from "./api/match.js";
-export * from "./api/get.js";
-export * from "./api/filter.js";
-export * from "./api/dimap.js";
 export * from "./api/collect.js";
+export * from "./api/dimap.js";
+export * from "./api/filter.js";
+export * from "./api/get.js";
+export * from "./api/match.js";
+export * from "./api/matchAll.js";
+export * from "./api/modify.js";
+export * from "./api/set.js";
 // codegen:end
 
 /**

package/_src/Ref.ts

@@ -1,17 +1,15 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Ref/*.ts }
-export * from "./Ref/definition.js";
-export * from "./Ref/constructors.js";
 export * from "./Ref/api.js";
-export * from "./Ref/Synchronized.js";
-export * from "./Ref/DerivedAll.js";
-export * from "./Ref/Derived.js";
 export * from "./Ref/Atomic.js";
+export * from "./Ref/constructors.js";
+export * from "./Ref/definition.js";
+export * from "./Ref/Derived.js";
+export * from "./Ref/DerivedAll.js";
+export * from "./Ref/Synchronized.js";
 // codegen:end
 
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Ref/Synchronized/*.ts }
-export * from "./Ref/Synchronized/definition.js";
-export * from "./Ref/Synchronized/constructors.js";
 export * from "./Ref/Synchronized/api.js";
+export * from "./Ref/Synchronized/constructors.js";
+export * from "./Ref/Synchronized/definition.js";
 // codegen:end

package/_src/RefSubject.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./RefSubject/*.ts }
-export * from "./RefSubject/definition.js";
 export * from "./RefSubject/api.js";
 export * from "./RefSubject/Atomic.js";
+export * from "./RefSubject/definition.js";
 // codegen:end

package/_src/Reloadable.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Reloadable/*.ts }
-export * from "./Reloadable/definition.js";
-export * from "./Reloadable/constructors.js";
 export * from "./Reloadable/api.js";
+export * from "./Reloadable/constructors.js";
+export * from "./Reloadable/definition.js";
 // codegen:end

package/_src/RuntimeFlags.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: RuntimeFlags/*.ts }
-export * from "./RuntimeFlags/RuntimeFlags.js";
 export * from "./RuntimeFlags/Patch.js";
+export * from "./RuntimeFlags/RuntimeFlags.js";
 // codegen:end

package/_src/STM.ts

@@ -1,12 +1,11 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: STM/*.ts }
-export * from "./STM/driver.js";
-export * from "./STM/definition.js";
 export * from "./STM/api.js";
+export * from "./STM/definition.js";
+export * from "./STM/driver.js";
 // codegen:end
-/* eslint-disable simple-import-sort/exports */
+
 // codegen:start { preset: barrel, include: STM/api/*.ts }
-export * from "./STM/api/core-constructors.js";
-export * from "./STM/api/core-api.js";
 export * from "./STM/api/atomically.js";
+export * from "./STM/api/core-api.js";
+export * from "./STM/api/core-constructors.js";
 // codegen:end

package/_src/Schedule.ts

@@ -1,7 +1,6 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Schedule/*.ts }
-export * from "./Schedule/definition.js";
 export * from "./Schedule/api.js";
-export * from "./Schedule/Driver.js";
 export * from "./Schedule/Decision.js";
+export * from "./Schedule/definition.js";
+export * from "./Schedule/Driver.js";
 // codegen:end

package/_src/Scope/ReleaseMap.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ReleaseMap/*.ts }
-export * from "./ReleaseMap/definition.js";
-export * from "./ReleaseMap/constructors.js";
 export * from "./ReleaseMap/api.js";
+export * from "./ReleaseMap/constructors.js";
+export * from "./ReleaseMap/definition.js";
 // codegen:end

package/_src/Scope.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Scope/*.ts, exclude: Scope/*(ReleaseMap|Finalizer).ts }
-export * from "./Scope/definition.js";
 export * from "./Scope/api.js";
+export * from "./Scope/definition.js";
 // codegen:end

package/_src/ScopedRef.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./ScopedRef/*.ts }
-export * from "./ScopedRef/definition.js";
 export * from "./ScopedRef/api.js";
+export * from "./ScopedRef/definition.js";
 // codegen:end

package/_src/Semaphore.ts

@@ -1,3 +1,6 @@
+import { EitherTag } from "@fncts/base/data/Either";
+import { IllegalArgumentError } from "@fncts/base/data/exceptions";
+
 /**
  * @tsplus type fncts.io.Semaphore
  * @tsplus companion fncts.io.SemaphoreOps
@@ -5,57 +8,113 @@
 export class Semaphore {
   constructor(readonly permits: number) {}
 
-  taken   = 0;
-  waiters = new Set<() => void>();
+  ref = Ref.unsafeMake<Either<ImmutableQueue<[Future<never, void>, number]>, number>>(Either.right(this.permits));
 
-  get free(): number {
-    return this.permits - this.taken;
+  available(__tsplusTrace?: string): UIO<number> {
+    return this.ref.get.map((_) =>
+      _.match(
+        () => 0,
+        (permits) => permits,
+      ),
+    );
   }
 
-  runNext() {
-    const next = this.waiters.values().next();
-    if (!next.done) {
-      this.waiters.delete(next.value);
-      next.value();
+  reserve(n: number, __tsplusTrace?: string): UIO<Reservation> {
+    if (n < 0) {
+      return IO.halt(new IllegalArgumentError(`Unexpected negative ${n} permits requested`, "Semaphore.reserve"));
+    } else if (n === 0) {
+      return IO.succeedNow(new Reservation(IO.unit, IO.unit));
+    } else {
+      return Future.make<never, void>().flatMap((future) =>
+        this.ref.modify((state) =>
+          state.match(
+            (queue) => [
+              new Reservation(future.await, this.restore(future, n)),
+              Either.left(queue.enqueue([future, n])),
+            ],
+            (permits) => {
+              if (permits >= n) {
+                return [new Reservation(IO.unit, this.releaseN(n)), Either.right(permits - n)];
+              } else {
+                return [
+                  new Reservation(future.await, this.restore(future, n)),
+                  Either.left(ImmutableQueue.single([future, n - permits])),
+                ];
+              }
+            },
+          ),
+        ),
+      );
     }
   }
 
-  take(n: number) {
-    return IO.asyncInterrupt<never, never, number>((cb) => {
-      if (this.free < n) {
-        const observer = () => {
-          if (this.free >= n) {
-            this.waiters.delete(observer);
-            this.taken += n;
-            cb(IO.succeedNow(n));
+  restore(future: Future<never, void>, n: number, __tsplusTrace?: string): UIO<void> {
+    return this.ref.modify((state) =>
+      state.match(
+        (queue) =>
+          queue
+            .find(([waiter]) => waiter === future)
+            .match(
+              () => [this.releaseN(n), Either.left(queue)],
+              ([_, permits]) => [
+                this.releaseN(n - permits),
+                Either.left(queue.filter(([waiter]) => waiter !== future)),
+              ],
+            ),
+        (permits) => [IO.unit, Either.right(permits + n)],
+      ),
+    ).flatten;
+  }
+
+  releaseN(n: number, __tsplusTrace?: string): UIO<void> {
+    const self = this;
+
+    /**
+     * @tsplus tailRec
+     */
+    function loop(
+      n: number,
+      state: Either<ImmutableQueue<[Future<never, any>, number]>, number>,
+      acc: UIO<void>,
+    ): [UIO<void>, Either<ImmutableQueue<[Future<never, any>, number]>, number>] {
+      state.concrete();
+      switch (state._tag) {
+        case EitherTag.Right: {
+          return [acc, Either.right(state.right + n)];
+        }
+        case EitherTag.Left: {
+          const waiter = state.left.dequeue;
+
+          Maybe.concrete(waiter);
+
+          switch (waiter._tag) {
+            case MaybeTag.Nothing: {
+              return [acc, Either.right(self.permits)];
+            }
+            case MaybeTag.Just: {
+              const [[future, permits], queue] = waiter.value;
+              if (n > permits) {
+                return loop(n - permits, Either.left(queue), acc.zipLeft(future.succeed(undefined)));
+              } else if (n === permits) {
+                return [acc.zipRight(future.succeed().asUnit), Either.left(queue)];
+              } else {
+                return [acc, Either.left(queue.prepend([future, permits - n]))];
+              }
+            }
           }
-        };
-        this.waiters.add(observer);
-        return Either.left(
-          IO(() => {
-            this.waiters.delete(observer);
-          }),
-        );
+        }
       }
-      this.taken += n;
-      return Either.right(IO.succeedNow(n));
-    });
-  }
+    }
 
-  release(n: number) {
-    return IO.withFiberRuntime<never, never, void>((fiber) => {
-      this.taken -= n;
-      fiber.getFiberRef(FiberRef.currentScheduler).scheduleTask(() => {
-        this.waiters.forEach((wake) => wake());
-      });
-      return IO.unit;
-    });
+    return this.ref.modify((state) => loop(n, state, IO.unit)).flatten;
   }
 
   withPermits(permits: number) {
     return <R, E, A>(io: IO<R, E, A>): IO<R, E, A> => {
-      return IO.uninterruptibleMask((restore) =>
-        restore(this.take(permits)).flatMap((permits) => restore(io).ensuring(this.release(permits))),
+      return IO.bracket(
+        this.reserve(permits),
+        (reservation) => reservation.acquire > io,
+        (reservation) => reservation.release,
       );
     };
   }
@@ -63,6 +122,25 @@ export class Semaphore {
   withPermit<R, E, A>(io: IO<R, E, A>): IO<R, E, A> {
     return this.withPermits(1)(io);
   }
+
+  withPermitsScoped(permits: number) {
+    return <R, E, A>(io: IO<R, E, A>): IO<Scope | R, E, A> => {
+      return IO.acquireRelease(this.reserve(permits), (reservation) => reservation.release).flatMap(
+        (reservation) => reservation.acquire > io,
+      );
+    };
+  }
+
+  withPermitScoped<R, E, A>(io: IO<R, E, A>): IO<Scope | R, E, A> {
+    return this.withPermitsScoped(1)(io);
+  }
+}
+
+export class Reservation {
+  constructor(
+    readonly acquire: UIO<void>,
+    readonly release: UIO<void>,
+  ) {}
 }
 
 /**

package/_src/Sink.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Sink/*.ts }
-export * from "./Sink/definition.js";
 export * from "./Sink/api.js";
+export * from "./Sink/definition.js";
 // codegen:end

package/_src/State.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./State/*.ts, exclude: State/internal.ts }
-export * from "./State/definition.js";
 export * from "./State/api.js";
+export * from "./State/definition.js";
 // codegen:end

package/_src/Stream.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Stream/*.ts, exclude: Stream/*(DebounceState|Handoff|Pull|SinkEndReason|Take).ts }
-export * from "./Stream/definition.js";
 export * from "./Stream/api.js";
+export * from "./Stream/definition.js";
 // codegen:end

package/_src/Subject.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Subject/*.ts }
-export * from "./Subject/definition.js";
 export * from "./Subject/api.js";
 export * from "./Subject/Atomic.js";
+export * from "./Subject/definition.js";
 // codegen:end

package/_src/Supervisor/constructors.ts

@@ -17,9 +17,11 @@ export function unsafeTrack(weak: boolean): Supervisor<Conc<Fiber.Runtime<any, a
       _parent: Maybe<Fiber.Runtime<E, A>>,
       fiber: Fiber.Runtime<E, A>,
     ) {
+      // @ts-expect-error
       set.add(fiber);
     }
     unsafeOnEnd<E, A>(_value: Exit<E, A>, fiber: Fiber.Runtime<E, A>) {
+      // @ts-expect-error
       set.delete(fiber);
     }
   })();

package/_src/Supervisor.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: Supervisor/*.ts }
-export * from "./Supervisor/definition.js";
-export * from "./Supervisor/constructors.js";
 export * from "./Supervisor/api.js";
+export * from "./Supervisor/constructors.js";
+export * from "./Supervisor/definition.js";
 // codegen:end

package/_src/TExit.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./TExit/*.ts }
-export * from "./TExit/definition.js";
 export * from "./TExit/constructors.js";
+export * from "./TExit/definition.js";
 // codegen:end

package/_src/TFuture.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: TFuture/*.ts }
-export * from "./TFuture/definition.js";
-export * from "./TFuture/constructors.js";
 export * from "./TFuture/api.js";
+export * from "./TFuture/constructors.js";
+export * from "./TFuture/definition.js";
 // codegen:end

package/_src/TReentrantLock.ts

@@ -1,5 +1,4 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: TReentrantLock/*.ts }
-export * from "./TReentrantLock/definition.js";
 export * from "./TReentrantLock/api.js";
+export * from "./TReentrantLock/definition.js";
 // codegen:end

package/_src/TRef.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: TRef/*.ts }
-export * from "./TRef/definition.js";
-export * from "./TRef/constructors.js";
 export * from "./TRef/api.js";
+export * from "./TRef/constructors.js";
+export * from "./TRef/definition.js";
 // codegen:end

package/_src/TSemaphore.ts

@@ -1,6 +1,5 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: TSemaphore/*.ts }
-export * from "./TSemaphore/definition.js";
-export * from "./TSemaphore/constructors.js";
 export * from "./TSemaphore/api.js";
+export * from "./TSemaphore/constructors.js";
+export * from "./TSemaphore/definition.js";
 // codegen:end

package/_src/collection/immutable/Conc.ts

@@ -1,9 +1,8 @@
-/* eslint-disable simple-import-sort/exports */
 // codegen:start { preset: barrel, include: ./Conc/*.ts }
-export * from "./Conc/takeWhileIO.js";
-export * from "./Conc/mapIO.js";
-export * from "./Conc/findIO.js";
-export * from "./Conc/filterIO.js";
-export * from "./Conc/dropWhileIO.js";
 export * from "./Conc/dropUntilIO.js";
+export * from "./Conc/dropWhileIO.js";
+export * from "./Conc/filterIO.js";
+export * from "./Conc/findIO.js";
+export * from "./Conc/mapIO.js";
+export * from "./Conc/takeWhileIO.js";
 // codegen:end

package/collection/immutable/Conc.d.ts

@@ -1,6 +1,6 @@
-export * from "./Conc/takeWhileIO.js";
-export * from "./Conc/mapIO.js";
-export * from "./Conc/findIO.js";
-export * from "./Conc/filterIO.js";
-export * from "./Conc/dropWhileIO.js";
 export * from "./Conc/dropUntilIO.js";
+export * from "./Conc/dropWhileIO.js";
+export * from "./Conc/filterIO.js";
+export * from "./Conc/findIO.js";
+export * from "./Conc/mapIO.js";
+export * from "./Conc/takeWhileIO.js";

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@fncts/io",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "dependencies": {
-    "@fncts/base": "0.0.37",
+    "@fncts/base": "0.0.38",
     "@fncts/transformers": "0.0.10",
     "@fncts/typelevel": "0.0.19"
   },