fix: skip mapping aggregate targets

Author: fortmarek

Package.resolved

@@ -66,7 +66,8 @@ struct PBXProjectMapper: PBXProjectMapping {
         let localPackagePaths = try await collectAllPackages(from: pbxProject.mainGroup, xcodeProj: xcodeProj)
 
         // Map PBXTargets to domain Targets
-        let targets = try await withThrowingTaskGroup(of: Target.self, returning: [Target].self) { taskGroup in
+        let targets = try await withThrowingTaskGroup(of: Target?.self, returning: [Target].self) { taskGroup in
+            let projectNativeTargets = projectNativeTargets
             for pbxTarget in pbxProject.targets {
                 taskGroup.addTask {
                     try await targetMapper.map(
@@ -80,7 +81,9 @@ struct PBXProjectMapper: PBXProjectMapping {
 
             var targets: [Target] = []
             for try await target in taskGroup {
-                targets.append(target)
+                if let target {
+                    targets.append(target)
+                }
             }
 
             return targets

Sources/XcodeGraphMapper/Mappers/Project/PBXProjectMapper.swift

@@ -49,7 +49,7 @@ protocol PBXTargetMapping {
         xcodeProj: XcodeProj,
         projectNativeTargets: [String: ProjectNativeTarget],
         packages: [AbsolutePath]
-    ) async throws -> Target
+    ) async throws -> Target?
 }
 
 // swiftlint:disable function_body_length
@@ -102,7 +102,11 @@ struct PBXTargetMapper: PBXTargetMapping {
         xcodeProj: XcodeProj,
         projectNativeTargets: [String: ProjectNativeTarget],
         packages: [AbsolutePath]
-    ) async throws -> Target {
+    ) async throws -> Target? {
+        // `XcodeGraph` currently doesn't support representing aggregate targets
+        if pbxTarget is PBXAggregateTarget {
+            return nil
+        }
         let platform = try pbxTarget.platform()
         let deploymentTargets = pbxTarget.deploymentTargets()
         let productType = pbxTarget.productType?.mapProductType()

Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetMapper.swift

@@ -26,12 +26,14 @@ struct PBXTargetMapperTests: Sendable {
         // When
         let mapper = PBXTargetMapper()
 
-        let mapped = try await mapper.map(
+        let mapped = try #require(
+            try await mapper.map(
             pbxTarget: target,
             xcodeProj: xcodeProj,
             projectNativeTargets: [:],
             packages: []
         )
+            )
 
         // Then
         #expect(mapped.name == "App")
@@ -54,12 +56,14 @@ struct PBXTargetMapperTests: Sendable {
         let mapper = PBXTargetMapper()
 
         // When
-        let mapped = try await mapper.map(
+        let mapped = try #require(
+            try await mapper.map(
             pbxTarget: target,
             xcodeProj: xcodeProj,
             projectNativeTargets: [:],
             packages: []
         )
+            )
 
         // Then
         #expect(mapped.bundleId == "Unknown")
@@ -81,12 +85,14 @@ struct PBXTargetMapperTests: Sendable {
         let mapper = PBXTargetMapper()
 
         // When
-        let mapped = try await mapper.map(
+        let mapped = try #require(
+            try await mapper.map(
             pbxTarget: target,
             xcodeProj: xcodeProj,
             projectNativeTargets: [:],
             packages: []
         )
+            )
 
         // Then
         #expect(mapped.environmentVariables["TEST_VAR"]?.value == "test_value")
@@ -110,12 +116,14 @@ struct PBXTargetMapperTests: Sendable {
         let mapper = PBXTargetMapper()
 
         // When
-        let mapped = try await mapper.map(
+        let mapped = try #require(
+            try await mapper.map(
             pbxTarget: target,
             xcodeProj: xcodeProj,
             projectNativeTargets: [:],
             packages: []
         )
+            )
 
         // Then
         let expected = [
@@ -151,12 +159,14 @@ struct PBXTargetMapperTests: Sendable {
         let mapper = PBXTargetMapper()
 
         // When
-        let mapped = try await mapper.map(
+        let mapped = try #require(
+            try await mapper.map(
             pbxTarget: target,
             xcodeProj: xcodeProj,
             projectNativeTargets: [:],
             packages: []
         )
+            )
 
         // Then
         #expect(mapped.sources.count == 1)
@@ -243,14 +253,16 @@ struct PBXTargetMapperTests: Sendable {
             )
 
             // When
-            let mapped = try await mapper.map(
+            let mapped = try #require(
+                try await mapper.map(
                 pbxTarget: target,
                 xcodeProj: xcodeProj,
                 projectNativeTargets: [:],
                 packages: [
                     packagePath,
                 ]
             )
+                )
 
             // Then
             #expect(
@@ -331,7 +343,7 @@ struct PBXTargetMapperTests: Sendable {
         )
 
         // Then
-        #expect(mapped.metadata.tags == Set(["tag1", "tag2", "tag3"]))
+        #expect(mapped?.metadata.tags == Set(["tag1", "tag2", "tag3"]))
     }
 
     @Test("Maps entitlements when CODE_SIGN_ENTITLEMENTS is set")
@@ -389,7 +401,7 @@ struct PBXTargetMapperTests: Sendable {
         )
 
         // Then
-        #expect(mapped.entitlements == .file(
+        #expect(mapped?.entitlements == .file(
             path: entitlementsPath,
             configuration: BuildConfiguration(name: "Debug", variant: .debug)
         ))
@@ -462,14 +474,37 @@ struct PBXTargetMapperTests: Sendable {
 
         // Then
         #expect({
-            switch mapped.infoPlist {
+            switch mapped?.infoPlist {
             case let .file(path, _):
                 return path == plistPath
             default:
                 return false
             }
         }() == true)
     }
+    
+    @Test
+    func testMapAggregateTarget() async throws {
+        // Given
+        let xcodeProj = try await XcodeProj.test()
+        let target = PBXAggregateTarget(
+            name: "App"
+        )
+
+        try xcodeProj.write(path: xcodeProj.path!)
+        let mapper = PBXTargetMapper()
+
+        // When
+        let mapped = try await mapper.map(
+            pbxTarget: target,
+            xcodeProj: xcodeProj,
+            projectNativeTargets: [:],
+            packages: []
+        )
+
+        // Then
+        #expect(mapped == nil)
+    }
 
     // MARK: - Helper Methods