supports multi-line directives for Source Generator

Author: Perklone

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

@@ -1012,7 +1012,7 @@ object Build {
       scope = scope,
       javaHomeOpt = Option(options.javaHomeLocation().value),
       javacOptions = javacOptions,
-      generateSource = hardcodedSource
+      generateSource = Option(sourceGeneratorConfig)
     )
     project
   }

modules/build/src/main/scala/scala/build/Project.scala

@@ -29,7 +29,7 @@ final case class Project(
   javaHomeOpt: Option[os.Path],
   scope: Scope,
   javacOptions: List[String],
-  generateSource: Option[GeneratorConfig]
+  generateSource: Option[Seq[GeneratorConfig]]
 ) {
 
   import Project._
@@ -52,51 +52,25 @@ final case class Project(
       )
     }
 
-    val sourceGen0: Option[List[BloopConfig.SourceGenerator]] =
-      generateSource.map(config =>
-        println(s"Input Directory => ${config.inputDir}")
-        println(s"Globber => ${config.glob}")
-        println(s"Command File Path => ${config.commandFilePath}")
-        // val command0 = s"${os.pwd}/testing-a/${config.commandFilePath}"
-        val command0 = config.commandFilePath
-        val sourceGlobs0 = BloopConfig.SourcesGlobs(
-          // (os.pwd / "testing-a" / config.inputDir).toNIO,
-          Paths.get(config.inputDir),
-          None,
-          config.glob,
-          Nil
-        )
-
-        val sourceGen = BloopConfig.SourceGenerator(
-          List(sourceGlobs0),
-          (os.pwd / "testing-a" / "source-generator-output").toNIO,
-          // Paths.get(config.inputDir),
-          List("python3", command0)
-          // Nil
-        )
+    val sourceGenerator: Option[List[BloopConfig.SourceGenerator]] =
+      generateSource.map(configs =>
+        configs.map { config =>
+          val command0 = config.commandFilePath
+          val sourceGlobs0 = BloopConfig.SourcesGlobs(
+            Paths.get(config.inputDir),
+            None,
+            config.glob,
+            Nil
+          )
 
-        List(sourceGen)
+          BloopConfig.SourceGenerator(
+            List(sourceGlobs0),
+            (config.outputPath / "source-generator-output").toNIO,
+            List("python3", command0)
+          )
+        }.toList
       )
 
-    // val sourceGen: BloopConfig.SourceGenerator = {
-    //   val command = s"${os.pwd}/${generateSource.commandFilePath}"
-    //   val sourceGlobs = BloopConfig.SourcesGlobs(
-    //     (os.pwd / generateSource.inputDir).toNIO,
-    //     None,
-    //     List(generateSource.glob),
-    //     Nil
-    //   )
-
-    //   BloopConfig.SourceGenerator(
-    //     List(sourceGlobs),
-    //     (os.pwd / "testing-a" / "source-generator-output").toNIO,
-    //     List("python3", command)
-    //     // Nil
-    //   )
-    // }
-
-    
-
     baseBloopProject(
       projectName,
       directory.toNIO,
@@ -113,7 +87,7 @@ final case class Project(
         `scala` = scalaConfigOpt,
         java = Some(BloopConfig.Java(javacOptions)),
         resolution = resolution,
-        sourceGenerators = sourceGen0
+        sourceGenerators = sourceGenerator
       )
   }
 

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

@@ -13,26 +13,26 @@ import scala.build.{Positioned, options}
 @DirectiveDescription("Generate code using Source Generator")
 @DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
 final case class SourceGenerator(
-  sourceGenerator: DirectiveValueParser.WithScopePath[Option[Positioned[String]]] = DirectiveValueParser.WithScopePath.empty(None)
+  sourceGenerator: DirectiveValueParser.WithScopePath[List[Positioned[String]]] =
+    DirectiveValueParser.WithScopePath.empty(Nil)
 ) extends HasBuildOptions {
-  def buildOptions: Either[BuildException, BuildOptions] = either {
-    val sourceGen = sourceGenerator.value
-    
-    val maybeGenerateSource = sourceGen
-      .map(GeneratorConfig.parse)
-      .sequence
-
-    val generateSource = maybeGenerateSource match {
-      case Left(buildException) => throw buildException
-      case Right(config) => config
-    }
-
-    BuildOptions(sourceGeneratorOptions =
-      SourceGeneratorOptions(generatorConfig = generateSource)
-    )
-  }
+  def buildOptions: Either[BuildException, BuildOptions] =
+    SourceGenerator.buildOptions(sourceGenerator)
 }
 
 object SourceGenerator {
   val handler: DirectiveHandler[SourceGenerator] = DirectiveHandler.derive
+  def buildOptions(sourceGenerator: DirectiveValueParser.WithScopePath[List[Positioned[String]]])
+    : Either[BuildException, BuildOptions] = {
+    val sourceGenValue = sourceGenerator.value
+    sourceGenValue
+      .map(config => GeneratorConfig.parse(config, sourceGenerator.scopePath.subPath))
+      .sequence
+      .left.map(CompositeBuildException(_))
+      .map { configs =>
+        BuildOptions(sourceGeneratorOptions =
+          SourceGeneratorOptions(generatorConfig = configs)
+        )
+      }
+  }
 }

modules/options/src/main/scala/scala/build/options/SourceGenerator.scala renamed to modules/options/src/main/scala/scala/build/options/GeneratorConfig.scala

@@ -6,15 +6,16 @@ import scala.build.errors.{BuildException, MalformedInputError}
 final case class GeneratorConfig(
   inputDir: String,
   glob: List[String],
-  commandFilePath: String
+  commandFilePath: String,
+  outputPath: os.SubPath
 )
 
 object GeneratorConfig {
 
-  def parse(input: Positioned[String]): Either[BuildException, GeneratorConfig] =
+  def parse(input: Positioned[String], output: os.SubPath): Either[BuildException, GeneratorConfig] =
     input.value.split("\\|", 3) match {
       case Array(inputDir, glob, commandFilePath) =>
-        Right(GeneratorConfig(inputDir, List(glob), commandFilePath))
+        Right(GeneratorConfig(inputDir, List(glob), commandFilePath, output))
       case _ =>
         Left(
           new MalformedInputError(
@@ -25,12 +26,4 @@ object GeneratorConfig {
           )
         )
     }
-
-  // def formatPath(
-  //   inputDir: String,
-  //   glob: String,
-  //   commandFilePath: String,
-  // ): GeneratorConfig = {
-
-  // }
 }

modules/options/src/main/scala/scala/build/options/SourceGeneratorOptions.scala

@@ -4,7 +4,7 @@ final case class SourceGeneratorOptions(
   useBuildInfo: Option[Boolean] = None,
   projectVersion: Option[String] = None,
   computeVersion: Option[ComputeVersion] = None,
-  generatorConfig: Option[GeneratorConfig] = None
+  generatorConfig: Seq[GeneratorConfig] = Nil,
 )
 
 object SourceGeneratorOptions {