Moved Trait helper types to a namespace

This commit is contained in:
Julien Valverdé
2024-02-04 22:20:19 +01:00
parent 1dd118d856
commit 891db74032
3 changed files with 56 additions and 55 deletions

View File

@@ -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,