From bc4b1b6492966eeb00276a789a99d7ca9d20bbc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Wed, 14 Feb 2024 23:18:17 +0100 Subject: [PATCH] Fix --- src/TraitExpressionBuilder.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/TraitExpressionBuilder.ts b/src/TraitExpressionBuilder.ts index 23c76de..b6b35a6 100644 --- a/src/TraitExpressionBuilder.ts +++ b/src/TraitExpressionBuilder.ts @@ -84,7 +84,15 @@ class TraitExpressionBuilder< } expresses< - const T extends Trait[] + const T extends Trait< + TraitExpression< + typeof TraitExpression.NullSuperclass, + Trait[] + >, + any, + any, + any + >[] >( ...traits: T ): TraitExpressionBuilder< @@ -97,7 +105,7 @@ class TraitExpressionBuilder< uniq([ ...this.expressionTraits, ...traits.flatMap(trait => [ - ...trait.superExpression.allTraits, + ...trait.superExpression.traits, trait, ]), ]) as [...Traits, ...SpreadSupertraits],