Merge pull request #2881 from SwiftPackageIndex/issue-2875

Make Manifest.Platform.Name parsing case-insensitive

Author: finestructure

Sources/App/Models/Manifest.swift

@@ -52,6 +52,30 @@ struct Manifest: Decodable, Equatable {
         }
         var platformName: Name
         var version: String
+        
+        init(platformName: Manifest.Platform.Name, version: String) {
+            self.platformName = platformName
+            self.version = version
+        }
+
+        enum CodingKeys: CodingKey {
+            case platformName
+            case version
+        }
+        
+        init(from decoder: any Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            
+            do { // case-insensitive decoding of Platform.Name
+                let rawValue = try container.decode(String.self, forKey: CodingKeys.platformName).lowercased()
+                guard let name = Name(rawValue: rawValue) else {
+                    throw DecodingError.dataCorrupted(.init(codingPath: [CodingKeys.platformName],
+                                                            debugDescription: "invalid rawValue: \(rawValue)"))
+                }
+                self.platformName = name
+            }
+            self.version = try container.decode(String.self, forKey: CodingKeys.version)
+        }
     }
 
     enum LibraryType: String, Decodable {

Tests/AppTests/Fixtures/Lottie-ios.json

@@ -0,0 +1,117 @@
+{
+  "cLanguageStandard" : null,
+  "cxxLanguageStandard" : null,
+  "dependencies" : [
+    {
+      "sourceControl" : [
+        {
+          "identity" : "swift",
+          "location" : {
+            "remote" : [
+              {
+                "urlString" : "https://github.com/airbnb/swift"
+              }
+            ]
+          },
+          "productFilter" : null,
+          "requirement" : {
+            "range" : [
+              {
+                "lowerBound" : "1.0.1",
+                "upperBound" : "2.0.0"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "name" : "Lottie",
+  "packageKind" : {
+    "root" : [
+      "/Users/sas/Projects/SPI/spi-server/SPI-checkouts/github.com-airbnb-lottie-ios"
+    ]
+  },
+  "pkgConfig" : null,
+  "platforms" : [
+    {
+      "options" : [
+
+      ],
+      "platformName" : "ios",
+      "version" : "11.0"
+    },
+    {
+      "options" : [
+
+      ],
+      "platformName" : "macos",
+      "version" : "10.11"
+    },
+    {
+      "options" : [
+
+      ],
+      "platformName" : "tvos",
+      "version" : "11.0"
+    },
+    {
+      "options" : [
+
+      ],
+      "platformName" : "visionOS",
+      "version" : "1.0"
+    }
+  ],
+  "products" : [
+    {
+      "name" : "Lottie",
+      "settings" : [
+
+      ],
+      "targets" : [
+        "Lottie"
+      ],
+      "type" : {
+        "library" : [
+          "automatic"
+        ]
+      }
+    }
+  ],
+  "providers" : null,
+  "swiftLanguageVersions" : null,
+  "targets" : [
+    {
+      "dependencies" : [
+
+      ],
+      "exclude" : [
+        "Private/EmbeddedLibraries/README.md",
+        "Private/EmbeddedLibraries/ZipFoundation/README.md",
+        "Private/EmbeddedLibraries/EpoxyCore/README.md",
+        "Private/EmbeddedLibraries/LRUCache/README.md"
+      ],
+      "name" : "Lottie",
+      "packageAccess" : false,
+      "path" : "Sources",
+      "resources" : [
+        {
+          "path" : "PrivacyInfo.xcprivacy",
+          "rule" : {
+            "copy" : {
+
+            }
+          }
+        }
+      ],
+      "settings" : [
+
+      ],
+      "type" : "regular"
+    }
+  ],
+  "toolsVersion" : {
+    "_version" : "5.7.0"
+  }
+}

Tests/AppTests/ManifestTests.swift

@@ -192,4 +192,17 @@ class ManifestTests: XCTestCase {
         ])
     }
 
+    func test_issue_2875() throws {
+        // Support decoding custom platform with different capitalisation
+        // https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/2875
+        let data = try fixtureData(for: "Lottie-ios.json")
+        let m = try JSONDecoder().decode(Manifest.self, from: data)
+        XCTAssertEqual(m.platforms, [
+            .init(platformName: .ios, version: "11.0"),
+            .init(platformName: .macos, version: "10.11"),
+            .init(platformName: .tvos, version: "11.0"),
+            .init(platformName: .visionos, version: "1.0"),
+        ])
+    }
+
 }