Add support for running a main method from the test scope

Author: Gedochao

modules/build/src/main/scala/scala/build/Build.scala

@@ -32,6 +32,7 @@ trait Build {
   def scope: Scope
   def outputOpt: Option[os.Path]
   def success: Boolean
+  def cancelled: Boolean
   def diagnostics: Option[Seq[(Either[String, os.Path], bsp4j.Diagnostic)]]
 
   def successfulOpt: Option[Build.Successful]
@@ -54,6 +55,7 @@ object Build {
     logger: Logger
   ) extends Build {
     def success: Boolean                  = true
+    def cancelled: Boolean                = false
     def successfulOpt: Some[this.type]    = Some(this)
     def outputOpt: Some[os.Path]          = Some(output)
     def dependencyClassPath: Seq[os.Path] = sources.resourceDirs ++ artifacts.classPath
@@ -215,9 +217,11 @@ object Build {
     project: Project,
     diagnostics: Option[Seq[(Either[String, os.Path], bsp4j.Diagnostic)]]
   ) extends Build {
-    def success: Boolean         = false
-    def successfulOpt: None.type = None
-    def outputOpt: None.type     = None
+    def success: Boolean = false
+
+    override def cancelled: Boolean = false
+    def successfulOpt: None.type    = None
+    def outputOpt: None.type        = None
   }
 
   final case class Cancelled(
@@ -227,6 +231,7 @@ object Build {
     reason: String
   ) extends Build {
     def success: Boolean         = false
+    def cancelled: Boolean       = true
     def successfulOpt: None.type = None
     def outputOpt: None.type     = None
     def diagnostics: None.type   = None

modules/cli/src/main/scala/scala/cli/commands/package0/Package.scala

@@ -697,7 +697,7 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
     isFullOpt <- build.options.scalaJsOptions.fullOpt
     linkerConfig = build.options.scalaJsOptions.linkerConfig(logger)
     linkResult <- linkJs(
-      build,
+      Seq(build),
       destPath,
       mainClass,
       addTestInitializer = false,
@@ -947,7 +947,7 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
   }
 
   def linkJs(
-    build: Build.Successful,
+    builds: Seq[Build.Successful],
     dest: os.Path,
     mainClassOpt: Option[String],
     addTestInitializer: Boolean,
@@ -957,19 +957,19 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
     logger: Logger,
     scratchDirOpt: Option[os.Path] = None
   ): Either[BuildException, os.Path] = {
-    val mainJar   = Library.libraryJar(build)
-    val classPath = mainJar +: build.artifacts.classPath
+    val jars      = builds.map(Library.libraryJar(_))
+    val classPath = jars ++ builds.flatMap(_.artifacts.classPath)
     val input = ScalaJsLinker.LinkJSInput(
-      options = build.options.notForBloopOptions.scalaJsLinkerOptions,
+      options = builds.head.options.notForBloopOptions.scalaJsLinkerOptions,
       javaCommand =
-        build.options.javaHome().value.javaCommand, // FIXME Allow users to use another JVM here?
+        builds.head.options.javaHome().value.javaCommand, // FIXME Allow users to use another JVM here?
       classPath = classPath,
       mainClassOrNull = mainClassOpt.orNull,
       addTestInitializer = addTestInitializer,
       config = config,
       fullOpt = fullOpt,
       noOpt = noOpt,
-      scalaJsVersion = build.options.scalaJsOptions.finalVersion
+      scalaJsVersion = builds.head.options.scalaJsOptions.finalVersion
     )
 
     val linkingDir = LinkingDir.getOrCreate(input, scratchDirOpt)
@@ -980,8 +980,8 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
           input,
           linkingDir,
           logger,
-          build.options.finalCache,
-          build.options.archiveCache
+          builds.head.options.finalCache,
+          builds.head.options.archiveCache
         )
       }
       val relMainJs      = os.rel / "main.js"
@@ -1012,9 +1012,9 @@ object Package extends ScalaCommand[PackageOptions] with BuildCommandHelpers {
         }
         else {
           os.copy(mainJs, dest, replaceExisting = true)
-          if (build.options.scalaJsOptions.emitSourceMaps && os.exists(sourceMapJs)) {
+          if (builds.head.options.scalaJsOptions.emitSourceMaps && os.exists(sourceMapJs)) {
             val sourceMapDest =
-              build.options.scalaJsOptions.sourceMapsDest.getOrElse(os.Path(s"$dest.map"))
+              builds.head.options.scalaJsOptions.sourceMapsDest.getOrElse(os.Path(s"$dest.map"))
             val updatedMainJs = ScalaJsLinker.updateSourceMappingURL(dest)
             os.write.over(dest, updatedMainJs)
             os.copy(sourceMapJs, sourceMapDest, replaceExisting = true)