From 01d59f2cef6c2f7e445168cfdfb36f347cb12672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 2 Feb 2024 03:27:47 +0100 Subject: [PATCH] ExtendsAndExpressesReturnType refactoring --- src/expresses.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/expresses.ts b/src/expresses.ts index 8f2d4dd..ef25033 100644 --- a/src/expresses.ts +++ b/src/expresses.ts @@ -95,15 +95,15 @@ type ExtendsAndExpressesReturnType< Super extends AbstractClass, Traits extends readonly Trait[], > = ( - Call extends false ? - AbstractMembersExtendable extends true ? - ImplInstanceExtendable extends true ? - ImplStaticMembersExtendable extends true ? - TraitExpression - : "Type conflict between the traits implementation static members and/or the superclass static members." - : "Type conflict between the traits implementation instances and/or the superclass instance." - : "Type conflict between the traits abstract members and/or the superclass instance." - : "Cannot express an empty list of traits." + Call extends true + ? "Cannot express an empty list of traits." + : AbstractMembersExtendable extends false + ? "Type conflict between the traits abstract members and/or the superclass instance." + : ImplInstanceExtendable extends false + ? "Type conflict between the traits implementation instances and/or the superclass instance." + : ImplStaticMembersExtendable extends false + ? "Type conflict between the traits implementation static members and/or the superclass static members." + : TraitExpression ) export function extendsAndExpresses<