Update PackageIdentity to account for URL query and fragment components

Author: mattt

Sources/PackageModel/PackageIdentity.swift

@@ -35,6 +35,9 @@ public struct PackageIdentity: LosslessStringConvertible {
             string.replaceFirstOccurenceIfPresent(of: ":", with: "/")
         }
 
+        string.removeFragmentComponentIfPresent()
+        string.removeQueryComponentIfPresent()
+
         var components = string.split(omittingEmptySubsequences: true, whereSeparator: isSeparator)
 
         var lastPathComponent = components.popLast() ?? ""
@@ -166,6 +169,24 @@ private extension String {
         return false
     }
 
+    @discardableResult
+    mutating func removeFragmentComponentIfPresent() -> Bool {
+        if let index = firstIndex(of: "#") {
+            self.removeSubrange(index...)
+        }
+
+        return false
+    }
+
+    @discardableResult
+    mutating func removeQueryComponentIfPresent() -> Bool {
+        if let index = firstIndex(of: "?") {
+            self.removeSubrange(index...)
+        }
+
+        return false
+    }
+
     @discardableResult
     mutating func replaceFirstOccurenceIfPresent<T: StringProtocol, U: StringProtocol>(of string: T, with replacement: U) -> Bool {
         guard let range = range(of: string) else { return false }

Tests/PackageModelTests/PackageIdentityTests.swift

@@ -71,6 +71,55 @@ final class PackageIdentityTests: XCTestCase {
         )
     }
 
+    func testQuery() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList?utm_source=forums.swift.org"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testQueryWithTrailingSlash() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList/?utm_source=forums.swift.org"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testQueryWithGitSuffix() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList.git?utm_source=forums.swift.org"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testFragment() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList#installation"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testFragmentWithTrailingSlash() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList/#installation"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testFragmentWithGitSuffix() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList.git#installation"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
+    func testFragmentAndQuery() {
+        XCTAssertEqual(
+            PackageIdentity("https://example.com/mona/LinkedList.git#installation?utm_source=forums.swift.org"),
+            "example.com/mona/LinkedList"
+        )
+    }
+
     func testSSHScheme() {
         XCTAssertEqual(
             PackageIdentity("ssh://git@example.com/mona/LinkedList.git"),