feat: working directive

Author: Perklone

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

@@ -866,7 +866,7 @@ object Build {
       if (options.useBuildServer.getOrElse(true)) None
       else releaseFlag(options, compilerJvmVersionOpt, logger).map(_.toString)
 
-    val hardcodedSource = options.generateSource
+    val hardcodedSource = options.sourceGeneratorOptions.generatorConfig
 
     val scalaCompilerParamsOpt = artifacts.scalaOpt match {
       case Some(scalaArtifacts) =>

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

@@ -10,7 +10,7 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Path
 import java.util.Arrays
 
-import scala.build.options.{ScalacOpt, Scope, ShadowingSeq}
+import scala.build.options.{GeneratorConfig, ScalacOpt, Scope, ShadowingSeq}
 
 final case class Project(
   workspace: os.Path,
@@ -29,7 +29,7 @@ final case class Project(
   javaHomeOpt: Option[os.Path],
   scope: Scope,
   javacOptions: List[String],
-  generateSource: Option[Boolean]
+  generateSource: Option[GeneratorConfig]
 ) {
 
   import Project._
@@ -52,22 +52,48 @@ final case class Project(
       )
     }
 
-    val sourceGen: BloopConfig.SourceGenerator = {
-      val command = "/Users/kiki/Kerja/scala-cli/testing-a/source-generator.py"
-      val sourceGlobs = BloopConfig.SourcesGlobs(
-        (os.root / "Users" / "kiki" / "Kerja" / "scala-cli" / "testing-a" / "generator-inputs").toNIO,
-        None,
-        List("glob:test.in"),
-        Nil
-      )
+    val sourceGen0: Option[List[BloopConfig.SourceGenerator]] =
+      generateSource.map(config =>
+        println(os.pwd)
+        println(config.commandFilePath)
+        println(config.inputDir)
+        println(config.glob)
+        val command0 = s"${os.pwd}/testing-a/${config.commandFilePath}"
+        val sourceGlobs0 = BloopConfig.SourcesGlobs(
+          (os.pwd / "testing-a" / config.inputDir).toNIO,
+          None,
+          config.glob,
+          Nil
+        )
+
+        val sourceGen = BloopConfig.SourceGenerator(
+          List(sourceGlobs0),
+          (os.pwd / "testing-a" / "source-generator-output").toNIO,
+          List("python3", command0)
+          // Nil
+        )
 
-      BloopConfig.SourceGenerator(
-        List(sourceGlobs),
-        (os.root / "Users" / "kiki" / "Kerja" / "scala-cli" / "testing-a" / "source-generator-a").toNIO,
-        List("python3",command)
-        // Nil
+        List(sourceGen)
       )
-    }
+
+    // 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,
@@ -85,7 +111,7 @@ final case class Project(
         `scala` = scalaConfigOpt,
         java = Some(BloopConfig.Java(javacOptions)),
         resolution = resolution,
-        sourceGenerators = if (generateSource.getOrElse(false)) Some(List(sourceGen)) else None
+        sourceGenerators = sourceGen0
       )
   }
 

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

@@ -124,15 +124,13 @@ case class DirectivesPreprocessor(
       logger: Logger
     ): Either[BuildException, ProcessedDirective[T]] =
       if !allowRestrictedFeatures && (handler.isRestricted || handler.isExperimental) then
-        print("Reached Error Flow")
         Left(DirectiveErrors(
           ::(WarningMessages.powerDirectiveUsedInSip(scopedDirective, handler), Nil),
           Seq(scopedDirective.directive.position(scopedDirective.maybePath))
         ))
       else
         if handler.isExperimental && !shouldSuppressExperimentalFeatures then
           logger.experimentalWarning(scopedDirective.directive.toString, FeatureType.Directive)
-        print("Reached Here")
         handler.handleValues(scopedDirective, logger)
 
     val handlersMap = handlers

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

@@ -1,25 +1,39 @@
 package scala.build.preprocessing.directives
 
-import scala.build.directives.*
-import scala.build.errors.BuildException
-import scala.build.options.BuildOptions
 import scala.cli.commands.SpecificationLevel
+import scala.build.directives.*
+import scala.build.EitherCps.{either, value}
+import scala.build.Ops.*
+import scala.build.errors.{BuildException, CompositeBuildException}
+import scala.build.options.{BuildOptions, SourceGeneratorOptions, GeneratorConfig}
+import scala.build.options.GeneratorConfig
+import scala.build.{Positioned, options}
 
-@DirectiveExamples("//> using generator")
-@DirectiveUsage("//> using generator", "`//> using generator`")
+@DirectiveUsage("//> using sourceGenerator", "`//> using sourceGenerator`")
 @DirectiveDescription("Generate code using Source Generator")
 @DirectiveLevel(SpecificationLevel.EXPERIMENTAL)
-final case class SourceGenerator (
-    placeHolderGenerator: Boolean = false
+final case class SourceGenerator(
+  sourceGenerator: Option[Positioned[String]] = None
 ) extends HasBuildOptions {
-    def buildOptions: Either[BuildException, BuildOptions] = {
-        val buildOpt = BuildOptions(
-            generateSource = Some(placeHolderGenerator)
-        )
-        Right(buildOpt)
+  def buildOptions: Either[BuildException, BuildOptions] = either {
+    val maybeGenerateSource = sourceGenerator
+      .map(GeneratorConfig.parse)
+      .sequence
+
+    // val buildOpt = BuildOptions(
+    //   generateSource = Some(generateSource0)
+    // )
+
+    val generateSource = maybeGenerateSource match {
+      case Left(buildException) => throw buildException
+      case Right(config) => config
     }
-}
 
+    BuildOptions(sourceGeneratorOptions =
+      SourceGeneratorOptions(generatorConfig = generateSource)
+    )
+  }
+}
 
 object SourceGenerator {
   val handler: DirectiveHandler[SourceGenerator] = DirectiveHandler.derive

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

@@ -47,7 +47,6 @@ final case class BuildOptions(
   notForBloopOptions: PostBuildOptions = PostBuildOptions(),
   sourceGeneratorOptions: SourceGeneratorOptions = SourceGeneratorOptions(),
   useBuildServer: Option[Boolean] = None,
-  generateSource: Option[Boolean] = None
 ) {
 
   import BuildOptions.JavaHomeInfo

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

@@ -0,0 +1,36 @@
+package scala.build.options
+
+import scala.build.Positioned
+import scala.build.errors.{BuildException, MalformedInputError}
+
+final case class GeneratorConfig(
+  inputDir: String,
+  glob: List[String],
+  commandFilePath: String
+)
+
+object GeneratorConfig {
+
+  def parse(input: Positioned[String]): Either[BuildException, GeneratorConfig] =
+    input.value.split("\\|", 3) match {
+      case Array(inputDir, glob, commandFilePath) =>
+        Right(GeneratorConfig(inputDir, List(glob), commandFilePath))
+      case _ =>
+        Left(
+          new MalformedInputError(
+            "sourceGenerator",
+            input.value,
+            "inputDir|glob|commandFilePath",
+            input.positions
+          )
+        )
+    }
+
+  // def formatPath(
+  //   inputDir: String,
+  //   glob: String,
+  //   commandFilePath: String,
+  // ): GeneratorConfig = {
+
+  // }
+}

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

@@ -3,7 +3,8 @@ package scala.build.options
 final case class SourceGeneratorOptions(
   useBuildInfo: Option[Boolean] = None,
   projectVersion: Option[String] = None,
-  computeVersion: Option[ComputeVersion] = None
+  computeVersion: Option[ComputeVersion] = None,
+  generatorConfig: Option[GeneratorConfig] = None
 )
 
 object SourceGeneratorOptions {