src/TraitExpression.ts

@@ -1,6 +1,6 @@
 import { Call, Fn, Pipe, Tuples } from "hotscript"
 import { AbstractClass, Class, Opaque } from "type-fest"
-import { AbstractTag, Trait, TraitApplierSuperTag, TraitOwnAbstractFn, TraitOwnImplClassFn, TraitOwnImplInstanceFn } from "."
+import { AbstractTag, Trait, TraitApplierSuperTag } from "."
 import { ExtendFn, SimplifyFn, StaticMembersFn } from "./util"
 
 
@@ -21,7 +21,7 @@ export class TraitExpression<
         AbstractClass<
             Pipe<[
                 InstanceType<Super>,
-                ...Call<Tuples.Map<TraitOwnImplInstanceFn>, OwnTraits>,
+                ...Call<Tuples.Map<Trait.OwnImplInstanceFn>, OwnTraits>,
             ], [
                 ExtendFn,
                 SimplifyFn,
@@ -32,7 +32,7 @@ export class TraitExpression<
 
         Pipe<[
             Super,
-            ...Call<Tuples.Map<TraitOwnImplClassFn>, OwnTraits>,
+            ...Call<Tuples.Map<Trait.OwnImplClassFn>, OwnTraits>,
         ], [
             Tuples.Map<StaticMembersFn>,
             ExtendFn,
@@ -92,7 +92,7 @@ export interface TraitExpressionAllTraitsFn extends Fn {
 export type Implements<Exp extends TraitExpression<any, any, any>> = (
     Exp extends TraitExpression<any, infer AllTraits, any>
         ? Pipe<AllTraits, [
-            Tuples.Map<TraitOwnAbstractFn>,
+            Tuples.Map<Trait.OwnAbstractFn>,
             ExtendFn,
             SimplifyFn,
         ]>