fix Context.add Context.make fns (#5031)

Co-authored-by: Tim <hello@timsmart.co>

Author: KhraksMamtsov

.changeset/flat-buses-allow.md

@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Fix Context.add & Context.make signatures

packages/effect/dtslint/Context.tst.ts

@@ -12,4 +12,15 @@ describe("Context", () => {
     class C extends Context.Reference<C>()("C", { defaultValue: () => 0 }) {}
     expect(C.key).type.toBe<"C">()
   })
+  it("Tag with static fields", () => {
+    class Foo extends Context.Tag("Foo")<Foo, { readonly bar: string }>() {
+      static readonly StaticField = "StaticField"
+    }
+
+    // @ts-expect-error
+    Context.empty().pipe(Context.add(Foo, 123))
+
+    const ctx = Context.empty().pipe(Context.add(Foo, { bar: "2" }))
+    expect(ctx).type.toBe<Context.Context<Foo>>()
+  })
 })

packages/effect/src/Context.ts

@@ -262,8 +262,7 @@ export const empty: () => Context<never> = internal.empty
  * @since 2.0.0
  * @category constructors
  */
-export const make: <T extends Tag<any, any>>(tag: T, service: Tag.Service<T>) => Context<Tag.Identifier<T>> =
-  internal.make
+export const make: <I, S>(tag: Tag<I, S>, service: Types.NoInfer<S>) => Context<I> = internal.make
 
 /**
  * Adds a service to a given `Context`.
@@ -290,15 +289,8 @@ export const make: <T extends Tag<any, any>>(tag: T, service: Tag.Service<T>) =>
  * @since 2.0.0
  */
 export const add: {
-  <T extends Tag<any, any>>(
-    tag: T,
-    service: Tag.Service<T>
-  ): <Services>(self: Context<Services>) => Context<Services | Tag.Identifier<T>>
-  <Services, T extends Tag<any, any>>(
-    self: Context<Services>,
-    tag: T,
-    service: Tag.Service<T>
-  ): Context<Services | Tag.Identifier<T>>
+  <I, S>(tag: Tag<I, S>, service: Types.NoInfer<S>): <Services>(self: Context<Services>) => Context<Services | I>
+  <Services, I, S>(self: Context<Services>, tag: Tag<I, S>, service: Types.NoInfer<S>): Context<Services | I>
 } = internal.add
 
 /**

packages/effect/src/internal/context.ts

@@ -9,6 +9,7 @@ import type * as O from "../Option.js"
 import { pipeArguments } from "../Pipeable.js"
 import { hasProperty } from "../Predicate.js"
 import type * as STM from "../STM.js"
+import type { NoInfer } from "../Types.js"
 import { EffectPrototype, effectVariance } from "./effectable.js"
 import * as option from "./option.js"
 
@@ -202,24 +203,22 @@ const _empty = makeContext(new Map())
 export const empty = (): C.Context<never> => _empty
 
 /** @internal */
-export const make = <T extends C.Tag<any, any>>(
-  tag: T,
-  service: C.Tag.Service<T>
-): C.Context<C.Tag.Identifier<T>> => makeContext(new Map([[tag.key, service]]))
+export const make = <I, S>(tag: C.Tag<I, S>, service: NoInfer<S>): C.Context<I> =>
+  makeContext(new Map([[tag.key, service]]))
 
 /** @internal */
 export const add = dual<
-  <T extends C.Tag<any, any>>(
-    tag: T,
-    service: C.Tag.Service<T>
+  <I, S>(
+    tag: C.Tag<I, S>,
+    service: NoInfer<S>
   ) => <Services>(
     self: C.Context<Services>
-  ) => C.Context<Services | C.Tag.Identifier<T>>,
-  <Services, T extends C.Tag<any, any>>(
+  ) => C.Context<Services | I>,
+  <Services, I, S>(
     self: C.Context<Services>,
-    tag: T,
-    service: C.Tag.Service<T>
-  ) => C.Context<Services | C.Tag.Identifier<T>>
+    tag: C.Tag<I, S>,
+    service: NoInfer<S>
+  ) => C.Context<Services | I>
 >(3, (self, tag, service) => {
   const map = new Map(self.unsafeMap)
   map.set(tag.key, service)

packages/effect/test/Context.test.ts

@@ -113,7 +113,9 @@ describe("Context", () => {
       readonly FooBar: unique symbol
     }
     const Service = Context.GenericTag<FooBar, Foo | Bar>("FooBar")
-    const context = Context.make(Service, { _tag: "Foo" })
+    const context = Context.make(Service, { _tag: "Foo" }).pipe(
+      Context.add(Service, { _tag: "Foo" })
+    )
     deepStrictEqual(Context.get(context, Service), { _tag: "Foo" })
   })