Merge pull request #51 from vigoo/rc3

ZIO 2.0.0-RC3
zio · Mar 24, 2022 · dc8f425 · dc8f425
2 parents d7d5322 + d3c25e5
commit dc8f425
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/build.sbt b/build.sbt
@@ -42,7 +42,7 @@ addCommandAlias(
   ";zioParserNative/test"
 )
 
-val zioVersion = "2.0.0-RC2"
+val zioVersion = "2.0.0-RC3"
 
 lazy val root = (project in file("."))
   .aggregate(
@@ -73,10 +73,11 @@ lazy val zioParser = crossProject(JSPlatform, JVMPlatform, NativePlatform)
           )
       }),
     libraryDependencies ++= Seq(
-      "dev.zio" %% "zio"          % zioVersion,
-      "dev.zio" %% "zio-streams"  % zioVersion,
-      "dev.zio" %% "zio-test"     % zioVersion % Test,
-      "dev.zio" %% "zio-test-sbt" % zioVersion % Test
+      "dev.zio"               %% "zio"          % zioVersion,
+      "dev.zio"               %% "zio-streams"  % zioVersion,
+      "com.github.ghostdogpr" %% "caliban"      % "1.4.0",
+      "dev.zio"               %% "zio-test"     % zioVersion % Test,
+      "dev.zio"               %% "zio-test-sbt" % zioVersion % Test
     ),
     testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
   )

diff --git a/zio-parser-caliban/src/main/scala/zio/parser/caliban/CalibanParser.scala b/zio-parser-caliban/src/main/scala/zio/parser/caliban/CalibanParser.scala
@@ -834,7 +834,8 @@ object CalibanParser {
     //      case Right(result) =>
     //        IO.succeed(Document(result._2.definitions,sm))
     //    }
-    Task(document.parseString(query))
+    Task
+      .attempt(document.parseString(query))
       .mapError(ex => ParsingError(s"Internal parsing error", innerThrowable = Some(ex)))
       .flatMap {
         case Left(error)   =>
@@ -933,12 +934,13 @@ object CalibanDemo extends ZIOAppDefault {
 """.trim
 
   val parsed: ZIO[Any, Nothing, Either[Parser.ParserError[String], StringValue]] =
-    UIO(CalibanParser.stringValue.parseString(query))
+    UIO
+      .succeed(CalibanParser.stringValue.parseString(query))
       //  val parsed = UIO(CalibanSyntax.stringValue.parse("\"\"\"hello\"\"\""))
       .tap {
         case Left(_)      => UIO.unit
         case Right(value) =>
-          UIO(value.getClass).debug("CLASS")
+          UIO.succeed(value.getClass).debug("CLASS")
       }
 
 //  Debug.printParserTree(CalibanParser.document.asParser.optimized)