FIX #42 remove Document type from GraphQLQuery` trait (#43)

muuki88 · Jul 26, 2018 · ee719a9 · ee719a9
1 parent 41c556c
commit ee719a9
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 33 deletions.
diff --git a/src/main/scala/rocks/muki/graphql/codegen/ApolloSourceGenerator.scala b/src/main/scala/rocks/muki/graphql/codegen/ApolloSourceGenerator.scala
@@ -64,8 +64,7 @@ case class ApolloSourceGenerator(fileName: String,
 
       q"""
           object $typeName extends ..$additionalInits {
-           type Document = sangria.ast.Document
-           val document: Document = $document
+           val document: sangria.ast.Document = $document
            case class Variables(..$inputParams)
            case class Data(..$dataParams)
            ..$dataJsonDecoder

diff --git a/src/main/scala/rocks/muki/graphql/codegen/GraphQLQueryGenerator.scala b/src/main/scala/rocks/muki/graphql/codegen/GraphQLQueryGenerator.scala
@@ -8,14 +8,14 @@ import scala.meta._
   *
   * {{{
   *   trait GraphQLQuery {
-  *      // the graphql document that should be executed
-  *      type Document
-  *
   *      // the input variables
   *      type Variables
   *
   *      // the returned data
   *      type Data
+  *
+  *      // the document that should be executed
+  *      val document: sangria.ast.Document
   *   }
   * }}}
   */
@@ -27,10 +27,9 @@ object GraphQLQueryGenerator {
 
   private val traitDefinition: Defn.Trait =
     q"""trait $typeName {
-          type Document
           type Variables
           type Data
-          val document: Document
+          val document: sangria.ast.Document
         }
      """
 

diff --git a/src/test/resources/apollo/blog/AddArticle.scala b/src/test/resources/apollo/blog/AddArticle.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object AddArticle {
   object addArticle extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""mutation addArticle($$content: ArticleContent!) {
+    val document: sangria.ast.Document = graphql"""mutation addArticle($$content: ArticleContent!) {
   addArticle(content: $$content) {
     id
     title

diff --git a/src/test/resources/apollo/blog/BlogArticleQuery.scala b/src/test/resources/apollo/blog/BlogArticleQuery.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object BlogArticleQuery {
   object BlogArticleQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query BlogArticleQuery($$query: ArticleQuery!) {
+    val document: sangria.ast.Document = graphql"""query BlogArticleQuery($$query: ArticleQuery!) {
   articles(query: $$query) {
     id
     status

diff --git a/src/test/resources/apollo/blog/BlogByID.scala b/src/test/resources/apollo/blog/BlogByID.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object BlogByID {
   object Blog extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query Blog($$blogId: ID!) {
+    val document: sangria.ast.Document = graphql"""query Blog($$blogId: ID!) {
   blog(id: $$blogId) {
     title
   }

diff --git a/src/test/resources/apollo/starwars-circe/HeroAndFriends.scala b/src/test/resources/apollo/starwars-circe/HeroAndFriends.scala
@@ -3,8 +3,7 @@ import io.circe.generic.semiauto.deriveDecoder
 import sangria.macros._
 object HeroAndFriends {
   object HeroAndFriends extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroAndFriends {
+    val document: sangria.ast.Document = graphql"""query HeroAndFriends {
   hero {
     name
     friends {

diff --git a/src/test/resources/apollo/starwars-circe/HeroFragmentQuery.scala b/src/test/resources/apollo/starwars-circe/HeroFragmentQuery.scala
@@ -3,8 +3,7 @@ import io.circe.generic.semiauto.deriveDecoder
 import sangria.macros._
 object HeroFragmentQuery {
   object HeroFragmentQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroFragmentQuery {
+    val document: sangria.ast.Document = graphql"""query HeroFragmentQuery {
   hero {
     ...CharacterInfo
   }

diff --git a/src/test/resources/apollo/starwars-circe/HeroNameQuery.scala b/src/test/resources/apollo/starwars-circe/HeroNameQuery.scala
@@ -3,8 +3,7 @@ import io.circe.generic.semiauto.deriveDecoder
 import sangria.macros._
 object HeroNameQuery {
   object HeroNameQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroNameQuery {
+    val document: sangria.ast.Document = graphql"""query HeroNameQuery {
   hero {
     name
   }

diff --git a/src/test/resources/apollo/starwars-circe/InputVariables.scala b/src/test/resources/apollo/starwars-circe/InputVariables.scala
@@ -3,8 +3,7 @@ import io.circe.generic.semiauto.deriveDecoder
 import sangria.macros._
 object InputVariables {
   object InputVariables extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query InputVariables($$humanId: String!) {
+    val document: sangria.ast.Document = graphql"""query InputVariables($$humanId: String!) {
   human(id: $$humanId) {
     name
     homePlanet

diff --git a/src/test/resources/apollo/starwars-circe/SearchQuery.scala b/src/test/resources/apollo/starwars-circe/SearchQuery.scala
@@ -3,8 +3,7 @@ import io.circe.generic.semiauto.deriveDecoder
 import sangria.macros._
 object SearchQuery {
   object SearchQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query SearchQuery($$text: String!) {
+    val document: sangria.ast.Document = graphql"""query SearchQuery($$text: String!) {
   search(text: $$text) {
     __typename
     ... on Human {

diff --git a/src/test/resources/apollo/starwars/HeroAndFriends.scala b/src/test/resources/apollo/starwars/HeroAndFriends.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object HeroAndFriends {
   object HeroAndFriends extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroAndFriends {
+    val document: sangria.ast.Document = graphql"""query HeroAndFriends {
   hero {
     name
     friends {

diff --git a/src/test/resources/apollo/starwars/HeroFragmentQuery.scala b/src/test/resources/apollo/starwars/HeroFragmentQuery.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object HeroFragmentQuery {
   object HeroFragmentQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroFragmentQuery {
+    val document: sangria.ast.Document = graphql"""query HeroFragmentQuery {
   hero {
     ...CharacterInfo
   }

diff --git a/src/test/resources/apollo/starwars/HeroNameQuery.scala b/src/test/resources/apollo/starwars/HeroNameQuery.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object HeroNameQuery {
   object HeroNameQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query HeroNameQuery {
+    val document: sangria.ast.Document = graphql"""query HeroNameQuery {
   hero {
     name
   }

diff --git a/src/test/resources/apollo/starwars/InputVariables.scala b/src/test/resources/apollo/starwars/InputVariables.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object InputVariables {
   object InputVariables extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query InputVariables($$humanId: String!) {
+    val document: sangria.ast.Document = graphql"""query InputVariables($$humanId: String!) {
   human(id: $$humanId) {
     name
     homePlanet

diff --git a/src/test/resources/apollo/starwars/SearchQuery.scala b/src/test/resources/apollo/starwars/SearchQuery.scala
@@ -1,8 +1,7 @@
 import sangria.macros._
 object SearchQuery {
   object SearchQuery extends GraphQLQuery {
-    type Document = sangria.ast.Document
-    val document: Document = graphql"""query SearchQuery($$text: String!) {
+    val document: sangria.ast.Document = graphql"""query SearchQuery($$text: String!) {
   search(text: $$text) {
     __typename
     ... on Human {