Refactor sources default main class override

- it is only to be used by scripts
- rename relevant fieds to imply the purpose better

Author: Gedochao

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

@@ -57,7 +57,7 @@ object Build {
       MainClass.find(output)
     def retainedMainClass: Either[MainClassError, String] = {
       lazy val foundMainClasses0 = foundMainClasses()
-      val defaultMainClassOpt = sources.mainClass
+      val defaultMainClassOpt = sources.defaultMainClass
         .filter(name => foundMainClasses0.contains(name))
       def foundMainClass =
         if (foundMainClasses0.isEmpty) Left(new NoMainClassFoundError)

modules/build/src/main/scala/scala/build/CrossSources.scala

@@ -9,7 +9,7 @@ import scala.build.preprocessing._
 final case class CrossSources(
   paths: Seq[HasBuildRequirements[(os.Path, os.RelPath)]],
   inMemory: Seq[HasBuildRequirements[Sources.InMemory]],
-  mainClass: Option[String],
+  defaultMainClass: Option[String],
   resourceDirs: Seq[HasBuildRequirements[os.Path]],
   buildOptions: Seq[HasBuildRequirements[BuildOptions]]
 ) {
@@ -49,7 +49,7 @@ final case class CrossSources(
         .flatMap(_.withScalaVersion(retainedScalaVersion).toSeq)
         .flatMap(_.withPlatform(platform.value).toSeq)
         .map(_.scopedValue(defaultScope)),
-      mainClass,
+      defaultMainClass,
       resourceDirs
         .flatMap(_.withScalaVersion(retainedScalaVersion).toSeq)
         .flatMap(_.withPlatform(platform.value).toSeq)
@@ -132,11 +132,8 @@ object CrossSources {
       )
     }
 
-    val mainClassOpt = for {
-      mainClassPath <- inputs.mainClassElement.map {
-        case sf: Inputs.SourceFile        => ScopePath.fromPath(sf.path).path
-        case vsf: Inputs.VirtualScalaFile => vsf.scopePath.path
-      }
+    val defaultMainClassOpt = for {
+      mainClassPath      <- inputs.defaultMainClassElement.map(s => ScopePath.fromPath(s.path).path)
       processedMainClass <- preprocessedSources.find(_.scopePath.path == mainClassPath)
       mainClass          <- processedMainClass.mainClassOpt
     } yield mainClass
@@ -165,6 +162,6 @@ object CrossSources {
       HasBuildRequirements(BuildRequirements(), _)
     )
 
-    CrossSources(paths, inMemory, mainClassOpt, resourceDirs, buildOptions)
+    CrossSources(paths, inMemory, defaultMainClassOpt, resourceDirs, buildOptions)
   }
 }

modules/build/src/main/scala/scala/build/Inputs.scala

@@ -16,7 +16,7 @@ import scala.util.matching.Regex
 
 final case class Inputs(
   elements: Seq[Inputs.Element],
-  mainClassElement: Option[Inputs.SingleElement],
+  defaultMainClassElement: Option[Inputs.Script],
   workspace: os.Path,
   baseProjectName: String,
   mayAppendHash: Boolean,
@@ -279,14 +279,11 @@ object Inputs {
       case _: ResourceDirectory => true
       case _: Virtual           => true
     }
-    val mainClassElemOpt = validElems
-      .collectFirst {
-        case f: SourceFile         => f
-        case vsf: VirtualScalaFile => vsf
-      }
+    // only on-disk scripts need a main class override
+    val defaultMainClassElemOpt = validElems.collectFirst { case script: Script => script }
     Inputs(
       updatedElems,
-      mainClassElemOpt,
+      defaultMainClassElemOpt,
       workspace,
       baseProjectName,
       mayAppendHash = needsHash,
@@ -297,15 +294,14 @@ object Inputs {
   private val githubGistsArchiveRegex: Regex =
     s""":\\/\\/gist\\.github\\.com\\/[^\\/]*?\\/[^\\/]*$$""".r
 
-  private def resolve(path: String, content: Array[Byte]): Element = {
-    val wrapperPath =
-      os.sub / path.split("/").last
-
+  private def resolve(path: String, content: Array[Byte]): Element =
     if (path.endsWith(".scala")) VirtualScalaFile(content, path)
     else if (path.endsWith(".java")) VirtualJavaFile(content, path)
-    else if (path.endsWith(".sc")) VirtualScript(content, path, wrapperPath)
+    else if (path.endsWith(".sc")) {
+      val wrapperPath = os.sub / path.split("/").last
+      VirtualScript(content, path, wrapperPath)
+    }
     else VirtualData(content, path)
-  }
 
   private def resolveZipArchive(content: Array[Byte]): Seq[Element] = {
     val zipInputStream = new ZipInputStream(new ByteArrayInputStream(content))
@@ -429,7 +425,7 @@ object Inputs {
   def empty(workspace: os.Path): Inputs =
     Inputs(
       elements = Nil,
-      mainClassElement = None,
+      defaultMainClassElement = None,
       workspace = workspace,
       baseProjectName = "project",
       mayAppendHash = true,

modules/build/src/main/scala/scala/build/ScopedSources.scala

@@ -5,15 +5,15 @@ import scala.build.options.{BuildOptions, HasScope, Scope}
 final case class ScopedSources(
   paths: Seq[HasScope[(os.Path, os.RelPath)]],
   inMemory: Seq[HasScope[Sources.InMemory]],
-  mainClass: Option[String],
+  defaultMainClass: Option[String],
   resourceDirs: Seq[HasScope[os.Path]],
   buildOptions: Seq[HasScope[BuildOptions]]
 ) {
   def sources(scope: Scope, baseOptions: BuildOptions): Sources =
     Sources(
       paths.flatMap(_.valueFor(scope).toSeq),
       inMemory.flatMap(_.valueFor(scope).toSeq),
-      mainClass,
+      defaultMainClass,
       resourceDirs.flatMap(_.valueFor(scope).toSeq),
       buildOptions
         .flatMap(_.valueFor(scope).toSeq)

modules/build/src/main/scala/scala/build/Sources.scala

@@ -7,7 +7,7 @@ import scala.build.preprocessing._
 final case class Sources(
   paths: Seq[(os.Path, os.RelPath)],
   inMemory: Seq[Sources.InMemory],
-  mainClass: Option[String],
+  defaultMainClass: Option[String],
   resourceDirs: Seq[os.Path],
   buildOptions: BuildOptions
 ) {

modules/build/src/main/scala/scala/build/preprocessing/ScalaPreprocessor.scala

@@ -9,7 +9,7 @@ import java.nio.charset.StandardCharsets
 import scala.build.EitherCps.{either, value}
 import scala.build.Ops._
 import scala.build.errors._
-import scala.build.internal.{AmmUtil, Util}
+import scala.build.internal.Util
 import scala.build.options.{BuildOptions, BuildRequirements, ClassPathOptions, ShadowingSeq}
 import scala.build.preprocessing.directives._
 import scala.build.{Inputs, Logger, Position, Positioned}
@@ -72,16 +72,12 @@ case object ScalaPreprocessor extends Preprocessor {
   ): Option[Either[BuildException, Seq[PreprocessedSource]]] =
     input match {
       case f: Inputs.ScalaFile =>
-        val inferredClsName = {
-          val (pkg, wrapper) = AmmUtil.pathToPackageWrapper(f.subPath)
-          (pkg :+ wrapper).map(_.raw).mkString(".")
-        }
         val res = either {
           val content   = value(PreprocessingUtil.maybeRead(f.path))
           val scopePath = ScopePath.fromPath(f.path)
           val source = value(process(content, Right(f.path), scopePath / os.up, logger)) match {
             case None =>
-              PreprocessedSource.OnDisk(f.path, None, None, Nil, Some(inferredClsName))
+              PreprocessedSource.OnDisk(f.path, None, None, Nil, None)
             case Some(ProcessingOutput(
                   requirements,
                   scopedRequirements,
@@ -96,7 +92,7 @@ case object ScalaPreprocessor extends Preprocessor {
                 Some(options),
                 Some(requirements),
                 scopedRequirements,
-                Some(inferredClsName),
+                None,
                 scopePath
               )
             case Some(ProcessingOutput(requirements, scopedRequirements, options, None)) =>
@@ -105,7 +101,7 @@ case object ScalaPreprocessor extends Preprocessor {
                 Some(options),
                 Some(requirements),
                 scopedRequirements,
-                Some(inferredClsName)
+                None
               )
           }
           Seq(source)
@@ -115,10 +111,6 @@ case object ScalaPreprocessor extends Preprocessor {
       case v: Inputs.VirtualScalaFile =>
         val res = either {
           val relPath = if (v.isStdin) os.sub / "stdin.scala" else v.subPath
-          val className = {
-            val (pkg, wrapper) = AmmUtil.pathToPackageWrapper(relPath)
-            (pkg :+ wrapper).map(_.raw).mkString(".")
-          }
           val content = new String(v.content, StandardCharsets.UTF_8)
           val (requirements, scopedRequirements, options, updatedContentOpt) =
             value(
@@ -135,7 +127,7 @@ case object ScalaPreprocessor extends Preprocessor {
             options = Some(options),
             requirements = Some(requirements),
             scopedRequirements,
-            mainClassOpt = Some(className),
+            mainClassOpt = None,
             scopePath = v.scopePath
           )
           Seq(s)

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

@@ -183,7 +183,7 @@ object Package extends ScalaCommand[PackageOptions] {
 
     val dest = outputOpt
       .orElse {
-        build.sources.mainClass
+        build.sources.defaultMainClass
           .map(n => n.drop(n.lastIndexOf('.') + 1))
           .map(_.stripSuffix("_sc"))
           .map(_ + extension)

modules/cli/src/main/scala/scala/cli/packaging/Library.scala

@@ -33,7 +33,7 @@ object Library {
     manifest.getMainAttributes.put(JarAttributes.Name.MANIFEST_VERSION, "1.0")
 
     if (hasActualManifest)
-      for (mainClass <- mainClassOpt.orElse(build.sources.mainClass) if mainClass.nonEmpty)
+      for (mainClass <- mainClassOpt.orElse(build.sources.defaultMainClass) if mainClass.nonEmpty)
         manifest.getMainAttributes.put(JarAttributes.Name.MAIN_CLASS, mainClass)
 
     var zos: ZipOutputStream = null