Skip to content

fix: skip mapping aggregate targets #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fortmarek merged 1 commit into from
Feb 24, 2025
Merged

fix: skip mapping aggregate targets #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Sources/XcodeGraphMapper/Mappers/Project/PBXProjectMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
Expand Down
8 changes: 6 additions & 2 deletions Sources/XcodeGraphMapper/Mappers/Targets/PBXTargetMapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protocol PBXTargetMapping {
xcodeProj: XcodeProj,
projectNativeTargets: [String: ProjectNativeTarget],
packages: [AbsolutePath]
) async throws -> Target
) async throws -> Target?
}

// swiftlint:disable function_body_length
Expand Down Expand Up @@ -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()
Expand Down
105 changes: 70 additions & 35 deletions Tests/XcodeGraphMapperTests/MapperTests/Target/PBXTargetMapperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ struct PBXTargetMapperTests: Sendable {
// When
let mapper = PBXTargetMapper()

let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
)
)

// Then
Expand All @@ -54,11 +56,13 @@ struct PBXTargetMapperTests: Sendable {
let mapper = PBXTargetMapper()

// When
let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
)
)

// Then
Expand All @@ -81,11 +85,13 @@ struct PBXTargetMapperTests: Sendable {
let mapper = PBXTargetMapper()

// When
let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
)
)

// Then
Expand All @@ -110,11 +116,13 @@ struct PBXTargetMapperTests: Sendable {
let mapper = PBXTargetMapper()

// When
let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
)
)

// Then
Expand Down Expand Up @@ -151,11 +159,13 @@ struct PBXTargetMapperTests: Sendable {
let mapper = PBXTargetMapper()

// When
let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: []
)
)

// Then
Expand Down Expand Up @@ -243,13 +253,15 @@ struct PBXTargetMapperTests: Sendable {
)

// When
let mapped = try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: [
packagePath,
]
let mapped = try #require(
try await mapper.map(
pbxTarget: target,
xcodeProj: xcodeProj,
projectNativeTargets: [:],
packages: [
packagePath,
]
)
)

// Then
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -389,7 +401,7 @@ struct PBXTargetMapperTests: Sendable {
)

// Then
#expect(mapped.entitlements == .file(
#expect(mapped?.entitlements == .file(
path: entitlementsPath,
configuration: BuildConfiguration(name: "Debug", variant: .debug)
))
Expand Down Expand Up @@ -462,7 +474,7 @@ struct PBXTargetMapperTests: Sendable {

// Then
#expect({
switch mapped.infoPlist {
switch mapped?.infoPlist {
case let .file(path, _):
return path == plistPath
default:
Expand All @@ -471,6 +483,29 @@ struct PBXTargetMapperTests: Sendable {
}() == 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

private func createTarget(
Expand Down