effect 2.3.1 → 2.3.2

package/src/FiberSet.ts

@@ -26,7 +26,7 @@ export type TypeId = typeof TypeId
  * @since 2.0.0
  * @categories models
  */
-export interface FiberSet<out A, out E = never>
+export interface FiberSet<out A = unknown, out E = unknown>
   extends Pipeable, Inspectable.Inspectable, Iterable<Fiber.RuntimeFiber<A, E>>
 {
   readonly [TypeId]: TypeId
@@ -92,7 +92,7 @@ const unsafeMake = <A, E>(): FiberSet<A, E> => {
  * @since 2.0.0
  * @categories constructors
  */
-export const make = <A, E = never>(): Effect.Effect<FiberSet<A, E>, never, Scope.Scope> =>
+export const make = <A = unknown, E = unknown>(): Effect.Effect<FiberSet<A, E>, never, Scope.Scope> =>
   Effect.acquireRelease(Effect.sync(() => unsafeMake<A, E>()), clear)
 
 /**
@@ -101,7 +101,7 @@ export const make = <A, E = never>(): Effect.Effect<FiberSet<A, E>, never, Scope
  * @since 2.0.0
  * @categories constructors
  */
-export const makeRuntime = <A, E = never, R = never>(): Effect.Effect<
+export const makeRuntime = <R = never, A = unknown, E = unknown>(): Effect.Effect<
   <XE extends E, XA extends A>(
     effect: Effect.Effect<XA, XE, R>,
     options?: Runtime.RunForkOptions | undefined
@@ -234,7 +234,7 @@ export const run: {
  * @since 2.0.0
  * @categories combinators
  */
-export const runtime: <A, E = never>(
+export const runtime: <A, E>(
   self: FiberSet<A, E>
 ) => <R = never>() => Effect.Effect<
   <XE extends E, XA extends A>(

package/src/Option.ts

@@ -648,12 +648,19 @@ export const flatMap: {
 export const andThen: {
   <A, B>(f: (a: A) => Option<B>): (self: Option<A>) => Option<B>
   <B>(f: Option<B>): <A>(self: Option<A>) => Option<B>
+  <A, B>(f: (a: A) => B): (self: Option<A>) => Option<B>
+  <B>(f: B): <A>(self: Option<A>) => Option<B>
   <A, B>(self: Option<A>, f: (a: A) => Option<B>): Option<B>
   <A, B>(self: Option<A>, f: Option<B>): Option<B>
+  <A, B>(self: Option<A>, f: (a: A) => B): Option<B>
+  <A, B>(self: Option<A>, f: B): Option<B>
 } = dual(
   2,
   <A, B>(self: Option<A>, f: (a: A) => Option<B> | Option<B>): Option<B> =>
-    isFunction(f) ? flatMap(self, f) : flatMap(self, () => f)
+    flatMap(self, (a) => {
+      const b = isFunction(f) ? f(a) : f
+      return isOption(b) ? b : some(b)
+    })
 )
 
 /**

package/src/Scheduler.ts

@@ -8,7 +8,6 @@ import type { FiberRef } from "./FiberRef.js"
 import { dual } from "./Function.js"
 import { globalValue } from "./GlobalValue.js"
 import * as core from "./internal/core.js"
-import * as timeout from "./internal/timeout.js"
 
 /**
  * @since 2.0.0
@@ -107,7 +106,7 @@ export class MixedScheduler implements Scheduler {
    */
   private starve(depth = 0) {
     if (depth >= this.maxNextTickBeforeTimer) {
-      timeout.set(() => this.starveInternal(0), 0)
+      setTimeout(() => this.starveInternal(0), 0)
     } else {
       Promise.resolve(void 0).then(() => this.starveInternal(depth + 1))
     }
@@ -337,14 +336,14 @@ export const makeBatched = (
  * @category constructors
  */
 export const timer = (ms: number, shouldYield: Scheduler["shouldYield"] = defaultShouldYield) =>
-  make((task) => timeout.set(task, ms), shouldYield)
+  make((task) => setTimeout(task, ms), shouldYield)
 
 /**
  * @since 2.0.0
  * @category constructors
  */
 export const timerBatched = (ms: number, shouldYield: Scheduler["shouldYield"] = defaultShouldYield) =>
-  makeBatched((task) => timeout.set(task, ms), shouldYield)
+  makeBatched((task) => setTimeout(task, ms), shouldYield)
 
 /** @internal */
 export const currentScheduler: FiberRef<Scheduler> = globalValue(

package/src/internal/clock.ts

@@ -5,7 +5,6 @@ import type * as Effect from "../Effect.js"
 import * as Either from "../Either.js"
 import { constFalse } from "../Function.js"
 import * as core from "./core.js"
-import * as timeout from "./timeout.js"
 
 /** @internal */
 const ClockSymbolKey = "effect/Clock"
@@ -29,12 +28,12 @@ export const globalClockScheduler: Clock.ClockScheduler = {
       return constFalse
     }
     let completed = false
-    const handle = timeout.set(() => {
+    const handle = setTimeout(() => {
       completed = true
       task()
     }, millis)
     return () => {
-      timeout.clear(handle)
+      clearTimeout(handle)
       return !completed
     }
   }

package/src/internal/fiberRuntime.ts

@@ -2771,7 +2771,12 @@ export const zipLeftOptions = dual<
   ) => Effect.Effect<A, E | E2, R | R2>
 >(
   (args) => core.isEffect(args[1]),
-  (self, that, options) => zipWithOptions(self, that, (a, _) => a, options)
+  (self, that, options) => {
+    if (options?.concurrent !== true && (options?.batching === undefined || options.batching === false)) {
+      return core.zipLeft(self, that)
+    }
+    return zipWithOptions(self, that, (a, _) => a, options)
+  }
 )
 
 /** @internal */
@@ -2794,11 +2799,16 @@ export const zipRightOptions: {
 } = dual((args) => core.isEffect(args[1]), <A, E, R, A2, E2, R2>(
   self: Effect.Effect<A, E, R>,
   that: Effect.Effect<A2, E2, R2>,
-  options: {
+  options?: {
     readonly concurrent?: boolean | undefined
     readonly batching?: boolean | "inherit" | undefined
   }
-): Effect.Effect<A2, E2 | E, R2 | R> => zipWithOptions(self, that, (_, b) => b, options))
+): Effect.Effect<A2, E2 | E, R2 | R> => {
+  if (options?.concurrent !== true && (options?.batching === undefined || options.batching === false)) {
+    return core.zipRight(self, that)
+  }
+  return zipWithOptions(self, that, (_, b) => b, options)
+})
 
 /** @internal */
 export const zipWithOptions: {

package/src/internal/version.ts

@@ -1 +1 @@
-export const moduleVersion = "2.3.1"
+export const moduleVersion = "2.3.2"

package/dist/cjs/internal/timeout.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.set = exports.clear = void 0;
-/**
- * Bun currently has a bug where `setTimeout` doesn't behave correctly with a 0ms delay.
- *
- * @see https://github.com/oven-sh/bun/issues/3333
- */
-/** @internal */
-const isBun = typeof process === "undefined" ? false : !!process?.isBun;
-/** @internal */
-const clear = exports.clear = isBun ? id => clearInterval(id) : id => clearTimeout(id);
-/** @internal */
-const set = exports.set = isBun ? (fn, ms) => {
-  const id = setInterval(() => {
-    fn();
-    clearInterval(id);
-  }, ms);
-  return id;
-} : (fn, ms) => setTimeout(fn, ms);
-//# sourceMappingURL=timeout.js.map

package/dist/cjs/internal/timeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeout.js","names":["isBun","process","clear","exports","id","clearInterval","clearTimeout","set","fn","ms","setInterval","setTimeout"],"sources":["../../../src/internal/timeout.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA;;;;;AAMA;AACA,MAAMA,KAAK,GAAG,OAAOC,OAAO,KAAK,WAAW,GAAG,KAAK,GAAG,CAAC,CAAGA,OAAe,EAAED,KAAM;AAElF;AACO,MAAME,KAAK,GAAAC,OAAA,CAAAD,KAAA,GAAiCF,KAAK,GAAII,EAAE,IAAKC,aAAa,CAACD,EAAE,CAAC,GAAIA,EAAE,IAAKE,YAAY,CAACF,EAAE,CAAC;AAE/G;AACO,MAAMG,GAAG,GAAAJ,OAAA,CAAAI,GAAA,GAAmDP,KAAK,GACtE,CAACQ,EAAc,EAAEC,EAAU,KAAI;EAC7B,MAAML,EAAE,GAAGM,WAAW,CAAC,MAAK;IAC1BF,EAAE,EAAE;IACJH,aAAa,CAACD,EAAE,CAAC;EACnB,CAAC,EAAEK,EAAE,CAAC;EAEN,OAAOL,EAAE;AACX,CAAC,GACD,CAACI,EAAc,EAAEC,EAAU,KAAKE,UAAU,CAACH,EAAE,EAAEC,EAAE,CAAC"}

package/dist/dts/internal/timeout.d.ts

@@ -1,7 +0,0 @@
-/**
- * Bun currently has a bug where `setTimeout` doesn't behave correctly with a 0ms delay.
- *
- * @see https://github.com/oven-sh/bun/issues/3333
- */
-export {};
-//# sourceMappingURL=timeout.d.ts.map

package/dist/dts/internal/timeout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeout.d.ts","sourceRoot":"","sources":["../../../src/internal/timeout.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/dist/esm/internal/timeout.js

@@ -1,18 +0,0 @@
-/**
- * Bun currently has a bug where `setTimeout` doesn't behave correctly with a 0ms delay.
- *
- * @see https://github.com/oven-sh/bun/issues/3333
- */
-/** @internal */
-const isBun = typeof process === "undefined" ? false : !!process?.isBun;
-/** @internal */
-export const clear = isBun ? id => clearInterval(id) : id => clearTimeout(id);
-/** @internal */
-export const set = isBun ? (fn, ms) => {
-  const id = setInterval(() => {
-    fn();
-    clearInterval(id);
-  }, ms);
-  return id;
-} : (fn, ms) => setTimeout(fn, ms);
-//# sourceMappingURL=timeout.js.map

package/dist/esm/internal/timeout.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"timeout.js","names":["isBun","process","clear","id","clearInterval","clearTimeout","set","fn","ms","setInterval","setTimeout"],"sources":["../../../src/internal/timeout.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;AAMA;AACA,MAAMA,KAAK,GAAG,OAAOC,OAAO,KAAK,WAAW,GAAG,KAAK,GAAG,CAAC,CAAGA,OAAe,EAAED,KAAM;AAElF;AACA,OAAO,MAAME,KAAK,GAAiCF,KAAK,GAAIG,EAAE,IAAKC,aAAa,CAACD,EAAE,CAAC,GAAIA,EAAE,IAAKE,YAAY,CAACF,EAAE,CAAC;AAE/G;AACA,OAAO,MAAMG,GAAG,GAAmDN,KAAK,GACtE,CAACO,EAAc,EAAEC,EAAU,KAAI;EAC7B,MAAML,EAAE,GAAGM,WAAW,CAAC,MAAK;IAC1BF,EAAE,EAAE;IACJH,aAAa,CAACD,EAAE,CAAC;EACnB,CAAC,EAAEK,EAAE,CAAC;EAEN,OAAOL,EAAE;AACX,CAAC,GACD,CAACI,EAAc,EAAEC,EAAU,KAAKE,UAAU,CAACH,EAAE,EAAEC,EAAE,CAAC"}

package/src/internal/timeout.ts

@@ -1,23 +0,0 @@
-/**
- * Bun currently has a bug where `setTimeout` doesn't behave correctly with a 0ms delay.
- *
- * @see https://github.com/oven-sh/bun/issues/3333
- */
-
-/** @internal */
-const isBun = typeof process === "undefined" ? false : !!((process as any)?.isBun)
-
-/** @internal */
-export const clear: (id: NodeJS.Timeout) => void = isBun ? (id) => clearInterval(id) : (id) => clearTimeout(id)
-
-/** @internal */
-export const set: (fn: () => void, ms: number) => NodeJS.Timeout = isBun ?
-  (fn: () => void, ms: number) => {
-    const id = setInterval(() => {
-      fn()
-      clearInterval(id)
-    }, ms)
-
-    return id
-  } :
-  (fn: () => void, ms: number) => setTimeout(fn, ms)