Pure TS implementation attempt

src/TraitBuilder.ts

@@ -2,10 +2,16 @@ import { Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class } from "type-fest"
 import { Trait, TraitClass, TraitConcreteClass } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
-import { ExtendFn, SimplifyFn, StaticMembers } from "./util"
+import { ExtendFn, ExtendPlain, SimplifyFn, StaticMembers } from "./util"
 
 
-type ExtendAbstractSuper<SuperExpression, Abstract> = (
+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>,
@@ -13,6 +19,12 @@ type ExtendAbstractSuper<SuperExpression, Abstract> = (
         ExtendFn,
         SimplifyFn,
     ]>
+    // ExtendPlain<[
+    //     ...Trait.OwnAbstract<
+    //         TraitExpression.Traits<SuperExpression>[number]
+    //     >,
+    //     Abstract,
+    // ]>
 )
 
 type ExtendStaticAbstractSuper<SuperExpression, StaticAbstract> = (
@@ -30,19 +42,20 @@ type TraitApplierSuperTag = "@thilawyn/traitify-ts/Super"
 
 type RemoveAbstractFromImplClass<
     ImplClassWithAbstract extends AbstractClass<object>,
-    Abstract              extends AbstractClass<object>,
+    Abstract              extends object,
+    StaticAbstract        extends object,
 > = (
     Class<
         Omit<
             InstanceType<ImplClassWithAbstract>,
-            keyof InstanceType<Abstract>
+            keyof Abstract
         >,
 
         ConstructorParameters<ImplClassWithAbstract>
     > &
     Omit<
         StaticMembers<ImplClassWithAbstract>,
-        keyof StaticMembers<Abstract> | "_tag"
+        keyof StaticAbstract | "_tag"
     >
 )
 
@@ -134,9 +147,8 @@ export class TraitBuilder<
             this.traitStaticAbstract,
             apply as unknown as (Super: AbstractClass<object>) => RemoveAbstractFromImplClass<
                 ImplClassWithAbstract,
-                TraitClass<
-                    Trait<SuperExpression, Abstract, StaticAbstract, ImplClass>
-                >
+                ExtendAbstractSuper<SuperExpression, Abstract>,
+                ExtendStaticAbstractSuper<SuperExpression, StaticAbstract>
             >,
         )
     }