Move scopeAndName to property of PackageIdentity

Author: mattt

Sources/PackageModel/PackageIdentity.swift

@@ -57,6 +57,17 @@ public struct PackageIdentity: Hashable, CustomStringConvertible {
     public static func plain(_ value: String) -> PackageIdentity {
         PackageIdentity(value)
     }
+
+    // TODO: formalize package registry identifier
+    public var scopeAndName: (String, String)? {
+        let components = description.split(separator: ".", maxSplits: 1, omittingEmptySubsequences: true)
+        guard let scope = components.first,
+              let name = components.last,
+              components.count == 2
+        else { return nil }
+
+        return (String(scope), String(name))
+    }
 }
 
 extension PackageIdentity: Comparable {

Sources/PackageRegistry/RegistryManager.swift

@@ -61,7 +61,7 @@ public final class RegistryManager {
         on queue: DispatchQueue,
         completion: @escaping (Result<[Version], Error>) -> Void
     ) {
-        guard case let (scope, name)? = package.scopeAndName else {
+        guard case let (scope, name)? = package.identity.scopeAndName else {
             return completion(.failure(RegistryError.invalidPackage(package)))
         }
 
@@ -109,7 +109,7 @@ public final class RegistryManager {
         on queue: DispatchQueue,
         completion: @escaping (Result<Manifest, Error>) -> Void
     ) {
-        guard case let (scope, name)? = package.scopeAndName else {
+        guard case let (scope, name)? = package.identity.scopeAndName else {
             return completion(.failure(RegistryError.invalidPackage(package)))
         }
 
@@ -187,7 +187,7 @@ public final class RegistryManager {
         on queue: DispatchQueue,
         completion: @escaping (Result<Void, Error>) -> Void
     ) {
-        guard case let (scope, name)? = package.scopeAndName else {
+        guard case let (scope, name)? = package.identity.scopeAndName else {
             return completion(.failure(RegistryError.invalidPackage(package)))
         }
 
@@ -271,16 +271,3 @@ private extension AbsolutePath {
         return AbsolutePath(self, RelativePath("..")).appending(component: "\(basename).\(`extension`)")
     }
 }
-
-// FIXME: Implement in PackageIdentity
-private extension PackageReference {
-    var scopeAndName: (String, String)? {
-        let components = identity.description.split(separator: ".", maxSplits: 1, omittingEmptySubsequences: true)
-        guard let scope = components.first,
-              let name = components.last,
-              components.count == 2
-        else { return nil }
-
-        return (String(scope), String(name))
-    }
-}