src/TraitExpression.ts

@@ -1,6 +1,6 @@
 import { Call, Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class, Opaque } from "type-fest"
-import { AbstractTag, Trait, TraitAbstractMembersFn, TraitApplierSuperTag, TraitImplClassFn, TraitImplInstanceFn } from "."
+import { AbstractTag, Trait, TraitApplierSuperTag, TraitOwnAbstractFn, TraitOwnImplClassFn, TraitOwnImplInstanceFn } from "."
 import { ExtendFn, ExtendableFn, SimplifyFn, StaticMembersFn } from "./util"
 
 
@@ -17,7 +17,7 @@ export class TraitExpression<
         AbstractClass<
             Pipe<[
                 InstanceType<Super>,
-                ...Call<Tuples.Map<TraitImplInstanceFn>, Traits>,
+                ...Call<Tuples.Map<TraitOwnImplInstanceFn>, Traits>,
             ], [
                 ExtendFn,
                 SimplifyFn,
@@ -28,7 +28,7 @@ export class TraitExpression<
 
         Pipe<[
             Super,
-            ...Call<Tuples.Map<TraitImplClassFn>, Traits>,
+            ...Call<Tuples.Map<TraitOwnImplClassFn>, Traits>,
         ], [
             Tuples.Map<StaticMembersFn>,
             ExtendFn,
@@ -47,7 +47,7 @@ export class TraitExpression<
     >(
         abstract: (
             abstract: Pipe<Traits, [
-                Tuples.Map<TraitAbstractMembersFn>,
+                Tuples.Map<TraitOwnAbstractFn>,
                 SimplifyFn,
             ]>
         ) => Opaque<SubtraitAbstract, AbstractTag>,
@@ -58,10 +58,12 @@ export class TraitExpression<
     }
 }
 
+
+
 export type Implements<Exp extends TraitExpression<any, any>> = (
     Exp extends TraitExpression<any, infer Traits>
         ? Pipe<Traits, [
-            Tuples.Map<TraitAbstractMembersFn>,
+            Tuples.Map<TraitOwnAbstractFn>,
             ExtendFn,
             SimplifyFn,
         ]>
@@ -71,7 +73,7 @@ export type Implements<Exp extends TraitExpression<any, any>> = (
 
 class TraitExpressionBuilder<
     Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any>[],
+    Traits extends Trait<any, any, any>[],
 > {
     constructor(public expression: TraitExpression<Super, Traits>) {}
 
@@ -87,7 +89,7 @@ class TraitExpressionBuilder<
     }
 
     expresses<
-        AppendTraits extends Trait<any, any>[]
+        AppendTraits extends Trait<any, any, any>[]
     >(...traits: AppendTraits) {
         return new TraitExpressionBuilder(
             new TraitExpression(
@@ -109,31 +111,31 @@ class TraitExpressionBuilder<
 
 type AbstractMembersExtendable<
     Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any>[],
+    Traits extends Trait<any, any, any>[],
 > = (
     Call<ExtendableFn, [
         InstanceType<Super>,
-        ...Call<Tuples.Map<TraitAbstractMembersFn>, Traits>,
+        ...Call<Tuples.Map<TraitOwnAbstractFn>, Traits>,
     ]>
 )
 
 type ImplInstanceExtendable<
     Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any>[],
+    Traits extends Trait<any, any, any>[],
 > = (
     Call<ExtendableFn, [
         InstanceType<Super>,
-        ...Call<Tuples.Map<TraitImplInstanceFn>, Traits>,
+        ...Call<Tuples.Map<TraitOwnImplInstanceFn>, Traits>,
     ]>
 )
 
 type ImplStaticMembersExtendable<
     Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any>[],
+    Traits extends Trait<any, any, any>[],
 > = (
     Pipe<[
         Super,
-        ...Call<Tuples.Map<TraitImplClassFn>, Traits>,
+        ...Call<Tuples.Map<TraitOwnImplClassFn>, Traits>,
     ], [
         Tuples.Map<StaticMembersFn>,
         ExtendableFn,
@@ -142,7 +144,7 @@ type ImplStaticMembersExtendable<
 
 type GetTraitExpression<
     Super  extends AbstractClass<{}>,
-    Traits extends Trait<any, any>[],
+    Traits extends Trait<any, any, any>[],
 > = (
     Call<Tuples.IsEmpty, Traits> extends true
         ? "Cannot express an empty list of traits."