From 5873926dc5d37a08bd062ce18d60dc6255d02c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Wed, 14 Feb 2024 03:27:03 +0100
Subject: [PATCH] TraitExpression subtrait work

---
 src/TraitExpression.ts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/TraitExpression.ts b/src/TraitExpression.ts
index 9a005a8..188edc0 100644
--- a/src/TraitExpression.ts
+++ b/src/TraitExpression.ts
@@ -52,22 +52,11 @@ export class TraitExpression<
     implementsStatic(target: ImplementsStatic<typeof this>, context: any) {}
 
     subtrait<
-        This                          extends TraitExpression<typeof TraitExpression.NullSuperclass, any, any>,
-        SubtraitAbstract              extends Implements<This>,
-        SubtraitStaticAbstract        extends ImplementsStatic<This>,
-        SubtraitImplClassWithAbstract extends Class<SubtraitAbstract, []> & SubtraitStaticAbstract & { _tag: TraitApplierSuperTag },
+        This extends TraitExpression<typeof TraitExpression.NullSuperclass, any, any>
     >(
-        this:            This,
-        abstract:        (expression: This) => Opaque<SubtraitAbstract, AbstractTag>,
-        staticAbstract:  (expression: This) => Opaque<SubtraitStaticAbstract, AbstractTag>,
-        apply:           (Super: AbstractClass<SubtraitAbstract> & SubtraitStaticAbstract & { _tag: TraitApplierSuperTag }) => SubtraitImplClassWithAbstract,
+        this: This
     ) {
         return new Trait(
-            this,
-            // {} as RemoveSupertraitsAbstractFromAbstract<SubtraitAbstract, Implements<typeof this>>,
-            {}    as SubtraitAbstract,        // TODO: find a way to cleanly substract Implements<typeof this> from this.
-            {}    as SubtraitStaticAbstract,  // TODO: find a way to cleanly substract StaticImplements<typeof this> from this.
-            apply as any as (Super: AbstractClass<{}>) => RemoveAbstractFromImplClass<SubtraitImplClassWithAbstract, SubtraitAbstract, SubtraitStaticAbstract>,
         )
     }
 }