From fe667e87fe55ef3aaf9d664d130e55a506c8c061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Thu, 15 Feb 2024 21:00:12 +0100
Subject: [PATCH] TraitExpression work

---
 src/TraitBuilder.ts    | 16 ++++++++--------
 src/TraitExpression.ts |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/TraitBuilder.ts b/src/TraitBuilder.ts
index a825162..b19aa8b 100644
--- a/src/TraitBuilder.ts
+++ b/src/TraitBuilder.ts
@@ -5,7 +5,7 @@ import { TraitExpression } from "./TraitExpression"
 import { ExtendFn, SimplifyFn, StaticMembers } from "./util"
 
 
-type SuperAbstract<SuperExpression, Abstract> = (
+type ExtendAbstractSuper<SuperExpression, Abstract> = (
     Pipe<SuperExpression, [
         TraitExpression.TraitsFn,
         Tuples.Map<Trait.OwnAbstractFn>,
@@ -15,7 +15,7 @@ type SuperAbstract<SuperExpression, Abstract> = (
     ]>
 )
 
-type SuperStaticAbstract<SuperExpression, StaticAbstract> = (
+type ExtendStaticAbstractSuper<SuperExpression, StaticAbstract> = (
     Pipe<SuperExpression, [
         TraitExpression.TraitsFn,
         Tuples.Map<Trait.OwnStaticAbstractFn>,
@@ -61,7 +61,7 @@ export class TraitBuilder<
         private readonly traitApply:            (Super: AbstractClass<object>) => ImplClass,
     ) {}
 
-    abstract<A extends SuperAbstract<SuperExpression, Abstract>>() {
+    abstract<A extends ExtendAbstractSuper<SuperExpression, Abstract>>() {
         return new TraitBuilder(
             this.traitSuperExpression,
             {} as A,
@@ -70,10 +70,10 @@ export class TraitBuilder<
         )
     }
 
-    extendAbstract<A extends SuperAbstract<SuperExpression, Abstract>>(
+    extendAbstract<A extends ExtendAbstractSuper<SuperExpression, Abstract>>(
         _: (
             Super: AbstractClass<
-                SuperAbstract<SuperExpression, Abstract>
+                ExtendAbstractSuper<SuperExpression, Abstract>
             >
         ) => AbstractClass<A, []>
     ) {
@@ -85,7 +85,7 @@ export class TraitBuilder<
         )
     }
 
-    staticAbstract<A extends SuperStaticAbstract<SuperExpression, StaticAbstract>>() {
+    staticAbstract<A extends ExtendStaticAbstractSuper<SuperExpression, StaticAbstract>>() {
         return new TraitBuilder(
             this.traitSuperExpression,
             this.traitAbstract,
@@ -94,9 +94,9 @@ export class TraitBuilder<
         )
     }
 
-    extendStaticAbstract<A extends SuperStaticAbstract<SuperExpression, StaticAbstract>>(
+    extendStaticAbstract<A extends ExtendStaticAbstractSuper<SuperExpression, StaticAbstract>>(
         _: (Super: AbstractClass<
-            SuperStaticAbstract<SuperExpression, StaticAbstract>
+            ExtendStaticAbstractSuper<SuperExpression, StaticAbstract>
         >) => AbstractClass<A, []>
     ) {
         return new TraitBuilder(
diff --git a/src/TraitExpression.ts b/src/TraitExpression.ts
index 96efaab..0d0147e 100644
--- a/src/TraitExpression.ts
+++ b/src/TraitExpression.ts
@@ -98,3 +98,11 @@ export type ImplementsStatic<Exp extends TraitExpression<any, any>> = (
         SimplifyFn,
     ]>
 )
+
+export type TraitExpressionClass<Exp extends TraitExpression<any, any>> = (
+
+)
+
+export type TraitExpressionInstance<Exp extends TraitExpression<any, any>> = (
+
+)