TraitBuilder use in tests

src/TraitBuilder.ts

@@ -73,7 +73,7 @@ export class TraitBuilder<
             )
         ) => ImplClassWithAbstract
     ) {
-        return new Trait(
+        return new TraitBuilder(
             this.traitSuperExpression,
             this.traitAbstract,
             this.traitStaticAbstract,

src/tests.ts

@@ -1,46 +1,43 @@
-import { Trait, trait } from "./Trait"
+import { Trait } from "./Trait"
+import { trait } from "./TraitBuilder"
 import { Implements, ImplementsStatic } from "./TraitExpression"
 import { expression } from "./TraitExpressionBuilder"
 import { abstract } from "./abstract"
 
 
-const PrintsHelloOnNew = trait(
+const PrintsHelloOnNew = trait
-    abstract(),
+    .implement(Super => class PrintsHelloOnNew extends Super {
-    abstract(),
-    Super => class PrintsHelloOnNew extends Super {
         static readonly isPrintsHelloOnNew = true
 
         constructor(...args: any[]) {
             super(...args)
             console.log("Hello!")
         }
-    },
+    })
-)
+    .build()
+
 type PrintsHelloOnNewClass = Trait.Class<typeof PrintsHelloOnNew>
 
-const Identifiable = <ID>() => trait(
+const Identifiable = <ID>() => trait
-    abstract<{ readonly id: ID }>(),
+    .abstract<{ readonly id: ID }>()
-    abstract(),
+    .implement(Super => class Identifiable extends Super {
-    Super => class Identifiable extends Super {
         equals(el: Identifiable) {
             return this.id === el.id
         }
-    },
+    })
-)
+    .build()
 
-const StatefulSubscription = trait(
+const StatefulSubscription = trait
-    abstract<{
+    .abstract<{
         readonly isStatefulSubscription: true
         readonly status: (
             { _tag: "awaitingPayment" } |
             { _tag: "active", activeSince: Date, expiresAt?: Date } |
             { _tag: "expired", expiredSince: Date }
         )
-    }>(),
+    }>()
-    abstract(),
+    .build()
 
-    Super => class StatefulSubscription extends Super {},
-)
 type StatefulSubscriptionClass = Trait.Class<typeof StatefulSubscription>
 
 const ActiveStatefulSubscription = expression