From 7b5eaa3838c79bf4bdccf91b94d61bbc38a2ec95 Mon Sep 17 00:00:00 2001
From: Matheus Michalski Puel <matheuspuel@gmail.com>
Date: Mon, 1 Jan 2024 05:58:49 -0300
Subject: [PATCH] make serviceFunctions accept an Effect (#1797)

---
 .changeset/four-zoos-happen.md              |  5 +++
 packages/effect/src/Effect.ts               | 36 +++++++++--------
 packages/effect/src/internal/core-effect.ts | 44 +++++++++++----------
 3 files changed, 47 insertions(+), 38 deletions(-)
 create mode 100644 .changeset/four-zoos-happen.md

diff --git a/.changeset/four-zoos-happen.md b/.changeset/four-zoos-happen.md
new file mode 100644
index 00000000000..12df37f0e3e
--- /dev/null
+++ b/.changeset/four-zoos-happen.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+make serviceFunctions and similar accept an Effect as the service
diff --git a/packages/effect/src/Effect.ts b/packages/effect/src/Effect.ts
index b44ff6edf5f..b8870d5c129 100644
--- a/packages/effect/src/Effect.ts
+++ b/packages/effect/src/Effect.ts
@@ -3154,29 +3154,30 @@ export const provideServiceEffect: {
  * @since 2.0.0
  * @category context
  */
-export const serviceFunction: <T extends Context.Tag<any, any>, Args extends Array<any>, A>(
-  service: T,
-  f: (_: Context.Tag.Service<T>) => (...args: Args) => A
-) => (...args: Args) => Effect<Context.Tag.Identifier<T>, never, A> = effect.serviceFunction
+export const serviceFunction: <T extends Effect<any, any, any>, Args extends Array<any>, A>(
+  getService: T,
+  f: (_: Effect.Success<T>) => (...args: Args) => A
+) => (...args: Args) => Effect<Effect.Context<T>, Effect.Error<T>, A> = effect.serviceFunction
 
 /**
  * @since 2.0.0
  * @category context
  */
-export const serviceFunctionEffect: <T extends Context.Tag<any, any>, Args extends Array<any>, R, E, A>(
-  service: T,
-  f: (_: Context.Tag.Service<T>) => (...args: Args) => Effect<R, E, A>
-) => (...args: Args) => Effect<R | Context.Tag.Identifier<T>, E, A> = effect.serviceFunctionEffect
+export const serviceFunctionEffect: <T extends Effect<any, any, any>, Args extends Array<any>, R, E, A>(
+  getService: T,
+  f: (_: Effect.Success<T>) => (...args: Args) => Effect<R, E, A>
+) => (...args: Args) => Effect<R | Effect.Context<T>, E | Effect.Error<T>, A> = effect.serviceFunctionEffect
 
 /**
  * @since 2.0.0
  * @category context
  */
-export const serviceFunctions: <I, S>(
-  tag: Context.Tag<I, S>
+export const serviceFunctions: <SR, SE, S>(
+  getService: Effect<SR, SE, S>
 ) => {
   [k in { [k in keyof S]: S[k] extends (...args: Array<any>) => Effect<any, any, any> ? k : never }[keyof S]]:
-    S[k] extends (...args: infer Args) => Effect<infer R, infer E, infer A> ? (...args: Args) => Effect<R | I, E, A> :
+    S[k] extends (...args: infer Args) => Effect<infer R, infer E, infer A> ?
+      (...args: Args) => Effect<R | SR, E | SE, A> :
       never
 } = effect.serviceFunctions
 
@@ -3184,26 +3185,27 @@ export const serviceFunctions: <I, S>(
  * @since 2.0.0
  * @category context
  */
-export const serviceConstants: <I, S>(
-  tag: Context.Tag<I, S>
+export const serviceConstants: <SR, SE, S>(
+  getService: Effect<SR, SE, S>
 ) => {
   [k in { [k in keyof S]: S[k] extends Effect<any, any, any> ? k : never }[keyof S]]: S[k] extends
-    Effect<infer R, infer E, infer A> ? Effect<R | I, E, A> : never
+    Effect<infer R, infer E, infer A> ? Effect<R | SR, E | SE, A> : never
 } = effect.serviceConstants
 
 /**
  * @since 2.0.0
  * @category context
  */
-export const serviceMembers: <I, S>(tag: Context.Tag<I, S>) => {
+export const serviceMembers: <SR, SE, S>(getService: Effect<SR, SE, S>) => {
   functions: {
     [k in { [k in keyof S]: S[k] extends (...args: Array<any>) => Effect<any, any, any> ? k : never }[keyof S]]:
-      S[k] extends (...args: infer Args) => Effect<infer R, infer E, infer A> ? (...args: Args) => Effect<R | I, E, A> :
+      S[k] extends (...args: infer Args) => Effect<infer R, infer E, infer A> ?
+        (...args: Args) => Effect<R | SR, E | SE, A> :
         never
   }
   constants: {
     [k in { [k in keyof S]: S[k] extends Effect<any, any, any> ? k : never }[keyof S]]: S[k] extends
-      Effect<infer R, infer E, infer A> ? Effect<R | I, E, A> : never
+      Effect<infer R, infer E, infer A> ? Effect<R | SR, E | SE, A> : never
   }
 } = effect.serviceMembers
 
diff --git a/packages/effect/src/internal/core-effect.ts b/packages/effect/src/internal/core-effect.ts
index 70fcd4fa456..dd9db103b2c 100644
--- a/packages/effect/src/internal/core-effect.ts
+++ b/packages/effect/src/internal/core-effect.ts
@@ -1832,62 +1832,64 @@ export const withMetric = dual<
 >(2, (self, metric) => metric(self))
 
 /** @internal */
-export const serviceFunctionEffect = <T extends Context.Tag<any, any>, Args extends Array<any>, R, E, A>(
-  service: T,
-  f: (_: Context.Tag.Service<T>) => (...args: Args) => Effect.Effect<R, E, A>
+export const serviceFunctionEffect = <T extends Effect.Effect<any, any, any>, Args extends Array<any>, R, E, A>(
+  getService: T,
+  f: (_: Effect.Effect.Success<T>) => (...args: Args) => Effect.Effect<R, E, A>
 ) =>
-(...args: Args): Effect.Effect<R | Context.Tag.Identifier<T>, E, A> => core.flatMap(service, (a) => f(a)(...args))
+(...args: Args): Effect.Effect<R | Effect.Effect.Context<T>, E | Effect.Effect.Error<T>, A> =>
+  core.flatMap(getService, (a) => f(a)(...args))
 
 /** @internal */
-export const serviceFunction = <T extends Context.Tag<any, any>, Args extends Array<any>, A>(
-  service: T,
-  f: (_: Context.Tag.Service<T>) => (...args: Args) => A
+export const serviceFunction = <T extends Effect.Effect<any, any, any>, Args extends Array<any>, A>(
+  getService: T,
+  f: (_: Effect.Effect.Success<T>) => (...args: Args) => A
 ) =>
-(...args: Args): Effect.Effect<Context.Tag.Identifier<T>, never, A> => core.map(service, (a) => f(a)(...args))
+(...args: Args): Effect.Effect<Effect.Effect.Context<T>, Effect.Effect.Error<T>, A> =>
+  core.map(getService, (a) => f(a)(...args))
 
 /** @internal */
-export const serviceFunctions = <I, S>(
-  tag: Context.Tag<I, S>
+export const serviceFunctions = <SR, SE, S>(
+  getService: Effect.Effect<SR, SE, S>
 ): {
   [k in { [k in keyof S]: S[k] extends (...args: Array<any>) => Effect.Effect<any, any, any> ? k : never }[keyof S]]:
     S[k] extends (...args: infer Args) => Effect.Effect<infer R, infer E, infer A>
-      ? (...args: Args) => Effect.Effect<R | I, E, A>
+      ? (...args: Args) => Effect.Effect<R | SR, E | SE, A>
       : never
 } =>
   new Proxy({} as any, {
     get(_target: any, prop: any, _receiver) {
-      return (...args: Array<any>) => core.flatMap(tag, (s: any) => s[prop](...args))
+      return (...args: Array<any>) => core.flatMap(getService, (s: any) => s[prop](...args))
     }
   })
 
 /** @internal */
-export const serviceConstants = <I, S>(
-  tag: Context.Tag<I, S>
+export const serviceConstants = <SR, SE, S>(
+  getService: Effect.Effect<SR, SE, S>
 ): {
   [k in { [k in keyof S]: S[k] extends Effect.Effect<any, any, any> ? k : never }[keyof S]]: S[k] extends
-    Effect.Effect<infer R, infer E, infer A> ? Effect.Effect<R | I, E, A> : never
+    Effect.Effect<infer R, infer E, infer A> ? Effect.Effect<R | SR, E | SE, A> : never
 } =>
   new Proxy({} as any, {
     get(_target: any, prop: any, _receiver) {
-      return core.flatMap(tag, (s: any) => s[prop])
+      return core.flatMap(getService, (s: any) => s[prop])
     }
   })
 
 /** @internal */
-export const serviceMembers = <I, S>(tag: Context.Tag<I, S>): {
+export const serviceMembers = <SR, SE, S>(getService: Effect.Effect<SR, SE, S>): {
   functions: {
     [k in { [k in keyof S]: S[k] extends (...args: Array<any>) => Effect.Effect<any, any, any> ? k : never }[keyof S]]:
       S[k] extends (...args: infer Args) => Effect.Effect<infer R, infer E, infer A>
-        ? (...args: Args) => Effect.Effect<R | I, E, A>
+        ? (...args: Args) => Effect.Effect<R | SR, E | SE, A>
         : never
   }
   constants: {
     [k in { [k in keyof S]: S[k] extends Effect.Effect<any, any, any> ? k : never }[keyof S]]: S[k] extends
-      Effect.Effect<infer R, infer E, infer A> ? Effect.Effect<R | I, E, A> : never
+      Effect.Effect<infer R, infer E, infer A> ? Effect.Effect<R | SR, E | SE, A> : never
   }
 } => ({
-  functions: serviceFunctions(tag),
-  constants: serviceConstants(tag)
+  functions: serviceFunctions(getService),
+  constants: serviceConstants(getService)
 })
 
 /** @internal */