src/TraitExpressionBuilder.ts

@@ -5,26 +5,32 @@ import { TraitExpression } from "./TraitExpression"
 import { Extendable, StaticMembers } from "./util"
 
 
-type SpreadSupertraits<T> = (
+type SpreadSupertraits<Traits> = (
-    T extends [infer Trait, ...infer Rest]
+    Traits extends [
+        infer El extends Trait<any, any, any, any>,
+        ...infer Rest,
+    ]
         ? [
-            ...Trait.Supertraits<Trait>,
+            ...Trait.Supertraits<El>,
-            Trait,
+            El,
             ...SpreadSupertraits<Rest>,
         ]
         : []
 )
 
 type TraitsUniq<Traits> = (
-    Traits extends [...infer Rest, infer Trait]
+    Traits extends [
-        ? IsTraitInTupleFromRight<Rest, Trait> extends true
+        ...infer Rest,
+        infer El extends Trait<any, any, any, any>,
+    ]
+        ? IsTraitInTupleFromRight<Rest, El> extends true
             ? TraitsUniq<Rest>
-            : [...TraitsUniq<Rest>, Trait]
+            : [...TraitsUniq<Rest>, El]
         : []
 )
 type IsTraitInTupleFromRight<Traits, T> = (
-    Traits extends [...infer Rest, infer Trait]
+    Traits extends [...infer Rest, infer El]
-        ? IsEqual<Trait, T> extends true
+        ? IsEqual<El, T> extends true
             ? true
             : IsTraitInTupleFromRight<Rest, T>
         : false