From b8ad8a94c92cd67c01f42220fa1354cc62b7acfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 23 Mar 2026 08:06:47 +0100
Subject: [PATCH] Fix

---
 packages/effect-fc/src/Lens.ts | 38 +++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/effect-fc/src/Lens.ts b/packages/effect-fc/src/Lens.ts
index 1f23b89..a7dd2f9 100644
--- a/packages/effect-fc/src/Lens.ts
+++ b/packages/effect-fc/src/Lens.ts
@@ -5,34 +5,38 @@ export const LensTypeId: unique symbol = Symbol.for("@effect-fc/Lens/Lens")
 export type LensTypeId = typeof LensTypeId
 
 export interface Lens<in out A, in out ER = never, in out RR = never, in out EW = never, in out RW = never>
-extends Subscribable.Subscribable<A, ER, RR>, LensPrototype<A, ER, RR, EW, RW> {
-    readonly set: (a: A) => Effect.Effect<void, EW, RW>
-}
-
-
-export interface LensPrototype<in out A, in out ER = never, in out RR = never, in out EW = never, in out RW = never> extends Pipeable.Pipeable {
+extends Subscribable.Subscribable<A, ER, RR> {
     readonly [LensTypeId]: LensTypeId
+
+    readonly set: (a: A) => Effect.Effect<void, EW, RW>
     readonly modify: <B, E1 = never, R1 = never>(
         f: (a: A) => Effect.Effect<readonly [B, A], E1, R1>
     ) => Effect.Effect<B, ER | EW | E1, RR | RW | R1>
 }
 
-export const LensPrototype: LensPrototype<any, any, any, any, any> = Object.freeze({
-    ...Pipeable.Prototype,
-    [Readable.TypeId]: Readable.TypeId,
-    [Subscribable.TypeId]: Subscribable.TypeId,
-    [LensTypeId]: LensTypeId,
+export class LensImpl<in out A, in out ER = never, in out RR = never, in out EW = never, in out RW = never>
+extends Pipeable.Class() implements Lens<A, ER, RR, EW, RW> {
+    readonly [Readable.TypeId]: Readable.TypeId = Readable.TypeId
+    readonly [Subscribable.TypeId]: Subscribable.TypeId = Subscribable.TypeId
+    readonly [LensTypeId]: LensTypeId = LensTypeId
 
-    modify<A, ER, RR, EW, RW, B, E1 = never, R1 = never>(
-        this: Lens<A, ER, RR, EW, RW>,
-        f: (a: A) => Effect.Effect<readonly [B, A], E1, R1>,
+    constructor(
+        readonly get: Effect.Effect<A, ER, RR>,
+        readonly changes: Stream.Stream<A, ER, RR>,
+        readonly set: (a: A) => Effect.Effect<void, EW, RW>,
+    ) {
+        super()
+    }
+
+    modify<B, E1 = never, R1 = never>(
+        f: (a: A) => Effect.Effect<readonly [B, A], E1, R1>
     ) {
         return Effect.flatMap(
             this.get,
             a => Effect.flatMap(f(a), ([b, next]) => Effect.as(this.set(next), b)
         ))
-    },
-} as const)
+    }
+}
 
 
 export const isLens = (u: unknown): u is Lens<unknown, unknown, unknown, unknown, unknown> => Predicate.hasProperty(u, LensTypeId)
@@ -43,7 +47,7 @@ export const make = <A, ER, RR, EW, RW>(
         readonly changes: Stream.Stream<A, ER, RR>
         readonly set: (a: A) => Effect.Effect<void, EW, RW>
     }
-): Lens<A, ER, RR, EW, RW> => Object.setPrototypeOf({ ...options }, LensPrototype)
+): Lens<A, ER, RR, EW, RW> => new LensImpl(options.get, options.changes, options.set)
 
 /**
  * Creates a `Lens` that directly proxies a `SubscriptionRef`.