no reason for these types to be associated with SPM, or public, or frozen

Author: tayloraswift

Sources/SymbolGraphBuilder/Artifacts/ArtifactDirectory.swift

@@ -0,0 +1,11 @@
+import System
+
+struct ArtifactDirectory:SystemWorkspace
+{
+    let path:FilePath
+
+    init(path:FilePath)
+    {
+        self.path = path
+    }
+}

Sources/SymbolGraphBuilder/Artifacts/ArtifactError.swift

@@ -0,0 +1,32 @@
+import System
+import TraceableErrors
+
+struct ArtifactError:Error, Sendable
+{
+    public
+    let underlying:any Error
+    public
+    let path:FilePath
+
+    public
+    init(underlying:any Error, path:FilePath)
+    {
+        self.underlying = underlying
+        self.path = path
+    }
+}
+extension ArtifactError:Equatable
+{
+    static
+    func == (lhs:Self, rhs:Self) -> Bool
+    {
+        lhs.path == rhs.path && lhs.underlying == rhs.underlying
+    }
+}
+extension ArtifactError:TraceableError
+{
+    var notes:[String]
+    {
+        ["while processing artifact '\(self.path)'"]
+    }
+}

Sources/SymbolGraphBuilder/Artifacts/SPM.Artifacts.Culture.swift renamed to Sources/SymbolGraphBuilder/Artifacts/Artifacts.Culture.swift

@@ -6,7 +6,7 @@ import SymbolGraphs
 import Symbols
 import System
 
-extension SPM.Artifacts
+extension Artifacts
 {
     struct Culture
     {
@@ -29,14 +29,14 @@ extension SPM.Artifacts
         }
     }
 }
-extension SPM.Artifacts.Culture:Identifiable
+extension Artifacts.Culture:Identifiable
 {
     var id:Symbol.Module
     {
         self.module.id
     }
 }
-extension SPM.Artifacts.Culture
+extension Artifacts.Culture
 {
     func loadArticles(root:Symbol.FileBase) throws -> [MarkdownSourceFile]
     {
@@ -83,7 +83,7 @@ extension SPM.Artifacts.Culture
             }
             catch let error
             {
-                throw SPM.ArtifactError.init(underlying: error, path: path)
+                throw ArtifactError.init(underlying: error, path: path)
             }
         }
     }

Sources/SymbolGraphBuilder/Artifacts/Artifacts.swift

@@ -0,0 +1,18 @@
+import PackageGraphs
+import PackageMetadata
+import SymbolGraphParts
+import SymbolGraphs
+import Symbols
+import System
+
+struct Artifacts
+{
+    let cultures:[Culture]
+    var root:Symbol.FileBase?
+
+    init(cultures:[Culture], root:Symbol.FileBase? = nil)
+    {
+        self.cultures = cultures
+        self.root = root
+    }
+}

Sources/SymbolGraphBuilder/Artifacts/SPM.ArtifactDirectory.swift

@@ -4,5 +4,5 @@ protocol DocumentationBuild
 {
     mutating
     func compile(with swift:Toolchain,
-        pretty:Bool) async throws -> (SymbolGraphMetadata, SPM.Artifacts)
+        pretty:Bool) async throws -> (SymbolGraphMetadata, Artifacts)
 }

Sources/SymbolGraphBuilder/Artifacts/SPM.ArtifactError.swift

@@ -128,7 +128,7 @@ extension SPM.Build
         let container:SPM.Workspace = try await shared.create("\(package)")
         let checkouts:SPM.CheckoutDirectory = try await container.create("checkouts",
             clean: clean.contains(.checkouts))
-        let artifacts:SPM.ArtifactDirectory = try await container.create("artifacts@\(refname)",
+        let artifacts:ArtifactDirectory = try await container.create("artifacts@\(refname)",
             clean: clean.contains(.artifacts))
 
         let cloned:FilePath = checkouts.path / "\(package)"
@@ -189,7 +189,7 @@ extension SPM.Build:DocumentationBuild
 {
     mutating
     func compile(with swift:Toolchain,
-        pretty:Bool) async throws -> (SymbolGraphMetadata, SPM.Artifacts)
+        pretty:Bool) async throws -> (SymbolGraphMetadata, Artifacts)
     {
         switch self.id
         {
@@ -295,7 +295,7 @@ extension SPM.Build:DocumentationBuild
             display: manifest.name,
             root: manifest.root)
 
-        let artifacts:SPM.Artifacts = try await swift.dump(from: flatNode,
+        let artifacts:Artifacts = try await swift.dump(from: flatNode,
             include: &include,
             output: self.output,
             triple: swift.triple,

Sources/SymbolGraphBuilder/Artifacts/SPM.Artifacts.swift

@@ -2,14 +2,14 @@ import SymbolGraphs
 
 extension Toolchain
 {
-    @frozen public
+    public
     struct Build
     {
         /// Where to emit documentation artifacts to.
-        let output:SPM.ArtifactDirectory
+        let output:ArtifactDirectory
 
         private
-        init(output:SPM.ArtifactDirectory)
+        init(output:ArtifactDirectory)
         {
             self.output = output
         }
@@ -27,10 +27,10 @@ extension Toolchain.Build
 extension Toolchain.Build:DocumentationBuild
 {
     func compile(with swift:Toolchain,
-        pretty:Bool) async throws -> (SymbolGraphMetadata, SPM.Artifacts)
+        pretty:Bool) async throws -> (SymbolGraphMetadata, Artifacts)
     {
         //  https://forums.swift.org/t/dependency-graph-of-the-standard-library-modules/59267
-        let artifacts:SPM.Artifacts = try await swift.dump(
+        let artifacts:Artifacts = try await swift.dump(
             modules:
             [
                 //  0:

Sources/SymbolGraphBuilder/Builds/DocumentationBuild.swift

@@ -238,17 +238,16 @@ extension Toolchain
 {
     /// Dumps the symbols for the given package, using the `output` workspace as the
     /// output directory.
-    public
     func dump(from package:PackageNode,
         include:inout [FilePath],
-        output:SPM.ArtifactDirectory,
+        output:ArtifactDirectory,
         triple:Triple,
-        pretty:Bool = false) async throws -> SPM.Artifacts
+        pretty:Bool = false) async throws -> Artifacts
     {
         //  Note: the manifest root is the root we want; the repository root may
         //  be a relative path.
         let sources:SPM.Build.Sources = try .init(scanning: package)
-        let cultures:[SPM.Artifacts.Culture] = try await self.dump(
+        let cultures:[Artifacts.Culture] = try await self.dump(
             modules: sources.modules,
             include: &include,
             output: output,
@@ -260,12 +259,12 @@ extension Toolchain
     /// Dumps the symbols for the given targets, using the `output` workspace as the
     /// output directory.
     func dump(modules:[SPM.Build.Sources.Module],
-        output:SPM.ArtifactDirectory,
+        output:ArtifactDirectory,
         triple:Triple,
-        pretty:Bool = false) async throws -> SPM.Artifacts
+        pretty:Bool = false) async throws -> Artifacts
     {
         var include:[FilePath] = []
-        let cultures:[SPM.Artifacts.Culture] = try await self.dump(
+        let cultures:[Artifacts.Culture] = try await self.dump(
             modules: modules,
             include: &include,
             output: output,
@@ -278,9 +277,9 @@ extension Toolchain
     private
     func dump(modules:[SPM.Build.Sources.Module],
         include:inout [FilePath],
-        output:SPM.ArtifactDirectory,
+        output:ArtifactDirectory,
         triple:Triple,
-        pretty:Bool) async throws -> [SPM.Artifacts.Culture]
+        pretty:Bool) async throws -> [Artifacts.Culture]
     {
         for sources:SPM.Build.Sources.Module in modules
         {

Sources/SymbolGraphBuilder/Builds/SPM.Build.swift

@@ -11,7 +11,7 @@ import UnidocDiagnostics
 extension SymbolGraph
 {
     static
-    func build(from artifacts:SPM.Artifacts) async throws -> Self
+    func build(from artifacts:Artifacts) async throws -> Self
     {
         let (namespaces, nominations):([[Compiler.Namespace]], Compiler.Nominations)
         let (extensions):[Compiler.Extension]
@@ -25,7 +25,7 @@ extension SymbolGraph
 
             var compiler:Compiler = .init(root: artifacts.root)
 
-            for culture:SPM.Artifacts.Culture in artifacts.cultures
+            for culture:Artifacts.Culture in artifacts.cultures
             {
                 let parts:[SymbolGraphPart] = try culture.loadSymbols()
 

Sources/SymbolGraphBuilder/Builds/Toolchain.Build.swift

@@ -24,7 +24,7 @@ extension SymbolGraphObject<Void>
         pretty:Bool) async throws
     {
         let metadata:SymbolGraphMetadata
-        let artifacts:SPM.Artifacts
+        let artifacts:Artifacts
 
         (metadata, artifacts) = try await build.compile(with: swift, pretty: pretty)