Add typealias for CompatibilityInfo.Requirements

Source/CarthageKit/CompatibilityInfo.swift

@@ -3,6 +3,8 @@ import Result
 
 /// Identifies a dependency, its pinned version, and its compatible and incompatible requirements
 public struct CompatibilityInfo {
+	public typealias Requirements = [Dependency: [Dependency: VersionSpecifier]]
+
 	/// The dependency
 	public let dependency: Dependency
 
@@ -31,8 +33,8 @@ public struct CompatibilityInfo {
 	/// Accepts a dictionary which maps a dependency to the pinned versions of the dependencies it requires.
 	/// Returns an inverted dictionary which maps a dependency to the dependencies that require it and the pinned version required.
 	/// e.g. [A: [B: 1, C: 2]] -> [B: [A: 1], C: [A: 2]]
-	public static func invert(requirements: [Dependency: [Dependency: VersionSpecifier]]) -> Result<[Dependency: [Dependency: VersionSpecifier]], CarthageError> {
-		var invertedRequirements: [Dependency: [Dependency: VersionSpecifier]] = [:]
+	public static func invert(requirements: Requirements) -> Result<Requirements, CarthageError> {
+		var invertedRequirements: Requirements = [:]
 		for (dependency, requirements) in requirements {
 			for (requiredDependency, requiredVersion) in requirements {
 				var requirements = invertedRequirements[requiredDependency] ?? [:]

Source/CarthageKit/Project.swift

@@ -378,21 +378,21 @@ public final class Project { // swiftlint:disable:this type_body_length
 	func requirementsByDependency(
 		resolvedCartfile: ResolvedCartfile,
 		tryCheckoutDirectory: Bool
-	) -> SignalProducer<[Dependency: [Dependency: VersionSpecifier]], CarthageError> {
+	) -> SignalProducer<CompatibilityInfo.Requirements, CarthageError> {
 		return SignalProducer(value: resolvedCartfile)
 			.map { resolvedCartfile -> [(Dependency, PinnedVersion)] in
 				return Array(resolvedCartfile.dependencies)
 			}
-			.flatMap(.concurrent(limit: 4)) { dependencies -> SignalProducer<[Dependency: [Dependency: VersionSpecifier]], CarthageError> in
+			.flatMap(.concurrent(limit: 4)) { dependencies -> SignalProducer<CompatibilityInfo.Requirements, CarthageError> in
 				return SignalProducer(dependencies)
 					.flatMap(.merge) { dependencyAndPinnedVersion -> SignalProducer<(Dependency, (Dependency, VersionSpecifier)), CarthageError> in
 						let (dependency, pinnedVersion) = dependencyAndPinnedVersion
 						return self.dependencies(for: dependency, version: pinnedVersion, tryCheckoutDirectory: tryCheckoutDirectory)
 							.map { (dependency, $0) }
 					}
 					.collect()
-					.flatMap(.merge) { dependencyAndRequirements -> SignalProducer<[Dependency: [Dependency: VersionSpecifier]], CarthageError> in
-						var dict: [Dependency: [Dependency: VersionSpecifier]] = [:]
+					.flatMap(.merge) { dependencyAndRequirements -> SignalProducer<CompatibilityInfo.Requirements, CarthageError> in
+						var dict: CompatibilityInfo.Requirements = [:]
 						for (dependency, requirement) in dependencyAndRequirements {
 							let (requiredDependency, requiredVersion) = requirement
 							var requirementsDict = dict[dependency] ?? [:]
@@ -1154,25 +1154,24 @@ public final class Project { // swiftlint:disable:this type_body_length
 			.promoteError(CarthageError.self)
 			.replayLazily(upTo: 1)
 
-		let dependencyRequirements = resolvedCartfileProducer
-			.flatMap(.merge) { (resolved: ResolvedCartfile) -> SignalProducer<[Dependency: [Dependency: VersionSpecifier]], CarthageError> in
+		let invertedRequirements = resolvedCartfileProducer
+			.flatMap(.merge) { (resolved: ResolvedCartfile) -> SignalProducer<CompatibilityInfo.Requirements, CarthageError> in
 				return self.requirementsByDependency(resolvedCartfile: resolved, tryCheckoutDirectory: true)
 			}
-			.flatMap(.merge) { requirements -> SignalProducer<[Dependency: [Dependency: VersionSpecifier]], CarthageError> in
+			.flatMap(.merge) { requirements -> SignalProducer<CompatibilityInfo.Requirements, CarthageError> in
 				return .init(result: CompatibilityInfo.invert(requirements: requirements))
 			}
 
 		return resolvedCartfileProducer.map { (resolved: ResolvedCartfile) -> [Dependency: PinnedVersion] in
 				return resolved.dependencies
 			}
-			.zip(with: dependencyRequirements)
-			.flatMap(.concat) { (dependencyInfo: ([Dependency: PinnedVersion], [Dependency: [Dependency: VersionSpecifier]])) ->
-					SignalProducer<CompatibilityInfo, CarthageError> in
-				let (resolved, requirements) = dependencyInfo
+			.zip(with: invertedRequirements)
+			.flatMap(.concat) { (dependencyInfo: ([Dependency: PinnedVersion], CompatibilityInfo.Requirements)) -> SignalProducer<CompatibilityInfo, CarthageError> in
+				let (resolved, invertedRequirements) = dependencyInfo
 				var result: [CompatibilityInfo] = []
 				resolved.forEach { dependency, pinnedVersion in
 					// Skip non-semantic resolved versions and transitive dependencies without semantic versions
-					if case .success = SemanticVersion.from(pinnedVersion), let requirements = requirements[dependency] {
+					if case .success = SemanticVersion.from(pinnedVersion), let requirements = invertedRequirements[dependency] {
 						result.append(CompatibilityInfo(dependency: dependency, pinnedVersion: pinnedVersion, requirements: requirements))
 					}
 				}