Allow multiple aliases for the same field (#115)

ghostdogpr · Dec 6, 2019 · 949a8fc · 949a8fc
1 parent 2ed8c93
commit 949a8fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/core/src/main/scala/caliban/execution/Executor.scala b/core/src/main/scala/caliban/execution/Executor.scala
@@ -205,10 +205,11 @@ object Executor {
     fields
       .foldLeft(ListMap.empty[String, Field]) {
         case (result, field) =>
+          val name = field.alias.getOrElse(field.name)
           result.updated(
-            field.name,
+            name,
             result
-              .get(field.name)
+              .get(name)
               .fold(field)(f => f.copy(selectionSet = f.selectionSet ++ field.selectionSet))
           )
       }

diff --git a/core/src/test/scala/caliban/execution/ExecutionSpec.scala b/core/src/test/scala/caliban/execution/ExecutionSpec.scala
@@ -81,12 +81,16 @@ object ExecutionSpec
                amos: character(name: "Amos Burton") {
                  name
                  nicknames
-               }
+               },
+               naomi: character(name: "Naomi Nagata") {
+                 name
+                 nicknames
+               },
              }""")
 
           assertM(
             interpreter.execute(query).map(_.data.toString),
-            equalTo("""{"amos":{"name":"Amos Burton","nicknames":[]}}""")
+            equalTo("""{"amos":{"name":"Amos Burton","nicknames":[]},"naomi":{"name":"Naomi Nagata","nicknames":[]}}""")
           )
         },
         testM("fragment") {