Merge bracnh 'main' into tr-path-mapping-optional

Author: lefou

.github/workflows/run-tests.yml

@@ -150,6 +150,9 @@ jobs:
           - java-version: 21
             millargs: "example.javalib.__.local.daemon"
 
+          - java-version: 21
+            millargs: "example.springboot.__.local.daemon"
+
           - java-version: 17
             millargs: "'example.androidlib.__.local.daemon'"
             setup-android: true

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 1.0.6-46-c0a7df
+//| mill-version: 1.0.6-88-54d201
 //| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m"]
 //| mill-opts: ["--jobs=0.5C"]
 

core/api/src/mill/api/Evaluator.scala

@@ -134,6 +134,8 @@ trait Evaluator extends AutoCloseable with EvaluatorApi {
    * APIs related to selective execution
    */
   def selective: SelectiveExecution
+
+  private[mill] def resolveScriptModuleDep(s: String): Option[mill.api.Module] = None
 }
 object Evaluator {
   // This needs to be a ThreadLocal because we need to pass it into the body of

core/api/src/mill/api/EvaluatorProxy.scala

@@ -114,4 +114,6 @@ final class EvaluatorProxy(var delegate0: () => Evaluator) extends Evaluator {
   def close = delegate0 = null
 
   def selective = delegate.selective
+  override private[mill] def resolveScriptModuleDep(s: String): Option[mill.api.Module] =
+    delegate.resolveScriptModuleDep(s)
 }

core/api/src/mill/api/internal/Cacher.scala

@@ -1,6 +1,6 @@
 package mill.api.internal
 
-import collection.mutable.LinkedHashSet
+import scala.collection.immutable.VectorMap
 import scala.collection.mutable
 import scala.util.DynamicVariable
 import scala.quoted.*
@@ -12,7 +12,8 @@ trait Cacher extends mill.moduledefs.Cacher {
     if (Cacher.taskEvaluationStack.value.contains((c, this))) {
       sys.error(
         "Circular task dependency detected:\n" +
-          (Cacher.taskEvaluationStack.value.toList ++ Seq((c, this)))
+
+          (Cacher.taskEvaluationStack.value.keys ++ Seq((c, this)))
             .map { case (c, o) =>
               val taskName = c.value.split("\\.|#| ").filter(!_.startsWith("$anon")).last
               o.toString match {
@@ -24,19 +25,16 @@ trait Cacher extends mill.moduledefs.Cacher {
       )
     }
 
-    try {
-      Cacher.taskEvaluationStack.value.add((c, this))
+    Cacher.taskEvaluationStack.withValue(Cacher.taskEvaluationStack.value ++ Seq((c, this) -> ())) {
       cacherLazyMap.getOrElseUpdate(c, t).asInstanceOf[T]
-    } finally {
-      Cacher.taskEvaluationStack.value.remove((c, this))
     }
   }
 }
 
 private[mill] object Cacher {
-  // Use a LinkedHashSet for fast contains checking while preserving insertion order
+  // Use a VectorMap for fast contains checking while preserving insertion order
   private[mill] val taskEvaluationStack =
-    DynamicVariable[LinkedHashSet[(sourcecode.Enclosing, Any)]](LinkedHashSet())
+    DynamicVariable[VectorMap[(sourcecode.Enclosing, Any), Unit]](VectorMap())
   private[mill] def withMacroOwner[T](using Quotes)(op: quotes.reflect.Symbol => T): T = {
     import quotes.reflect.*
     // In Scala 3, the top level splice of a macro is owned by a symbol called "macro" with the macro flag set,

core/eval/src/mill/eval/EvaluatorImpl.scala

@@ -25,12 +25,7 @@ final class EvaluatorImpl private[mill] (
     private[mill] val allowPositionalCommandArgs: Boolean,
     private[mill] val selectiveExecution: Boolean = false,
     private val execution: Execution,
-    scriptModuleResolver: (
-        String,
-        String => Option[mill.Module],
-        Boolean,
-        Option[String]
-    ) => Seq[Result[mill.api.ExternalModule]]
+    scriptModuleResolver: (String, String => Option[Module]) => Seq[Result[ExternalModule]]
 ) extends Evaluator {
 
   private[mill] def workspace = execution.workspace
@@ -50,7 +45,7 @@ final class EvaluatorImpl private[mill] (
     scriptModuleResolver
   )
 
-  private[mill] def resolveSingleModule(s: String): Option[mill.Module] = {
+  override private[mill] def resolveScriptModuleDep(s: String): Option[mill.Module] = {
     resolveModulesOrTasks(Seq(s), SelectMode.Multi)
       .toOption
       .toSeq
@@ -75,7 +70,7 @@ final class EvaluatorImpl private[mill] (
         selectMode,
         allowPositionalCommandArgs,
         resolveToModuleTasks,
-        scriptModuleResolver = scriptModuleResolver(_, resolveSingleModule, _, _)
+        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
       )
     }
   }
@@ -92,7 +87,7 @@ final class EvaluatorImpl private[mill] (
         selectMode,
         allowPositionalCommandArgs,
         resolveToModuleTasks,
-        scriptModuleResolver = scriptModuleResolver(_, resolveSingleModule, _, _)
+        scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
       )
     }
   }
@@ -115,7 +110,7 @@ final class EvaluatorImpl private[mill] (
           selectMode,
           allowPositionalCommandArgs,
           resolveToModuleTasks,
-          scriptModuleResolver = scriptModuleResolver(_, resolveSingleModule, _, _)
+          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
         )
       }
     }
@@ -134,7 +129,7 @@ final class EvaluatorImpl private[mill] (
           selectMode,
           allowPositionalCommandArgs,
           resolveToModuleTasks,
-          scriptModuleResolver = scriptModuleResolver(_, resolveSingleModule, _, _)
+          scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
         )
       }
     }
@@ -296,7 +291,7 @@ final class EvaluatorImpl private[mill] (
             scriptArgs,
             selectMode,
             allowPositionalCommandArgs,
-            scriptModuleResolver = scriptModuleResolver(_, resolveSingleModule, _, _)
+            scriptModuleResolver = scriptModuleResolver(_, resolveScriptModuleDep)
           )
         }
       }

core/resolve/src/mill/resolve/Resolve.scala

@@ -310,14 +310,10 @@ private[mill] trait Resolve[T] {
       selectMode: SelectMode,
       allowPositionalCommandArgs: Boolean = false,
       resolveToModuleTasks: Boolean = false,
-      scriptModuleResolver: (
-          String,
-          Boolean,
-          Option[String]
-      ) => Seq[Result[mill.api.ExternalModule]]
+      scriptModuleResolver: String => Seq[Result[mill.api.ExternalModule]]
   ): Result[List[T]] = {
     val nullCommandDefaults = selectMode == SelectMode.Multi
-    val cache = new ResolveCore.Cache(scriptModuleChildResolver = scriptModuleResolver(_, true, _))
+    val cache = new ResolveCore.Cache()
     def handleScriptModule(args: Seq[String], fallback: => Result[Seq[T]]): Result[Seq[T]] = {
       val (first, selector, remaining) = args match {
         case Seq(s"$prefix:$suffix", rest*) => (prefix, Some(suffix), rest)
@@ -336,21 +332,14 @@ private[mill] trait Resolve[T] {
             Segments.labels(segments*),
             nullCommandDefaults,
             allowPositionalCommandArgs,
-            resolveToModuleTasks,
-            scriptModuleResolver
+            resolveToModuleTasks
           )
         )
       }
 
-      scriptModuleResolver(first, false, None) match {
+      scriptModuleResolver(first) match {
         case Seq(resolved) => handleResolved(resolved, selector.toSeq, remaining)
-        case Nil =>
-          if (selector.isEmpty) { // if the `:selector` is empty, try treating the `first` as a selector
-            scriptModuleResolver(".", false, None) match {
-              case Seq(resolved) => handleResolved(resolved, Seq(first), remaining)
-              case Nil => fallback
-            }
-          } else fallback
+        case Nil => fallback
       }
     }
     val resolvedGroups = ParseArgs.separate(scriptArgs).map { group =>
@@ -392,14 +381,9 @@ private[mill] trait Resolve[T] {
       sel: Segments,
       nullCommandDefaults: Boolean,
       allowPositionalCommandArgs: Boolean,
-      resolveToModuleTasks: Boolean,
-      scriptModuleResolver: (
-          String,
-          Boolean,
-          Option[String]
-      ) => Seq[Result[mill.api.ExternalModule]]
+      resolveToModuleTasks: Boolean
   ): Result[Seq[T]] = {
-    val cache = new ResolveCore.Cache(scriptModuleChildResolver = scriptModuleResolver(_, true, _))
+    val cache = new ResolveCore.Cache()
     resolveNonEmptyAndHandle2(
       rootModule,
       args,

core/resolve/src/mill/resolve/ResolveCore.scala

@@ -59,11 +59,7 @@ private object ResolveCore {
           java.lang.reflect.Method,
           String
       )]] =
-        collection.mutable.Map(),
-      val scriptModuleChildResolver: (
-          String,
-          Option[String]
-      ) => Seq[mill.api.Result[mill.api.ExternalModule]]
+        collection.mutable.Map()
   ) {
     def decode(s: String): String = {
       decodedNames.getOrElseUpdate(s, scala.reflect.NameTransformer.decode(s))
@@ -429,7 +425,7 @@ private object ResolveCore {
               )
         }
       } else mill.api.Result.Success {
-        val reflectMemberObjects = Reflect
+        Reflect
           .reflectNestedObjects02[Module](cls, namePred, cache.getMethods)
           .collect {
             case (name, memberCls, getter) =>
@@ -439,18 +435,6 @@ private object ResolveCore {
               (resolved, getter2)
           }
           .toSeq
-
-        val simpleModuleObjects =
-          if (!segments.value.forall(_.isInstanceOf[Segment.Label])) Nil
-          else {
-            val scriptKey = segments.value.flatMap(_.pathSegments).mkString("/")
-            val resolvedScript = cache.scriptModuleChildResolver(scriptKey, nameOpt)
-            for (mod <- resolvedScript) yield {
-              val newSegments = Segments.labels(mod.get.moduleSegments.last.value)
-              (Resolved.Module(newSegments, mod.get.getClass), Some((_: Module) => mod))
-            }
-          }
-        reflectMemberObjects ++ simpleModuleObjects
       }
     }
 

core/resolve/test/src/mill/resolve/Checker.scala

@@ -53,7 +53,7 @@ class Checker[T <: RootModule0](module: T) {
       SelectMode.Separated,
       false,
       false,
-      (_, _, _) => Nil
+      _ => Nil
     )
   }
 
@@ -64,7 +64,7 @@ class Checker[T <: RootModule0](module: T) {
       SelectMode.Separated,
       false,
       false,
-      (_, _, _) => Nil
+      _ => Nil
     ).map(_.map(_.render))
   }
 }

example/javalib/basic/1-script/FooTest.java

@@ -1,5 +1,5 @@
 //| extends: [mill.script.JavaModule.Junit4]
-//| moduleDeps: [Foo.java]
+//| moduleDeps: [./Foo.java]
 //| mvnDeps:
 //| - "com.google.guava:guava:33.3.0-jre"