Extract Registry from RegistryConfiguration

Author: mattt

Sources/PackageRegistry/CMakeLists.txt

@@ -7,6 +7,7 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_library(PackageRegistry
+  Registry.swift
   RegistryConfiguration.swift)
 target_link_libraries(PackageRegistry PUBLIC
   TSCBasic

Sources/PackageRegistry/Registry.swift

@@ -0,0 +1,19 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright (c) 2021 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+import struct Foundation.URL
+
+public struct Registry: Hashable, Codable {
+    public var url: Foundation.URL
+
+    public init(url: Foundation.URL) {
+        self.url = url
+    }
+}

Sources/PackageRegistry/RegistryConfiguration.swift

@@ -13,15 +13,7 @@ import Foundation
 public struct RegistryConfiguration: Hashable {
     public typealias Scope = String
 
-    public struct Registry: Hashable {
-        public var url: Foundation.URL
-
-        public init(url: Foundation.URL) {
-            self.url = url
-        }
-    }
-
-    public enum Version: Int {
+    public enum Version: Int, Codable {
         case v1 = 1
     }
 
@@ -48,6 +40,10 @@ public struct RegistryConfiguration: Hashable {
             self.scopedRegistries[scope] = registry
         }
     }
+    
+    public func registry(for scope: Scope) -> Registry? {
+        return scopedRegistries[scope] ?? defaultRegistry
+    }
 }
 
 // MARK: - Codable
@@ -108,6 +104,3 @@ extension RegistryConfiguration: Codable {
         }
     }
 }
-
-extension RegistryConfiguration.Version: Codable {}
-extension RegistryConfiguration.Registry: Codable {}