Merge pull request #11 from SwiftPackageIndex/support-Package.resolve…

…d-v2

Move extension to test-only

Sources/ReleaseNotesCore/Dictionary+ext.swift

@@ -0,0 +1,22 @@
+// Copyright 2022 Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
+
+extension Dictionary where Key == PackageId, Value == URL {
+    subscript(caseInsensitive packageId: PackageId) -> URL? {
+        first(where: { $0.key.lowercased() == packageId.lowercased() })?.value
+    }
+}

Sources/ReleaseNotesCore/PackageResolved.swift

@@ -61,27 +61,6 @@ enum PackageResolved {
 }
 
 
-extension PackageResolved {
-    var v1: V1? {
-        switch self {
-            case let .v1(value):
-                return value
-            case .v2:
-                return nil
-        }
-    }
-
-    var v2: V2? {
-        switch self {
-            case .v1:
-                return nil
-            case let .v2(value):
-                return value
-        }
-    }
-}
-
-
 extension PackageResolved {
     func getPackageMap() -> [PackageId: URL] {
         switch self {

Sources/ReleaseNotesCore/ReleaseNotes.swift

@@ -53,7 +53,7 @@ struct ReleaseNotes: AsyncParsableCommand {
 
         print("\nRelease notes URLs (updating from):")
         for update in updates {
-            let releasesURL = packageMap[caseIgnoring: update.packageId]
+            let releasesURL = packageMap[caseInsensitive: update.packageId]
                 .map { $0.absoluteString.droppingGitExtension + "/releases" }
             ?? "\(update.packageId)"
             print(releasesURL, "(\(update.oldRevision?.description ?? "new package"))")
@@ -105,10 +105,3 @@ struct ReleaseNotes: AsyncParsableCommand {
     }
 
 }
-
-
-private extension Dictionary where Key == PackageId, Value == URL {
-    subscript(caseIgnoring packageId: PackageId) -> URL? {
-        first(where: { $0.key.lowercased() == packageId.lowercased() })?.value
-    }
-}

Tests/ReleaseNotesTests/PackageResolvedTests.swift

@@ -32,4 +32,13 @@ final class ReleaseNotesCoreTests: XCTestCase {
         XCTAssertEqual(map?.count, 5)
     }
 
+    func test_Dictionary_subscript_caseInsensitive() throws {
+        let d = [
+            PackageId("foo"): URL(string: "1")!,
+            PackageId("bar"): URL(string: "2")!,
+        ]
+        XCTAssertEqual(d[caseInsensitive: "foo"], URL(string: "1")!)
+        XCTAssertEqual(d[caseInsensitive: "Foo"], URL(string: "1")!)
+    }
+
 }

Tests/ReleaseNotesTests/ReleaseNotesCoreTests.swift

@@ -49,3 +49,26 @@ final class PackageResolvedTests: XCTestCase {
     }
 
 }
+
+
+private extension PackageResolved {
+    var v1: V1? {
+        switch self {
+            case let .v1(value):
+                return value
+            case .v2:
+                return nil
+        }
+    }
+
+    var v2: V2? {
+        switch self {
+            case .v1:
+                return nil
+            case let .v2(value):
+                return value
+        }
+    }
+}
+
+