Fix not keeping semantics of .optional on custom schema

ghostdogpr · May 11, 2024 · bb949dd · bb949dd
1 parent 61f3c6d
commit bb949dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala b/core/src/main/scala-2/caliban/schema/SchemaDerivation.scala
@@ -100,8 +100,7 @@ trait CommonSchemaDerivation[R] {
                 val hasNonNullAnn  = p.annotations.contains(GQLNonNullable())
 
                 if (hasNonNullAnn) (false, false)
-                else if (hasNullableAnn || p.typeclass.nullable) (true, false)
-                else if (p.typeclass.canFail) (true, true)
+                else if ((hasNullableAnn || p.typeclass.optional)) (true, !p.typeclass.canFail)
                 else (false, false)
               }
               Types.makeField(

diff --git a/core/src/main/scala-3/caliban/schema/DerivationUtils.scala b/core/src/main/scala-3/caliban/schema/DerivationUtils.scala
@@ -132,8 +132,7 @@ private object DerivationUtils {
         val hasNonNullAnn  = fieldAnnotations.contains(GQLNonNullable())
 
         if (hasNonNullAnn) (false, false)
-        else if (hasNullableAnn || schema.nullable) (true, false)
-        else if (schema.canFail) (true, true)
+        else if ((hasNullableAnn || schema.optional)) (true, !schema.canFail)
         else (false, false)
       }
       Types.makeField(