From 891db74032ac45e64301059e655c81f9170cf5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 4 Feb 2024 22:20:19 +0100
Subject: [PATCH] Moved Trait helper types to a namespace

---
 src/Trait.ts                  | 101 +++++++++++++++++-----------------
 src/TraitExpressionBuilder.ts |   8 +--
 src/tests.ts                  |   2 +-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/Trait.ts b/src/Trait.ts
index 7422207..95719cd 100644
--- a/src/Trait.ts
+++ b/src/Trait.ts
@@ -39,61 +39,62 @@ export class Trait<
     ) {}
 }
 
-export type TraitOwnAbstract<T> = (
-    T extends Trait<any, infer Abstract, any>
-        ? Abstract
-        : never
-)
-export interface TraitOwnAbstractFn extends Fn {
-    return: TraitOwnAbstract<this["arg0"]>
-}
+export namespace Trait {
+    export type OwnAbstract<T> = (
+        T extends Trait<any, infer Abstract, any>
+            ? Abstract
+            : never
+    )
+    export interface OwnAbstractFn extends Fn {
+        return: Trait.OwnAbstract<this["arg0"]>
+    }
 
-export type TraitOwnImplClass<T> = (
-    T extends Trait<any, any, infer ImplClass>
-        ? ImplClass
-        : never
-)
-export interface TraitOwnImplClassFn extends Fn {
-    return: TraitOwnImplClass<this["arg0"]>
-}
+    export type OwnImplClass<T> = (
+        T extends Trait<any, any, infer ImplClass>
+            ? ImplClass
+            : never
+    )
+    export interface OwnImplClassFn extends Fn {
+        return: Trait.OwnImplClass<this["arg0"]>
+    }
 
-export type TraitOwnImplInstance<T> = (
-    T extends Trait<any, any, infer ImplClass>
-        ? InstanceType<ImplClass>
-        : never
-)
-export interface TraitOwnImplInstanceFn extends Fn {
-    return: TraitOwnImplInstance<this["arg0"]>
-}
+    export type OwnImplInstance<T> = (
+        T extends Trait<any, any, infer ImplClass>
+            ? InstanceType<ImplClass>
+            : never
+    )
+    export interface OwnImplInstanceFn extends Fn {
+        return: Trait.OwnImplInstance<this["arg0"]>
+    }
 
-export type TraitOwnClass<T> = (
-    T extends Trait<any, infer Abstract, infer ImplClass>
-        ? AddAbstractToImplClass<ImplClass, Abstract>
-        : never
-)
-export interface TraitOwnClassFn extends Fn {
-    return: TraitOwnClass<this["arg0"]>
-}
+    export type OwnClass<T> = (
+        T extends Trait<any, infer Abstract, infer ImplClass>
+            ? AddAbstractToImplClass<ImplClass, Abstract>
+            : never
+    )
+    export interface OwnClassFn extends Fn {
+        return: Trait.OwnClass<this["arg0"]>
+    }
 
-export type TraitOwnInstance<T> = (
-    T extends Trait<any, infer Abstract, infer ImplClass>
-        ? InstanceType<
-            AddAbstractToImplClass<ImplClass, Abstract>
-        >
-        : never
-)
-export interface TraitOwnInstanceFn extends Fn {
-    return: TraitOwnInstance<this["arg0"]>
-}
+    export type OwnInstance<T> = (
+        T extends Trait<any, infer Abstract, infer ImplClass>
+            ? InstanceType<
+                AddAbstractToImplClass<ImplClass, Abstract>
+            >
+            : never
+    )
+    export interface OwnInstanceFn extends Fn {
+        return: Trait.OwnInstance<this["arg0"]>
+    }
 
-
-export type TraitSupertraits<T> = (
-    T extends Trait<infer Super, any, any>
-        ? TraitExpressionAllTraits<Super>
-        : never
-)
-export interface TraitSupertraitsFn extends Fn {
-    return: TraitSupertraits<this["arg0"]>
+    export type Supertraits<T> = (
+        T extends Trait<infer Super, any, any>
+            ? TraitExpressionAllTraits<Super>
+            : never
+    )
+    export interface SupertraitsFn extends Fn {
+        return: Trait.Supertraits<this["arg0"]>
+    }
 }
 
 
diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts
index 3974336..bd926d3 100644
--- a/src/TraitExpressionBuilder.ts
+++ b/src/TraitExpressionBuilder.ts
@@ -1,6 +1,6 @@
 import { Call, Fn, Pipe, Tuples } from "hotscript"
 import { AbstractClass } from "type-fest"
-import { Trait, TraitExpression, TraitOwnAbstractFn, TraitOwnImplClassFn, TraitOwnImplInstanceFn, emptyTraitExpression } from "."
+import { Trait, TraitExpression, emptyTraitExpression } from "."
 import { ExtendableFn, StaticMembersFn } from "./util"
 
 
@@ -87,7 +87,7 @@ type AbstractMembersExtendable<
 > = (
     Call<ExtendableFn, [
         InstanceType<Super>,
-        ...Call<Tuples.Map<TraitOwnAbstractFn>, Traits>,
+        ...Call<Tuples.Map<Trait.OwnAbstractFn>, Traits>,
     ]>
 )
 
@@ -97,7 +97,7 @@ type ImplInstanceExtendable<
 > = (
     Call<ExtendableFn, [
         InstanceType<Super>,
-        ...Call<Tuples.Map<TraitOwnImplInstanceFn>, Traits>,
+        ...Call<Tuples.Map<Trait.OwnImplInstanceFn>, Traits>,
     ]>
 )
 
@@ -107,7 +107,7 @@ type ImplStaticMembersExtendable<
 > = (
     Pipe<[
         Super,
-        ...Call<Tuples.Map<TraitOwnImplClassFn>, Traits>,
+        ...Call<Tuples.Map<Trait.OwnImplClassFn>, Traits>,
     ], [
         Tuples.Map<StaticMembersFn>,
         ExtendableFn,
diff --git a/src/tests.ts b/src/tests.ts
index 6a03f21..e225d7f 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -1,4 +1,4 @@
-import { Implements, abstract, expression, trait } from "."
+import { Implements, Trait, abstract, expression, trait } from "."
 
 
 const PrintsHelloOnNew = trait(