ci: retrigger checks

Author: Samoppakiks

zio-cli-testkit/shared/src/main/scala/zio/cli/CliAssertion.scala

@@ -20,17 +20,17 @@ object CliAssertion {
    */
   def accessCommand[R, E, A](cliApp: CliApp[R, E, A], assert: Assertion[Command[_]]): TestResult =
     cliApp match {
-      case CliAppImpl(_, _, _, command, _, _, _, _, _) => assert.run(command)
+      case CliAppImpl(_, _, _, command, _, _, _, _) => assert.run(command)
     }
 
   def accessHelpDoc[R, E, A](cliApp: CliApp[R, E, A], assert: Assertion[HelpDoc]): TestResult =
     cliApp match {
-      case CliAppImpl(_, _, _, command, _, _, _, _, _) => assert.run(command.helpDoc)
+      case CliAppImpl(_, _, _, command, _, _, _, _) => assert.run(command.helpDoc)
     }
 
   def accessSynopsis[R, E, A](cliApp: CliApp[R, E, A], assert: Assertion[UsageSynopsis]): TestResult =
     cliApp match {
-      case CliAppImpl(_, _, _, command, _, _, _, _, _) => assert.run(command.synopsis)
+      case CliAppImpl(_, _, _, command, _, _, _, _) => assert.run(command.synopsis)
     }
 
   /**
@@ -62,15 +62,15 @@ object CliAssertion {
     cliConfig: CliConfig
   ): TestResult =
     cliApp match {
-      case CliAppImpl(_, _, _, command, _, _, _, _, _) => assertSynopsis(command, synopsis)
+      case CliAppImpl(_, _, _, command, _, _, _, _) => assertSynopsis(command, synopsis)
     }
 
   def assertSynopsis[R, E, A](cliApp: CliApp[R, E, A], synopsis: UsageSynopsis): TestResult =
     assertSynopsis(cliApp, synopsis.enumerate(CliConfig.default).map(_.text))
 
   def assertHelpDoc[R, E, A](cliApp: CliApp[R, E, A], helpDoc: HelpDoc): TestResult =
     cliApp match {
-      case CliAppImpl(_, _, _, command, _, _, _, _, _) => assertHelpDoc(command, helpDoc)
+      case CliAppImpl(_, _, _, command, _, _, _, _) => assertHelpDoc(command, helpDoc)
     }
 
   /**

zio-cli/shared/src/main/scala/zio/cli/CliApp.scala

@@ -23,18 +23,10 @@ sealed trait CliApp[-R, +E, +A] { self =>
 
   final def map[B](f: A => B): CliApp[R, E, B] =
     self match {
-      case CliApp.CliAppImpl(name, version, summary, command, execute, footer, config, figFont, configFileResolver) =>
-        CliApp.CliAppImpl(
-          name,
-          version,
-          summary,
-          command,
-          execute.andThen(_.map(f)),
-          footer,
-          config,
-          figFont,
-          configFileResolver
-        )
+      case impl @ CliApp.CliAppImpl(name, version, summary, command, execute, footer, config, figFont) =>
+        CliApp
+          .CliAppImpl(name, version, summary, command, execute.andThen(_.map(f)), footer, config, figFont)
+          .withConfigFileResolver(impl.configFileResolver)
     }
 
   def flatMap[R1 <: R, E1 >: E, B](f: A => ZIO[R1, E1, B]): CliApp[R1, E1, B]
@@ -57,7 +49,8 @@ object CliApp {
     figFont: FigFont = FigFont.Default,
     configFileResolver: ConfigFileResolver = ConfigFileResolver.live
   )(execute: Model => ZIO[R, E, A]): CliApp[R, E, A] =
-    CliAppImpl(name, version, summary, command, execute, footer, config, figFont, configFileResolver)
+    CliAppImpl(name, version, summary, command, execute, footer, config, figFont)
+      .withConfigFileResolver(configFileResolver)
 
   private[cli] case class CliAppImpl[-R, +E, Model, +A](
     name: String,
@@ -67,9 +60,19 @@ object CliApp {
     execute: Model => ZIO[R, E, A],
     footer: HelpDoc = HelpDoc.Empty,
     config: CliConfig = CliConfig.default,
-    figFont: FigFont = FigFont.Default,
-    configFileResolver: ConfigFileResolver = ConfigFileResolver.live
+    figFont: FigFont = FigFont.Default
   ) extends CliApp[R, E, A] { self =>
+
+    private var _configFileResolver: ConfigFileResolver = ConfigFileResolver.live
+
+    def configFileResolver: ConfigFileResolver = _configFileResolver
+
+    def withConfigFileResolver(resolver: ConfigFileResolver): CliAppImpl[R, E, Model, A] = {
+      val c = copy()
+      c._configFileResolver = resolver
+      c
+    }
+
     def config(newConfig: CliConfig): CliApp[R, E, A] = copy(config = newConfig)
 
     def footer(newFooter: HelpDoc): CliApp[R, E, A] =
@@ -155,7 +158,7 @@ object CliApp {
             }
           )
 
-      configFileResolver.resolve(self.name).flatMap { case (dotfileArgs, dotfileSources) =>
+      _configFileResolver.resolve(self.name).flatMap { case (dotfileArgs, dotfileSources) =>
         val (mergedArgs, allSources) =
           ConfigFileResolver.mergeArgs(dotfileArgs, dotfileSources, filteredArgs)
         val diagnosticsEffect =
@@ -175,9 +178,8 @@ object CliApp {
         { (app: ZIO[R, E, A]) => app.flatMap(f) } compose execute,
         footer,
         config,
-        figFont,
-        configFileResolver
-      )
+        figFont
+      ).withConfigFileResolver(_configFileResolver)
 
     override def summary(s: HelpDoc.Span): CliApp[R, E, A] =
       copy(summary = self.summary + s)