Work

src/TraitExpressionBuilder.ts

@@ -73,40 +73,36 @@ type SpreadSupertraits<Traits extends Trait<any, any, any>[]> = (
     >
 )
 interface PrependTraitSupertraitsFn extends Fn {
-    return: this["arg0"] extends Trait<infer Super, any, any>
-        ? Super extends TraitExpression<any, any, infer AllTraits>
-            ? [...AllTraits, this["arg0"]]
-            : never
-        : never
+    return: [...Trait.Supertraits<this["arg0"]>, this["arg0"]]
 }
 
 
 type AbstractMembersExtendable<
-    Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any, any>[],
+    Superclass extends AbstractClass<{}>,
+    Traits     extends Trait<any, any, any>[],
 > = (
     Call<ExtendableFn, [
-        InstanceType<Super>,
+        InstanceType<Superclass>,
         ...Call<Tuples.Map<Trait.OwnAbstractFn>, Traits>,
     ]>
 )
 
 type ImplInstanceExtendable<
-    Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any, any>[],
+    Superclass extends AbstractClass<{}>,
+    Traits     extends Trait<any, any, any>[],
 > = (
     Call<ExtendableFn, [
-        InstanceType<Super>,
+        InstanceType<Superclass>,
         ...Call<Tuples.Map<Trait.OwnImplInstanceFn>, Traits>,
     ]>
 )
 
 type ImplStaticMembersExtendable<
-    Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any, any>[],
+    Superclass extends AbstractClass<{}>,
+    Traits     extends Trait<any, any, any>[],
 > = (
     Pipe<[
-        Super,
+        Superclass,
         ...Call<Tuples.Map<Trait.OwnImplClassFn>, Traits>,
     ], [
         Tuples.Map<StaticMembersFn>,
@@ -115,19 +111,19 @@ type ImplStaticMembersExtendable<
 )
 
 type GetTraitExpression<
-    Super     extends AbstractClass<{}>,
-    OwnTraits extends Trait<any, any, any>[],
-    AllTraits extends Trait<any, any, any>[],
+    Superclass extends AbstractClass<{}>,
+    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<Super, AllTraits> extends false
+        : AbstractMembersExtendable<Superclass, AllTraits> extends false
             ? "Type conflict between the traits abstract members and/or the superclass instance."
-            : ImplInstanceExtendable<Super, AllTraits> extends false
+            : ImplInstanceExtendable<Superclass, AllTraits> extends false
                 ? "Type conflict between the traits implementation instances and/or the superclass instance."
-                : ImplStaticMembersExtendable<Super, AllTraits> extends false
+                : ImplStaticMembersExtendable<Superclass, AllTraits> extends false
                     ? "Type conflict between the traits implementation static members and/or the superclass static members."
-                    : TraitExpression<Super, OwnTraits, AllTraits>
+                    : TraitExpression<Superclass, OwnTraits, AllTraits>
 )