This commit is contained in:
10
src/Trait.ts
10
src/Trait.ts
@@ -1,6 +1,6 @@
|
|||||||
import { AbstractClass, Class, Simplify } from "type-fest"
|
import { AbstractClass, Class, Simplify } from "type-fest"
|
||||||
import { TraitExpression } from "./TraitExpression"
|
import { TraitExpression } from "./TraitExpression"
|
||||||
import { Extend, StaticMembers as StaticMembersUtil } from "./util"
|
import { Extend, StaticMembers } from "./util"
|
||||||
|
|
||||||
|
|
||||||
export class Trait<
|
export class Trait<
|
||||||
@@ -54,7 +54,7 @@ export namespace Trait {
|
|||||||
)
|
)
|
||||||
|
|
||||||
export type ImplStaticMembers<T> = (
|
export type ImplStaticMembers<T> = (
|
||||||
StaticMembersUtil<Trait.ImplClass<T>>
|
StaticMembers<Trait.ImplClass<T>>
|
||||||
)
|
)
|
||||||
|
|
||||||
export type Instance<T> = (
|
export type Instance<T> = (
|
||||||
@@ -64,7 +64,7 @@ export namespace Trait {
|
|||||||
]>
|
]>
|
||||||
)
|
)
|
||||||
|
|
||||||
export type StaticMembers<T> = (
|
export type Static<T> = (
|
||||||
Extend<[
|
Extend<[
|
||||||
Trait.StaticAbstract<T>,
|
Trait.StaticAbstract<T>,
|
||||||
Trait.ImplStaticMembers<T>,
|
Trait.ImplStaticMembers<T>,
|
||||||
@@ -112,7 +112,7 @@ export namespace TraitTuple {
|
|||||||
export type MapStaticMembers<T> = {
|
export type MapStaticMembers<T> = {
|
||||||
[K in keyof T]: K extends keyof []
|
[K in keyof T]: K extends keyof []
|
||||||
? T[K]
|
? T[K]
|
||||||
: Trait.StaticMembers<T[K]>
|
: Trait.Static<T[K]>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,5 +132,5 @@ export type TraitInstance<T extends Trait<any, any, any, any>> = (
|
|||||||
)
|
)
|
||||||
|
|
||||||
export type TraitStaticMembers<T extends Trait<any, any, any, any>> = (
|
export type TraitStaticMembers<T extends Trait<any, any, any, any>> = (
|
||||||
Simplify<Trait.StaticMembers<T>>
|
Simplify<Trait.Static<T>>
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user