effect-app 1.28.0 → 1.29.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/prelude
 
+## 1.29.0
+
+### Minor Changes
+
+- 3d4e45a: cleanup FiberSets
+
 ## 1.28.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "1.28.0",
+  "version": "1.29.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -240,16 +240,6 @@
         "default": "./_cjs/schema.cjs"
       }
     },
-    "./services/MainFiberSet": {
-      "import": {
-        "types": "./dist/services/MainFiberSet.d.ts",
-        "default": "./dist/services/MainFiberSet.js"
-      },
-      "require": {
-        "types": "./dist/services/MainFiberSet.d.ts",
-        "default": "./_cjs/services/MainFiberSet.cjs"
-      }
-    },
     "./utils": {
       "import": {
         "types": "./dist/utils.d.ts",

package/_cjs/services/MainFiberSet.cjs

@@ -1,45 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.MainFiberSet = void 0;
-var _core = require("@effect-app/core");
-var _logger = require("../logger.cjs");
-const make = _core.Effect.gen(function* () {
-  const set = yield* _core.FiberSet.make();
-  const add = (...fibers) => _core.Effect.sync(() => fibers.forEach(_ => _core.FiberSet.unsafeAdd(set, _)));
-  const addAll = fibers => _core.Effect.sync(() => fibers.forEach(_ => _core.FiberSet.unsafeAdd(set, _)));
-  const join = _core.FiberSet.size(set).pipe(_core.Effect.andThen(count => _logger.PreludeLogger.logDebug(`Joining ${count} current fibers on the MainFiberSet`)), _core.Effect.andThen(_core.FiberSet.join(set)));
-  const run = _core.FiberSet.run(set);
-  // const waitUntilEmpty = Effect.gen(function*() {
-  //   const currentSize = yield* FiberSet.size(set)
-  //   if (currentSize === 0) {
-  //     return
-  //   }
-  //   yield* PreludeLogger.logInfo("Waiting MainFiberSet to be empty: " + currentSize)
-  //   while ((yield* FiberSet.size(set)) > 0) yield* Effect.sleep("250 millis")
-  //   yield* PreludeLogger.logDebug("MainFiberSet is empty")
-  // })
-  // TODO: loop and interrupt all fibers in the set continuously?
-  const interrupt = _core.Fiber.interruptAll(set);
-  return {
-    interrupt,
-    join,
-    run,
-    add,
-    addAll
-  };
-});
-/**
- * Whenever you fork long running (e.g worker) fibers via e.g `Effect.forkScoped` or `Effect.forkDaemon`
- * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
- * This way any errors will blow up the main program instead of fibers dying unknowingly.
- */
-class MainFiberSet extends _core.Context.TagMakeId("MainFiberSet", make)() {
-  static Live = this.toLayerScoped();
-  static JoinLive = this.pipe(_core.Effect.andThen(_ => _.join), _core.Layer.effectDiscard, _core.Layer.provide(this.Live));
-  static run = self => this.use(_ => _.run(self));
-}
-exports.MainFiberSet = MainFiberSet;
-//# sourceMappingURL=MainFiberSet.cjs.map

package/_cjs/services/MainFiberSet.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"MainFiberSet.cjs","names":["_core","require","_logger","make","Effect","gen","set","FiberSet","add","fibers","sync","forEach","_","unsafeAdd","addAll","join","size","pipe","andThen","count","PreludeLogger","logDebug","run","interrupt","Fiber","interruptAll","MainFiberSet","Context","TagMakeId","Live","toLayerScoped","JoinLive","Layer","effectDiscard","provide","self","use"],"sources":["../../src/services/MainFiberSet.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,KAAA,GAAAC,OAAA;AAIA,IAAAC,OAAA,GAAAD,OAAA;AAEA,MAAME,IAAI,GAAGC,YAAM,CAACC,GAAG,CAAC,aAAS;EAC/B,MAAMC,GAAG,GAAG,OAAOC,cAAQ,CAACJ,IAAI,EAAkB;EAClD,MAAMK,GAAG,GAAGA,CAAC,GAAGC,MAA0C,KACxDL,YAAM,CAACM,IAAI,CAAC,MAAMD,MAAM,CAACE,OAAO,CAAEC,CAAC,IAAKL,cAAQ,CAACM,SAAS,CAACP,GAAG,EAAEM,CAAC,CAAC,CAAC,CAAC;EACtE,MAAME,MAAM,GAAIL,MAAmD,IACjEL,YAAM,CAACM,IAAI,CAAC,MAAMD,MAAM,CAACE,OAAO,CAAEC,CAAC,IAAKL,cAAQ,CAACM,SAAS,CAACP,GAAG,EAAEM,CAAC,CAAC,CAAC,CAAC;EACtE,MAAMG,IAAI,GAAGR,cAAQ,CAACS,IAAI,CAACV,GAAG,CAAC,CAACW,IAAI,CAClCb,YAAM,CAACc,OAAO,CAAEC,KAAK,IAAKC,qBAAa,CAACC,QAAQ,CAAC,WAAWF,KAAK,qCAAqC,CAAC,CAAC,EACxGf,YAAM,CAACc,OAAO,CAACX,cAAQ,CAACQ,IAAI,CAACT,GAAG,CAAC,CAAC,CACnC;EACD,MAAMgB,GAAG,GAAGf,cAAQ,CAACe,GAAG,CAAChB,GAAG,CAAC;EAE7B;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA,MAAMiB,SAAS,GAAGC,WAAK,CAACC,YAAY,CAACnB,GAAG,CAAC;EAEzC,OAAO;IACLiB,SAAS;IACTR,IAAI;IACJO,GAAG;IACHd,GAAG;IACHM;GACD;AACH,CAAC,CAAC;AAEF;;;;;AAKM,MAAOY,YAAa,SAAQC,aAAO,CAACC,SAAS,CAAC,cAAc,EAAEzB,IAAI,CAAC,EAAgB;EACvF,OAAgB0B,IAAI,GAAG,IAAI,CAACC,aAAa,EAAE;EAC3C,OAAgBC,QAAQ,GAAG,IAAI,CAACd,IAAI,CAACb,YAAM,CAACc,OAAO,CAAEN,CAAC,IAAKA,CAAC,CAACG,IAAI,CAAC,EAAEiB,WAAK,CAACC,aAAa,EAAED,WAAK,CAACE,OAAO,CAAC,IAAI,CAACL,IAAI,CAAC,CAAC;EAClH,OAAgBP,GAAG,GAAUa,IAAyB,IAAK,IAAI,CAACC,GAAG,CAAExB,CAAC,IAAKA,CAAC,CAACU,GAAG,CAACa,IAAI,CAAC,CAAC","ignoreList":[]}

package/dist/services/MainFiberSet.d.ts

@@ -1,56 +0,0 @@
-import { Context, Effect, Fiber, Layer } from "@effect-app/core";
-declare const MainFiberSet_base: (abstract new (service: {
-    interrupt: Effect.Effect<void, never, never>;
-    join: Effect.Effect<void, never, never>;
-    run: <R, XE extends never, XA extends unknown>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-}) => Readonly<{
-    interrupt: Effect.Effect<void, never, never>;
-    join: Effect.Effect<void, never, never>;
-    run: <R, XE extends never, XA extends unknown>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-}> & Context.TagClassShape<"MainFiberSet", {
-    interrupt: Effect.Effect<void, never, never>;
-    join: Effect.Effect<void, never, never>;
-    run: <R, XE extends never, XA extends unknown>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-}>) & {
-    toLayer: {
-        (): Layer<MainFiberSet, never, import("effect/Scope").Scope>;
-        <E_1, R_1>(eff: Effect<Omit<MainFiberSet, keyof Context.TagClassShape<any, any>>, E_1, R_1>): Layer<MainFiberSet, E_1, R_1>;
-    };
-    toLayerScoped: {
-        (): Layer<MainFiberSet, never, never>;
-        <E_1, R_2>(eff: Effect<Context.TagClassShape<any, any>, E_1, R_2>): Layer<MainFiberSet, E_1, Exclude<R_2, import("effect/Scope").Scope>>;
-    };
-    of: (service: Context.TagClassShape<any, any>) => MainFiberSet;
-    make: Effect<MainFiberSet, never, import("effect/Scope").Scope>;
-} & Context.Tag<MainFiberSet, MainFiberSet> & {
-    interrupt: Effect<void, never, MainFiberSet>;
-    join: Effect<void, never, MainFiberSet>;
-    add: (...args: readonly Fiber.RuntimeFiber<never, never>[]) => Effect<void, never, MainFiberSet>;
-    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect<void, never, MainFiberSet>;
-} & {
-    use: <X>(body: (_: {
-        interrupt: Effect.Effect<void, never, never>;
-        join: Effect.Effect<void, never, never>;
-        run: <R, XE extends never, XA extends unknown>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-        add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_1, infer E_2, infer R_4> ? Effect<A_1, E_2, MainFiberSet | R_4> : Effect<X, never, MainFiberSet>;
-};
-/**
- * Whenever you fork long running (e.g worker) fibers via e.g `Effect.forkScoped` or `Effect.forkDaemon`
- * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
- * This way any errors will blow up the main program instead of fibers dying unknowingly.
- */
-export declare class MainFiberSet extends MainFiberSet_base {
-    static readonly Live: Layer<MainFiberSet, never, never>;
-    static readonly JoinLive: Layer.Layer<never, never, never>;
-    static readonly run: <A, R>(self: Effect<A, never, R>) => Effect<Fiber.RuntimeFiber<A, never>, never, MainFiberSet | R>;
-}
-export {};
-//# sourceMappingURL=MainFiberSet.d.ts.map

package/dist/services/MainFiberSet.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MainFiberSet.d.ts","sourceRoot":"","sources":["../../src/services/MainFiberSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,KAAK,EAAE,MAAM,kBAAkB,CAAA;;;;;qBAQhD,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;qBAElC,SAAS,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;;;;;qBAF3C,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;qBAElC,SAAS,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;;;;;qBAF3C,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;qBAElC,SAAS,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;;;yBAF3C,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;yBAElC,SAAS,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;;;AA8BrE;;;;GAIG;AACH,qBAAa,YAAa,SAAQ,iBAAuD;IACvF,MAAM,CAAC,QAAQ,CAAC,IAAI,oCAAuB;IAC3C,MAAM,CAAC,QAAQ,CAAC,QAAQ,mCAA0F;IAClH,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAI,CAAC,EAAE,CAAC,QAAQ,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,mEAAiC;CACxF"}

package/dist/services/MainFiberSet.js

@@ -1,38 +0,0 @@
-import { Context, Effect, Fiber, FiberSet, Layer } from "@effect-app/core";
-import { PreludeLogger } from "../logger.js";
-const make = Effect.gen(function* () {
-    const set = yield* FiberSet.make();
-    const add = (...fibers) => Effect.sync(() => fibers.forEach((_) => FiberSet.unsafeAdd(set, _)));
-    const addAll = (fibers) => Effect.sync(() => fibers.forEach((_) => FiberSet.unsafeAdd(set, _)));
-    const join = FiberSet.size(set).pipe(Effect.andThen((count) => PreludeLogger.logDebug(`Joining ${count} current fibers on the MainFiberSet`)), Effect.andThen(FiberSet.join(set)));
-    const run = FiberSet.run(set);
-    // const waitUntilEmpty = Effect.gen(function*() {
-    //   const currentSize = yield* FiberSet.size(set)
-    //   if (currentSize === 0) {
-    //     return
-    //   }
-    //   yield* PreludeLogger.logInfo("Waiting MainFiberSet to be empty: " + currentSize)
-    //   while ((yield* FiberSet.size(set)) > 0) yield* Effect.sleep("250 millis")
-    //   yield* PreludeLogger.logDebug("MainFiberSet is empty")
-    // })
-    // TODO: loop and interrupt all fibers in the set continuously?
-    const interrupt = Fiber.interruptAll(set);
-    return {
-        interrupt,
-        join,
-        run,
-        add,
-        addAll
-    };
-});
-/**
- * Whenever you fork long running (e.g worker) fibers via e.g `Effect.forkScoped` or `Effect.forkDaemon`
- * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
- * This way any errors will blow up the main program instead of fibers dying unknowingly.
- */
-export class MainFiberSet extends Context.TagMakeId("MainFiberSet", make)() {
-    static Live = this.toLayerScoped();
-    static JoinLive = this.pipe(Effect.andThen((_) => _.join), Layer.effectDiscard, Layer.provide(this.Live));
-    static run = (self) => this.use((_) => _.run(self));
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWFpbkZpYmVyU2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL01haW5GaWJlclNldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLEtBQUssRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBSTFFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFNUMsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDL0IsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksRUFBa0IsQ0FBQTtJQUNsRCxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsTUFBMEMsRUFBRSxFQUFFLENBQzVELE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3RFLE1BQU0sTUFBTSxHQUFHLENBQUMsTUFBbUQsRUFBRSxFQUFFLENBQ3JFLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3RFLE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUNsQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLFdBQVcsS0FBSyxxQ0FBcUMsQ0FBQyxDQUFDLEVBQ3hHLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUNuQyxDQUFBO0lBQ0QsTUFBTSxHQUFHLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUU3QixrREFBa0Q7SUFDbEQsa0RBQWtEO0lBQ2xELDZCQUE2QjtJQUM3QixhQUFhO0lBQ2IsTUFBTTtJQUNOLHFGQUFxRjtJQUNyRiw4RUFBOEU7SUFDOUUsMkRBQTJEO0lBQzNELEtBQUs7SUFFTCwrREFBK0Q7SUFDL0QsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUV6QyxPQUFPO1FBQ0wsU0FBUztRQUNULElBQUk7UUFDSixHQUFHO1FBQ0gsR0FBRztRQUNILE1BQU07S0FDUCxDQUFBO0FBQ0gsQ0FBQyxDQUFDLENBQUE7QUFFRjs7OztHQUlHO0FBQ0gsTUFBTSxPQUFPLFlBQWEsU0FBUSxPQUFPLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsRUFBZ0I7SUFDdkYsTUFBTSxDQUFVLElBQUksR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUE7SUFDM0MsTUFBTSxDQUFVLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDbEgsTUFBTSxDQUFVLEdBQUcsR0FBRyxDQUFPLElBQXlCLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQSJ9

package/src/services/MainFiberSet.ts

@@ -1,50 +0,0 @@
-import { Context, Effect, Fiber, FiberSet, Layer } from "@effect-app/core"
-
-import type {} from "effect/Scope"
-import type {} from "effect/Context"
-import { PreludeLogger } from "../logger.js"
-
-const make = Effect.gen(function*() {
-  const set = yield* FiberSet.make<unknown, never>()
-  const add = (...fibers: Fiber.RuntimeFiber<never, never>[]) =>
-    Effect.sync(() => fibers.forEach((_) => FiberSet.unsafeAdd(set, _)))
-  const addAll = (fibers: readonly Fiber.RuntimeFiber<never, never>[]) =>
-    Effect.sync(() => fibers.forEach((_) => FiberSet.unsafeAdd(set, _)))
-  const join = FiberSet.size(set).pipe(
-    Effect.andThen((count) => PreludeLogger.logDebug(`Joining ${count} current fibers on the MainFiberSet`)),
-    Effect.andThen(FiberSet.join(set))
-  )
-  const run = FiberSet.run(set)
-
-  // const waitUntilEmpty = Effect.gen(function*() {
-  //   const currentSize = yield* FiberSet.size(set)
-  //   if (currentSize === 0) {
-  //     return
-  //   }
-  //   yield* PreludeLogger.logInfo("Waiting MainFiberSet to be empty: " + currentSize)
-  //   while ((yield* FiberSet.size(set)) > 0) yield* Effect.sleep("250 millis")
-  //   yield* PreludeLogger.logDebug("MainFiberSet is empty")
-  // })
-
-  // TODO: loop and interrupt all fibers in the set continuously?
-  const interrupt = Fiber.interruptAll(set)
-
-  return {
-    interrupt,
-    join,
-    run,
-    add,
-    addAll
-  }
-})
-
-/**
- * Whenever you fork long running (e.g worker) fibers via e.g `Effect.forkScoped` or `Effect.forkDaemon`
- * you should register these long running fibers in a FiberSet, and join them at the end of your main program.
- * This way any errors will blow up the main program instead of fibers dying unknowingly.
- */
-export class MainFiberSet extends Context.TagMakeId("MainFiberSet", make)<MainFiberSet>() {
-  static readonly Live = this.toLayerScoped()
-  static readonly JoinLive = this.pipe(Effect.andThen((_) => _.join), Layer.effectDiscard, Layer.provide(this.Live))
-  static readonly run = <A, R>(self: Effect<A, never, R>) => this.use((_) => _.run(self))
-}