correct wrong source file search paths for non-library targets

Author: tayloraswift

Assets/css/Main.css

@@ -41,20 +41,47 @@ extension PackageBuild.Sources.Module
         exclude:borrowing [String],
         root:borrowing FilePath) throws
     {
-        try self.init(scanning: module, exclude: exclude,
-            path: module.location.map { root / $0 } ?? root / "Sources" / "\(module.name)")
+        self.init(module, path: nil)
+
+        if  let location:String = module.location
+        {
+            self.path = root / location
+        }
+        else
+        {
+            let directory:String
+            switch module.type
+            {
+            case .binary:       return
+            case .executable:   directory = "Sources"
+            case .regular:      directory = "Sources"
+            case .macro:        directory = "Sources"
+            case .plugin:       directory = "Plugins"
+            case .snippet:      directory = "Snippets"
+            case .system:       return
+            case .test:         directory = "Tests"
+            }
+
+            self.path = root / directory / module.name
+        }
+
+        try self.scan(excluding: exclude)
     }
 
-    private
-    init(scanning module:SymbolGraph.Module,
-        exclude:borrowing [String],
-        path:FilePath) throws
+    private mutating
+    func scan(excluding exclude:[String]) throws
     {
+        guard
+        let path:FilePath = self.path
+        else
+        {
+            return
+        }
+
         let exclude:Set<FilePath> = exclude.reduce(into: []) { $0.insert(path / $1) }
         var include:Set<FilePath> = []
-        var language:SymbolGraph.ModuleLanguage = module.language ?? .swift
+        var language:SymbolGraph.ModuleLanguage = self.module.language ?? .swift
 
-        self.init(module, path: path)
         defer
         {
             self.articles.sort              { $0.string < $1.string }

Assets/css/Main.css.map

@@ -19,18 +19,28 @@ extension SPM.Manifest
         //  The manifest can be very large, possibly larger than the 64 KB pipe buffer
         //  limit. So instead of getting the `dump-package` output from a pipe, we
         //  tell the subprocess to write it to a file, and read back the file afterwards.
-        let path:FilePath = build.output.path / "\(build.id.package).package.json"
-        let utf8:[UInt8] = try await path.open(.readWrite,
-            permissions: (.rw, .r, .r),
-            options: [.create, .truncate])
+        let json:JSON
+        do
         {
-            let dump:SystemProcess = try .init(command: "swift", "package", "dump-package",
-                "--package-path", "\(build.root)",
-                stdout: $0)
-            try await dump()
-            return try $0.readAll()
+            let path:FilePath = build.output.path / "\(build.id.package).package.json"
+            let utf8:[UInt8] = try await path.open(.readWrite,
+                permissions: (.rw, .r, .r),
+                options: [.create, .truncate])
+            {
+                let dump:SystemProcess = try .init(command: "swift", "package", "dump-package",
+                    "--package-path", "\(build.root)",
+                    stdout: $0)
+                try await dump()
+                return try $0.readAll()
+            }
+
+            json = .init(utf8: utf8)
+        }
+        catch let error
+        {
+            throw SPM.ManifestDumpError.init(underlying: error, root: build.root)
         }
-        let json:JSON = .init(utf8: utf8)
+
         return try json.decode()
     }
 }

Sources/SymbolGraphBuilder/Builds/PackageBuild.Sources.Module.swift

@@ -0,0 +1,30 @@
+import PackageMetadata
+import System
+import TraceableErrors
+
+extension SPM
+{
+    public
+    struct ManifestDumpError:Error
+    {
+        public
+        let underlying:any Error
+        public
+        let root:FilePath
+
+        public
+        init(underlying:any Error, root:FilePath)
+        {
+            self.underlying = underlying
+            self.root = root
+        }
+    }
+}
+extension SPM.ManifestDumpError:TraceableError
+{
+    public
+    var notes:[String]
+    {
+        ["while dumping manifest for package at '\(self.root)'"]
+    }
+}

Sources/SymbolGraphBuilder/Builds/SPM.Manifest (ext).swift

@@ -1,7 +1,5 @@
 section.details table
 {
-    width: 100%;
-
     th
     {
         text-align: left;
@@ -28,6 +26,8 @@ section.details table
 }
 section.details table.dependencies
 {
+    width: 100%;
+
     td:first-child
     {
         font-style: italic;
@@ -39,6 +39,8 @@ section.details table.dependencies
 }
 section.details table.tags
 {
+    width: 100%;
+
     tr.modern
     {
         font-weight: 700;