Change PackageContainerConstraint<T>.Requirement to PackageRequirement

It doesn't need to be generic.

Author: mdiep

Sources/PackageGraph/DependencyResolver.swift

@@ -146,6 +146,42 @@ public enum VersionSetSpecifier: Hashable, CustomStringConvertible {
  }
 }
 
+/// A requirement that a package must satisfy.
+public enum PackageRequirement: Hashable {
+
+ /// The requirement is specified by the version set.
+ case versionSet(VersionSetSpecifier)
+
+ /// The requirement is specified by the revision.
+ ///
+ /// The revision string (identifier) should be valid and present in the
+ /// container. Only one revision requirement per container is possible
+ /// i.e. two revision requirements for same container will lead to
+ /// unsatisfiable resolution. The revision requirement can either come
+ /// from initial set of constraints or from dependencies of a revision
+ /// requirement.
+ case revision(String)
+
+ /// Un-versioned requirement i.e. a version should not resolved.
+ case unversioned
+
+ /// Returns if this requirement pins to an exact version, e.g. a specific
+ /// version or a revision.
+ public var isExact: Bool {
+ switch self {
+ case .versionSet(let vs):
+ if case .exact = vs {
+ return true
+ }
+ return false
+ case .revision:
+ return true
+ case .unversioned:
+ return false
+ }
+ }
+}
+
 /// An identifier which unambiguously references a package container.
 ///
 /// This identifier is used to abstractly refer to another container when
@@ -248,51 +284,15 @@ public protocol PackageContainerProvider {
 public struct PackageContainerConstraint<T: PackageContainerIdentifier>: CustomStringConvertible, Equatable {
  public typealias Identifier = T
 
- /// The requirement of this constraint.
- public enum Requirement: Hashable {
-
- /// The requirement is specified by the version set.
- case versionSet(VersionSetSpecifier)
-
- /// The requirement is specified by the revision.
- ///
- /// The revision string (identifier) should be valid and present in the
- /// container. Only one revision requirement per container is possible
- /// i.e. two revision requirements for same container will lead to
- /// unsatisfiable resolution. The revision requirement can either come
- /// from initial set of constraints or from dependencies of a revision
- /// requirement.
- case revision(String)
-
- /// Un-versioned requirement i.e. a version should not resolved.
- case unversioned
-
- /// Returns if this requirement pins to an exact version, e.g. a specific
- /// version or a revision.
- public var isExact: Bool {
- switch self {
- case .versionSet(let vs):
- if case .exact = vs {
- return true
- }
- return false
- case .revision(_):
- return true
- case .unversioned:
- return false
- }
- }
- }
-
  /// The identifier for the container the constraint is on.
  public let identifier: Identifier
 
  /// The constraint requirement.
- public let requirement: Requirement
+ public let requirement: PackageRequirement
 
  /// Create a constraint requiring the given `container` satisfying the
  /// `requirement`.
- public init(container identifier: Identifier, requirement: Requirement) {
+ public init(container identifier: Identifier, requirement: PackageRequirement) {
  self.identifier = identifier
  self.requirement = requirement
  }
@@ -367,7 +367,7 @@ public enum BoundVersion: Equatable, CustomStringConvertible {
 public struct PackageContainerConstraintSet<C: PackageContainer>: Collection, Hashable {
  public typealias Container = C
  public typealias Identifier = Container.Identifier
- public typealias Requirement = PackageContainerConstraint<Identifier>.Requirement
+ public typealias Requirement = PackageRequirement
 
  public typealias Index = Dictionary<Identifier, Requirement>.Index
  public typealias Element = Dictionary<Identifier, Requirement>.Element

Sources/PackageGraph/PackageGraphRoot.swift

@@ -118,7 +118,7 @@ public struct PackageGraphRoot {
 extension PackageDependencyDescription.Requirement {
 
  /// Returns the constraint requirement representation.
- public func toConstraintRequirement() -> RepositoryPackageConstraint.Requirement {
+ public func toConstraintRequirement() -> PackageRequirement {
  switch self {
  case .range(let range):
  return .versionSet(.range(range))

Sources/PackageGraph/Pubgrub.swift

@@ -14,7 +14,7 @@ import struct PackageModel.PackageReference
 
 /// A term represents a statement about a package that may be true or false.
 struct Term<Identifier: PackageContainerIdentifier>: Equatable, Hashable {
- typealias Requirement = PackageContainerConstraint<Identifier>.Requirement
+ typealias Requirement = PackageRequirement
 
  let package: Identifier
  let requirement: Requirement
@@ -245,8 +245,7 @@ public struct Incompatibility<Identifier: PackageContainerIdentifier>: Equatable
  // in the same incompatibility, but have these combined by intersecting
  // their version requirements to a^1.5.0.
 
- typealias Requirement = PackageContainerConstraint<Identifier>.Requirement
- let intersectedPackages = terms.reduce(into: [PackageAndPolarity: Requirement]()) { res, term in
+ let intersectedPackages = terms.reduce(into: [PackageAndPolarity: PackageRequirement]()) { res, term in
  let pap = PackageAndPolarity(term)
  let previous = res[pap, default: term.requirement]
  let intersection = term.intersect(withRequirement: previous, andPolarity: term.isPositive)

Sources/TestSupport/MockDependencyResolver.swift

@@ -75,7 +75,7 @@ public class MockPackageContainer: PackageContainer {
 
  public typealias Identifier = String
 
- public typealias Dependency = (container: Identifier, requirement: MockPackageConstraint.Requirement)
+ public typealias Dependency = (container: Identifier, requirement: PackageRequirement)
 
  let name: Identifier
 

Sources/Workspace/CheckoutState.swift

@@ -56,7 +56,7 @@ public struct CheckoutState: Equatable, CustomStringConvertible {
 extension CheckoutState {
 
  /// Returns requirement induced by this state.
- func requirement() -> RepositoryPackageConstraint.Requirement {
+ func requirement() -> PackageRequirement {
  if let version = version {
  return .versionSet(.exact(version))
  } else if let branch = branch {

Sources/Workspace/Workspace.swift

@@ -469,7 +469,7 @@ extension Workspace {
  }
 
  // Compute the custom or extra constraint we need to impose.
- let requirement: RepositoryPackageConstraint.Requirement
+ let requirement: PackageRequirement
  if let version = version {
  requirement = .versionSet(.exact(version))
  } else if let branch = branch {

Tests/PackageGraphTests/DependencyResolverTests.swift

@@ -986,7 +986,7 @@ private extension DependencyResolver {
  subjectTo allConstraints: [Identifier: VersionSetSpecifier] = [:],
  excluding exclusions: [Identifier: Set<Version>] = [:]
  ) -> AnySequence<AssignmentSet> {
- let constraints = Dictionary(items: allConstraints.map{ ($0.0, PackageContainerConstraint<Identifier>.Requirement.versionSet($0.1)) })
+ let constraints = Dictionary(items: allConstraints.map{ ($0.0, PackageRequirement.versionSet($0.1)) })
  return resolveSubtree(container, subjectTo: ConstraintSet(constraints), excluding: exclusions)
  }
 }

Tests/PackageGraphTests/PubgrubTests.swift

@@ -22,7 +22,7 @@ public class _MockPackageContainer: PackageContainer {
 
  public typealias Identifier = PackageReference
 
- public typealias Dependency = (container: Identifier, requirement: _MockPackageConstraint.Requirement)
+ public typealias Dependency = (container: Identifier, requirement: PackageRequirement)
 
  let name: Identifier