diff --git a/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/ProjectUtils.kt b/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/ProjectUtils.kt index cbe977a941..9af79d4cd9 100644 --- a/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/ProjectUtils.kt +++ b/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/ProjectUtils.kt @@ -212,19 +212,20 @@ fun processTargetsForProject( (target["dependsOn"] as? List>)?.map { dependency -> val depTarget = dependency["target"] as? String ?: return@map dependency - val newTargetName = when { - hasCiTestTarget && depTarget == testTargetName -> ciTestTargetBaseName - hasCiTestTarget -> { - // depTarget is already prefixed, so use pre-indexed lookup - val matchingTask = testTasksByPrefixedName[depTarget] - if (matchingTask != null && depTarget != testTargetName) { - "$ciTestTargetBaseName-${matchingTask.name}" - } else { - null + val newTargetName = + when { + hasCiTestTarget && depTarget == testTargetName -> ciTestTargetBaseName + hasCiTestTarget -> { + // depTarget is already prefixed, so use pre-indexed lookup + val matchingTask = testTasksByPrefixedName[depTarget] + if (matchingTask != null && depTarget != testTargetName) { + "$ciTestTargetBaseName-${matchingTask.name}" + } else { + null + } + } + else -> null } - } - else -> null - } if (newTargetName != null) { dependency.toMutableMap().apply { this["target"] = newTargetName } diff --git a/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/TaskUtils.kt b/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/TaskUtils.kt index 138c82312e..ed47009af2 100644 --- a/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/TaskUtils.kt +++ b/packages/gradle/project-graph/src/main/kotlin/dev/nx/gradle/utils/TaskUtils.kt @@ -273,10 +273,15 @@ fun getDependsOnTask(task: Task): Set { * @param targetNamePrefix optional prefix to apply to all target names * @return list of dependsOn task names (possibly replaced), or null if none found or error occurred */ -private data class DepEntry(val projectName: String, val targetName: String, val isSameProject: Boolean) +private data class DepEntry( + val projectName: String, + val targetName: String, + val isSameProject: Boolean +) // Add a thread-local cache to prevent infinite recursion in dependency resolution -internal val taskDependencyCache = ThreadLocal.withInitial { mutableMapOf>?>() } +internal val taskDependencyCache = + ThreadLocal.withInitial { mutableMapOf>?>() } fun getDependsOnForTask( dependsOnTasks: Set?, @@ -302,49 +307,53 @@ fun getDependsOnForTask( fun mapTasksToObjects(tasks: Collection): List> { val taskProject = task.project - val depEntries = tasks.mapNotNull { depTask -> - val depProject = depTask.project - - if (task.name != "buildDependents" && - depProject != taskProject && - dependencies != null && - taskProject.buildFile.exists()) { - dependencies.add( - Dependency( - taskProject.projectDir.path, - depProject.projectDir.path, - taskProject.buildFile.path)) - } + val depEntries = + tasks.mapNotNull { depTask -> + val depProject = depTask.project + + if (task.name != "buildDependents" && + depProject != taskProject && + dependencies != null && + taskProject.buildFile.exists()) { + dependencies.add( + Dependency( + taskProject.projectDir.path, + depProject.projectDir.path, + taskProject.buildFile.path)) + } - if (depProject.buildFile.path != null && depProject.buildFile.exists()) { - val targetName = - applyPrefix( - if (depTask.name == "test" && targetNameOverrides.containsKey("testTargetName")) { - targetNameOverrides["testTargetName"]!! - } else { - depTask.name - }) - DepEntry(getNxProjectName(depProject), targetName, depProject == taskProject) - } else { - null - } - } + if (depProject.buildFile.path != null && depProject.buildFile.exists()) { + val targetName = + applyPrefix( + if (depTask.name == "test" && + targetNameOverrides.containsKey("testTargetName")) { + targetNameOverrides["testTargetName"]!! + } else { + depTask.name + }) + DepEntry(getNxProjectName(depProject), targetName, depProject == taskProject) + } else { + null + } + } val result = mutableListOf>() val grouped = depEntries.groupBy { it.isSameProject } // Same-project dependencies: one entry per target - grouped[true]?.map { it.targetName }?.distinct()?.forEach { targetName -> - result.add(mapOf("target" to targetName)) - } + grouped[true] + ?.map { it.targetName } + ?.distinct() + ?.forEach { targetName -> result.add(mapOf("target" to targetName)) } // Cross-project dependencies: group by target, collect projects into array - grouped[false]?.groupBy { it.targetName }?.forEach { (targetName, entries) -> - result.add(mapOf( - "target" to targetName, - "projects" to entries.map { it.projectName }.distinct() - )) - } + grouped[false] + ?.groupBy { it.targetName } + ?.forEach { (targetName, entries) -> + result.add( + mapOf( + "target" to targetName, "projects" to entries.map { it.projectName }.distinct())) + } return result } diff --git a/packages/gradle/project-graph/src/test/kotlin/dev/nx/gradle/utils/ProcessTaskUtilsTest.kt b/packages/gradle/project-graph/src/test/kotlin/dev/nx/gradle/utils/ProcessTaskUtilsTest.kt index 748fc0e5f2..cadeb913d0 100644 --- a/packages/gradle/project-graph/src/test/kotlin/dev/nx/gradle/utils/ProcessTaskUtilsTest.kt +++ b/packages/gradle/project-graph/src/test/kotlin/dev/nx/gradle/utils/ProcessTaskUtilsTest.kt @@ -82,7 +82,9 @@ class ProcessTaskUtilsTest { val dependsOn = getDependsOnForTask(null, taskA, dependencies) assertNotNull(dependsOn) - assertTrue(dependsOn!!.any { it["target"] == "taskB" }, "Expected dependsOn entry with target 'taskB' but got $dependsOn") + assertTrue( + dependsOn!!.any { it["target"] == "taskB" }, + "Expected dependsOn entry with target 'taskB' but got $dependsOn") } @Test @@ -274,10 +276,18 @@ class ProcessTaskUtilsTest { assertEquals(2, resultWithPreComputed.size) // Should contain both dependencies as object entries with target names - assertTrue(resultWithPreComputed.any { it["target"] == "taskB" }, "Expected target 'taskB' in $resultWithPreComputed") - assertTrue(resultWithPreComputed.any { it["target"] == "taskC" }, "Expected target 'taskC' in $resultWithPreComputed") - assertTrue(resultWithoutPreComputed.any { it["target"] == "taskB" }, "Expected target 'taskB' in $resultWithoutPreComputed") - assertTrue(resultWithoutPreComputed.any { it["target"] == "taskC" }, "Expected target 'taskC' in $resultWithoutPreComputed") + assertTrue( + resultWithPreComputed.any { it["target"] == "taskB" }, + "Expected target 'taskB' in $resultWithPreComputed") + assertTrue( + resultWithPreComputed.any { it["target"] == "taskC" }, + "Expected target 'taskC' in $resultWithPreComputed") + assertTrue( + resultWithoutPreComputed.any { it["target"] == "taskB" }, + "Expected target 'taskB' in $resultWithoutPreComputed") + assertTrue( + resultWithoutPreComputed.any { it["target"] == "taskC" }, + "Expected target 'taskC' in $resultWithoutPreComputed") } @Test @@ -479,8 +489,7 @@ class ProcessTaskUtilsTest { assertNotNull(result["options"]) // Verify dependsOn is populated with object format - @Suppress("UNCHECKED_CAST") - val dependsOn = result["dependsOn"] as? List> + @Suppress("UNCHECKED_CAST") val dependsOn = result["dependsOn"] as? List> assertNotNull(dependsOn) assertEquals(1, dependsOn!!.size) assertEquals("compile", dependsOn[0]["target"]) @@ -635,9 +644,9 @@ class ProcessTaskUtilsTest { assertNotNull(dependsOn) val libEntry = dependsOn!!.find { it["target"] == "compileJava" } - assertNotNull(libEntry, "Expected dependsOn entry with target 'compileJava' but got $dependsOn") - @Suppress("UNCHECKED_CAST") - val projects = libEntry!!["projects"] as? List + assertNotNull( + libEntry, "Expected dependsOn entry with target 'compileJava' but got $dependsOn") + @Suppress("UNCHECKED_CAST") val projects = libEntry!!["projects"] as? List assertNotNull(projects, "Expected 'projects' field for cross-project dependency") assertTrue(projects!!.contains(":lib"), "Expected project ':lib' in $projects") } finally {