From 9524458c0fc791b7bb9275caf129c42284924d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 18 Feb 2024 20:51:58 +0100
Subject: [PATCH] Trait work

---
 src/Trait.ts | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Trait.ts b/src/Trait.ts
index 4ba2450..16988cd 100644
--- a/src/Trait.ts
+++ b/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>>,
+        ]>
+    >
 )