fix types for bindAll

Effect-TS · Aug 28, 2024 · 2cdf5df · 2cdf5df
1 parent 11a76cd
commit 2cdf5df
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/packages/effect/src/internal/effect/circular.ts b/packages/effect/src/internal/effect/circular.ts
@@ -22,6 +22,7 @@ import { currentScheduler } from "../../Scheduler.js"
 import type * as Scope from "../../Scope.js"
 import type * as Supervisor from "../../Supervisor.js"
 import type * as Synchronized from "../../SynchronizedRef.js"
+import type * as Types from "../../Types.js"
 import * as internalCause from "../cause.js"
 import * as effect from "../core-effect.js"
 import * as core from "../core.js"
@@ -707,7 +708,16 @@ export const zipWithFiber = dual<
 
 /* @internal */
 export const bindAll: {
-  <A extends object, X extends Record<string, Effect.Effect<any, any, any>>, O extends Effect.All.Options>(
+  <
+    A extends object,
+    X extends Record<string, Effect.Effect<any, any, any>>,
+    O extends {
+      readonly concurrency?: Types.Concurrency | undefined
+      readonly batching?: boolean | "inherit" | undefined
+      readonly mode?: "default" | "validate" | "either" | undefined
+      readonly concurrentFinalizers?: boolean | undefined
+    }
+  >(
     f: (a: A) => [Extract<keyof X, keyof A>] extends [never] ? X : `Duplicate keys`,
     options?: undefined | O
   ): <E1, R1>(self: Effect.Effect<A, E1, R1>) => Effect.Effect<
@@ -729,13 +739,23 @@ export const bindAll: {
   <
     A extends object,
     X extends Record<string, Effect.Effect<any, any, any>>,
-    O extends Effect.All.Options,
+    O extends {
+      readonly concurrency?: Types.Concurrency | undefined
+      readonly batching?: boolean | "inherit" | undefined
+      readonly mode?: "default" | "validate" | "either" | undefined
+      readonly concurrentFinalizers?: boolean | undefined
+    },
     E1,
     R1
   >(
     self: Effect.Effect<A, E1, R1>,
     f: (a: A) => [Extract<keyof X, keyof A>] extends [never] ? X : `Duplicate keys`,
-    options?: undefined | Effect.All.Options
+    options?: undefined | {
+      readonly concurrency?: Types.Concurrency | undefined
+      readonly batching?: boolean | "inherit" | undefined
+      readonly mode?: "default" | "validate" | "either" | undefined
+      readonly concurrentFinalizers?: boolean | undefined
+    }
   ): Effect.Effect<
     {
       [K in keyof X | keyof A]: K extends keyof A ? A[K] :
@@ -755,7 +775,12 @@ export const bindAll: {
 } = dual((args) => core.isEffect(args[0]), <
   A extends object,
   X extends Record<string, Effect.Effect<any, any, any>>,
-  O extends Effect.All.Options,
+  O extends {
+    readonly concurrency?: Types.Concurrency | undefined
+    readonly batching?: boolean | "inherit" | undefined
+    readonly mode?: "default" | "validate" | "either" | undefined
+    readonly concurrentFinalizers?: boolean | undefined
+  },
   E1,
   R1
 >(

diff --git a/packages/effect/test/Effect/do-notation.test.ts b/packages/effect/test/Effect/do-notation.test.ts
@@ -48,7 +48,7 @@ describe("do notation", () => {
 
   describe("bindAll", () => {
     it("succeed", () => {
-      const getTest = <O extends Effect.All.Options>(options: O) =>
+      const getTest = <O extends { mode: "default" | "either" | "validate" }>(options: O) =>
         Effect.Do.pipe(
           Effect.bind("x", () => Effect.succeed(2)),
           Effect.bindAll(({ x }) => ({
@@ -77,7 +77,7 @@ describe("do notation", () => {
     })
 
     it("with failure", () => {
-      const getTest = <O extends Effect.All.Options>(options: O) =>
+      const getTest = <O extends { mode: "default" | "either" | "validate" }>(options: O) =>
         Effect.Do.pipe(
           Effect.bind("x", () => Effect.succeed(2)),
           Effect.bindAll(({ x }) => ({