diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts index 8e28338..c563268 100644 --- a/src/TraitExpressionBuilder.ts +++ b/src/TraitExpressionBuilder.ts @@ -36,7 +36,7 @@ export class TraitExpressionBuilder< ]) as readonly Trait[] as TraitExpressionBuilder.SpreadSupertraits } - static traitsUniq< + static traitsUnique< const T extends readonly Trait< TraitExpression< typeof TraitExpression.NullSuperclass, @@ -49,7 +49,7 @@ export class TraitExpressionBuilder< >( traits: T ) { - return unique(traits) as readonly Trait[] as TraitExpressionBuilder.TraitsUniq + return unique(traits) as readonly Trait[] as TraitExpressionBuilder.TraitsUnique } @@ -83,7 +83,7 @@ export class TraitExpressionBuilder< return new this.constructor( this.expressionSuperclass, - this.constructor.traitsUniq([ + this.constructor.traitsUnique([ ...this.expressionTraits, ...this.constructor.spreadSupertraits(traits), ]), @@ -109,7 +109,7 @@ export class TraitExpressionBuilder< return new this.constructor( this.expressionSuperclass, - this.constructor.traitsUniq([ + this.constructor.traitsUnique([ ...this.constructor.spreadSupertraits(traits), ...this.expressionTraits, ]), @@ -154,14 +154,14 @@ export namespace TraitExpressionBuilder { : readonly [] ) - export type TraitsUniq = ( + export type TraitsUnique = ( Traits extends readonly [ ...infer Rest, infer El extends Trait, ] ? IsTraitInTupleFromRight extends true - ? TraitsUniq - : readonly [...TraitsUniq, El] + ? TraitsUnique + : readonly [...TraitsUnique, El] : readonly [] ) type IsTraitInTupleFromRight = ( @@ -176,7 +176,7 @@ export namespace TraitExpressionBuilder { Traits extends readonly Trait[], T extends readonly Trait[], > = ( - TraitExpressionBuilder.TraitsUniq, ]> @@ -186,7 +186,7 @@ export namespace TraitExpressionBuilder { Traits extends readonly Trait[], T extends readonly Trait[], > = ( - TraitExpressionBuilder.TraitsUniq, ...Traits, ]>