From 4b142c28f5ba995fb009bc186a1be2029c3d48f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Wed, 7 Feb 2024 21:14:52 +0100
Subject: [PATCH] Code improvement

---
 src/TraitExpressionBuilder.ts | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts
index fc7c04e..53abdf4 100644
--- a/src/TraitExpressionBuilder.ts
+++ b/src/TraitExpressionBuilder.ts
@@ -19,9 +19,9 @@ type AbstractMembersExtendable<
     Superclass extends AbstractClass<{}>,
     Traits     extends Trait<any, any, any>[],
 > = (
-    Call<ExtendableFn, [
-        InstanceType<Superclass>,
-        ...Call<Tuples.Map<Trait.OwnAbstractFn>, Traits>,
+    Pipe<Traits, [
+        Tuples.Map<Trait.OwnAbstractFn>,
+        Tuples.Prepend<InstanceType<Superclass>>,
     ]>
 )
 
@@ -29,9 +29,9 @@ type ImplInstanceExtendable<
     Superclass extends AbstractClass<{}>,
     Traits     extends Trait<any, any, any>[],
 > = (
-    Call<ExtendableFn, [
-        InstanceType<Superclass>,
-        ...Call<Tuples.Map<Trait.OwnImplInstanceFn>, Traits>,
+    Pipe<Traits, [
+        Tuples.Map<Trait.OwnImplInstanceFn>,
+        Tuples.Prepend<InstanceType<Superclass>>,
     ]>
 )
 
@@ -39,10 +39,9 @@ type ImplStaticMembersExtendable<
     Superclass extends AbstractClass<{}>,
     Traits     extends Trait<any, any, any>[],
 > = (
-    Pipe<[
-        Superclass,
-        ...Call<Tuples.Map<Trait.OwnImplClassFn>, Traits>,
-    ], [
+    Pipe<Traits, [
+        Tuples.Map<Trait.OwnImplClassFn>,
+        Tuples.Prepend<Superclass>,
         Tuples.Map<StaticMembersFn>,
         ExtendableFn,
     ]>
@@ -53,15 +52,13 @@ type BuildTraitExpression<
     OwnTraits  extends Trait<any, any, any>[],
     AllTraits  extends Trait<any, any, any>[],
 > = (
-    Call<Tuples.IsEmpty, AllTraits> extends true
-        ? "Cannot express an empty list of traits."
-        : AbstractMembersExtendable<Superclass, AllTraits> extends false
-            ? "Type conflict between the traits abstract members and/or the superclass instance."
-            : ImplInstanceExtendable<Superclass, AllTraits> extends false
-                ? "Type conflict between the traits implementation instances and/or the superclass instance."
-                : ImplStaticMembersExtendable<Superclass, AllTraits> extends false
-                    ? "Type conflict between the traits implementation static members and/or the superclass static members."
-                    : TraitExpression<Superclass, OwnTraits, AllTraits>
+    AbstractMembersExtendable<Superclass, AllTraits> extends false
+        ? "Type conflict between the traits abstract members and/or the superclass instance."
+        : ImplInstanceExtendable<Superclass, AllTraits> extends false
+            ? "Type conflict between the traits implementation instances and/or the superclass instance."
+            : ImplStaticMembersExtendable<Superclass, AllTraits> extends false
+                ? "Type conflict between the traits implementation static members and/or the superclass static members."
+                : TraitExpression<Superclass, OwnTraits, AllTraits>
 )