Merge branch 'swiftlang:main' into pif_updates

Author: daveinglis

.swift-version

@@ -1 +1 @@
-6.1.0
+6.1.2

Fixtures/Miscellaneous/Plugins/PluginsAndSnippets/Plugins/PluginScriptTarget/Script.swift

@@ -4,7 +4,9 @@ import PackagePlugin
 struct PluginScript: CommandPlugin {
 
     func performCommand(context: PluginContext, arguments: [String]) async throws {
-        dump(context)
+        if !arguments.contains("--skip-dump") {
+            dump(context)
+        }
         if let target = try context.package.targets(named: ["MySnippet"]).first as? SourceModuleTarget {
             print("type of snippet target: \(target.kind)")
         }

Fixtures/Traits/PackageConditionalDeps/Package.swift

@@ -0,0 +1,39 @@
+// swift-tools-version: 6.1
+
+import PackageDescription
+
+let package = Package(
+    name: "PackageConditionalDeps",
+    products: [
+        .library(
+            name: "PackageConditionalDeps",
+            targets: ["PackageConditionalDeps"]
+        ),
+    ],
+    traits: [
+        .default(enabledTraits: ["EnablePackage1Dep"]),
+        "EnablePackage1Dep",
+        "EnablePackage2Dep"
+    ],
+    dependencies: [
+        .package(path: "../Package1"),
+        .package(path: "../Package2"),
+    ],
+    targets: [
+        .target(
+            name: "PackageConditionalDeps",
+            dependencies: [ 
+                .product(
+                    name: "Package1Library1",
+                    package: "Package1",
+                    condition: .when(traits: ["EnablePackage1Dep"])
+                ),
+                .product(
+                    name: "Package2Library1",
+                    package: "Package2",
+                    condition: .when(traits: ["EnablePackage2Dep"])
+                )
+            ]
+        ),
+    ]
+)

Fixtures/Traits/PackageConditionalDeps/Sources/PackageConditionalDeps/PackageConditionalDeps.swift

@@ -0,0 +1,3 @@
+public func nothingHappens() {
+    // Do nothing.
+}

Package.swift

@@ -80,7 +80,6 @@ let swiftPMProduct = (
         "LLBuildManifest",
         "SourceKitLSPAPI",
         "SPMLLBuild",
-        "SwiftBuildSupport",
     ]
 )
 

Sources/Commands/PackageCommands/DumpCommands.swift

@@ -56,8 +56,16 @@ struct DumpSymbolGraph: AsyncSwiftCommand {
             enableAllTraits: true,
             cacheBuildManifest: false
         )
-        // TODO pass along the various flags as associated values to the symbol graph build output (e.g. includeSPISymbols)
-        let buildResult = try await buildSystem.build(subset: .allExcludingTests, buildOutputs: [.symbolGraph, .buildPlan])
+        let buildResult = try await buildSystem.build(subset: .allExcludingTests, buildOutputs: [.symbolGraph(
+            BuildOutput.SymbolGraphOptions(
+                prettyPrint: prettyPrint,
+                minimumAccessLevel: .accessLevel(minimumAccessLevel),
+                includeSynthesized: !skipSynthesizedMembers,
+                includeSPI: includeSPISymbols,
+                emitExtensionBlocks: extensionBlockSymbolBehavior != .omitExtensionBlockSymbols,
+                // TODO skip inherited docs
+            )
+        ), .buildPlan])
 
         let symbolGraphDirectory = try swiftCommandState.productsBuildParameters.dataPath.appending("symbolgraph")
 
@@ -189,3 +197,9 @@ struct DumpPIF: AsyncSwiftCommand {
         return .init(wantsMultipleTestProducts: true)
     }
 }
+
+fileprivate extension BuildOutput.SymbolGraphAccessLevel {
+    fileprivate static func accessLevel(_ accessLevel: SymbolGraphExtract.AccessLevel) -> BuildOutput.SymbolGraphAccessLevel {
+        return BuildOutput.SymbolGraphAccessLevel.init(rawValue: accessLevel.rawValue)!
+    }
+}

Sources/Commands/Utilities/PluginDelegate.swift

@@ -413,8 +413,7 @@ final class PluginDelegate: PluginInvocationDelegate {
         )
 
         // Build the target, if needed. We are interested in symbol graph (ideally) or a build plan.
-        // TODO pass along the options as associated values to the symbol graph build output (e.g. includeSPI)
-        let buildResult = try await buildSystem.build(subset: .target(targetName), buildOutputs: [.symbolGraph, .buildPlan])
+        let buildResult = try await buildSystem.build(subset: .target(targetName), buildOutputs: [.symbolGraph(options), .buildPlan])
 
         if let symbolGraph = buildResult.symbolGraph {
             let path = (try swiftCommandState.productsBuildParameters.buildPath)
@@ -505,3 +504,33 @@ extension BuildSystem {
         }
     }
 }
+
+extension BuildOutput {
+    static func symbolGraph(_ options: PluginInvocationSymbolGraphOptions) -> BuildOutput {
+        return .symbolGraph(SymbolGraphOptions(
+                minimumAccessLevel: .accessLevel(options.minimumAccessLevel),
+                includeSynthesized: options.includeSynthesized,
+                includeSPI: options.includeSPI,
+                emitExtensionBlocks: options.emitExtensionBlocks
+        ))
+    }
+}
+
+fileprivate extension BuildOutput.SymbolGraphAccessLevel {
+    fileprivate static func accessLevel(_ accessLevel: PluginInvocationSymbolGraphOptions.AccessLevel) -> BuildOutput.SymbolGraphAccessLevel {
+        return switch accessLevel {
+        case .private:
+            .private
+        case .fileprivate:
+            .fileprivate
+        case .internal:
+            .internal
+        case .package:
+            .package
+        case .public:
+            .public
+        case .open:
+            .open
+        }
+    }
+}

Sources/PackageGraph/ModulesGraph.swift

@@ -505,26 +505,14 @@ public func loadModulesGraph(
                         return condition.isSatisfied(by: parentTraits)
                     }.map(\.name)
 
-                    var enabledTraitsSet = explicitlyEnabledTraits.flatMap { Set($0) }
-                    let precomputedTraits = enabledTraitsMap[dependency.identity]
-
-                    if precomputedTraits == ["default"],
-                       let enabledTraitsSet {
-                        enabledTraitsMap[dependency.identity] = enabledTraitsSet
-                    } else {
-                        // unify traits
-                        enabledTraitsSet?.formUnion(precomputedTraits)
-                        if let enabledTraitsSet {
-                            enabledTraitsMap[dependency.identity] = enabledTraitsSet
-                        }
+                    if let enabledTraitsSet = explicitlyEnabledTraits.flatMap({ Set($0) }) {
+                        let calculatedTraits = try manifest.enabledTraits(
+                            using: enabledTraitsSet,
+                            .init(parent)
+                        )
+                        enabledTraitsMap[dependency.identity] = calculatedTraits
                     }
 
-                    let calculatedTraits = try manifest.enabledTraits(
-                        using: enabledTraitsSet ?? ["default"],
-                        .init(parent)
-                    )
-
-                    enabledTraitsMap[dependency.identity] = calculatedTraits
                     let result = visited.insert(dependency.identity)
                     if result.inserted {
                         try dependencies(of: manifest, dependency.productFilter)

Sources/PackageGraph/PackageGraphRoot.swift

@@ -164,8 +164,8 @@ public struct PackageGraphRoot {
                     return condition.isSatisfied(by: rootEnabledTraits)
                 }.map(\.name)
 
-                var enabledTraitsSet = enabledTraits.flatMap { Set($0) } ?? ["default"]
-                enabledTraitsSet.formUnion(enabledTraitsMap[dep.identity])
+                var enabledTraitsSet = enabledTraitsMap[dep.identity]
+                enabledTraitsSet.formUnion(enabledTraits.flatMap({ Set($0) }) ?? [])
 
                 return PackageContainerConstraint(
                     package: dep.packageRef,

Sources/PackageGraph/PackageModel+Extensions.swift

@@ -42,7 +42,7 @@ extension Manifest {
                 return condition.isSatisfied(by: enabledTraits)
             }.map(\.name)
 
-            var enabledTraitsSet = explicitlyEnabledTraits.flatMap({ Set($0) }) ?? ["default"]
+            let enabledTraitsSet = explicitlyEnabledTraits.flatMap({ Set($0) }) ?? ["default"]
 
             return PackageContainerConstraint(
                 package: $0.packageRef,