fix more massbuild edge cases

Author: tayloraswift

Sources/Massbuild/Main.swift

@@ -105,25 +105,25 @@ enum Main
         try await builder.build("swift-hash",
             repository: "https://github.com/tayloraswift/swift-hash.git",
             versions:
-            "0.2.3")
+            "v0.2.3")
 
         try await builder.build("swift-dom",
             repository: "https://github.com/tayloraswift/swift-dom.git",
             versions:
-            "0.5.0")
+            "v0.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")
+            "v0.1.4",
+            "v0.1.5",
+            "v0.2.0")
 
         try await builder.build("swift-json",
             repository: "https://github.com/tayloraswift/swift-json.git",
             versions:
-            "0.2.2",
-            "0.3.0")
+            "v0.2.2",
+            "v0.3.0")
 
         try await builder.build("bson",
             repository: "https://github.com/orlandos-nl/bson.git",
@@ -134,7 +134,6 @@ enum Main
         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",
@@ -144,7 +143,7 @@ enum Main
             "7.1.0",
             "7.2.0",
             "7.2.1",
-            "7.2.2",
-            "7.7.1")
+            "7.2.2")
+            // "7.7.1"
     }
 }

Sources/Massbuild/Massbuilder.swift

@@ -41,7 +41,7 @@ extension Massbuilder
                 at: version,
                 in: self.workspace,
                 clean: true),
-            pretty: false)
+            pretty: true)
 
         let bson:BSON.Document = .init(encoding: docs)
         try file.overwrite(with: bson.bytes)

Sources/ModuleGraphs/Repositories/Repository.swift

@@ -6,3 +6,33 @@ enum Repository:Hashable, Equatable, Sendable
     /// A package in a remote git repository.
     case remote(url:String)
 }
+extension Repository
+{
+    @inlinable public
+    init(location:String)
+    {
+        self = location.first == "/" ?
+            .local(root: .init(location)) :
+            .remote(url: location)
+    }
+}
+extension Repository
+{
+    /// Returns the exact name of the repository, which is the last path component without the
+    /// extension.
+    public
+    var name:Substring
+    {
+        let uri:String
+        switch self
+        {
+        case .local(let root):  uri = root.path
+        case .remote(let url):  uri = url
+        }
+
+        let start:String.Index = uri.lastIndex(of: "/").map(uri.index(after:)) ??
+            uri.startIndex
+
+        return uri[start...].prefix(while: { $0 != "." })
+    }
+}

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

@@ -29,14 +29,10 @@ extension Repository.Pin.V1:JSONObjectDecodable
     public
     init(json:JSON.ObjectDecoder<CodingKey>) throws
     {
-        let location:String = try json[.location].decode()
-        let start:String.Index = location.lastIndex(of: "/").map(location.index(after:)) ??
-            location.startIndex
+        let repository:Repository = .init(location: try json[.location].decode())
 
-        self.init(value: .init(id: .init(location[start...].prefix(while: { $0 != "." })),
-            location: location.first == "/" ?
-                .local(root: .init(location)) :
-                .remote(url: location),
+        self.init(value: .init(id: .init(repository.name),
+            location: repository,
             state: try json[.state].decode()))
     }
 }

Sources/SymbolGraphBuilder/Builds/Toolchain.swift

@@ -194,7 +194,7 @@ extension Toolchain
         ]
         for pin:Repository.Pin in pins
         {
-            let checkout:FilePath = build.root / ".build" / "checkouts" / "\(pin.id)"
+            let checkout:FilePath = build.root / ".build" / "checkouts" / "\(pin.location.name)"
 
             let manifest:PackageManifest = try await .dump(from: .init(
                 identity: .upstream(pin),

Sources/SymbolGraphCompiler/Compiler/Compiler.swift

@@ -82,17 +82,21 @@ extension Compiler
                             with: symbol,
                             in: culture)
 
+                    case (.block(let block), excluded: true):
+                        //  We *do* in fact care about extension blocks that only contain
+                        //  internal/private members, because they might contain a conformance
+                        //  to an internal protocol that inherits from a public protocol.
+                        //  SymbolGraphGen probably shouldn’t be marking these extension blocks
+                        //  as internal, but SymbolGraphGen doesn’t care what we think.
+                        fallthrough
+                        //  continue
+
                     case (.block(let block), excluded: false):
                         try self.extensions.include(block: block,
                             extending: try extensions.extendee(of: block),
                             namespace: namespace,
                             with: symbol,
                             in: culture)
-
-                    case (.block, excluded: true):
-                        //  We do not care about extension blocks that only contain
-                        //  internal/private members.
-                        continue
                     }
                 }
                 catch let error