diff --git a/src/Trait.ts b/src/Trait.ts index 2ad5dff..9d43662 100644 --- a/src/Trait.ts +++ b/src/Trait.ts @@ -1,6 +1,6 @@ import { AbstractClass, Class, Simplify } from "type-fest" import { TraitExpression } from "./TraitExpression" -import { Extend, StaticMembers as StaticMembersUtil } from "./util" +import { Extend, StaticMembers } from "./util" export class Trait< @@ -54,7 +54,7 @@ export namespace Trait { ) export type ImplStaticMembers = ( - StaticMembersUtil> + StaticMembers> ) export type Instance = ( @@ -64,7 +64,7 @@ export namespace Trait { ]> ) - export type StaticMembers = ( + export type Static = ( Extend<[ Trait.StaticAbstract, Trait.ImplStaticMembers, @@ -112,7 +112,7 @@ export namespace TraitTuple { export type MapStaticMembers = { [K in keyof T]: K extends keyof [] ? T[K] - : Trait.StaticMembers + : Trait.Static } } @@ -132,5 +132,5 @@ export type TraitInstance> = ( ) export type TraitStaticMembers> = ( - Simplify> + Simplify> )