TraitBuilder work

2024-02-16 01:30:04 +01:00
parent 9f2c42db14
commit f37f15e466
2 changed files with 11 additions and 9 deletions
--- a/src/TraitBuilder.ts
+++ b/src/TraitBuilder.ts
@@ -1,6 +1,6 @@
 import { Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class } from "type-fest"
-import { Trait } from "./Trait"
+import { Trait, TraitClass, TraitConcreteClass, TraitInstance } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
 import { ExtendFn, SimplifyFn, StaticMembers } from "./util"

@@ -109,15 +109,17 @@ export class TraitBuilder<

    implement<
        ImplClassWithAbstract extends (
-            Class<Abstract, []> &
-            SuperStaticAbstract<SuperExpression, StaticAbstract> &
+            TraitConcreteClass<
+                Trait<SuperExpression, Abstract, StaticAbstract, ImplClass>
+            > &
            { _tag: TraitApplierSuperTag }
        )
    >(
        apply: (
            Super: (
-                AbstractClass<Abstract> &
-                StaticAbstract &
+                TraitClass<
+                    Trait<SuperExpression, Abstract, StaticAbstract, ImplClass>
+                > &
                { _tag: TraitApplierSuperTag }
            )
        ) => ImplClassWithAbstract