.

Author: lefou

core/api/src/mill/api/opt/Opt.scala

@@ -1,17 +1,15 @@
 package mill.api.opt
 
 import mill.api.daemon.internal.OptApi
-
 import mill.api.JsonFormatters.given
 
 import scala.annotation.targetName
+import scala.language.implicitConversions
 
-type OptTypes = (String | os.Path)
-
-case class Opt private (value: Seq[OptTypes]) extends OptApi {
+case class Opt private (value: Seq[Opt.OptTypes]) extends OptApi {
   override def toString(): String = value.mkString("")
 
-  def map(conv: OptTypes => OptTypes): Opt = Opt(value.map(conv)*)
+  def map(conv: Opt.OptTypes => Opt.OptTypes): Opt = Opt(value.map(conv)*)
 
   private def startStrings: Seq[String] =
     value.takeWhile(_.isInstanceOf[String]).collect { case s: String => s }
@@ -30,6 +28,9 @@ case class Opt private (value: Seq[OptTypes]) extends OptApi {
 }
 
 object Opt {
+
+  type OptTypes = (String | os.Path)
+
   @targetName("applyVarArg")
   def apply(value: OptTypes*): Opt = {
     // TODO: merge sequential strings
@@ -76,6 +77,17 @@ object Opt {
         }*)
     )
 
-  given stringToOpt: Conversion[String, Opt] = (value: String) => Opt(value)
-  given osPathToOpt: Conversion[os.Path, Opt] = (value: os.Path) => Opt(value)
+//  given stringToOpt: Conversion[String, Opt] = (value: String) => Opt(value)
+//  given osPathToOpt: Conversion[os.Path, Opt] = (value: os.Path) => Opt(value)
+
+//  implicit def IterableToOpt[T](s: Iterable[T])(using f: T => Opt): Opt =
+//    Opt(s.toSeq.flatMap(f(_).value))
+
+
+  implicit def StringToOpt(s: String): Opt = Opt(s)
+
+  implicit def OsPathToOpt(p: os.Path): Opt = Opt(p)
+
+  implicit def OptToOpt(o: Opt): Opt = o
+
 }

core/api/src/mill/api/opt/OptGroup.scala

@@ -18,15 +18,19 @@ case class OptGroup private (value: Seq[Opt]) extends OptGroupApi
 
   def head: Opt = value.head
 
-  def toStringSeq: Seq[String] = value.map(_.toString)
+  def toStringSeq: Seq[String] = value.map(_.toString())
+
+  def concat(suffix: OptGroup): OptGroup = new OptGroup(value ++ suffix.value)
+
+  @`inline` final def ++(suffix: OptGroup): OptGroup = concat(suffix)
+
 }
 
 object OptGroup {
-  @targetName("applyUnion")
-  def apply(value: (Opt | Seq[Opt])*): OptGroup = new OptGroup(value.flatMap {
-    case a: Opt => Seq(a)
-    case s: Seq[Opt] => s
-  })
+  @targetName("applyVarAar")
+  def apply(opts: Opt*): OptGroup = new OptGroup(opts)
+  @targetName("applyIterable")
+  def apply[T](opts: T*)(using f: T => Opt): OptGroup = new OptGroup(opts.map(f(_)))
 
   def when(cond: Boolean)(value: Opt*): OptGroup = if (cond) OptGroup(value*) else OptGroup()
 
@@ -43,7 +47,8 @@ object OptGroup {
   implicit def IterableToOptGroup[T](s: Iterable[T])(using f: T => OptGroup): OptGroup =
     OptGroup(s.toSeq.flatMap(f(_).value))
 
-  implicit def ArrayToOptGroup[T](s: Array[T])(using f: T => OptGroup): OptGroup =
-    OptGroup(s.flatMap(f(_).value))
+//  implicit def ArrayToOptGroup[T](s: Array[T])(using f: T => OptGroup): OptGroup =
+//    OptGroup(s.flatMap(f(_).value))
+
 
 }

core/api/src/mill/api/opt/OptSyntax.scala

@@ -1,8 +1,5 @@
 package mill.api.opt
 
-import mill.api.daemon.internal.{OptApi, OptGroupApi, OptsApi}
-
-import scala.annotation.targetName
 import scala.language.implicitConversions
 
 implicit class OptSyntax(ctx: StringContext) extends AnyVal {

core/api/src/mill/api/opt/Opts.scala

@@ -7,7 +7,7 @@ import scala.language.implicitConversions
 case class Opts private (override val value: OptGroup*) extends OptsApi
     derives upickle.ReadWriter {
 
-  def toStringSeq: Seq[String] = value.map(_.toString)
+  def toStringSeq: Seq[String] = value.flatMap(_.toStringSeq)
   override def toString(): String = value.mkString("Opts(", ", ", ")")
 
   def concat(suffix: Opts): Opts = Opts(value ++ suffix.value)