TraitBuilder work

src/TraitBuilder.ts

@@ -1,42 +1,40 @@
-import { Pipe, Tuples } from "hotscript"
-import { AbstractClass, Class } from "type-fest"
+import { AbstractClass, Class, Simplify } from "type-fest"
 import { Trait, TraitClass, TraitConcreteClass } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
-import { ExtendFn, ExtendPlain, SimplifyFn, StaticMembers } from "./util"
+import { ExtendPlain, StaticMembers } from "./util"
 
 
-export type ExtendAbstractSuper<
-    SuperExpression extends TraitExpression<
-        typeof TraitExpression.NullSuperclass,
-        Trait<any, any, any, any>[]
-    >,
-    Abstract        extends object,
-> = (
-    Pipe<SuperExpression, [
-        TraitExpression.TraitsFn,
-        Tuples.Map<Trait.OwnAbstractFn>,
-        Tuples.Append<Abstract>,
-        ExtendFn,
-        SimplifyFn,
-    ]>
-    // ExtendPlain<[
-    //     ...Trait.OwnAbstract<
-    //         TraitExpression.Traits<SuperExpression>[number]
-    //     >,
-    //     Abstract,
-    // ]>
+type ExtendAbstractSuper<SuperExpression, Abstract> = (
+    Simplify<
+        ExtendPlain<[
+            ...MapTraitsToOwnAbstract<
+                TraitExpression.Traits<SuperExpression>
+            >,
+            Abstract,
+        ]>
+    >
 )
 
+type MapTraitsToOwnAbstract<T extends readonly any[]> = {
+    [K in keyof T]: Trait.OwnAbstract<T[K]>
+}
+
+
 type ExtendStaticAbstractSuper<SuperExpression, StaticAbstract> = (
-    Pipe<SuperExpression, [
-        TraitExpression.TraitsFn,
-        Tuples.Map<Trait.OwnStaticAbstractFn>,
-        Tuples.Append<StaticAbstract>,
-        ExtendFn,
-        SimplifyFn,
-    ]>
+    Simplify<
+        ExtendPlain<[
+            ...MapTraitsToOwnStaticAbstract<
+                TraitExpression.Traits<SuperExpression>
+            >,
+            StaticAbstract,
+        ]>
+    >
 )
 
+type MapTraitsToOwnStaticAbstract<T extends readonly any[]> = {
+    [K in keyof T]: Trait.OwnStaticAbstract<T[K]>
+}
+
 
 type TraitApplierSuperTag = "@thilawyn/traitify-ts/Super"