Improved show output to be valid JSON and added showNamed

main/src/mill/main/MainModule.scala

@@ -2,12 +2,13 @@ package mill.main
 
 import java.util.concurrent.LinkedBlockingQueue
 import mill.{BuildInfo, T}
-import mill.api.{Ctx, PathRef, Result}
+import mill.api.{Ctx, PathRef, Result, internal}
 import mill.define.{Command, NamedTask, Task}
 import mill.eval.{Evaluator, EvaluatorPaths}
 import mill.util.{PrintLogger, Watched}
 import mill.define.SelectMode
 import pprint.{Renderer, Truncated}
+import ujson.Value
 
 object MainModule {
   @deprecated(
@@ -56,6 +57,21 @@ object MainModule {
         Result.Success(Watched((), watched))
     }
   }
+
+  @internal
+  def evaluateTasks1[T](
+      evaluator: Evaluator,
+      targets: Seq[String],
+      selectMode: SelectMode
+  )(f: Seq[(Any, Option[(String, ujson.Value)])] => T): Result[Watched[Option[T]]] = {
+    RunScript.evaluateTasks1(evaluator, targets, selectMode) match {
+      case Left(err) => Result.Failure(err)
+      case Right((watched, Left(err))) => Result.Failure(err, Some(Watched(None, watched)))
+      case Right((watched, Right(res))) =>
+        val fRes = f(res)
+        Result.Success(Watched(Some(fRes), watched))
+    }
+  }
 }
 
 trait MainModule extends mill.Module {
@@ -236,7 +252,7 @@ trait MainModule extends mill.Module {
    * to integrate Mill into external scripts and tooling.
    */
   def show(evaluator: Evaluator, targets: String*) = T.command {
-    MainModule.evaluateTasks(
+    MainModule.evaluateTasks1(
       evaluator.withBaseLogger(
         // When using `show`, redirect all stdout of the evaluated tasks so the
         // printed JSON is the only thing printed to stdout.
@@ -248,10 +264,14 @@ trait MainModule extends mill.Module {
       ),
       targets,
       SelectMode.Separated
-    ) { res =>
-      for (json <- res.flatMap(_._2)) {
-        T.log.outputStream.println(json.render(indent = 4))
-      }
+    ) { res: Seq[(Any, Option[(String, ujson.Value)])] =>
+      val nameAndJson = res.flatMap(_._2)
+      val output: ujson.Value = ujson.Obj.from(nameAndJson)
+      T.log.outputStream.println(output.render(indent = 2))
+      output
+    }.map { res =>
+      val Watched(Some(json), _) = res
+      json
     }
   }
 

main/src/mill/main/MainRunner.scala

@@ -49,7 +49,6 @@ class MainRunner(
   var stateCache = stateCache0
 
   override def watchAndWait(watched: Seq[(ammonite.interp.Watchable, Long)]) = {
-
     setIdle(true)
     super.watchAndWait(watched)
     setIdle(false)
@@ -86,7 +85,7 @@ class MainRunner(
   val colored = config.core.color.getOrElse(mainInteractive)
 
   override val colors = if (colored) Colors.Default else Colors.BlackWhite
-  override def runScript(scriptPath: os.Path, scriptArgs: List[String]) =
+  override def runScript(scriptPath: os.Path, scriptArgs: List[String]): Boolean =
     watchLoop2(
       isRepl = false,
       printing = true,

main/src/mill/main/RunScript.scala

@@ -17,6 +17,7 @@ import mill.internal.AmmoniteUtils
 import scala.collection.mutable
 import scala.reflect.ClassTag
 import mill.define.ParseArgs.TargetsWithParams
+import ujson.Value
 
 /**
  * Custom version of ammonite.main.Scripts, letting us run the build.sc script
@@ -319,11 +320,45 @@ object RunScript {
       }
   }
 
+  def evaluateTasks1[T](
+      evaluator: Evaluator,
+      scriptArgs: Seq[String],
+      selectMode: SelectMode
+  ): Either[String, (Seq[PathRef], Either[String, Seq[(Any, Option[(String, ujson.Value)])]])] = {
+    for (targets <- resolveTasks(mill.main.ResolveTasks, evaluator, scriptArgs, selectMode))
+      yield {
+        val (watched, res) = evaluate1(evaluator, Agg.from(targets.distinct))
+
+        val watched2 = for {
+          x <- res.toSeq
+          (Watched(_, extraWatched), _) <- x
+          w <- extraWatched
+        } yield w
+
+        (watched ++ watched2, res)
+      }
+  }
+
   def evaluate(
       evaluator: Evaluator,
       targets: Agg[Task[Any]]
   ): (Seq[PathRef], Either[String, Seq[(Any, Option[ujson.Value])]]) = {
-    val evaluated = evaluator.evaluate(targets)
+    val (watched, results) = evaluate1(evaluator, targets)
+    // we drop the task name in the inner tuple
+    (watched, results.map(_.map(p => (p._1, p._2.map(_._2)))))
+  }
+
+  /**
+   *
+   * @param evaluator
+   * @param targets
+   * @return (watched-paths, Either[err-msg, Seq[(task-result, Option[(task-name, task-return-as-json)])]])
+   */
+  def evaluate1(
+      evaluator: Evaluator,
+      targets: Agg[Task[Any]]
+  ): (Seq[PathRef], Either[String, Seq[(Any, Option[(String, ujson.Value)])]]) = {
+    val evaluated: Evaluator.Results = evaluator.evaluate(targets)
     val watched = evaluated.results
       .iterator
       .collect {
@@ -337,18 +372,18 @@ object RunScript {
 
     evaluated.failing.keyCount match {
       case 0 =>
-        val json = for (t <- targets.toSeq) yield {
+        val nameAndJson = for (t <- targets.toSeq) yield {
           t match {
             case t: mill.define.NamedTask[_] =>
               val jsonFile = EvaluatorPaths.resolveDestPaths(evaluator.outPath, t).meta
               val metadata = upickle.default.read[Evaluator.Cached](ujson.read(jsonFile.toIO))
-              Some(metadata.value)
+              Some(t.toString, metadata.value)
 
             case _ => None
           }
         }
 
-        watched -> Right(evaluated.values.zip(json))
+        watched -> Right(evaluated.values.zip(nameAndJson))
       case n => watched -> Left(s"$n targets failed\n$errorStr")
     }
   }

main/test/src/main/MainModuleTests.scala

@@ -0,0 +1,50 @@
+package mill.main
+
+import mill.api.Result
+import mill.{Agg, T}
+import mill.util.{TestEvaluator, TestUtil}
+import utest.{TestSuite, Tests, test}
+
+object MainModuleTests extends TestSuite {
+
+  object mainModule extends TestUtil.BaseModule with MainModule {
+    def hello = T { Seq("hello") }
+    def hello2 = T { Seq("hello2") }
+  }
+
+  override def tests: Tests = Tests {
+    test("show") {
+      val evaluator = new TestEvaluator(mainModule)
+      test("single") {
+        val results =
+          evaluator.evaluator.evaluate(Agg(mainModule.show(evaluator.evaluator, "hello")))
+
+        assert(results.failing.keyCount == 0)
+
+        val Result.Success(value) = results.rawValues.head
+
+        assert(value == ujson.Obj.from(Map(
+          "hello" -> ujson.Arr.from(Seq("hello"))
+        )))
+      }
+      test("multi") {
+        val results =
+          evaluator.evaluator.evaluate(Agg(mainModule.show(
+            evaluator.evaluator,
+            "hello",
+            "+",
+            "hello2"
+          )))
+
+        assert(results.failing.keyCount == 0)
+
+        val Result.Success(value) = results.rawValues.head
+
+        assert(value == ujson.Obj.from(Map(
+          "hello" -> ujson.Arr.from(Seq("hello")),
+          "hello2" -> ujson.Arr.from(Seq("hello2"))
+        )))
+      }
+    }
+  }
+}