diff --git a/src/expresses.ts b/src/expresses.ts index c66c0b9..f439dc3 100644 --- a/src/expresses.ts +++ b/src/expresses.ts @@ -1,7 +1,7 @@ -import { Call, ComposeLeft, Pipe, Tuples } from "hotscript" +import { Call, Pipe, Tuples } from "hotscript" import { AbstractClass, Opaque } from "type-fest" import { Trait, TraitAbstractMembersFn, TraitApplierSuperTag, TraitImplClassFn, TraitImplInstanceFn } from "." -import { ExtendFn, ExtendableFn, SimplifyFn, StaticMembers, StaticMembersFn } from "./util" +import { ExtendFn, ExtendableFn, SimplifyFn, StaticMembersFn } from "./util" class TraitExpression< @@ -77,14 +77,12 @@ type ImplStaticMembersExtendable< Super extends AbstractClass, Traits extends readonly Trait[], > = ( - Call, - ...Call< - Tuples.Map< - ComposeLeft<[TraitImplClassFn, StaticMembersFn]> - >, - Traits - >, + Pipe<[ + Super, + ...Call, Traits>, + ], [ + Tuples.Map, + ExtendableFn, ]> )