Expresses fix

This commit is contained in:
Julien Valverdé
2024-02-01 03:51:07 +01:00
parent 288969a789
commit 2945cdb7ae

View File

@@ -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<any>,
Traits extends readonly Trait<any, any>[],
> = (
Call<ExtendableFn, [
StaticMembers<Super>,
...Call<
Tuples.Map<
ComposeLeft<[TraitImplClassFn, StaticMembersFn]>
>,
Traits
>,
Pipe<[
Super,
...Call<Tuples.Map<TraitImplClassFn>, Traits>,
], [
Tuples.Map<StaticMembersFn>,
ExtendableFn,
]>
)