Skip to content

Settings: move fromCliArgs into class #1081

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

Merged
kitbellew merged 1 commit into from
Apr 8, 2026
Merged

Settings: move fromCliArgs into class #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 15 additions & 14 deletions cli/src/main/scala/mdoc/internal/cli/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,19 @@ case class Settings(
cwd = dir
)
}

def withCliArgs(args: List[String]): Configured[Settings] = {
Conf.parseCliArgs[Settings](args).andThen { conf =>
val withCwd = conf.get[String]("cwd").map { x =>
implicit val defaultCwd: AbsolutePath = this.cwd
withWorkingDirectory(AbsolutePath(x))
}.getOrElse(this)
val base = conf.get[String]("propertyFileName")
.map(withCwd.withPropertiesFromFile).getOrElse(withCwd)
conf.as[Settings](Settings.decoder(base)).map(_.addSite(base.site))
}
}

}

object Settings { // extends MetaconfigScalametaImplicits with Decoders with SettingsGeneric {
Expand Down Expand Up @@ -306,20 +319,8 @@ object Settings { // extends MetaconfigScalametaImplicits with Decoders with Set
generic.deriveDecoder[Settings](base)
}

def fromCliArgs(args: List[String], workingDirectory: => AbsolutePath): Configured[Settings] = {
Conf
.parseCliArgs[Settings](args)
.andThen { conf =>
implicit val defaultCwd: AbsolutePath = workingDirectory
val base = Settings(
conf.get[String]("cwd").map(AbsolutePath(_)).getOrElse(defaultCwd),
conf.get[String]("propertyFileName").getOrElse("mdoc.properties")
)
conf
.as[Settings](decoder(base))
.map(_.addSite(base.site))
}
}
def fromCliArgs(args: List[String], workingDirectory: AbsolutePath): Configured[Settings] =
Settings(workingDirectory, "mdoc.properties").withCliArgs(args)

def fromCliArgs(args: List[String], workingDirectory: Path): Configured[Settings] =
fromCliArgs(args, AbsolutePath(workingDirectory))
Expand Down
4 changes: 2 additions & 2 deletions mdoc/src/main/scala/mdoc/MainSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ final class MainSettings private (
def withArgs(args: List[String]): MainSettings = {
if (args.isEmpty) this
else {
Settings.fromCliArgs(args, settings.cwd.toNIO) match {
settings.withCliArgs(args) match {
case Configured.Ok(newSettings) =>
copy(settings = newSettings)
if (newSettings eq settings) this else copy(settings = newSettings)
case Configured.NotOk(error) =>
throw new IllegalArgumentException(error.toString())
}
Expand Down