From f8a3c7dedeee2c313490c4f41a5dabf9827e77b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Sat, 24 Feb 2024 21:41:49 +0100 Subject: [PATCH] UniqTraits -> TraitsUniq --- src/TraitExpressionBuilder.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts index e5d3aaa..004ba8e 100644 --- a/src/TraitExpressionBuilder.ts +++ b/src/TraitExpressionBuilder.ts @@ -36,7 +36,7 @@ export class TraitExpressionBuilder< ]) as TraitExpressionBuilder.SpreadSupertraits } - static uniqTraits< + static traitsUniq< const T extends Trait< TraitExpression< typeof TraitExpression.NullSuperclass, @@ -49,7 +49,7 @@ export class TraitExpressionBuilder< >( traits: T ) { - return uniq(traits) as TraitExpressionBuilder.UniqTraits + return uniq(traits) as TraitExpressionBuilder.TraitsUniq } @@ -80,7 +80,7 @@ export class TraitExpressionBuilder< return new this.constructor( this.expressionSuperclass, - this.constructor.uniqTraits([ + this.constructor.traitsUniq([ ...this.expressionTraits, ...this.constructor.spreadSupertraits(traits), ]), @@ -103,7 +103,7 @@ export class TraitExpressionBuilder< return new this.constructor( this.expressionSuperclass, - this.constructor.uniqTraits([ + this.constructor.traitsUniq([ ...this.constructor.spreadSupertraits(traits), ...this.expressionTraits, ]), @@ -148,14 +148,14 @@ export namespace TraitExpressionBuilder { : [] ) - export type UniqTraits = ( + export type TraitsUniq = ( Traits extends [ ...infer Rest, infer El extends Trait, ] ? IsTraitInTupleFromRight extends true - ? UniqTraits - : [...UniqTraits, El] + ? TraitsUniq + : [...TraitsUniq, El] : [] ) type IsTraitInTupleFromRight = (