Pass a root to resolve things from to directives

Author: alexarchambault

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

@@ -45,7 +45,8 @@ object DirectivesProcessor {
 
   def process(
     directives: Map[Path, Seq[Value[_]]],
-    handlers: Seq[DirectiveHandler]
+    handlers: Seq[DirectiveHandler],
+    cwd: ScopePath
   ): Either[BuildException, BuildOptions] = {
 
     val values = directives.map {
@@ -63,7 +64,7 @@ object DirectivesProcessor {
       .iterator
       .flatMap {
         case (k, v) =>
-          handlersMap.get(k).iterator.map(_(v))
+          handlersMap.get(k).iterator.map(_(v, cwd))
       }
       .toVector
       .sequence

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

@@ -124,7 +124,7 @@ case object ScalaPreprocessor extends Preprocessor {
     Option[String]
   )]] = either {
 
-    val afterStrictUsing = value(processStrictUsing(content))
+    val afterStrictUsing = value(processStrictUsing(content, scopeRoot))
     val afterUsing = value {
       processUsing(path, afterStrictUsing.map(_._2).getOrElse(content), scopeRoot)
         .sequence
@@ -153,14 +153,16 @@ case object ScalaPreprocessor extends Preprocessor {
     }
   }
 
-  private def directivesBuildOptions(directives: Seq[Directive])
-    : Either[BuildException, BuildOptions] = {
+  private def directivesBuildOptions(
+    directives: Seq[Directive],
+    cwd: ScopePath
+  ): Either[BuildException, BuildOptions] = {
     val results = directives
       .filter(_.tpe == Directive.Using)
       .map { dir =>
         val fromHandlersOpt = usingDirectiveHandlers
           .iterator
-          .flatMap(_.handle(dir).iterator)
+          .flatMap(_.handle(dir, cwd).iterator)
           .take(1)
           .toList
           .headOption
@@ -190,7 +192,7 @@ case object ScalaPreprocessor extends Preprocessor {
       .map { dir =>
         val fromHandlersOpt = requireDirectiveHandlers
           .iterator
-          .flatMap(_.handle(dir).iterator)
+          .flatMap(_.handle(dir, scopeRoot).iterator)
           .take(1)
           .toList
           .headOption
@@ -240,7 +242,7 @@ case object ScalaPreprocessor extends Preprocessor {
       case (directives, updatedContentOpt) =>
         val tuple = (
           directivesBuildRequirements(directives, scopeRoot),
-          directivesBuildOptions(directives),
+          directivesBuildOptions(directives, scopeRoot),
           Right(updatedContentOpt)
         )
         tuple
@@ -339,7 +341,8 @@ case object ScalaPreprocessor extends Preprocessor {
   }
 
   private def processStrictUsing(
-    content: String
+    content: String,
+    cwd: ScopePath
   ): Either[BuildException, Option[(BuildOptions, String)]] = either {
 
     val processor = {
@@ -364,7 +367,8 @@ case object ScalaPreprocessor extends Preprocessor {
     val updatedOptions = value {
       DirectivesProcessor.process(
         directives0,
-        usingDirectiveHandlers ++ requireDirectiveHandlers
+        usingDirectiveHandlers ++ requireDirectiveHandlers,
+        cwd
       )
     }
     val codeOffset = directives.getCodeOffset()

modules/build/src/main/scala/scala/build/preprocessing/directives/DirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.BuildOptions
+import scala.build.preprocessing.ScopePath
 
 trait DirectiveHandler {
   def name: String
@@ -13,7 +14,7 @@ trait DirectiveHandler {
 
   // Strict / using_directives-based directives
   def keys: Seq[String] = Nil
-  def handleValues(values: Seq[Any]): Either[BuildException, BuildOptions] =
+  def handleValues(values: Seq[Any], cwd: ScopePath): Either[BuildException, BuildOptions] =
     if (keys.isEmpty)
       sys.error("Cannot happen")
     else

modules/build/src/main/scala/scala/build/preprocessing/directives/RequireDirectiveHandler.scala

@@ -2,7 +2,11 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.BuildRequirements
+import scala.build.preprocessing.ScopePath
 
 trait RequireDirectiveHandler extends DirectiveHandler {
-  def handle(directive: Directive): Option[Either[BuildException, BuildRequirements]]
+  def handle(
+    directive: Directive,
+    cwd: ScopePath
+  ): Option[Either[BuildException, BuildRequirements]]
 }

modules/build/src/main/scala/scala/build/preprocessing/directives/RequirePlatformsDirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.{BuildRequirements, Platform}
+import scala.build.preprocessing.ScopePath
 
 case object RequirePlatformsDirectiveHandler extends RequireDirectiveHandler {
   def name             = "Platform"
@@ -14,7 +15,10 @@ case object RequirePlatformsDirectiveHandler extends RequireDirectiveHandler {
     "using target jvm"
   )
 
-  def handle(directive: Directive): Option[Either[BuildException, BuildRequirements]] =
+  def handle(
+    directive: Directive,
+    cwd: ScopePath
+  ): Option[Either[BuildException, BuildRequirements]] =
     Platform.parseSpec(directive.values.map(Platform.normalize)) match {
       case Some(platforms) =>
         val reqs = BuildRequirements(

modules/build/src/main/scala/scala/build/preprocessing/directives/RequireScalaVersionDirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.BuildRequirements
+import scala.build.preprocessing.ScopePath
 
 case object RequireScalaVersionDirectiveHandler extends RequireDirectiveHandler {
   def name             = "Scala version"
@@ -14,7 +15,10 @@ case object RequireScalaVersionDirectiveHandler extends RequireDirectiveHandler
     "using target scala 3.0.2"
   )
 
-  def handle(directive: Directive): Option[Either[BuildException, BuildRequirements]] =
+  def handle(
+    directive: Directive,
+    cwd: ScopePath
+  ): Option[Either[BuildException, BuildRequirements]] =
     directive.values match {
       case Seq("scala", ">=", minVer) =>
         val req = BuildRequirements(

modules/build/src/main/scala/scala/build/preprocessing/directives/RequireScopeDirectiveHandler.scala

@@ -2,6 +2,7 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.{BuildRequirements, Scope}
+import scala.build.preprocessing.ScopePath
 
 case object RequireScopeDirectiveHandler extends RequireDirectiveHandler {
   def name             = "Scope"
@@ -14,7 +15,10 @@ case object RequireScopeDirectiveHandler extends RequireDirectiveHandler {
 
   private val scopesByName = Scope.all.map(s => s.name -> s).toMap
 
-  def handle(directive: Directive): Option[Either[BuildException, BuildRequirements]] =
+  def handle(
+    directive: Directive,
+    cwd: ScopePath
+  ): Option[Either[BuildException, BuildRequirements]] =
     directive.values match {
       case Seq(name) if scopesByName.contains(name) =>
         val scope = scopesByName(name)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCustomJarDirectiveHandler.scala

@@ -3,6 +3,7 @@ package scala.build.preprocessing.directives
 import scala.build.Os
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
+import scala.build.preprocessing.ScopePath
 
 case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
   def name        = "Custom JAR"
@@ -14,7 +15,7 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
     "using jar \"/Users/alexandre/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/com/chuusai/shapeless_2.13/2.3.7/shapeless_2.13-2.3.7.jar\""
   )
 
-  def handle(directive: Directive): Option[Either[BuildException, BuildOptions]] =
+  def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]] =
     directive.values match {
       case Seq("jar" | "jars", paths @ _*) =>
         val paths0 = paths.map(os.Path(_, Os.pwd))
@@ -29,7 +30,10 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
     }
 
   override def keys = Seq("jar", "jars")
-  override def handleValues(values: Seq[Any]): Either[BuildException, BuildOptions] = {
+  override def handleValues(
+    values: Seq[Any],
+    cwd: ScopePath
+  ): Either[BuildException, BuildOptions] = {
 
     val extraJars = DirectiveUtil.stringValues(values).map { p =>
       // FIXME Not the right cwd

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingDependencyDirectiveHandler.scala

@@ -8,6 +8,7 @@ import scala.build.Ops._
 import scala.build.Positioned
 import scala.build.errors.{BuildException, DependencyFormatError}
 import scala.build.options.{BuildOptions, ClassPathOptions}
+import scala.build.preprocessing.ScopePath
 
 case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
   def name             = "Dependency"
@@ -19,7 +20,7 @@ case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
     "using dev.zio::zio:1.0.12"
   )
 
-  def handle(directive: Directive): Option[Either[BuildException, BuildOptions]] =
+  def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]] =
     directive.values match {
       case Seq(depStr) if depStr.split(":").count(_.trim.nonEmpty) == 3 =>
         val res =
@@ -39,7 +40,10 @@ case object UsingDependencyDirectiveHandler extends UsingDirectiveHandler {
       .left.map(err => new DependencyFormatError(depStr, err))
 
   override def keys = Seq("lib")
-  override def handleValues(values: Seq[Any]): Either[BuildException, BuildOptions] = either {
+  override def handleValues(
+    values: Seq[Any],
+    cwd: ScopePath
+  ): Either[BuildException, BuildOptions] = either {
 
     val extraDependencies = value {
       DirectiveUtil.stringValues(values)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingDirectiveHandler.scala

@@ -2,8 +2,9 @@ package scala.build.preprocessing.directives
 
 import scala.build.errors.BuildException
 import scala.build.options.BuildOptions
+import scala.build.preprocessing.ScopePath
 
 trait UsingDirectiveHandler extends DirectiveHandler {
   // Loose / fastparse-based directives
-  def handle(directive: Directive): Option[Either[BuildException, BuildOptions]]
+  def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]]
 }