fix: zinc issue with duplicates

.bazelrc_shared

@@ -2,7 +2,6 @@ common --announce_rc
 common --color=yes
 
 build --experimental_strict_action_env
-build --extra_toolchains=@local_jdk//:all
 
 build --strategy=ScalaCompile=worker
 build --worker_max_instances=4
@@ -13,9 +12,3 @@ build:rules --disk_cache=.bazel_cache
 build:tests --disk_cache=../.bazel_cache
 
 test --test_output=all
-test --jvmopt='-Dfile.encoding=UTF-8'
-
-test --test_env='LC_ALL=en_US.UTF-8'
-test --test_env='LANG=en_US.UTF-8'
-test --jvmopt='-Dsun.jnu.encoding=UTF-8'
-test --jvmopt='-Dfile.encoding=UTF-8'

scala/workers/common/FileUtil.scala

@@ -1,14 +1,15 @@
 package rules_scala
 package workers.common
 
-import scala.annotation.tailrec
-import java.io.IOException
+import java.io.{IOException, File}
 import java.nio.channels.{FileChannel, FileLock}
 import java.nio.file.{FileAlreadyExistsException, FileVisitResult, Files, OpenOption, Path, SimpleFileVisitor, StandardCopyOption, StandardOpenOption}
 import java.nio.file.attribute.BasicFileAttributes
 import java.security.SecureRandom
 import java.util.zip.{ZipEntry, ZipInputStream, ZipOutputStream}
 
+import scala.annotation.tailrec
+
 class CopyFileVisitor(source: Path, target: Path) extends SimpleFileVisitor[Path]:
   override def preVisitDirectory(directory: Path, attributes: BasicFileAttributes) =
     try Files.createDirectory(target.resolve(source.relativize(directory)))
@@ -84,7 +85,7 @@ object FileUtil:
     try
       val zipStream = ZipInputStream(fileStream)
 
-      @tailrec def next(files: List[Path]): List[Path] =
+      @tailrec def next(files: List[File]): List[File] =
         zipStream.getNextEntry match
           case null => files
           case entry: ZipEntry =>
@@ -96,7 +97,7 @@ object FileUtil:
               Files.createDirectories(file.getParent)
               Files.copy(zipStream, file, StandardCopyOption.REPLACE_EXISTING)
               zipStream.closeEntry()
-              next(file :: files)
+              next(file.toFile :: files)
 
       next(Nil)
     finally fileStream.close()

scala/workers/zinc/compile/main/Deps.scala

@@ -24,7 +24,7 @@ final case class DepAnalysisFiles(apis: Path, relations: Path)
 final case class ExternalDep(file: Path, classpath: Path, analysis: DepAnalysisFiles) extends Dep
 final case class ExternalCachedDep(cachedPath: Path, file: Path, classpath: Path, analysis: DepAnalysisFiles) extends Dep
 
-object Dep:
+object Deps:
   def sha1(file: Path): String =
     val digest = MessageDigest.getInstance("SHA1")
     BigInteger(1, digest.digest(Files.readAllBytes(file))).toString(16)

scala/workers/zinc/compile/main/ZincPersistence.scala

@@ -3,8 +3,7 @@ package workers.zinc.compile
 
 import workers.common.FileUtil
 
-import java.nio.file.Files
-import java.nio.file.Path
+import java.nio.file.{Files, Path}
 
 trait ZincPersistence:
   def load(): Unit

scala/workers/zinc/compile/main/ZincRunner.scala

@@ -31,7 +31,8 @@ import xsbti.compile.{
   MiniSetup,
   PerClasspathEntryLookup,
   PreviousResult,
-  Setup
+  Setup,
+  TastyFiles
 }
 
 import rules_scala.common.worker.WorkerMain
@@ -113,7 +114,6 @@ object ZincRunner extends WorkerMain[ZincRunner.Arguments]:
     val sourcesDir = workArgs.tmpDir.resolve("src")
     val sources: collection.Seq[File] = workArgs.sources ++ workArgs.sourceJars.zipWithIndex
       .flatMap((jar, i) => FileUtil.extractZip(jar, sourcesDir.resolve(i.toString)))
-      .map(_.toFile)
 
     // extract upstream classes
     val classesDir = workArgs.tmpDir.resolve("classes")
@@ -126,7 +126,7 @@ object ZincRunner extends WorkerMain[ZincRunner.Arguments]:
               jar -> (classesDir.resolve(labelToPath(arg.label)), DepAnalysisFiles(arg.apis, arg.relations))
           .toMap
       case false => Map.empty
-    val deps = Dep.create(workerArgs.depsCache, workArgs.classpath, analyses)
+    val deps = Deps.create(workerArgs.depsCache, workArgs.classpath, analyses)
 
     // load persisted files
     val analysisFiles = AnalysisFiles(
@@ -139,10 +139,9 @@ object ZincRunner extends WorkerMain[ZincRunner.Arguments]:
     val analysesFormat = AnxAnalyses(if workArgs.debug then AnxAnalysisStore.TextFormat else AnxAnalysisStore.BinaryFormat)
     val analysisStore = AnxAnalysisStore(analysisFiles, analysesFormat)
 
-    val persistence = workerArgs.persistenceDir.fold[ZincPersistence](NullPersistence) { rootDir =>
+    val persistence = workerArgs.persistenceDir.fold[ZincPersistence](NullPersistence): rootDir =>
       val path = labelToPath(workArgs.label)
       FilePersistence(rootDir.resolve(path), analysisFiles, workArgs.outputJar)
-    }
 
     val classesOutputDir = classesDir.resolve(labelToPath(workArgs.label))
     Files.createDirectories(classesOutputDir)
@@ -192,21 +191,20 @@ object ZincRunner extends WorkerMain[ZincRunner.Arguments]:
         case ExternalDep(_, classpath, files) => classpath -> files
         case ExternalCachedDep(_, _, classpath, files) => classpath -> files
       .toMap
-    val lookup = AnxPerClasspathEntryLookup(file =>
+    val lookup = AnxPerClasspathEntryLookup: file =>
       depMap
         .get(file)
-        .map(files =>
+        .map: files =>
           Analysis.Empty.copy(
             apis = analysesFormat.apis.read(files.apis),
             relations = analysesFormat.relations.read(files.relations)
           )
-        )
-    )
 
     val setup =
       val incOptions = IncOptions.create()
         .withEnabled(true)
         .withPipelining(true)
+        .withAuxiliaryClassFiles(Array(TastyFiles.instance()))
         // .withStrictMode(true)
         // .withRelationsDebug(true)
         // .withApiDebug(true)
@@ -272,7 +270,7 @@ object ZincRunner extends WorkerMain[ZincRunner.Arguments]:
     val analysis = compileResult.analysis.asInstanceOf[Analysis]
 
     val usedDeps =
-      deps.filter(Dep.used(deps, analysis.relations, lookup)).filter(_.file != scalaInstance.libraryJar.toPath)
+      deps.filter(Deps.used(deps, analysis.relations, lookup)).filter(_.file != scalaInstance.libraryJar.toPath)
     Files.write(workArgs.outputUsed, usedDeps.map(_.file.toString).sorted.asJava)
 
     // create jar

tests/.bazelrc

@@ -1,3 +1 @@
-common --config=tests
-
 import %workspace%/../.bazelrc_shared

tests/compile/zinc-inc/A1.scala

@@ -0,0 +1,5 @@
+package test
+
+sealed trait A
+object A:
+  case object Item extends A

tests/compile/zinc-inc/A2.scala

@@ -0,0 +1,6 @@
+package test
+
+opaque type A = Int
+
+object A:
+  val Item: A = 1

tests/compile/zinc-inc/B.scala

@@ -1 +1,4 @@
-final class B
+package test
+
+def test(): Unit =
+  println(A.Item)

tests/compile/zinc-inc/BUILD

@@ -1,6 +1,22 @@
 load("@rules_scala3//rules:scala.bzl", "scala_library")
 
+
+config_setting(
+    name = "a2",
+    values = {"define": "a2=true"},
+    visibility = ["//visibility:public"],
+)
+
+scala_library(
+    name = "a",
+    srcs = select({
+      ":a2": ["A2.scala"],
+      "//conditions:default": ["A1.scala"],
+    }),
+)
+
 scala_library(
     name = "lib",
-    srcs = glob(["*.scala"]),
+    srcs = ["B.scala"],
+    deps = [":a"],
 )

tests/compile/zinc-inc/test

@@ -1,5 +1,7 @@
 #!/usr/bin/env -S bash -e
 . "$(dirname "$0")"/../../common.sh
 
-# rm -fr "$(bazel info execution_root)/.bazel-zinc"
-bazel build --noworker_sandboxing --worker_extra_flag=ScalaCompile=--persistence_dir=/tmp/.bazel-zinc --worker_extra_flag=ScalaCompile=--extracted_file_cache=/tmp/.bazel-zinc-outputs :lib
+rm -rf /tmp/.bazel-zinc/zinc-inc /tmp/.bazel-zinc-outputs/zinc-inc
+
+bazel build --noworker_sandboxing --worker_extra_flag=ScalaCompile=--persistence_dir=/tmp/.bazel-zinc/zinc-inc --worker_extra_flag=ScalaCompile=--extracted_file_cache=/tmp/.bazel-zinc-outputs/zinc-inc :lib
+bazel build --sandbox_debug --define=a2=true --noworker_sandboxing --worker_extra_flag=ScalaCompile=--persistence_dir=/tmp/.bazel-zinc/zinc-inc --worker_extra_flag=ScalaCompile=--extracted_file_cache=/tmp/.bazel-zinc-outputs/zinc-inc :lib