Wire up combined parsing

Author: finestructure

Sources/ReleaseNotesCore/PackageResolved.swift

@@ -83,6 +83,23 @@ extension PackageResolved {
 }
 
 
+extension PackageResolved {
+    func getPackageMap() -> [PackageId: URL] {
+        switch self {
+            case let .v1(value):
+                return Dictionary(value.object.pins
+                    .map { ($0.package, $0.repositoryURL) },
+                                  uniquingKeysWith: { first, _ in first })
+
+            case let .v2(value):
+                return Dictionary(value.pins
+                    .map { ($0.identity, $0.location) },
+                                  uniquingKeysWith: { first, _ in first })
+        }
+    }
+}
+
+
 extension PackageResolved: Decodable {
     init(from decoder: Decoder) throws {
         if let value = try? decoder.singleValueContainer().decode(V1.self) {

Sources/ReleaseNotesCore/ReleaseNotes.swift

@@ -25,8 +25,10 @@ struct ReleaseNotes: AsyncParsableCommand {
     var workingDirecory: String = "."
 
     func runAsync() async throws {
-        guard let packageMap = Self.getPackageMap(at: workingDirecory) else {
-            print("Failed to parse Package.resolved in \(workingDirecory).")
+        let path = URL(fileURLWithPath: workingDirecory)
+            .appendingPathComponent("Package.resolved").path
+        guard let packageMap = Self.getPackageMap(at: path) else {
+            print("Failed to parse \(path).")
             return
         }
 
@@ -90,54 +92,16 @@ struct ReleaseNotes: AsyncParsableCommand {
         return process
     }
 
-//    static func decodePackageResolved(at url: URL) -> [PackageId: URL]? {
-//        //    object:
-//        //      pins:
-//        //        - package: String
-//        //          repositoryURL: URL
-//        //          state:
-//        //            branch: String?
-//        //            revision: CommitHash
-//        //            version: SemVer?
-//        //        - ...
-//        //      version: 1
-//        struct PackageResolvedV1: Decodable {
-//            var object: Object
-//
-//            struct Object: Decodable {
-//                var pins: [Pin]
-//
-//                struct Pin: Decodable {
-//                    var package: String
-//                    var repositoryURL: URL
-//                }
-//            }
-//        }
-//
-//        guard FileManager.default.fileExists(atPath: url.path),
-//              let json = FileManager.default.contents(atPath: url.path),
-//              let packageResolved = try? JSONDecoder()
-//            .decode(PackageResolvedV1.self, from: json)
-//        else {
-//            return nil
-//        }
-//    }
-
     static func getPackageMap(at path: String) -> [PackageId: URL]? {
-        let filePath = URL(fileURLWithPath: path)
-            .appendingPathComponent("Package.resolved").path
-        guard FileManager.default.fileExists(atPath: filePath),
-              let json = FileManager.default.contents(atPath: filePath),
+        guard FileManager.default.fileExists(atPath: path),
+              let json = FileManager.default.contents(atPath: path),
               let packageResolved = try? JSONDecoder()
                 .decode(PackageResolved.self, from: json)
         else {
             return nil
         }
 
-//        return Dictionary(packageResolved.object.pins
-//                            .map { ($0.package, $0.repositoryURL) },
-//                          uniquingKeysWith: { first, _ in first })
-        return [:]
+        return packageResolved.getPackageMap()
     }
 
 }

Tests/ReleaseNotesTests/PackageResolvedTests.swift

@@ -25,4 +25,11 @@ final class ReleaseNotesCoreTests: XCTestCase {
         XCTAssertEqual(map?.count, 3)
     }
 
+    func test_getPackageMap_v2() throws {
+        let path = fixtureUrl(for: "Package.resolved-v2.json").path
+        let map = ReleaseNotes.getPackageMap(at: path)
+
+        XCTAssertEqual(map?.count, 5)
+    }
+
 }

Tests/ReleaseNotesTests/ReleaseNotesCoreTests.swift

@@ -0,0 +1,51 @@
+// 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.
+
+@testable import ReleaseNotesCore
+import XCTest
+
+
+final class PackageResolvedTests: XCTestCase {
+
+    func test_decode_v1() throws {
+        let data = try fixtureData(for: "Package.resolved-v1.json")
+        let res = try JSONDecoder().decode(PackageResolved.self, from: data)
+
+        XCTAssertEqual(res.v1?.object.pins.count, 3)
+        XCTAssertEqual(res.v2, nil)
+    }
+
+    func test_decode_v2() throws {
+        let data = try fixtureData(for: "Package.resolved-v2.json")
+        let res = try JSONDecoder().decode(PackageResolved.self, from: data)
+
+        XCTAssertEqual(res.v1, nil)
+        XCTAssertEqual(res.v2?.pins.count, 5)
+    }
+
+    func test_getPackageMap_v1() throws {
+        let data = try fixtureData(for: "Package.resolved-v1.json")
+        let res = try JSONDecoder().decode(PackageResolved.self, from: data)
+
+        XCTAssertEqual(res.getPackageMap().count, 3)
+    }
+
+    func test_getPackageMap_v2() throws {
+        let data = try fixtureData(for: "Package.resolved-v2.json")
+        let res = try JSONDecoder().decode(PackageResolved.self, from: data)
+
+        XCTAssertEqual(res.getPackageMap().count, 5)
+    }
+
+}