Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle nested orphans #607

Merged
merged 1 commit into from
Oct 9, 2020
Merged

Handle nested orphans #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion federation/src/main/scala/caliban/federation/Federation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ trait Federation {
_fieldSet: FieldSet = FieldSet("")
)

val withSDL = original.withAdditionalTypes(resolvers.map(_.toType))
val withSDL = original.withAdditionalTypes(resolvers.map(_.toType).flatMap(Types.collectTypes(_)))

GraphQL.graphQL(
RootResolver(
Expand Down
17 changes: 13 additions & 4 deletions federation/src/test/scala/caliban/federation/FederationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ import zio.test._
import zio.query.ZQuery

object FederationSpec extends DefaultRunnableSpec {
case class OrphanChild(id: String)

object OrphanChild {
implicit val schema: Schema[Any, Orphan] = Schema.gen[Orphan]
}

@GQLDirective(Key("name"))
@GQLDirective(Extend)
case class Orphan(@GQLDirective(External) name: String, nicknames: List[String])
case class Orphan(@GQLDirective(External) name: String, nicknames: List[String], child: OrphanChild)

object Orphan {
implicit val schema: Schema[Any, Orphan] = Schema.gen[Orphan]
Expand All @@ -26,7 +32,7 @@ object FederationSpec extends DefaultRunnableSpec {

val orphanResolver =
EntityResolver[Any, OrphanArgs, Orphan](args =>
ZQuery.succeed(characters.find(_.name == args.name).map(c => Orphan(c.name, c.nicknames)))
ZQuery.succeed(characters.find(_.name == args.name).map(c => Orphan(c.name, c.nicknames, OrphanChild("abc"))))
)

override def spec = suite("FederationSpec")(
Expand Down Expand Up @@ -77,8 +83,11 @@ object FederationSpec extends DefaultRunnableSpec {
val query = gqldoc("""{ _service { sdl } }""")
assertM(interpreter.flatMap(_.execute(query)).map(d => d.data.toString))(
containsString(
"""type Orphan @key(fields: \"name\") @extends {\n name: String! @external\n nicknames: [String!]!\n}"""
)
"""type Orphan @key(fields: \"name\") @extends {\n name: String! @external\n nicknames: [String!]!\n child: OrphanChild!\n}"""
) &&
containsString(
"""type OrphanChild {\n id: String!\n}"""
)
)
}
)
Expand Down