Fix caching for unused platforms (#6824)

fortmarek · web-flow · commit e862cc403bb6 · 2024-10-07T18:38:06.000+02:00
diff --git a/Sources/TuistCore/Graph/GraphTraverser.swift b/Sources/TuistCore/Graph/GraphTraverser.swift
@@ -919,6 +919,8 @@ public class GraphTraverser: GraphTraversing {
                 .map { GraphDependency.target(name: $0.target.name, path: $0.project.path) }
         )
 
+        let externalTargetSupportedPlatforms = externalTargetSupportedPlatforms()
+
         let allTargetExternalDependendedUponTargets = filterDependencies(
             from: graphDependenciesWithExternalDependencies
         )
@@ -929,7 +931,14 @@ public class GraphTraverser: GraphTraversing {
                 else {
                     return nil
                 }
-                return GraphTarget(path: path, target: target, project: project)
+                let graphTarget = GraphTarget(path: path, target: target, project: project)
+
+                if externalTargetSupportedPlatforms[graphTarget]?.isEmpty == false {
+                    return graphTarget
+                } else {
+                    return nil
+                }
+
             } else {
                 return nil
             }
diff --git a/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift b/Tests/TuistCoreTests/Graph/GraphTraverserTests.swift
@@ -4692,6 +4692,59 @@ final class GraphTraverserTests: TuistUnitTestCase {
         XCTAssertEqual(got, Set([GraphTarget(path: packageProject.path, target: packageDevProduct, project: packageProject)]))
     }
 
+    func test_orphanExternalDependencies_when_a_dependency_condition_platforms_are_not_used_downstream() throws {
+        // Given
+        let app = Target.test(name: "App", destinations: [.iPhone], product: .app)
+        let project = Project.test(path: try! AbsolutePath(validating: "/App"), targets: [app])
+        let appDependency = GraphDependency.target(name: app.name, path: project.path)
+        let directPackageProduct = Target.test(
+            name: "DirectPackage",
+            destinations: [.iPhone],
+            product: .app
+        )
+        let packageProject = Project.test(
+            path: try! AbsolutePath(validating: "/Package"),
+            name: "Package",
+            targets: [directPackageProduct],
+            isExternal: true
+        )
+        let directPackageProductDependency = GraphDependency.target(
+            name: directPackageProduct.name,
+            path: packageProject.path
+        )
+
+        let graph = Graph.test(
+            path: project.path,
+            projects: [project.path: project, packageProject.path: packageProject],
+            dependencies: [
+                appDependency: Set([directPackageProductDependency]),
+            ],
+            dependencyConditions: [
+                GraphEdge(
+                    from: appDependency,
+                    to: directPackageProductDependency
+                ): try XCTUnwrap(.when([.macos])),
+            ]
+        )
+
+        // When
+        let got = GraphTraverser(graph: graph).allOrphanExternalTargets()
+
+        // Then
+        XCTAssertEqual(
+            got,
+            Set(
+                [
+                    GraphTarget(
+                        path: packageProject.path,
+                        target: directPackageProduct,
+                        project: packageProject
+                    ),
+                ]
+            )
+        )
+    }
+
     func test_targetsWithExternalDependencies() {
         // Given
         let app = Target.test(name: "App", destinations: [.iPhone], product: .app)

Original file line number	Diff line number	Diff line change
`@@ -919,6 +919,8 @@ public class GraphTraverser: GraphTraversing {`
`919`	`919`	`.map { GraphDependency.target(name: $0.target.name, path: $0.project.path) }`
`920`	`920`	`)`
`921`	`921`
	`922`	`+ let externalTargetSupportedPlatforms = externalTargetSupportedPlatforms()`
	`923`	`+`
`922`	`924`	`let allTargetExternalDependendedUponTargets = filterDependencies(`
`923`	`925`	`from: graphDependenciesWithExternalDependencies`
`924`	`926`	`)`
`@@ -929,7 +931,14 @@ public class GraphTraverser: GraphTraversing {`
`929`	`931`	`else {`
`930`	`932`	`return nil`
`931`	`933`	`}`
`932`		`- return GraphTarget(path: path, target: target, project: project)`
	`934`	`+ let graphTarget = GraphTarget(path: path, target: target, project: project)`
	`935`	`+`
	`936`	`+ if externalTargetSupportedPlatforms[graphTarget]?.isEmpty == false {`
	`937`	`+ return graphTarget`
	`938`	`+ } else {`
	`939`	`+ return nil`
	`940`	`+ }`
	`941`	`+`
`933`	`942`	`} else {`
`934`	`943`	`return nil`
`935`	`944`	`}`