From c9a7b660dbbc60ee3f0d94abd8b3e1920e0e864e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 12 May 2024 03:50:51 +0200
Subject: [PATCH] Effect schema inheritance fix

---
 src/effect/EffectSchemaTraitExpression.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/effect/EffectSchemaTraitExpression.ts b/src/effect/EffectSchemaTraitExpression.ts
index a3d29ca..2d284f8 100644
--- a/src/effect/EffectSchemaTraitExpression.ts
+++ b/src/effect/EffectSchemaTraitExpression.ts
@@ -33,7 +33,15 @@ implements TraitExpressionLike<
     extends<Self>(): (
         AbstractConstructor<
             ApplyMutability<S.Struct.Type<Fields>, Mutability> &
-            Omit<Inherited, keyof Fields> &
+            Omit<
+                Simplify<
+                    Extend<[
+                        Inherited,
+                        ...TraitTuple.MapImplInstance<Traits>
+                    ]>
+                >,
+                keyof Fields
+            > &
             Proto,
 
             ConstructorParameters<S.Class<unknown, Fields, I, R, C, Inherited, Proto>>
@@ -45,12 +53,7 @@ implements TraitExpressionLike<
                 Fields,
                 ApplyMutability<I, EncodedMutability>,
                 R, C,
-                Simplify<
-                    Extend<[
-                        Inherited,
-                        ...TraitTuple.MapImplInstance<Traits>
-                    ]>
-                >,
+                Inherited,
                 Proto
             >
         > &