[Traits] Encode all trait information for package dump

# Motivation

We need to encode all trait related package manifest configuration so that it shows up in the `dump-package` output.

# Modification

This PR encodes the missing `traits` property of the manifest.

Author: FranzBusch

Sources/PackageModel/Manifest/Manifest.swift

@@ -524,7 +524,7 @@ extension Manifest: Encodable {
     private enum CodingKeys: CodingKey {
         case name, path, url, version, targetMap, toolsVersion,
              pkgConfig, providers, cLanguageStandard, cxxLanguageStandard, swiftLanguageVersions,
-             dependencies, products, targets, platforms, packageKind, revision,
+             dependencies, products, targets, traits, platforms, packageKind, revision,
              defaultLocalization
     }
 
@@ -555,6 +555,7 @@ extension Manifest: Encodable {
         try container.encode(self.dependencies, forKey: .dependencies)
         try container.encode(self.products, forKey: .products)
         try container.encode(self.targets, forKey: .targets)
+        try container.encode(self.traits, forKey: .traits)
         try container.encode(self.platforms, forKey: .platforms)
         try container.encode(self.packageKind, forKey: .packageKind)
     }

Sources/PackageModel/Manifest/TraitDescription.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-public struct TraitDescription: Sendable, Hashable, ExpressibleByStringLiteral {
+public struct TraitDescription: Sendable, Hashable, Codable, ExpressibleByStringLiteral {
     /// The trait's canonical name.
     ///
     /// This is used when enabling the trait or when referring to it from other modifiers in the manifest.

Tests/FunctionalTests/TraitTests.swift

@@ -13,6 +13,7 @@
 import DriverSupport
 import SPMTestSupport
 import PackageModel
+import TSCBasic
 import XCTest
 
 final class TraitTests: XCTestCase {
@@ -161,5 +162,17 @@ final class TraitTests: XCTestCase {
             """)
         }
     }
+
+    func testTraits_dumpPackage() async throws {
+        try await fixture(name: "Traits") { fixturePath in
+            let packageRoot = fixturePath.appending("Example")
+            let (dumpOutput, _) = try await SwiftPM.Package.execute(["dump-package"], packagePath: packageRoot)
+            let json = try JSON(bytes: ByteString(encodingAsUTF8: dumpOutput))
+            guard case let .dictionary(contents) = json else { XCTFail("unexpected result"); return }
+            guard case let .array(traits)? = contents["traits"] else { XCTFail("unexpected result"); return }
+            XCTAssertEqual(traits.count, 11)
+        }
+    }
+
 }
 #endif

Tests/PackageGraphTests/ModulesGraphTests.swift

@@ -2369,7 +2369,7 @@ final class ModulesGraphTests: XCTestCase {
                 ),
             ])
         // Make sure aliases are found properly and do not fall back to pre‐5.2 behavior, leaking across onto other dependencies.
-        let required = manifest.dependenciesRequired(for: .everything)
+        let required = manifest.dependenciesRequired(for: .everything, enabledTraits: [])
         let unrelated = try XCTUnwrap(required.first(where: { $0.nameForModuleDependencyResolutionOnly == "Unrelated" }))
         let requestedProducts = unrelated.productFilter
         #if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION

Tests/PackageModelTests/ManifestTests.swift

@@ -92,7 +92,7 @@ class ManifestTests: XCTestCase {
                 targets: targets
             )
 
-            XCTAssertEqual(manifest.dependenciesRequired(for: .everything).map({ $0.identity.description }).sorted(), [
+            XCTAssertEqual(manifest.dependenciesRequired(for: .everything, enabledTraits: []).map({ $0.identity.description }).sorted(), [
                 "bar1",
                 "bar2",
                 "bar3",
@@ -109,7 +109,7 @@ class ManifestTests: XCTestCase {
                 targets: targets
             )
 
-            XCTAssertEqual(manifest.dependenciesRequired(for: .specific(["Foo"])).map({ $0.identity.description }).sorted(), [
+            XCTAssertEqual(manifest.dependenciesRequired(for: .specific(["Foo"]), enabledTraits: []).map({ $0.identity.description }).sorted(), [
                 "bar1", // Foo → Foo1 → Bar1
                 "bar2", // Foo → Foo1 → Foo2 → Bar2
                 "bar3", // Foo → Foo1 → Bar1 → could be from any package due to pre‐5.2 tools version.
@@ -126,7 +126,7 @@ class ManifestTests: XCTestCase {
                 targets: targets
             )
 
-            XCTAssertEqual(manifest.dependenciesRequired(for: .everything).map({ $0.identity.description }).sorted(), [
+            XCTAssertEqual(manifest.dependenciesRequired(for: .everything, enabledTraits: []).map({ $0.identity.description }).sorted(), [
                 "bar1",
                 "bar2",
                 "bar3",