fix(bazel): Apply name and version overrides earlier

In order to use the correct keys for the scope lookup, name and version
overrides need to be applied earlier. This fixes the recognition of
development dependencies with archive overrides.

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>

Author: sschuberth

plugins/package-managers/bazel/src/funTest/assets/projects/synthetic/bazel-expected-output-archive-override.yml

@@ -17,8 +17,6 @@ project:
   homepage_url: ""
   scopes:
   - name: "dev"
-    dependencies: []
-  - name: "main"
     dependencies:
     - id: "Bazel::nanopb:0.4.9"
       linkage: "STATIC"
@@ -171,6 +169,8 @@ project:
           linkage: "STATIC"
         - id: "Bazel::rules_proto:6.0.2"
           linkage: "STATIC"
+  - name: "main"
+    dependencies:
     - id: "Bazel::rules_cuda:0.1.1"
       linkage: "STATIC"
       dependencies:

plugins/package-managers/bazel/src/main/kotlin/Bazel.kt

@@ -370,7 +370,20 @@ class Bazel(
     ): Set<Scope> {
         val process = run("mod", "graph", "--output", "json", "--disk_cache=", workingDir = projectDir)
         val mainModule = process.stdout.parseBazelModule()
-        val (mainDeps, devDeps) = mainModule.dependencies.partition { depDirectives[it.key]?.devDependency != true }
+        val (mainDeps, devDeps) = mainModule.dependencies.map { module ->
+            val name = module.name ?: module.key.substringBefore("@", "")
+            val version = module.version ?: module.key.substringAfter("@", "")
+
+            val overriddenKey = "$name@$version"
+            if (overriddenKey != module.key) {
+                logger.info { "Using overridden module key '$overriddenKey' instead of '${module.key}'." }
+                module.copy(key = "$name@$version")
+            } else {
+                module
+            }
+        }.partition {
+            depDirectives[it.key]?.devDependency != true
+        }
 
         return setOf(
             Scope(
@@ -387,24 +400,20 @@ class Bazel(
     /**
      * Convert a [BazelModule] to a [PackageReference].
      */
-    private fun BazelModule.toPackageReference(archiveOverrides: Map<String, ArchiveOverride>): PackageReference {
-        val packageRefName = name ?: key.substringBefore("@", "")
-        val packageRefVersion = version ?: key.substringAfter("@", "")
-
-        return PackageReference(
+    private fun BazelModule.toPackageReference(archiveOverrides: Map<String, ArchiveOverride>): PackageReference =
+        PackageReference(
             id = Identifier(
                 type = managerName,
                 namespace = "",
-                name = packageRefName,
-                version = packageRefVersion
+                name = key.substringBefore("@", ""),
+                version = key.substringAfter("@", "")
             ),
             // Static linking is the default for cc_binary targets. According to the documentation, it is off for
             // cc_test, but according to experiments, it is on.
             // See https://bazel.build/reference/be/c-cpp#cc_binary.linkstatic
             linkage = PackageLinkage.STATIC,
             dependencies = dependencies.mapTo(mutableSetOf()) { it.toPackageReference(archiveOverrides) }
         )
-    }
 }
 
 private fun String.expandRepositoryUrl(): String = withoutPrefix("github:")?.let { "https://github.com/$it" } ?: this