Handle install 6.4-snapshot properly (#561)

Author: ktoso

Sources/Swiftly/OutputSchema.swift

@@ -285,7 +285,7 @@ struct InstallToolchainInfo: OutputData {
                 branch = .main
             } else if let major = branchMajor, let minor = branchMinor {
                 let branchPatch = try? versionContainer.decodeIfPresent(String.self, forKey: .patch)
-                branch = .release(major: major, minor: minor, patch: branchPatch)
+                branch = .releaseNormalized(major: major, minor: minor, patch: branchPatch)
             } else {
                 throw DecodingError.dataCorruptedError(
                     forKey: ToolchainVersionCodingKeys.branch,

Sources/SwiftlyCore/HTTPClient.swift

@@ -445,7 +445,7 @@ extension SwiftlyWebsiteAPI.Components.Schemas.DevToolchainForArch {
                     message: "malformatted release branch: \"\(majorString).\(minorString)\"")
             }
             let patch = match.output.3.map(String.init)
-            branch = .release(major: major, minor: minor, patch: patch)
+            branch = .releaseNormalized(major: major, minor: minor, patch: patch)
         } else {
             branch = .main
         }

Sources/SwiftlyCore/ToolchainVersion.swift

@@ -7,6 +7,17 @@ public enum ToolchainVersion: Sendable {
             case main
             case release(major: Int, minor: Int, patch: String? = nil)
 
+            /// Constructs a release-snapshot branch, normalizing the patch component
+            /// to match the swift.org URL scheme:
+            /// - from Swift 6.4 onward, snapshots live under `/install/dev/X.Y.x/...`,
+            /// - on older releases are passed through as-is.
+            public static func releaseNormalized(major: Int, minor: Int, patch: String?) -> Self {
+                if patch == nil, (major, minor) >= (6, 4) {
+                    return .release(major: major, minor: minor, patch: "x")
+                }
+                return .release(major: major, minor: minor, patch: patch)
+            }
+
             public var description: String {
                 switch self {
                 case .main:
@@ -145,7 +156,7 @@ public enum ToolchainVersion: Sendable {
                 throw SwiftlyError(message: "invalid release snapshot version: \(string)")
             }
             let patch = match.output.3.map(String.init)
-            self = ToolchainVersion(snapshotBranch: .release(major: major, minor: minor, patch: patch), date: String(match.output.4))
+            self = ToolchainVersion(snapshotBranch: .releaseNormalized(major: major, minor: minor, patch: patch), date: String(match.output.4))
         } else if string == "xcode" {
             self = ToolchainVersion.xcodeVersion
         } else {
@@ -477,7 +488,7 @@ struct ReleaseSnapshotParser: ToolchainSelectorParser {
         }
 
         let patch = match.output.3.map(String.init)
-        return .snapshot(branch: .release(major: major, minor: minor, patch: patch), date: match.output.4.map(String.init))
+        return .snapshot(branch: .releaseNormalized(major: major, minor: minor, patch: patch), date: match.output.4.map(String.init))
     }
 }
 

Tests/SwiftlyTests/ToolchainSelectorTests.swift

@@ -39,7 +39,7 @@ import Testing
         try runTest(.snapshot(branch: .main, date: "2023-06-05"), parses)
     }
 
-    @Test func parseReleaseSnapshot() throws {
+    @Test func parseDeprecatedReleaseSnapshot() throws {
         let parses = [
             "5.7-snapshot",
             "5.7-SNAPSHOT",
@@ -63,6 +63,35 @@ import Testing
         try runTest(.snapshot(branch: .release(major: 5, minor: 7, patch: "x"), date: nil), parses)
     }
 
+    @Test func parseReleaseSnapshot() throws {
+        let parses = [
+            "6.4-snapshot",
+            "6.4.x-snapshot",
+            "6.4-SNAPSHOT",
+            "6.4.x-SNAPSHOT",
+            "6.4-DEVELOPMENT-SNAPSHOT",
+            "6.4.x-DEVELOPMENT-SNAPSHOT",
+            "swift-6.4-snapshot",
+            "swift-6.4.x-snapshot",
+            "swift-6.4-SNAPSHOT",
+            "swift-6.4.x-SNAPSHOT",
+            "swift-6.4-DEVELOPMENT-SNAPSHOT",
+            "swift-6.4.x-DEVELOPMENT-SNAPSHOT",
+        ]
+        try runTest(.snapshot(branch: .release(major: 6, minor: 4, patch: "x"), date: nil), parses)
+    }
+
+    @Test func releaseSnapshotXDependingOnVersion() throws {
+        #expect(
+            try ToolchainSelector(parsing: "6.4-snapshot")
+                == ToolchainSelector(parsing: "6.4.x-snapshot")
+        )
+        #expect(
+            try ToolchainSelector(parsing: "5.7-snapshot")
+                != ToolchainSelector(parsing: "5.7.x-snapshot")
+        )
+    }
+
     @Test func parseReleaseSnapshotWithDate() throws {
         let parses = [
             "5.7-snapshot-2023-06-05",