Thilawyn/traitify-ts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.1.20 #20

Merged
Thilawyn merged 12 commits from next into master 2024-05-01 02:51:13 +02:00
Conversation 0 Commits 12 Files Changed 7 +9 -9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ffeca9565f - Show all commits

18
src/TraitExpressionBuilder.ts
View File

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