abstract

src/TraitBuilder.ts

@@ -24,13 +24,13 @@ export class TraitBuilder<
     ) {}
 
 
-    abstract<A extends Abstract>(
-        _: (Super: AbstractConstructor<Abstract>) => AbstractConstructor<A, []>
+    abstract<A extends AbstractConstructor<Abstract> & StaticAbstract>(
+        _: (Super: AbstractConstructor<Abstract> & StaticAbstract) => A
     ) {
         return new TraitBuilder(
             this.traitSuperExpression,
-            {} as Simplify<A>,
-            this.traitStaticAbstract,
+            {} as Simplify<InstanceType<A>>,
+            {} as Simplify<StaticMembers<A>>,
             this.traitApply,
         )
     }
@@ -46,17 +46,6 @@ export class TraitBuilder<
         )
     }
 
-    staticAbstract<A extends StaticAbstract>(
-        _: (Super: AbstractConstructor<StaticAbstract>) => AbstractConstructor<A, []>
-    ) {
-        return new TraitBuilder(
-            this.traitSuperExpression,
-            this.traitAbstract,
-            {} as Simplify<A>,
-            this.traitApply,
-        )
-    }
-
     staticAbstractType<A extends StaticAbstract>(
         _: (Super: StaticAbstract) => typeof type<A>
     ) {