0.1.23 (#23)

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com> Reviewed-on: https://git.jvalver.de/Thilawyn/traitify-ts/pulls/23
2024-05-12 03:58:36 +02:00
parent 5d949114e7
commit 7bc5d5b812
2 changed files with 11 additions and 8 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@thilawyn/traitify-ts",
-  "version": "0.1.22",
+  "version": "0.1.23",
  "type": "module",
  "publishConfig": {
    "registry": "https://git.jvalver.de/api/packages/thilawyn/npm/"
--- 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
            >
        > &