fix massbuild bug related to faulty parsing of legacy Package.resolved format

Author: tayloraswift

Sources/Massbuild/Main.swift

@@ -33,6 +33,29 @@ enum Main
             versions:
             "1.0.0")
 
+        try await builder.build("swift-argument-parser",
+            repository: "https://github.com/apple/swift-argument-parser.git",
+            versions:
+            "1.1.3")
+
+        try await builder.build("swift-markdown",
+            repository: "https://github.com/apple/swift-markdown.git",
+            versions:
+            "0.2.0")
+
+        try await builder.build("swift-syntax",
+            repository: "https://github.com/apple/swift-syntax.git",
+            versions:
+            "508.0.1")
+
+        try await builder.build("swift-system",
+            repository: "https://github.com/apple/swift-system.git",
+            versions:
+            "1.1.0",
+            "1.1.1",
+            "1.2.0",
+            "1.2.1")
+
         try await builder.build("swift-nio",
             repository: "https://github.com/apple/swift-nio.git",
             versions:
@@ -47,5 +70,81 @@ enum Main
             "2.46.0",
             "2.47.0",
             "2.48.0")
+
+        try await builder.build("swift-nio-ssl",
+            repository: "https://github.com/apple/swift-nio-ssl.git",
+            versions:
+            "2.20.2",
+            "2.21.0",
+            "2.22.0",
+            "2.23.0",
+            "2.24.0",
+            "2.25.0")
+
+        try await builder.build("swift-log",
+            repository: "https://github.com/apple/swift-log.git",
+            versions:
+            "1.4.2",
+            "1.4.3",
+            "1.4.4",
+            "1.5.0",
+            "1.5.1",
+            "1.5.2",
+            "1.5.3")
+
+        try await builder.build("swift-metrics",
+            repository: "https://github.com/apple/swift-metrics.git",
+            versions:
+            "2.3.1",
+            "2.3.2",
+            "2.3.3",
+            "2.3.4",
+            "2.4.0",
+            "2.4.1")
+
+        try await builder.build("swift-hash",
+            repository: "https://github.com/tayloraswift/swift-hash.git",
+            versions:
+            "0.2.3")
+
+        try await builder.build("swift-dom",
+            repository: "https://github.com/tayloraswift/swift-dom.git",
+            versions:
+            "0.5.0")
+
+        try await builder.build("swift-grammar",
+            repository: "https://github.com/tayloraswift/swift-grammar.git",
+            versions:
+            "0.1.4",
+            "0.1.5",
+            "0.2.0")
+
+        try await builder.build("swift-json",
+            repository: "https://github.com/tayloraswift/swift-json.git",
+            versions:
+            "0.2.2",
+            "0.3.0")
+
+        try await builder.build("bson",
+            repository: "https://github.com/orlandos-nl/bson.git",
+            versions:
+            "8.0.1",
+            "8.0.10")
+
+        try await builder.build("dnsclient",
+            repository: "https://github.com/orlandos-nl/dnsclient.git",
+            versions:
+            "2.0.7",
+            "2.4.1")
+
+        try await builder.build("mongokitten",
+            repository: "https://github.com/orlandos-nl/mongokitten.git",
+            versions:
+            "7.0.1",
+            "7.1.0",
+            "7.2.0",
+            "7.2.1",
+            "7.2.2",
+            "7.7.1")
     }
 }

Sources/PackageMetadata/Resolutions/Repository.Pin.State (ext).swift

@@ -15,7 +15,8 @@ extension Repository.Pin.State:JSONObjectDecodable
     init(json:JSON.ObjectDecoder<CodingKey>) throws
     {
         let version:AnyVersion
-        if  let stable:SemanticVersion = try json[.version]?.decode(
+        //  `try?` because sometimes we have explicit JSON null
+        if  let stable:SemanticVersion = try? json[.version]?.decode(
                 as: JSON.StringRepresentation<SemanticVersion>.self,
                 with: \.value)
         {

Sources/PackageMetadata/Resolutions/Repository.Pin.V1.swift

@@ -20,15 +20,20 @@ extension Repository.Pin.V1:JSONObjectDecodable
     public
     enum CodingKey:String
     {
-        case id = "package"
+        //  this field is completely useless!
+        //  case id = "package"
+
         case location = "repositoryURL"
         case state
     }
     public
     init(json:JSON.ObjectDecoder<CodingKey>) throws
     {
         let location:String = try json[.location].decode()
-        self.init(value: .init(id: try json[.id].decode(),
+        let start:String.Index = location.lastIndex(of: "/").map(location.index(after:)) ??
+            location.startIndex
+
+        self.init(value: .init(id: .init(location[start...].prefix(while: { $0 != "." })),
             location: location.first == "/" ?
                 .local(root: .init(location)) :
                 .remote(url: location),

Sources/SymbolGraphBuilder/Builds/Toolchain.swift

@@ -194,10 +194,12 @@ extension Toolchain
         ]
         for pin:Repository.Pin in pins
         {
+            let checkout:FilePath = build.root / ".build" / "checkouts" / "\(pin.id)"
+
             let manifest:PackageManifest = try await .dump(from: .init(
                 identity: .upstream(pin),
                 output: build.output,
-                root: build.root / ".build" / "checkouts" / "\(pin.id)"))
+                root: checkout))
 
             let upstream:PackageNode = try .libraries(as: pin.id,
                 flattening: manifest,