From 4cb9ebd589c884a6c556db638d0f80b87d50a3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <me@julienvalver.de>
Date: Wed, 21 Feb 2024 04:44:24 +0100
Subject: [PATCH] 0.1.7 (#7)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://git.jvalver.de/Thilawyn/traitify-ts/pulls/7
---
 package.json                  |  2 +-
 src/TraitBuilder.ts           |  3 ++
 src/TraitExpressionBuilder.ts | 95 ++++++++++++++++++++++++-----------
 src/tests.ts                  |  6 ---
 4 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 115a0c5..df29d94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thilawyn/traitify-ts",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "type": "module",
   "publishConfig": {
     "registry": "https://git.jvalver.de/api/packages/thilawyn/npm/"
diff --git a/src/TraitBuilder.ts b/src/TraitBuilder.ts
index a59b333..bcc45ee 100644
--- a/src/TraitBuilder.ts
+++ b/src/TraitBuilder.ts
@@ -51,6 +51,7 @@ export class TraitBuilder<
         private readonly traitApply:            (Super: AbstractClass<object>) => ImplClass,
     ) {}
 
+    // TODO: consider "implements" as a name?
     abstract<A extends Abstract>(
         _: (Super: AbstractClass<Abstract>) => AbstractClass<A, []>
     ) {
@@ -62,6 +63,7 @@ export class TraitBuilder<
         )
     }
 
+    // TODO: consider "staticImplements" as a name?
     staticAbstract<A extends StaticAbstract>(
         _: (Super: AbstractClass<StaticAbstract>) => AbstractClass<A, []>
     ) {
@@ -73,6 +75,7 @@ export class TraitBuilder<
         )
     }
 
+    // TODO: consider "impl" as a name?
     implement<
         ImplClassWithAbstract extends ImplSuper<typeof this>  // TODO: find a way to set the constraint to concrete classes while keeping the Super arg as an abstract class
     >(
diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts
index 4e222ee..0fd65d6 100644
--- a/src/TraitExpressionBuilder.ts
+++ b/src/TraitExpressionBuilder.ts
@@ -1,50 +1,61 @@
 import { uniq } from "lodash-es"
-import { AbstractClass } from "type-fest"
+import { AbstractClass, IsEqual } from "type-fest"
 import { Trait, TraitTuple } from "./Trait"
 import { TraitExpression } from "./TraitExpression"
 import { Extendable, StaticMembers } from "./util"
 
 
-type SpreadSupertraits<T> = (
-    T extends [infer Trait, ...infer Rest]
+type SpreadSupertraits<Traits> = (
+    Traits extends [
+        infer El extends Trait<any, any, any, any>,
+        ...infer Rest,
+    ]
         ? [
-            ...Trait.Supertraits<Trait>,
-            Trait,
+            ...Trait.Supertraits<El>,
+            El,
             ...SpreadSupertraits<Rest>,
         ]
         : []
 )
 
-
-type InstanceExtendable<
-    Superclass extends AbstractClass<object>,
-    Traits     extends Trait<any, any, any, any>[],
-> = (
-    Extendable<[
-        InstanceType<Superclass>,
-        ...TraitTuple.MapInstance<Traits>,
-    ]>
+type TraitsUniq<Traits> = (
+    Traits extends [
+        ...infer Rest,
+        infer El extends Trait<any, any, any, any>,
+    ]
+        ? IsTraitInTupleFromRight<Rest, El> extends true
+            ? TraitsUniq<Rest>
+            : [...TraitsUniq<Rest>, El]
+        : []
+)
+type IsTraitInTupleFromRight<Traits, T> = (
+    Traits extends [...infer Rest, infer El]
+        ? IsEqual<El, T> extends true
+            ? true
+            : IsTraitInTupleFromRight<Rest, T>
+        : false
 )
 
-type StaticMembersExtendable<
-    Superclass extends AbstractClass<object>,
-    Traits     extends Trait<any, any, any, any>[],
-> = (
-    Extendable<[
-        StaticMembers<Superclass>,
-        ...TraitTuple.MapStaticMembers<Traits>,
-    ]>
-)
 
 type BuildTraitExpression<
     Superclass extends AbstractClass<object>,
     Traits     extends Trait<any, any, any, any>[],
 > = (
-    InstanceExtendable<Superclass, Traits> extends false
-        ? "Type conflict on the instance side."
-        : StaticMembersExtendable<Superclass, Traits> extends false
-            ? "Type conflict on the static side."
-            : TraitExpression<Superclass, Traits>
+    Extendable<TraitTuple.MapAbstract<Traits>> extends false
+        ? "Type conflict between the traits abstract definitions."
+        : Extendable<TraitTuple.MapStaticAbstract<Traits>> extends false
+            ? "Type conflict between the traits static abstract definitions."
+            : Extendable<[
+                InstanceType<Superclass>,
+                ...TraitTuple.MapImplInstance<Traits>,
+            ]> extends false
+                ? "Type conflict between the traits implementation instance and/or the superclass instance."
+                : Extendable<[
+                    StaticMembers<Superclass>,
+                    ...TraitTuple.MapImplStaticMembers<Traits>,
+                ]> extends false
+                    ? "Type conflict between the traits implementation static members and/or the superclass static members."
+                    : TraitExpression<Superclass, Traits>
 )
 
 
@@ -90,7 +101,33 @@ export class TraitExpressionBuilder<
                     ...trait.superExpression.traits,
                     trait,
                 ]),
-            ]) as [...Traits, ...SpreadSupertraits<T>],
+            ]) as TraitsUniq<[...Traits, ...SpreadSupertraits<T>]>,
+        )
+    }
+
+    expressesFirst<
+        const T extends Trait<
+            TraitExpression<
+                typeof TraitExpression.NullSuperclass,
+                Trait<any, any, any, any>[]
+            >,
+            any,
+            any,
+            any
+        >[]
+    >(
+        ...traits: T
+    ) {
+        return new TraitExpressionBuilder(
+            this.expressionSuperclass,
+
+            uniq([
+                ...traits.flatMap(trait => [
+                    ...trait.superExpression.traits,
+                    trait,
+                ]),
+                ...this.expressionTraits,
+            ]) as TraitsUniq<[...SpreadSupertraits<T>, ...Traits]>,
         )
     }
 
diff --git a/src/tests.ts b/src/tests.ts
index daf516b..631b011 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -81,9 +81,3 @@ class User extends exp.extends implements Implements<typeof exp> {
 }
 
 console.log(new User())
-
-
-// type T = NonExtendableKeys<[
-//     { prout: "gneugneu" },
-//     { prout: string },
-// ]>