copyContext -> modifyContext

Author: blast-hardcheese

modules/cli/src/main/scala/dev/guardrail/cli/CLICommon.scala

@@ -125,13 +125,13 @@ trait CLICommon extends GuardrailRunner {
             case (sofar :: already, "--models" :: xs) =>
               Continue((empty.withKind(CodegenTarget.Models) :: sofar :: already, xs))
             case (sofar :: already, "--framework" :: value :: xs) =>
-              Continue((sofar.copyContext(framework = Some(value)) :: already, xs))
+              Continue((sofar.modifyContext(_.withFramework(Some(value))) :: already, xs))
             case (sofar :: already, "--help" :: xs) =>
               Continue((sofar.withPrintHelp(true) :: already, List.empty))
             case (sofar :: already, "--specPath" :: value :: xs) =>
               Continue((sofar.withSpecPath(Option(expandTilde(value))) :: already, xs))
             case (sofar :: already, "--tracing" :: xs) =>
-              Continue((sofar.copyContext(tracing = true) :: already, xs))
+              Continue((sofar.modifyContext(_.withTracing(true)) :: already, xs))
             case (sofar :: already, "--outputPath" :: value :: xs) =>
               Continue((sofar.withOutputPath(Option(expandTilde(value))) :: already, xs))
             case (sofar :: already, "--packageName" :: value :: xs) =>
@@ -141,11 +141,11 @@ trait CLICommon extends GuardrailRunner {
             case (sofar :: already, "--import" :: value :: xs) =>
               Continue((sofar.withImports(sofar.imports :+ value) :: already, xs))
             case (sofar :: already, "--module" :: value :: xs) =>
-              Continue((sofar.copyContext(modules = sofar.context.modules :+ value) :: already, xs))
+              Continue((sofar.modifyContext(_.withModules(sofar.context.modules :+ value)) :: already, xs))
             case (sofar :: already, "--custom-extraction" :: xs) =>
-              Continue((sofar.copyContext(customExtraction = true) :: already, xs))
+              Continue((sofar.modifyContext(_.withCustomExtraction(true)) :: already, xs))
             case (sofar :: already, "--package-from-tags" :: xs) =>
-              Continue((sofar.copyContext(tagsBehaviour = TagsBehaviour.PackageFromTags) :: already, xs))
+              Continue((sofar.modifyContext(_.withTagsBehaviour(TagsBehaviour.PackageFromTags)) :: already, xs))
             case (sofar :: already, (arg @ "--optional-encode-as") :: value :: xs) =>
               for {
                 propertyRequirement <- parseOptionalProperty(arg.drop(2), value)
@@ -159,7 +159,7 @@ trait CLICommon extends GuardrailRunner {
             case (sofar :: already, (arg @ "--auth-implementation") :: value :: xs) =>
               for {
                 auth <- parseAuthImplementation(arg, value)
-                res  <- Continue((sofar.copyContext(authImplementation = auth) :: already, xs))
+                res  <- Continue((sofar.modifyContext(_.withAuthImplementation(auth)) :: already, xs))
               } yield res
             case (_, unknown) =>
               debug("Unknown argument") >> Bail(UnknownArguments(unknown))

modules/core/src/main/scala/dev/guardrail/syntax/args.scala

@@ -1,7 +1,7 @@
 package dev.guardrail.syntax
 
 import dev.guardrail.terms.protocol.PropertyRequirement
-import dev.guardrail.{ Args, AuthImplementation, CodegenTarget, Context, TagsBehaviour }
+import dev.guardrail.{ Args, CodegenTarget, Context }
 import dev.guardrail.syntax.context._
 
 /* Syntax for `dev.guardrail.Args`
@@ -22,34 +22,19 @@ object args {
   }
 
   implicit class ArgsSyntax(args: Args) {
-    def copyContext(
-        framework: Option[String] = args.context.framework,
-        customExtraction: Boolean = args.context.customExtraction,
-        tracing: Boolean = args.context.tracing,
-        modules: List[String] = args.context.modules,
-        propertyRequirement: PropertyRequirement.Configured = args.context.propertyRequirement,
-        tagsBehaviour: TagsBehaviour = args.context.tagsBehaviour,
-        authImplementation: AuthImplementation = args.context.authImplementation
-    ): Args =
-      args.withContext(
-        args.context
-          .withFramework(framework)
-          .withCustomExtraction(customExtraction)
-          .withTracing(tracing)
-          .withModules(modules)
-          .withPropertyRequirement(propertyRequirement)
-          .withTagsBehaviour(tagsBehaviour)
-          .withAuthImplementation(authImplementation)
-      )
+    def modifyContext(func: Context => Context): Args =
+      args.withContext(func(args.context))
 
     def copyPropertyRequirement(
         encoder: PropertyRequirement.OptionalRequirement = args.context.propertyRequirement.encoder,
         decoder: PropertyRequirement.OptionalRequirement = args.context.propertyRequirement.decoder
     ): Args =
-      copyContext(
-        propertyRequirement = args.context.propertyRequirement.copy(
-          encoder = encoder,
-          decoder = decoder
+      modifyContext(ctx =>
+        ctx.withPropertyRequirement(
+          ctx.propertyRequirement.copy(
+            encoder = encoder,
+            decoder = decoder
+          )
         )
       )
   }