Merge pull request #131 from dmhts/fix-description-package-resolves-o…

…nly-exported-targets

Fix DescriptionPackage resolves targets not exported via products

Sources/ScipioKit/DescriptionPackage.swift

@@ -188,7 +188,8 @@ extension DescriptionPackage {
             // In create mode, all products should be built
             // In future update, users will be enable to specify products want to build
             let rootPackage = try fetchRootPackage()
-            let productsToBuild = rootPackage.products
+            let productNamesToBuild = rootPackage.manifest.products.map { $0.name }
+            let productsToBuild = rootPackage.products.filter { productNamesToBuild.contains($0.name) }
             return Set(productsToBuild.flatMap(\.targets))
         case .prepareDependencies:
             // In prepare mode, all targets should be built

Tests/ScipioKitTests/DescriptionPackageTests.swift

@@ -65,14 +65,31 @@ final class DescriptionPackageTests: XCTestCase {
     }
 
     func testBuildProductsInCreateMode() throws {
+        let rootPath = fixturePath.appendingPathComponent("TestingPackage")
+        let package = try XCTUnwrap(try DescriptionPackage(
+            packageDirectory: rootPath.absolutePath,
+            mode: .createPackage,
+            onlyUseVersionsFromResolvedFile: false
+        ))
+        XCTAssertEqual(package.name, "TestingPackage")
+
+        XCTAssertEqual(
+            Set(try package.resolveBuildProducts().map(\.target.name)),
+            [
+                "Logging",
+                "TestingPackage",
+            ]
+        )
+    }
+
+    func testBinaryBuildProductsInCreateMode() throws {
         let rootPath = fixturePath.appendingPathComponent("BinaryPackage")
         let package = try XCTUnwrap(try DescriptionPackage(
             packageDirectory: rootPath.absolutePath,
             mode: .createPackage,
             onlyUseVersionsFromResolvedFile: false
         ))
         XCTAssertEqual(package.name, "BinaryPackage")
-
         XCTAssertEqual(
             Set(try package.resolveBuildProducts().map(\.target.name)),
             ["SomeBinary"]

Tests/ScipioKitTests/Resources/Fixtures/TestingPackage/Package.swift

@@ -22,6 +22,16 @@ let package = Package(
             name: "TestingPackage",
             dependencies: [
                 .product(name: "Logging", package: "swift-log"),
-            ]),
+            ]
+        ),
+        .executableTarget(
+            name: "InternalExecutableTarget",
+            dependencies: ["InternalRegularTarget"]
+        ),
+        .target(name: "InternalRegularTarget"),
+        .testTarget(
+            name: "TestingPackageTests",
+            dependencies: ["InternalRegularTarget"]
+        )
     ]
 )

Tests/ScipioKitTests/Resources/Fixtures/TestingPackage/Sources/InternalExecutableTarget/InternalExecutableTarget.swift

@@ -0,0 +1,4 @@
+@main
+public struct InternalExecutableTarget {
+    static func main() {}
+}

Tests/ScipioKitTests/Resources/Fixtures/TestingPackage/Sources/InternalRegularTarget/InternalRegularTarget.swift

@@ -0,0 +1,3 @@
+public struct InternalRegularTarget {
+    public init() {}
+}

Tests/ScipioKitTests/Resources/Fixtures/TestingPackage/Tests/TestingPackageTests/TestingPackageTests.swift

@@ -0,0 +1,4 @@
+import XCTest
+import InternalRegularTarget
+
+class TestingPackageTests: XCTest {}