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

Fix cats interop schema bug #2296

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Fix cats interop schema bug #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
603bc81
Use `ev.canFail` in cats interop schema
kyri-petrou Jun 19, 2024
0bc1a52
Also change for monix and fs2 interops
kyri-petrou Jun 19, 2024
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
5 changes: 2 additions & 3 deletions interop/cats/src/main/scala/caliban/interop/cats/CatsInterop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,8 @@ object CatsInterop {
override def toType(isInput: Boolean, isSubscription: Boolean): __Type =
ev.toType_(isInput, isSubscription)

override def nullable: Boolean =
ev.nullable
override def canFail: Boolean = true
override def nullable: Boolean = ev.nullable
override def canFail: Boolean = ev.canFail

override def resolve(value: F[A]): Step[R] =
QueryStep(ZQuery.fromZIO(interop.fromEffect(value).map(ev.resolve)))
Expand Down
4 changes: 2 additions & 2 deletions interop/cats/src/main/scala/caliban/interop/fs2/Fs2Interop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Fs2Interop {
ev.toType_(isInput, isSubscription)

override def nullable: Boolean = ev.nullable
override def canFail: Boolean = true
override def canFail: Boolean = ev.canFail

override def resolve(value: Stream[RIO[R, *], A]): Step[R] =
ev.resolve(value.toZStream())
Expand All @@ -30,7 +30,7 @@ object Fs2Interop {
ev.toType_(isInput, isSubscription)

override def nullable: Boolean = ev.nullable
override def canFail: Boolean = true
override def canFail: Boolean = ev.canFail

override def resolve(value: Stream[F, A]): Step[R] =
ev.resolve(value.translate(interop.fromEffectK))
Expand Down
31 changes: 30 additions & 1 deletion interop/cats/src/test/scala/caliban/interop/cats/CatsInteropSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package caliban.interop.cats

import caliban.schema.Schema
import caliban.{ graphQL, RootResolver }
import cats.Applicative
import cats.data.{ Chain, Kleisli }
import cats.effect.kernel.Async
Expand Down Expand Up @@ -77,7 +79,34 @@ object CatsInteropSpec extends ZIOSpecDefault {
} yield assertTrue(contextual == List(rootCtx, rootCtx, rootCtx))
}
)
}
},
suite("schema derivation")(
test("IO types are derived as non-nullable") {
case class Query(io: IO[Int])
val query = Query(IO(42))

val rendered =
Dispatcher
.parallel[IO]
.use { implicit dispatcher =>
implicit val ioSchema: Schema[Any, IO[Int]] = CatsInterop.schema[IO, Any, Int]
implicit val schema: Schema[Any, Query] = Schema.gen
val api = graphQL(RootResolver(query))
IO(api.render)
}
.unsafeRunSync()

assertTrue(
rendered == """|schema {
| query: Query
|}
|
|type Query {
| io: Int!
|}""".stripMargin
)
} @@ TestAspect.blocking
)
)

private def program[F[_]: Async, R](interop: CatsInterop[F, R], inner: R)(implicit local: Local[F, R]): F[List[R]] = {
Expand Down
2 changes: 1 addition & 1 deletion interop/monix/src/main/scala/caliban/interop/monix/MonixInterop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ object MonixInterop {
new Schema[R, MonixTask[A]] {
override def toType(isInput: Boolean, isSubscription: Boolean): __Type = ev.toType_(isInput, isSubscription)
override def nullable: Boolean = ev.nullable
override def canFail: Boolean = true
override def canFail: Boolean = ev.canFail
override def resolve(value: MonixTask[A]): Step[R] =
QueryStep(ZQuery.fromZIO(value.to[Task].map(ev.resolve)))
}
Expand Down