Trait work

src/Trait.ts

@@ -1,7 +1,7 @@
-import { Fn, Pipe, Tuples } from "hotscript"
-import { AbstractClass, Class } from "type-fest"
+import { Fn } from "hotscript"
+import { AbstractClass, Class, Simplify } from "type-fest"
 import { TraitExpression } from "./TraitExpression"
-import { Extend, ExtendFn, SimplifyFn, StaticMembers, StaticMembersFn } from "./util"
+import { Extend, StaticMembers } from "./util"
 
 
 export class Trait<
@@ -121,22 +121,19 @@ export type TraitConcreteClass<T extends Trait<any, any, any, any>> = (
 )
 
 export type TraitInstance<T extends Trait<any, any, any, any>> = (
-    Pipe<T, [
-        Trait.SupertraitsFn,
-        Tuples.Append<T>,
-        Tuples.Map<Trait.OwnInstanceFn>,
-        ExtendFn,
-        SimplifyFn,
+    Simplify<
+        Extend<[
+            Trait.OwnAbstract<T>,
+            Trait.OwnImplInstance<T>,
         ]>
+    >
 )
 
 export type TraitStaticMembers<T extends Trait<any, any, any, any>> = (
-    Pipe<T, [
-        Trait.SupertraitsFn,
-        Tuples.Append<T>,
-        Tuples.Map<Trait.OwnClassFn>,
-        Tuples.Map<StaticMembersFn>,
-        ExtendFn,
-        SimplifyFn,
+    Simplify<
+        Extend<[
+            Trait.OwnStaticAbstract<T>,
+            StaticMembers<Trait.OwnImplClass<T>>,
         ]>
+    >
 )