From 7bc5d5b812cb46d7c003a911d203c9d8cde1ac2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <me@julienvalver.de>
Date: Sun, 12 May 2024 03:58:36 +0200
Subject: [PATCH] 0.1.23 (#23)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://git.jvalver.de/Thilawyn/traitify-ts/pulls/23
---
 package.json                              |  2 +-
 src/effect/EffectSchemaTraitExpression.ts | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index ff0b823..1c12030 100644
--- 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/"
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
             >
         > &