Effect schema inheritance fix

2024-05-12 03:50:51 +02:00
parent 5d949114e7
commit c9a7b660db
1 changed files with 10 additions and 7 deletions
--- 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
            >
        > &