Maybe fix codegen-sbt

jeejeeone · jeejeeone · commit 6999c9d45744 · 2024-03-21T09:11:57.000+02:00
diff --git a/codegen-sbt/src/main/scala/caliban/codegen/CalibanSettings.scala b/codegen-sbt/src/main/scala/caliban/codegen/CalibanSettings.scala
@@ -28,6 +28,7 @@ sealed trait CalibanSettings {
   final def preserveInputNames(value: Boolean): Self              = withSettings(_.preserveInputNames(value))
   final def addDerives(value: Boolean): Self                      = withSettings(_.addDerives(value))
   final def envForDerives(value: String): Self                    = withSettings(_.envForDerives(value))
+  final def excludeDeprecated(value: Boolean): Self               = withSettings(_.excludeDeprecated(value))
 }
 
 final case class CalibanFileSettings(file: File, settings: CalibanCommonSettings) extends CalibanSettings {
diff --git a/codegen-sbt/src/main/scala/caliban/codegen/OptionsParser.scala b/codegen-sbt/src/main/scala/caliban/codegen/OptionsParser.scala
@@ -22,7 +22,8 @@ object OptionsParser {
     preserveInputNames: Option[Boolean],
     supportIsRepeatable: Option[Boolean],
     addDerives: Option[Boolean],
-    envForDerives: Option[String]
+    envForDerives: Option[String],
+    excludeDeprecated: Option[Boolean]
   )
 
   private object DescriptorUtils {
@@ -74,7 +75,8 @@ object OptionsParser {
             rawOpts.preserveInputNames,
             rawOpts.supportIsRepeatable,
             rawOpts.addDerives,
-            rawOpts.envForDerives
+            rawOpts.envForDerives,
+            rawOpts.excludeDeprecated
           )
         }.option
       case _                             => ZIO.none
diff --git a/codegen-sbt/src/test/scala/caliban/codegen/OptionsParserSpec.scala b/codegen-sbt/src/test/scala/caliban/codegen/OptionsParserSpec.scala
@@ -30,6 +30,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                 None,
                 None,
                 None,
+                None,
                 None
               )
             )
@@ -59,6 +60,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                 None,
                 None,
                 None,
+                None,
                 None
               )
             )
@@ -89,6 +91,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -137,6 +140,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -167,6 +171,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -197,6 +202,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -227,6 +233,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -257,6 +264,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -287,6 +295,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -317,6 +326,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -347,6 +357,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -377,6 +388,7 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   Some(true),
                   None,
                   None,
+                  None,
                   None
                 )
               )
@@ -407,11 +419,43 @@ object OptionsParserSpec extends ZIOSpecDefault {
                   None,
                   None,
                   None,
+                  None,
                   None
                 )
               )
           )
         }
+      },
+      test("provide excludeDeprecated") {
+        val input = List("schema", "output", "--excludeDeprecated", "true")
+        OptionsParser.fromArgs(input).map { result =>
+          assertTrue(
+            result ==
+              Some(
+                Options(
+                  "schema",
+                  "output",
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  None,
+                  Some(true)
+                )
+              )
+          )
+        }
       }
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ sealed trait CalibanSettings {`
`28`	`28`	`final def preserveInputNames(value: Boolean): Self = withSettings(_.preserveInputNames(value))`
`29`	`29`	`final def addDerives(value: Boolean): Self = withSettings(_.addDerives(value))`
`30`	`30`	`final def envForDerives(value: String): Self = withSettings(_.envForDerives(value))`
	`31`	`+ final def excludeDeprecated(value: Boolean): Self = withSettings(_.excludeDeprecated(value))`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`final case class CalibanFileSettings(file: File, settings: CalibanCommonSettings) extends CalibanSettings {`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`30`	`30`	`None,`
`31`	`31`	`None,`
`32`	`32`	`None,`
	`33`	`+ None,`
`33`	`34`	`None`
`34`	`35`	`)`
`35`	`36`	`)`
`@@ -59,6 +60,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`59`	`60`	`None,`
`60`	`61`	`None,`
`61`	`62`	`None,`
	`63`	`+ None,`
`62`	`64`	`None`
`63`	`65`	`)`
`64`	`66`	`)`
`@@ -89,6 +91,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`89`	`91`	`None,`
`90`	`92`	`None,`
`91`	`93`	`None,`
	`94`	`+ None,`
`92`	`95`	`None`
`93`	`96`	`)`
`94`	`97`	`)`
`@@ -137,6 +140,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`137`	`140`	`None,`
`138`	`141`	`None,`
`139`	`142`	`None,`
	`143`	`+ None,`
`140`	`144`	`None`
`141`	`145`	`)`
`142`	`146`	`)`
`@@ -167,6 +171,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`167`	`171`	`None,`
`168`	`172`	`None,`
`169`	`173`	`None,`
	`174`	`+ None,`
`170`	`175`	`None`
`171`	`176`	`)`
`172`	`177`	`)`
`@@ -197,6 +202,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`197`	`202`	`None,`
`198`	`203`	`None,`
`199`	`204`	`None,`
	`205`	`+ None,`
`200`	`206`	`None`
`201`	`207`	`)`
`202`	`208`	`)`
`@@ -227,6 +233,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`227`	`233`	`None,`
`228`	`234`	`None,`
`229`	`235`	`None,`
	`236`	`+ None,`
`230`	`237`	`None`
`231`	`238`	`)`
`232`	`239`	`)`
`@@ -257,6 +264,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`257`	`264`	`None,`
`258`	`265`	`None,`
`259`	`266`	`None,`
	`267`	`+ None,`
`260`	`268`	`None`
`261`	`269`	`)`
`262`	`270`	`)`
`@@ -287,6 +295,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`287`	`295`	`None,`
`288`	`296`	`None,`
`289`	`297`	`None,`
	`298`	`+ None,`
`290`	`299`	`None`
`291`	`300`	`)`
`292`	`301`	`)`
`@@ -317,6 +326,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`317`	`326`	`None,`
`318`	`327`	`None,`
`319`	`328`	`None,`
	`329`	`+ None,`
`320`	`330`	`None`
`321`	`331`	`)`
`322`	`332`	`)`
`@@ -347,6 +357,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`347`	`357`	`None,`
`348`	`358`	`None,`
`349`	`359`	`None,`
	`360`	`+ None,`
`350`	`361`	`None`
`351`	`362`	`)`
`352`	`363`	`)`
`@@ -377,6 +388,7 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`377`	`388`	`Some(true),`
`378`	`389`	`None,`
`379`	`390`	`None,`
	`391`	`+ None,`
`380`	`392`	`None`
`381`	`393`	`)`
`382`	`394`	`)`
`@@ -407,11 +419,43 @@ object OptionsParserSpec extends ZIOSpecDefault {`
`407`	`419`	`None,`
`408`	`420`	`None,`
`409`	`421`	`None,`
	`422`	`+ None,`
`410`	`423`	`None`
`411`	`424`	`)`
`412`	`425`	`)`
`413`	`426`	`)`
`414`	`427`	`}`
	`428`	`+ },`
	`429`	`+ test("provide excludeDeprecated") {`
	`430`	`+ val input = List("schema", "output", "--excludeDeprecated", "true")`
	`431`	`+ OptionsParser.fromArgs(input).map { result =>`
	`432`	`+ assertTrue(`
	`433`	`+ result ==`
	`434`	`+ Some(`
	`435`	`+ Options(`
	`436`	`+ "schema",`
	`437`	`+ "output",`
	`438`	`+ None,`
	`439`	`+ None,`
	`440`	`+ None,`
	`441`	`+ None,`
	`442`	`+ None,`
	`443`	`+ None,`
	`444`	`+ None,`
	`445`	`+ None,`
	`446`	`+ None,`
	`447`	`+ None,`
	`448`	`+ None,`
	`449`	`+ None,`
	`450`	`+ None,`
	`451`	`+ None,`
	`452`	`+ None,`
	`453`	`+ None,`
	`454`	`+ Some(true)`
	`455`	`+ )`
	`456`	`+ )`
	`457`	`+ )`
	`458`	`+ }`
`415`	`459`	`}`
`416`	`460`	`)`
`417`	`461`	`}`